isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Invoke Wayland from the Grand Central Station callback

Browse Source
This commit is contained in:
Jasper St. Pierre
2013-10-04 02:29:43 -04:00
parent 6cc014a941
commit 648639fffe
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/display.c
View File

@ -2461,7 +2461,7 @@ meta_display_handle_event (MetaDisplay *display,
* we can get into a confused state. So if a keybinding is
* handled (because it's one of our hot-keys, or because we are
* in a keyboard-grabbed mode like moving a window, we don't
* want to pass the key event to the compositor or GTK+ at all.
* want to pass the key event to the compositor or Wayland at all.
*/
if (meta_display_process_key_event (display, window, (ClutterKeyEvent *) event))
return TRUE;
@ -2470,7 +2470,18 @@ meta_display_handle_event (MetaDisplay *display,
break;
}
return FALSE;
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor () && (display->grab_op == META_GRAB_OP_NONE))
{
MetaWaylandCompositor *compositor;
compositor = meta_wayland_compositor_get_default ();
if (meta_wayland_compositor_handle_event (compositor, event))
return TRUE;
}
#endif /* HAVE_WAYLAND */
return (display->grab_op != META_GRAB_OP_COMPOSITOR);
}
static gboolean