mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 12:32:05 +00:00
display: Rename META_GRAB_OP_WAYLAND_CLIENT to WAYLAND_POPUP
We're going to introduce other grab ops soon.
This commit is contained in:
parent
02c31ac069
commit
e55dd4e3f4
@ -1302,7 +1302,7 @@ meta_grab_op_should_block_wayland (MetaGrabOp op)
|
||||
if (op == META_GRAB_OP_NONE)
|
||||
return FALSE;
|
||||
|
||||
if (op == META_GRAB_OP_WAYLAND_CLIENT)
|
||||
if (op == META_GRAB_OP_WAYLAND_POPUP)
|
||||
return FALSE;
|
||||
|
||||
/* Clicking on a frame button needs us to deliver events to the
|
||||
|
@ -1703,7 +1703,7 @@ grab_op_should_block_mouse_events (MetaGrabOp op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
case META_GRAB_OP_WAYLAND_CLIENT:
|
||||
case META_GRAB_OP_WAYLAND_POPUP:
|
||||
case META_GRAB_OP_COMPOSITOR:
|
||||
return TRUE;
|
||||
|
||||
@ -2165,7 +2165,7 @@ meta_display_handle_event (MetaDisplay *display,
|
||||
bypass_wayland = TRUE;
|
||||
|
||||
/* If a Wayland client has a grab, don't pass that through to Clutter */
|
||||
if (display->grab_op == META_GRAB_OP_WAYLAND_CLIENT)
|
||||
if (display->grab_op == META_GRAB_OP_WAYLAND_POPUP)
|
||||
bypass_clutter = TRUE;
|
||||
|
||||
if (compositor && !bypass_wayland)
|
||||
|
@ -223,8 +223,8 @@ typedef enum
|
||||
/* Special grab op when the compositor asked for a grab */
|
||||
META_GRAB_OP_COMPOSITOR,
|
||||
|
||||
/* For when a client takes a popup grab */
|
||||
META_GRAB_OP_WAYLAND_CLIENT,
|
||||
/* For when a Wayland client takes a popup grab */
|
||||
META_GRAB_OP_WAYLAND_POPUP,
|
||||
} MetaGrabOp;
|
||||
|
||||
/**
|
||||
|
@ -793,7 +793,7 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
|
||||
meta_display_begin_grab_op (window->display,
|
||||
window->screen,
|
||||
window,
|
||||
META_GRAB_OP_WAYLAND_CLIENT,
|
||||
META_GRAB_OP_WAYLAND_POPUP,
|
||||
FALSE, /* pointer_already_grabbed */
|
||||
FALSE, /* frame_action */
|
||||
1, /* button. XXX? */
|
||||
|
Loading…
Reference in New Issue
Block a user