From 029673d0eeadfbf372f8cd7e3ce45c14db3a3509 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu, 17 Jul 2014 17:18:08 +0200
Subject: [PATCH] Revert "backend-x11: Take the touch grab on the stage window"

This reverts commit 3b85e4b2b911740d9f9dea672aa0e673b841e701.

This breaks touch support; reverting would break wayland
(is what this patch tried to fix; we should find a better solution
that works on both).
---
 src/backends/meta-backend-private.h |  1 -
 src/backends/meta-backend.c         | 12 ------------
 src/backends/meta-backend.h         |  2 --
 src/backends/x11/meta-backend-x11.c | 11 +++--------
 src/core/display.c                  |  2 --
 5 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h
index d5a7ee515..02b123d5f 100644
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -50,7 +50,6 @@ struct _MetaBackendClass
   GObjectClass parent_class;
 
   void (* post_init) (MetaBackend *backend);
-  void (* compositor_created) (MetaBackend *backend);
 
   MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
                                              int          device_id);
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index 454616a83..3cfb95110 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -79,11 +79,6 @@ meta_backend_real_post_init (MetaBackend *backend)
   priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
 }
 
-static void
-meta_backend_real_compositor_created (MetaBackend *backend)
-{
-}
-
 static MetaCursorRenderer *
 meta_backend_real_create_cursor_renderer (MetaBackend *backend)
 {
@@ -119,7 +114,6 @@ meta_backend_class_init (MetaBackendClass *klass)
   klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
   klass->grab_device = meta_backend_real_grab_device;
   klass->ungrab_device = meta_backend_real_ungrab_device;
-  klass->compositor_created = meta_backend_real_compositor_created;
 }
 
 static void
@@ -151,12 +145,6 @@ meta_backend_post_init (MetaBackend *backend)
   META_BACKEND_GET_CLASS (backend)->post_init (backend);
 }
 
-void
-meta_backend_compositor_created (MetaBackend *backend)
-{
-  META_BACKEND_GET_CLASS (backend)->compositor_created (backend);
-}
-
 MetaIdleMonitor *
 meta_backend_get_idle_monitor (MetaBackend *backend,
                                int          device_id)
diff --git a/src/backends/meta-backend.h b/src/backends/meta-backend.h
index 27f67df1d..f93b6f6cb 100644
--- a/src/backends/meta-backend.h
+++ b/src/backends/meta-backend.h
@@ -38,8 +38,6 @@ GType meta_backend_get_type (void);
 
 MetaBackend * meta_get_backend (void);
 
-void meta_backend_compositor_created (MetaBackend *backend);
-
 MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
                                                  int          device_id);
 MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index d61c97589..c7440e244 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -266,7 +266,7 @@ take_touch_grab (MetaBackend *backend)
   XISetMask (mask.mask, XI_TouchEnd);
 
   XIGrabTouchBegin (priv->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
-                    meta_backend_x11_get_xwindow (x11),
+                    DefaultRootWindow (priv->xdisplay),
                     False, &mask, 1, &mods);
 }
 
@@ -307,13 +307,9 @@ meta_backend_x11_post_init (MetaBackend *backend)
       meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
   }
 
-  META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
-}
-
-static void
-meta_backend_x11_compositor_created (MetaBackend *backend)
-{
   take_touch_grab (backend);
+
+  META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
 }
 
 static MetaIdleMonitor *
@@ -412,7 +408,6 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass)
   MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
 
   backend_class->post_init = meta_backend_x11_post_init;
-  backend_class->compositor_created = meta_backend_x11_compositor_created;
   backend_class->create_idle_monitor = meta_backend_x11_create_idle_monitor;
   backend_class->create_monitor_manager = meta_backend_x11_create_monitor_manager;
   backend_class->create_cursor_renderer = meta_backend_x11_create_cursor_renderer;
diff --git a/src/core/display.c b/src/core/display.c
index 603ba5160..3ddad2069 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -877,8 +877,6 @@ meta_display_open (void)
 
   enable_compositor (display);
 
-  meta_backend_compositor_created (meta_get_backend ());
-
   meta_screen_create_guard_window (screen);
 
   /* Set up touch support */