events: Don't check if we have the grab to raise / focus a window

It isn't necessary. As an X11 compositor, we'll only see the event
if we have the grab on the window, anyway.

This was causing issues moving windows as a Wayland compositor.
This commit is contained in:
Jasper St. Pierre 2014-05-08 14:16:35 -04:00
parent 7b3cdc8f96
commit 2d225a3386

View File

@ -1958,9 +1958,7 @@ meta_display_handle_event (MetaDisplay *display,
* grab on the window, or because we're a wayland * grab on the window, or because we're a wayland
* compositor and thus we see all the events, so we * compositor and thus we see all the events, so we
* need to check if the event is interesting. * need to check if the event is interesting.
* We want an event that is not modified, for a window * We want an event that is not modified for a window.
* that has (or would have, the wayland case) the
* button grab active.
* *
* We may have other events on the window, for example * We may have other events on the window, for example
* a click on a frame button, but that's not for us to * a click on a frame button, but that's not for us to
@ -1969,7 +1967,7 @@ meta_display_handle_event (MetaDisplay *display,
unmodified = (event->button.modifier_state & grab_mask) == 0; unmodified = (event->button.modifier_state & grab_mask) == 0;
fully_modified = grab_mask && (event->button.modifier_state & grab_mask) == grab_mask; fully_modified = grab_mask && (event->button.modifier_state & grab_mask) == grab_mask;
if (unmodified && window && window->have_focus_click_grab) if (unmodified && window)
{ {
if (meta_prefs_get_raise_on_click ()) if (meta_prefs_get_raise_on_click ())
meta_window_raise (window); meta_window_raise (window);