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

backend: Fix the nested mode

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-01 13:56:40 -04:00
parent 899d4d8477
commit 29396014fd
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/meta-backend.c
View File

@ -88,8 +88,23 @@ meta_clutter_init (void)
{ {
GSource *source; GSource *source;
/* When running as an X11 compositor, we install our own event filter and
* pass events to Clutter explicitly, so we need to prevent Clutter from
* handling our events.
*
* However, when running as a Wayland compostior under X11 nested, Clutter
* Clutter needs to see events related to its own window. We need to
* eventually replace this with a proper frontend / backend split: Clutter
* under nested is connecting to the "host X server" to get its events it
* needs to put up a window, and GTK+ is connecting to the "inner X server".
* The two would the same in the X11 compositor case, but not when running
* XWayland as a Wayland compositor.
*/
if (!meta_is_wayland_compositor ())
{
clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
clutter_x11_disable_event_retrieval (); clutter_x11_disable_event_retrieval ();
}
/* If we're running on bare metal, we're a display server, /* If we're running on bare metal, we're a display server,
* so start talking to weston-launch. */ * so start talking to weston-launch. */