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

display: Rename META_GRAB_OP_WAYLAND_CLIENT to WAYLAND_POPUP

Browse Source 
We're going to introduce other grab ops soon.
This commit is contained in:
Jasper St. Pierre 2014-04-20 11:37:46 -04:00
parent 02c31ac069
commit e55dd4e3f4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display.c
View File

@ -1302,7 +1302,7 @@ meta_grab_op_should_block_wayland (MetaGrabOp op)
if (op == META_GRAB_OP_NONE) if (op == META_GRAB_OP_NONE)
return FALSE; return FALSE;
if (op == META_GRAB_OP_WAYLAND_CLIENT) if (op == META_GRAB_OP_WAYLAND_POPUP)
return FALSE; return FALSE;
/* Clicking on a frame button needs us to deliver events to the /* Clicking on a frame button needs us to deliver events to the

4
src/core/events.c
View File

@ -1703,7 +1703,7 @@ grab_op_should_block_mouse_events (MetaGrabOp op)
{ {
switch (op) switch (op)
{ {
case META_GRAB_OP_WAYLAND_CLIENT: case META_GRAB_OP_WAYLAND_POPUP:
case META_GRAB_OP_COMPOSITOR: case META_GRAB_OP_COMPOSITOR:
return TRUE; return TRUE;
@ -2165,7 +2165,7 @@ meta_display_handle_event (MetaDisplay *display,
bypass_wayland = TRUE; bypass_wayland = TRUE;
/* If a Wayland client has a grab, don't pass that through to Clutter */ /* 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; bypass_clutter = TRUE;
if (compositor && !bypass_wayland) if (compositor && !bypass_wayland)

4
src/meta/common.h
View File

@ -223,8 +223,8 @@ typedef enum
/* Special grab op when the compositor asked for a grab */ /* Special grab op when the compositor asked for a grab */
META_GRAB_OP_COMPOSITOR, META_GRAB_OP_COMPOSITOR,
/* For when a client takes a popup grab */ /* For when a Wayland client takes a popup grab */
META_GRAB_OP_WAYLAND_CLIENT, META_GRAB_OP_WAYLAND_POPUP,
} MetaGrabOp; } MetaGrabOp;
/** /**

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

@ -793,7 +793,7 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
meta_display_begin_grab_op (window->display, meta_display_begin_grab_op (window->display,
window->screen, window->screen,
window, window,
META_GRAB_OP_WAYLAND_CLIENT, META_GRAB_OP_WAYLAND_POPUP,
FALSE, /* pointer_already_grabbed */ FALSE, /* pointer_already_grabbed */
FALSE, /* frame_action */ FALSE, /* frame_action */
1, /* button. XXX? */ 1, /* button. XXX? */