[mutter] compositor: Select for input on the output window the right display

[Jasper St. Pierre <jstpierre src gnome org>]

commit d590626017c77e229e5f735c76c4de43eccdc43d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Apr 23 13:31:44 2014 -0400

    compositor: Select for input on the output window the right display

 src/compositor/compositor.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index f9c28d9..eb67189 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -80,6 +80,8 @@
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
+#include "backends/x11/meta-backend-x11.h"
+
 #include "wayland/meta-wayland-private.h"
 
 static gboolean
@@ -148,16 +150,15 @@ process_damage (MetaCompositor     *compositor,
 static Window
 get_output_window (MetaCompositor *compositor)
 {
-  MetaDisplay *display = compositor->display;
-  Display *xdisplay = display->xdisplay;
-  Window output, xroot;
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
+  Window output;
   XWindowAttributes attr;
   long event_mask;
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
 
-  xroot = display->screen->xroot;
-  output = XCompositeGetOverlayWindow (xdisplay, xroot);
+  output = XCompositeGetOverlayWindow (xdisplay, DefaultRootWindow (xdisplay));
 
   meta_core_add_old_event_mask (xdisplay, output, &mask);