events: Swallow all events directly on windows

This is how the X11 mode works.
This commit is contained in:
Jasper St. Pierre 2014-05-08 15:06:52 -04:00
parent df642b96e2
commit a7ea54bd7d

View File

@ -1936,6 +1936,9 @@ meta_display_handle_event (MetaDisplay *display,
if (g_getenv ("MUTTER_DEBUG_BUTTON_GRABS")) if (g_getenv ("MUTTER_DEBUG_BUTTON_GRABS"))
grab_mask |= CLUTTER_CONTROL_MASK; grab_mask |= CLUTTER_CONTROL_MASK;
/* Swallow all events on windows that come our way. */
bypass_clutter = TRUE;
/* We have three passive button grabs: /* We have three passive button grabs:
* - on any button, without modifiers => focuses and maybe raises the window * - on any button, without modifiers => focuses and maybe raises the window
* - on resize button, with modifiers => start an interactive resizing * - on resize button, with modifiers => start an interactive resizing
@ -1994,8 +1997,6 @@ meta_display_handle_event (MetaDisplay *display,
XIReplayDevice, event->button.time); XIReplayDevice, event->button.time);
} }
} }
bypass_clutter = TRUE;
} }
else if (fully_modified && (int) event->button.button == meta_prefs_get_mouse_button_resize ()) else if (fully_modified && (int) event->button.button == meta_prefs_get_mouse_button_resize ())
{ {
@ -2045,7 +2046,6 @@ meta_display_handle_event (MetaDisplay *display,
event->button.x, event->button.x,
event->button.y); event->button.y);
} }
bypass_clutter = TRUE;
bypass_wayland = TRUE; bypass_wayland = TRUE;
} }
else if (fully_modified && (int) event->button.button == meta_prefs_get_mouse_button_menu ()) else if (fully_modified && (int) event->button.button == meta_prefs_get_mouse_button_menu ())
@ -2057,7 +2057,6 @@ meta_display_handle_event (MetaDisplay *display,
event->button.y, event->button.y,
event->button.button, event->button.button,
event->any.time); event->any.time);
bypass_clutter = TRUE;
bypass_wayland = TRUE; bypass_wayland = TRUE;
} }
else if (fully_modified && (int) event->button.button == 1) else if (fully_modified && (int) event->button.button == 1)
@ -2076,7 +2075,6 @@ meta_display_handle_event (MetaDisplay *display,
event->button.x, event->button.x,
event->button.y); event->button.y);
} }
bypass_clutter = TRUE;
bypass_wayland = TRUE; bypass_wayland = TRUE;
} }
} }