From 991fdeb9dd68e2467e09f00d618428f2891b1269 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 21 Jun 2011 18:28:55 +0200
Subject: [PATCH] display: Use meta_device_grab() for pointer active grabs.

---
 src/core/display.c | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index 624ab55fd..6db222121 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3605,12 +3605,12 @@ meta_display_create_x_cursor (MetaDisplay *display,
   return xcursor;
 }
 
-static Cursor
-xcursor_for_op (MetaDisplay *display,
-                MetaGrabOp   op)
+static MetaCursor
+cursor_for_op (MetaDisplay *display,
+               MetaGrabOp   op)
 {
   MetaCursor cursor = META_CURSOR_DEFAULT;
-  
+
   switch (op)
     {
     case META_GRAB_OP_RESIZING_SE:
@@ -3655,9 +3655,7 @@ xcursor_for_op (MetaDisplay *display,
       break;
     }
 
-  if (cursor == META_CURSOR_DEFAULT)
-    return None;
-  return meta_display_create_x_cursor (display, cursor);
+  return cursor;
 }
 
 void
@@ -3670,9 +3668,9 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
                                  guint32      timestamp)
 {
   MetaGrabInfo *grab_info;
-  Cursor cursor;
+  MetaCursor cursor;
 
-  cursor = xcursor_for_op (display, op);
+  cursor = cursor_for_op (display, op);
   grab_info = meta_display_get_grab_info (display, device);
 
 #define GRAB_MASK (PointerMotionMask |                          \
@@ -3681,6 +3679,10 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
 
   if (change_pointer)
     {
+      Cursor xcursor;
+
+      xcursor = meta_display_create_x_cursor (display, cursor);
+
       meta_error_trap_push_with_return (display);
       XChangeActivePointerGrab (display->xdisplay,
                                 GRAB_MASK,
@@ -3697,39 +3699,37 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
           if (grab_info->grab_have_pointer)
             grab_info->grab_have_pointer = FALSE;
         }
+
+      if (xcursor != None)
+        XFreeCursor (display->xdisplay, xcursor);
     }
   else
     {
       g_assert (screen != NULL);
 
       meta_error_trap_push (display);
-      if (XGrabPointer (display->xdisplay,
-                        grab_xwindow,
-                        False,
-                        GRAB_MASK,
-                        GrabModeAsync, GrabModeAsync,
-                        screen->xroot,
-                        cursor,
-                        timestamp) == GrabSuccess)
+      if (meta_device_grab (grab_info->grab_pointer,
+                            grab_xwindow,
+                            GRAB_MASK,
+                            cursor,
+                            FALSE,
+                            FALSE,
+                            timestamp))
         {
           grab_info->grab_have_pointer = TRUE;
           meta_topic (META_DEBUG_WINDOW_OPS,
-                      "XGrabPointer() returned GrabSuccess time %u\n",
+                      "grabbing pointer succeeded time %u\n",
                       timestamp);
         }
       else
         {
           meta_topic (META_DEBUG_WINDOW_OPS,
-                      "XGrabPointer() failed time %u\n",
+                      "grabbing pointer failed time %u\n",
                       timestamp);
         }
       meta_error_trap_pop (display);
     }
-
 #undef GRAB_MASK
-  
-  if (cursor != None)
-    XFreeCursor (display->xdisplay, cursor);
 }
 
 gboolean
@@ -3815,7 +3815,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   if (!grab_info->grab_have_pointer && !grab_op_is_keyboard (op))
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
-                  "XGrabPointer() failed\n");
+                  "grabbing pointer failed\n");
       return FALSE;
     }
 
@@ -3838,7 +3838,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
         {
           meta_topic (META_DEBUG_WINDOW_OPS,
                       "grabbing all keys failed, ungrabbing pointer\n");
-          XUngrabPointer (display->xdisplay, timestamp);
+          meta_device_ungrab (grab_info->grab_pointer, timestamp);
           grab_info->grab_have_pointer = FALSE;
           return FALSE;
         }
@@ -4053,7 +4053,7 @@ meta_display_end_grab_op (MetaDisplay *display,
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "Ungrabbing pointer with timestamp %u\n", timestamp);
-      XUngrabPointer (display->xdisplay, timestamp);
+      meta_device_ungrab (grab_info->grab_pointer, timestamp);
     }
 
   if (grab_info->grab_have_keyboard)