chase wlroots: ime: don't use data in kb grab destroy handler (MR 5170)

Ref: 06275103f249cd2954630e59383342e102a6c1a3
(input-method-v2: Destroy keyboard grab before input method)

Background:

My MR in wlroots (!5107) stopped emitting `wlr_input_method_v2`
on its `commit`/`destroy` events, but didn't stop emitting
`wlr_input_method_keyboard_grab_v2` on its `destroy` event. That was
because `handle_keyboard_grab_destroy()` was called *after*
`handle_input_method_destroy()` for some reason, which caused segfault
when dereferencing `relay->input_method.keyboard_grab` in
`handle_keyboard_grab_destroy()`.

MR 5170 reversed this weired order of destroy handler calls, and finally
stopped emitting `wlr_input_method_keyboard_grab_v2` on its `destroy`
event.

.github/workflows/build.yml

@@ -93,6 +93,7 @@ jobs:
           apt-get install -y git gcc clang gdb xwayland
           apt-get build-dep -y labwc
           apt-get build-dep -y libwlroots-0.19-dev
+          apt-get build-dep -y libxkbcommon-dev
 
       - name: Install FreeBSD dependencies
         if: matrix.name == 'FreeBSD'
@@ -119,7 +120,7 @@ jobs:
           xbps-install -y git meson gcc clang pkg-config scdoc \
             cairo-devel glib-devel libpng-devel librsvg-devel libxml2-devel \
             pango-devel wlroots0.19-devel gdb bash xorg-server-xwayland \
-            dejavu-fonts-ttf libsfdo-devel foot
+            dejavu-fonts-ttf libsfdo-devel foot hwids
 
       # These builds are executed on all runners
       - name: Build with gcc

meson.build

@@ -51,9 +51,9 @@ endif
 add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
 
 wlroots = dependency(
-  'wlroots-0.19',
+  'wlroots-0.20',
   default_options: ['default_library=static', 'examples=false'],
-  version: ['>=0.19.0', '<0.20.0'],
+  version: ['>=0.20.0', '<0.21.0'],
 )
 
 wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true'

src/input/ime.c

@@ -309,7 +309,8 @@ handle_keyboard_grab_destroy(struct wl_listener *listener, void *data)
 {
 	struct input_method_relay *relay =
 		wl_container_of(listener, relay, keyboard_grab_destroy);
-	struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+	struct wlr_input_method_keyboard_grab_v2 *keyboard_grab =
+		relay->input_method->keyboard_grab;
 	assert(keyboard_grab);
 
 	wl_list_remove(&relay->keyboard_grab_destroy.link);
@@ -583,11 +584,11 @@ input_method_relay_create(struct seat *seat)
 	relay->popup_tree = wlr_scene_tree_create(&seat->server->scene->tree);
 
 	relay->new_text_input.notify = handle_new_text_input;
-	wl_signal_add(&seat->server->text_input_manager->events.text_input,
+	wl_signal_add(&seat->server->text_input_manager->events.new_text_input,
 		&relay->new_text_input);
 
 	relay->new_input_method.notify = handle_new_input_method;
-	wl_signal_add(&seat->server->input_method_manager->events.input_method,
+	wl_signal_add(&seat->server->input_method_manager->events.new_input_method,
 		&relay->new_input_method);
 
 	relay->focused_surface_destroy.notify = handle_focused_surface_destroy;

src/server.c

@@ -17,6 +17,7 @@
 #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
 #include <wlr/types/wlr_ext_image_capture_source_v1.h>
 #include <wlr/types/wlr_ext_image_copy_capture_v1.h>
+#include <wlr/types/wlr_fixes.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_input_method_v2.h>
@@ -255,6 +256,7 @@ allow_for_sandbox(const struct wlr_security_context_v1_state *security_state,
 		"wl_data_device_manager", /* would be great if we could drop this one */
 		"wl_seat",
 		"xdg_wm_base",
+		"wl_fixes",
 		/* enhanced */
 		"wl_output",
 		"wl_drm",
@@ -434,6 +436,8 @@ server_init(struct server *server)
 
 	server->wl_event_loop = wl_display_get_event_loop(server->wl_display);
 
+	wlr_fixes_create(server->wl_display, 1);
+
 	/* Catch signals */
 	server->sighup_source = wl_event_loop_add_signal(
 		server->wl_event_loop, SIGHUP, handle_sighup, server);

subprojects/wlroots.wrap

@@ -1,7 +1,7 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 0.19
+revision = master
 
 [provide]
-dependency_names = wlroots-0.19
-wlroots-0.19=wlroots
+dependency_names = wlroots-0.20
+wlroots-0.20=wlroots