isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Remove unnecessary COMPOSITOR_GRAB checks

Browse Source 
Since the new ClutterGrab API replaced the old plugin-modal hook,
the event-route is never set to COMPOSITOR_GRAB.

The code in question already checks whether the stage has a grab,
so we can just remove old checks.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2436>
This commit is contained in:
Florian Müllner 2022-05-27 18:51:24 +02:00 committed by Marge Bot
parent 50e89e3760
commit fabad0be9c
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-pointer.c
View File

@ -281,7 +281,6 @@ sync_focus_surface (MetaWaylandPointer *pointer)
switch (display->event_route) switch (display->event_route)
{ {
case META_EVENT_ROUTE_WINDOW_OP: case META_EVENT_ROUTE_WINDOW_OP:
case META_EVENT_ROUTE_COMPOSITOR_GRAB:
case META_EVENT_ROUTE_FRAME_BUTTON: case META_EVENT_ROUTE_FRAME_BUTTON:
/* The compositor has a grab, so remove our focus... */ /* The compositor has a grab, so remove our focus... */
meta_wayland_pointer_set_focus (pointer, NULL); meta_wayland_pointer_set_focus (pointer, NULL);
@ -461,7 +460,6 @@ default_grab_focus (MetaWaylandPointerGrab *grab,
switch (display->event_route) switch (display->event_route)
{ {
case META_EVENT_ROUTE_WINDOW_OP: case META_EVENT_ROUTE_WINDOW_OP:
case META_EVENT_ROUTE_COMPOSITOR_GRAB:
case META_EVENT_ROUTE_FRAME_BUTTON: case META_EVENT_ROUTE_FRAME_BUTTON:
return; return;
break; break;

1
src/wayland/meta-wayland-tablet-tool.c
View File

@ -565,7 +565,6 @@ sync_focus_surface (MetaWaylandTabletTool *tool,
switch (display->event_route) switch (display->event_route)
{ {
case META_EVENT_ROUTE_WINDOW_OP: case META_EVENT_ROUTE_WINDOW_OP:
case META_EVENT_ROUTE_COMPOSITOR_GRAB:
case META_EVENT_ROUTE_FRAME_BUTTON: case META_EVENT_ROUTE_FRAME_BUTTON:
/* The compositor has a grab, so remove our focus */ /* The compositor has a grab, so remove our focus */
meta_wayland_tablet_tool_set_focus (tool, NULL, event); meta_wayland_tablet_tool_set_focus (tool, NULL, event);