brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Drop META_EVENT_ROUTE_FRAME_BUTTON

Browse Source 
With META_GRAB_OP_FRAME_BUTTON gone, this is no longer used. Drop
this event route.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2683>
This commit is contained in:
Carlos Garnacho 2022-09-28 12:13:42 +02:00 committed by Marge Bot
parent 970ef35a62
commit a5bd0c39fe
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/display-private.h
View File

@ -89,9 +89,6 @@ typedef enum
/* A Wayland application has a popup open. All events go to /* A Wayland application has a popup open. All events go to
* the Wayland application. */ * the Wayland application. */
META_EVENT_ROUTE_WAYLAND_POPUP, META_EVENT_ROUTE_WAYLAND_POPUP,
/* The user is clicking on a window button. */
META_EVENT_ROUTE_FRAME_BUTTON,
} MetaEventRoute; } MetaEventRoute;
typedef void (* MetaDisplayWindowFunc) (MetaWindow *window, typedef void (* MetaDisplayWindowFunc) (MetaWindow *window,

4
src/core/events.c
View File

@ -109,7 +109,6 @@ get_window_for_event (MetaDisplay *display,
} }
case META_EVENT_ROUTE_WINDOW_OP: case META_EVENT_ROUTE_WINDOW_OP:
case META_EVENT_ROUTE_WAYLAND_POPUP: case META_EVENT_ROUTE_WAYLAND_POPUP:
case META_EVENT_ROUTE_FRAME_BUTTON:
return display->grab_window; return display->grab_window;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
@ -477,8 +476,7 @@ meta_display_handle_event (MetaDisplay *display,
* event, and if it doesn't, replay the event to release our * event, and if it doesn't, replay the event to release our
* own sync grab. */ * own sync grab. */
if (display->event_route == META_EVENT_ROUTE_WINDOW_OP || if (display->event_route == META_EVENT_ROUTE_WINDOW_OP)
display->event_route == META_EVENT_ROUTE_FRAME_BUTTON)
{ {
bypass_clutter = TRUE; bypass_clutter = TRUE;
bypass_wayland = TRUE; bypass_wayland = TRUE;

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

@ -330,7 +330,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_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);
break; break;
@ -509,7 +508,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_FRAME_BUTTON:
return; return;
break; break;

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

@ -588,7 +588,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_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);
break; break;