isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-24 02:19:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/events: Restore IS_GESTURE_EVENT check for X11

Browse Source 
It got lost during feec896d85ea resulting in a PROPAGATE that should
be STOP.

For Wayland, gesture events are already handled (663f9d44).

Fixes: feec896d85ea ("core: Simplify meta_display_handle_event()")
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3293
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3589>
This commit is contained in:
Daniel van Vugt 2024-02-16 13:54:31 +08:00 committed by Marge Bot
parent dc2b2e379b
commit 5b49e0853c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/events.c
View File

@ -46,6 +46,14 @@
#include "wayland/meta-wayland-private.h" #include "wayland/meta-wayland-private.h"
#endif #endif
#define IS_GESTURE_EVENT(et) ((et) == CLUTTER_TOUCHPAD_SWIPE || \
(et) == CLUTTER_TOUCHPAD_PINCH || \
(et) == CLUTTER_TOUCHPAD_HOLD || \
(et) == CLUTTER_TOUCH_BEGIN || \
(et) == CLUTTER_TOUCH_UPDATE || \
(et) == CLUTTER_TOUCH_END || \
(et) == CLUTTER_TOUCH_CANCEL)
#define IS_KEY_EVENT(et) ((et) == CLUTTER_KEY_PRESS || \ #define IS_KEY_EVENT(et) ((et) == CLUTTER_KEY_PRESS || \
(et) == CLUTTER_KEY_RELEASE) (et) == CLUTTER_KEY_RELEASE)
@ -467,7 +475,12 @@ meta_display_handle_event (MetaDisplay *display,
if (meta_wayland_compositor_handle_event (wayland_compositor, event)) if (meta_wayland_compositor_handle_event (wayland_compositor, event))
return CLUTTER_EVENT_STOP; return CLUTTER_EVENT_STOP;
} }
else
#endif #endif
{
if (window && !IS_GESTURE_EVENT (event_type))
return CLUTTER_EVENT_STOP;
}
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }