isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Remove COMPOSITOR from mouse/keyboard grab ops

Browse Source 
Looking at the code paths where is_mouse / is_keyboard are used,
all of them should never be run when dealing with a COMPOSITOR
grab op, since they're filtered out above or the method is just
never run during that time.

It's confusing that COMPOSITOR is in here, and requires us to
be funny with other places in code, so just take it out.
This commit is contained in:
Jasper St. Pierre 2014-04-20 11:04:43 -04:00
parent ceb0f1005d
commit 258112d6a7
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display.c
View File

@ -1193,7 +1193,6 @@ meta_grab_op_is_mouse (MetaGrabOp op)
case META_GRAB_OP_KEYBOARD_RESIZING_SW: case META_GRAB_OP_KEYBOARD_RESIZING_SW:
case META_GRAB_OP_KEYBOARD_RESIZING_NW: case META_GRAB_OP_KEYBOARD_RESIZING_NW:
case META_GRAB_OP_KEYBOARD_MOVING: case META_GRAB_OP_KEYBOARD_MOVING:
case META_GRAB_OP_COMPOSITOR:
return TRUE; return TRUE;
default: default:
@ -1216,7 +1215,6 @@ meta_grab_op_is_keyboard (MetaGrabOp op)
case META_GRAB_OP_KEYBOARD_RESIZING_NE: case META_GRAB_OP_KEYBOARD_RESIZING_NE:
case META_GRAB_OP_KEYBOARD_RESIZING_SW: case META_GRAB_OP_KEYBOARD_RESIZING_SW:
case META_GRAB_OP_KEYBOARD_RESIZING_NW: case META_GRAB_OP_KEYBOARD_RESIZING_NW:
case META_GRAB_OP_COMPOSITOR:
return TRUE; return TRUE;
default: default:

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

@ -370,8 +370,7 @@ sync_focus_surface (MetaWaylandPointer *pointer)
MetaWaylandSurface *focus_surface; MetaWaylandSurface *focus_surface;
/* Don't update the focus surface while we have a special grab. */ /* Don't update the focus surface while we have a special grab. */
if (meta_grab_op_is_mouse (display->grab_op) && if (meta_grab_op_is_mouse (display->grab_op))
display->grab_op != META_GRAB_OP_COMPOSITOR)
return; return;
focus_surface = get_focus_surface (pointer); focus_surface = get_focus_surface (pointer);