From bb9cc21d8e1104d8486276e15bcb28028b35ed77 Mon Sep 17 00:00:00 2001
From: Jayaraj Rajappan <jayaraj.rajappan@wipro.com>
Date: Wed, 14 Aug 2002 16:51:13 +0000
Subject: [PATCH] In XGrabPointer, set the confine_to argument to the root
 window of the

2002-08-14  Jayaraj Rajappan <jayaraj.rajappan@wipro.com>

        * src/display.c (meta_display_set_grab_op_cursor):
        In XGrabPointer, set the confine_to argument to the root window
        of the screen the window is on.

        * src/display.h: add screen argument.

        * src/window.c (meta_window_update_resize_grab_op):
        pass screen argument as NULL.
---
 ChangeLog     | 11 +++++++++++
 src/display.c |  6 ++++--
 src/display.h |  1 +
 src/window.c  |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 018fe0011..96d756556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-14  Jayaraj Rajappan <jayaraj.rajappan@wipro.com>
+
+	* src/display.c (meta_display_set_grab_op_cursor):
+        In XGrabPointer, set the confine_to argument to the root window
+        of the screen the window is on.
+
+	* src/display.h: add screen argument.
+
+	* src/window.c (meta_window_update_resize_grab_op):
+        pass screen argument as NULL.
+
 2002-08-14  James M. Cape  <jcape@ignore-your.tv>
 
 	* src/themes/Esco/metacity-theme-1.xml: use button positioning
diff --git a/src/display.c b/src/display.c
index ec45e27c2..e20fc32f6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -2248,6 +2248,7 @@ xcursor_for_op (MetaDisplay *display,
 
 void
 meta_display_set_grab_op_cursor (MetaDisplay *display,
+                                 MetaScreen  *screen,
                                  MetaGrabOp   op,
                                  gboolean     change_pointer,
                                  Window       grab_xwindow,
@@ -2279,7 +2280,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
                         False,
                         GRAB_MASK,
                         GrabModeAsync, GrabModeAsync,
-                        None,
+                        screen->xroot,
                         cursor,
                         timestamp) == GrabSuccess)
         {
@@ -2341,7 +2342,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
   if (pointer_already_grabbed)
     display->grab_have_pointer = TRUE;
       
-  meta_display_set_grab_op_cursor (display, op, FALSE, grab_xwindow, timestamp);
+  meta_display_set_grab_op_cursor (display, screen, op, FALSE, grab_xwindow,
+                                   timestamp);
 
   if (!display->grab_have_pointer)
     {
diff --git a/src/display.h b/src/display.h
index 7c56d24fe..b301c4545 100644
--- a/src/display.h
+++ b/src/display.h
@@ -293,6 +293,7 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
                                              MetaCursor   cursor);
 
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
+                                          MetaScreen  *screen,
                                           MetaGrabOp   op,
                                           gboolean     change_pointer,
                                           Window       grab_xwindow,
diff --git a/src/window.c b/src/window.c
index 3d8e06e86..5a8846fa9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6475,6 +6475,7 @@ void meta_window_update_resize_grab_op (MetaWindow *window,
   if (update_cursor)
     {
       meta_display_set_grab_op_cursor (window->display,
+                                       NULL,
                                        window->display->grab_op,
                                        TRUE,
                                        window->display->grab_xwindow,