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

display: Correct check for grab_window_buttons

Browse Source 
When we're a Wayland compositor, we get all the events, no exceptions,
so we don't need to grab.

This was masking focusing and raising issues under nested that showed
up under native.
This commit is contained in:
Jasper St. Pierre 2014-05-08 14:14:30 -04:00
parent b6f9500ccc
commit 7b3cdc8f96
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/display.c
View File

@ -2012,10 +2012,7 @@ void
meta_display_grab_window_buttons (MetaDisplay *display,
Window xwindow)
{
MetaBackend *backend = meta_get_backend ();
/* Do nothing under non-X11 backends */
if (!META_IS_BACKEND_X11 (backend))
if (meta_is_wayland_compositor ())
return;
/* Grab Alt + button1 for moving window.
@ -2068,15 +2065,12 @@ void
meta_display_ungrab_window_buttons (MetaDisplay *display,
Window xwindow)
{
MetaBackend *backend = meta_get_backend ();
/* Do nothing under non-X11 backends */
if (!META_IS_BACKEND_X11 (backend))
return;
gboolean debug;
int i;
if (meta_is_wayland_compositor ())
return;
if (display->window_grab_modifiers == 0)
return;
@ -2102,10 +2096,7 @@ void
meta_display_grab_focus_window_button (MetaDisplay *display,
MetaWindow *window)
{
MetaBackend *backend = meta_get_backend ();
/* Do nothing under non-X11 backends */
if (!META_IS_BACKEND_X11 (backend))
if (meta_is_wayland_compositor ())
return;
/* Grab button 1 for activating unfocused windows */
@ -2157,10 +2148,7 @@ void
meta_display_ungrab_focus_window_button (MetaDisplay *display,
MetaWindow *window)
{
MetaBackend *backend = meta_get_backend ();
/* Do nothing under non-X11 backends */
if (!META_IS_BACKEND_X11 (backend))
if (meta_is_wayland_compositor ())
return;
meta_verbose ("Ungrabbing unfocused window buttons for %s\n", window->desc);