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

core: Drop META_GRAB_OP_COMPOSITOR

Browse Source 
There is no longer meta_plugin_begin_modal(), so this grab operation
is no longer used.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2100>
This commit is contained in:
Carlos Garnacho 2021-11-23 13:01:09 +01:00
parent b6de66e353
commit e8ed9ece1c
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/display.c
View File

@ -1817,10 +1817,6 @@ get_event_route_from_grab_op (MetaGrabOp op)
case META_GRAB_OP_WINDOW_BASE: case META_GRAB_OP_WINDOW_BASE:
return META_EVENT_ROUTE_WINDOW_OP; return META_EVENT_ROUTE_WINDOW_OP;
case META_GRAB_OP_COMPOSITOR:
/* begin_grab_op shouldn't be called with META_GRAB_OP_COMPOSITOR. */
g_assert_not_reached ();
case META_GRAB_OP_WAYLAND_POPUP: case META_GRAB_OP_WAYLAND_POPUP:
return META_EVENT_ROUTE_WAYLAND_POPUP; return META_EVENT_ROUTE_WAYLAND_POPUP;
@ -2053,9 +2049,7 @@ meta_display_end_grab_op (MetaDisplay *display,
* Gets the current grab operation, if any. * Gets the current grab operation, if any.
* *
* Return value: the current grab operation, or %META_GRAB_OP_NONE if * Return value: the current grab operation, or %META_GRAB_OP_NONE if
* Mutter doesn't currently have a grab. %META_GRAB_OP_COMPOSITOR will * Mutter doesn't currently have a grab.
* be returned if a compositor-plugin modal operation is in effect
* (See mutter_begin_modal_for_plugin())
*/ */
MetaGrabOp MetaGrabOp
meta_display_get_grab_op (MetaDisplay *display) meta_display_get_grab_op (MetaDisplay *display)

4
src/meta/common.h
View File

@ -109,7 +109,6 @@ typedef enum
* @META_GRAB_OP_KEYBOARD_RESIZING_NE: Resizing NE with keyboard * @META_GRAB_OP_KEYBOARD_RESIZING_NE: Resizing NE with keyboard
* @META_GRAB_OP_KEYBOARD_RESIZING_SW: Resizing SW with keyboard * @META_GRAB_OP_KEYBOARD_RESIZING_SW: Resizing SW with keyboard
* @META_GRAB_OP_KEYBOARD_RESIZING_NW: Resizing NS with keyboard * @META_GRAB_OP_KEYBOARD_RESIZING_NW: Resizing NS with keyboard
* @META_GRAB_OP_COMPOSITOR: Compositor asked for grab
*/ */
/* The lower 16 bits of the grab operation is its type. /* The lower 16 bits of the grab operation is its type.
@ -154,9 +153,6 @@ typedef enum
/* Window grab ops. */ /* Window grab ops. */
META_GRAB_OP_WINDOW_BASE, META_GRAB_OP_WINDOW_BASE,
/* Special grab op when the compositor asked for a grab */
META_GRAB_OP_COMPOSITOR,
/* For when a Wayland client takes a popup grab. */ /* For when a Wayland client takes a popup grab. */
META_GRAB_OP_WAYLAND_POPUP, META_GRAB_OP_WAYLAND_POPUP,

6
src/ui/frames.c
View File

@ -1643,15 +1643,11 @@ static gboolean
handle_leave_notify_event (MetaUIFrame *frame, handle_leave_notify_event (MetaUIFrame *frame,
ClutterCrossingEvent *event) ClutterCrossingEvent *event)
{ {
MetaGrabOp grab_op;
grab_op = meta_x11_wm_get_grab_op (frame->frames->x11_display);
/* ignore the first LeaveNotify event after opening a window menu /* ignore the first LeaveNotify event after opening a window menu
* if it is the result of a compositor grab * if it is the result of a compositor grab
*/ */
frame->maybe_ignore_leave_notify = frame->maybe_ignore_leave_notify && frame->maybe_ignore_leave_notify = frame->maybe_ignore_leave_notify &&
grab_op == META_GRAB_OP_COMPOSITOR; (event->flags & CLUTTER_EVENT_FLAG_GRAB_NOTIFY) != 0;
if (frame->maybe_ignore_leave_notify) if (frame->maybe_ignore_leave_notify)
return FALSE; return FALSE;