163 lines
6.4 KiB
Diff
163 lines
6.4 KiB
Diff
|
From 88b50f5a9e4b1b87e766e929a77aafdc27e335cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Carlos Garnacho <carlosg@gnome.org>
|
||
|
|
Date: Wed, 7 Jun 2023 11:04:15 +0200
|
||
|
|
Subject: [PATCH] core: Change MetaWaylandTextInput event forwarding to IMs
|
||
|
|
|
||
|
|
We need to juggle with some things here to keep key event ordering
|
||
|
|
and accounting consistent.
|
||
|
|
|
||
|
|
The keyboard internal state changes (and maybe modifier event emission)
|
||
|
|
happening through meta_wayland_seat_update() should ideally happen
|
||
|
|
from the same key events that reach the client through wl_keyboard.key,
|
||
|
|
so that wl_keyboard.modifier events are emitted in the right relative
|
||
|
|
order to other key events.
|
||
|
|
|
||
|
|
In order to fix this, we need to decide at an earlier point whether
|
||
|
|
the event will get processed through IM (and maybe be reinjected),
|
||
|
|
thus ignored in wait of IM-postprocessed events.
|
||
|
|
|
||
|
|
This means we pay less attention to whether events are first-hand
|
||
|
|
hardware events for some things and go with the event that does
|
||
|
|
eventually reach to us (hardware or IM).
|
||
|
|
|
||
|
|
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5890
|
||
|
|
---
|
||
|
|
src/core/events.c | 8 ++++++++
|
||
|
|
src/wayland/meta-wayland-keyboard.c | 8 --------
|
||
|
|
src/wayland/meta-wayland-seat.c | 30 ++++++++++++++++++++++-------
|
||
|
|
src/wayland/meta-wayland-seat.h | 3 +++
|
||
|
|
src/wayland/meta-wayland.c | 7 +++++++
|
||
|
|
src/wayland/meta-wayland.h | 3 +++
|
||
|
|
6 files changed, 44 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/events.c b/src/core/events.c
|
||
|
|
index 6bb4e90..7751042 100644
|
||
|
|
--- a/src/core/events.c
|
||
|
|
+++ b/src/core/events.c
|
||
|
|
@@ -234,6 +234,14 @@ meta_display_handle_event (MetaDisplay *display,
|
||
|
|
if (meta_is_wayland_compositor ())
|
||
|
|
{
|
||
|
|
compositor = meta_wayland_compositor_get_default ();
|
||
|
|
+
|
||
|
|
+ if (display->event_route == META_EVENT_ROUTE_NORMAL &&
|
||
|
|
+ meta_wayland_compositor_handle_text_input_event (compositor, event))
|
||
|
|
+ {
|
||
|
|
+ bypass_wayland = bypass_clutter = TRUE;
|
||
|
|
+ goto out;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
meta_wayland_compositor_update (compositor, event);
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
|
||
|
|
index 836939c..460d9e9 100644
|
||
|
|
--- a/src/wayland/meta-wayland-keyboard.c
|
||
|
|
+++ b/src/wayland/meta-wayland-keyboard.c
|
||
|
|
@@ -564,14 +564,6 @@ meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
|
||
|
|
{
|
||
|
|
gboolean is_press = event->type == CLUTTER_KEY_PRESS;
|
||
|
|
|
||
|
|
- /* Only handle real, non-synthetic, events here. The IM is free to reemit
|
||
|
|
- * key events (incl. modifiers), handling those additionally will result
|
||
|
|
- * in doubly-pressed keys.
|
||
|
|
- */
|
||
|
|
- if ((event->flags &
|
||
|
|
- (CLUTTER_EVENT_FLAG_SYNTHETIC | CLUTTER_EVENT_FLAG_INPUT_METHOD)) != 0)
|
||
|
|
- return;
|
||
|
|
-
|
||
|
|
/* If we get a key event but still have pending modifier state
|
||
|
|
* changes from a previous event that didn't get cleared, we need to
|
||
|
|
* send that state right away so that the new key event can be
|
||
|
|
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
|
||
|
|
index 25d5074..27d8fe3 100644
|
||
|
|
--- a/src/wayland/meta-wayland-seat.c
|
||
|
|
+++ b/src/wayland/meta-wayland-seat.c
|
||
|
|
@@ -376,6 +376,29 @@ meta_wayland_seat_update (MetaWaylandSeat *seat,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+gboolean
|
||
|
|
+meta_wayland_seat_handle_text_input_event (MetaWaylandSeat *seat,
|
||
|
|
+ const ClutterEvent *event)
|
||
|
|
+{
|
||
|
|
+ switch (event->type)
|
||
|
|
+ {
|
||
|
|
+ case CLUTTER_KEY_PRESS:
|
||
|
|
+ case CLUTTER_KEY_RELEASE:
|
||
|
|
+ if (meta_wayland_text_input_handle_event (seat->text_input, event))
|
||
|
|
+ return TRUE;
|
||
|
|
+
|
||
|
|
+ if (meta_wayland_gtk_text_input_handle_event (seat->gtk_text_input,
|
||
|
|
+ event))
|
||
|
|
+ return TRUE;
|
||
|
|
+
|
||
|
|
+ break;
|
||
|
|
+ default:
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return FALSE;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
gboolean
|
||
|
|
meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
|
||
|
|
const ClutterEvent *event)
|
||
|
|
@@ -398,13 +421,6 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
|
||
|
|
break;
|
||
|
|
case CLUTTER_KEY_PRESS:
|
||
|
|
case CLUTTER_KEY_RELEASE:
|
||
|
|
- if (meta_wayland_text_input_handle_event (seat->text_input, event))
|
||
|
|
- return TRUE;
|
||
|
|
-
|
||
|
|
- if (meta_wayland_gtk_text_input_handle_event (seat->gtk_text_input,
|
||
|
|
- event))
|
||
|
|
- return TRUE;
|
||
|
|
-
|
||
|
|
if (meta_wayland_seat_has_keyboard (seat))
|
||
|
|
return meta_wayland_keyboard_handle_event (seat->keyboard,
|
||
|
|
(const ClutterKeyEvent *) event);
|
||
|
|
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
|
||
|
|
index ae4e107..ab90106 100644
|
||
|
|
--- a/src/wayland/meta-wayland-seat.h
|
||
|
|
+++ b/src/wayland/meta-wayland-seat.h
|
||
|
|
@@ -84,4 +84,7 @@ gboolean meta_wayland_seat_has_pointer (MetaWaylandSeat *seat);
|
||
|
|
|
||
|
|
gboolean meta_wayland_seat_has_touch (MetaWaylandSeat *seat);
|
||
|
|
|
||
|
|
+gboolean meta_wayland_seat_handle_text_input_event (MetaWaylandSeat *seat,
|
||
|
|
+ const ClutterEvent *event);
|
||
|
|
+
|
||
|
|
#endif /* META_WAYLAND_SEAT_H */
|
||
|
|
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
|
||
|
|
index a3f0984..b548aa1 100644
|
||
|
|
--- a/src/wayland/meta-wayland.c
|
||
|
|
+++ b/src/wayland/meta-wayland.c
|
||
|
|
@@ -721,3 +721,10 @@ meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
|
||
|
|
meta_wayland_compositor_remove_surface_association (compositor, id);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+gboolean
|
||
|
|
+meta_wayland_compositor_handle_text_input_event (MetaWaylandCompositor *compositor,
|
||
|
|
+ const ClutterEvent *event)
|
||
|
|
+{
|
||
|
|
+ return meta_wayland_seat_handle_text_input_event (compositor->seat, event);
|
||
|
|
+}
|
||
|
|
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
|
||
|
|
index 6c655e4..ad82d52 100644
|
||
|
|
--- a/src/wayland/meta-wayland.h
|
||
|
|
+++ b/src/wayland/meta-wayland.h
|
||
|
|
@@ -89,6 +89,10 @@
|
||
|
|
void meta_wayland_compositor_schedule_surface_association (MetaWaylandCompositor *compositor,
|
||
|
|
int id,
|
||
|
|
MetaWindow *window);
|
||
|
|
+
|
||
|
|
+gboolean meta_wayland_compositor_handle_text_input_event (MetaWaylandCompositor *compositor,
|
||
|
|
+ const ClutterEvent *event);
|
||
|
|
+
|
||
|
|
META_EXPORT_TEST
|
||
|
|
void meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
|
||
|
|
int id,
|
||
|
|
|
||
|
|
2.40.1
|