display: Remove COMPOSITOR from mouse/keyboard grab ops

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

View File

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