From dbfe24c33cfd2ab7e2fceb810926ad193aa0b7ac Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 23 Jan 2008 10:30:42 +0100
Subject: [PATCH] winex11: Move resetting of the cursor clip rectangle into
 xinerama_init().

---
 dlls/winex11.drv/winpos.c      | 1 -
 dlls/winex11.drv/x11drv_main.c | 1 -
 dlls/winex11.drv/xinerama.c    | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c
index 94dca2b4521..e19c919a521 100644
--- a/dlls/winex11.drv/winpos.c
+++ b/dlls/winex11.drv/winpos.c
@@ -964,7 +964,6 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height )
     resize_data.old_virtual_rect = virtual_screen_rect;
 
     xinerama_init( width, height );
-    ClipCursor(NULL);
 
     if (!(data = X11DRV_get_win_data( hwnd )))
     {
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index a84c65bfef1..f2bf12c7ecb 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -543,7 +543,6 @@ static BOOL process_attach(void)
     X11DRV_XComposite_Init();
 #endif
 
-    X11DRV_ClipCursor( NULL );
     X11DRV_InitKeyboard();
     X11DRV_InitClipboard();
 
diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c
index 86021512cb4..782c779be27 100644
--- a/dlls/winex11.drv/xinerama.c
+++ b/dlls/winex11.drv/xinerama.c
@@ -169,6 +169,7 @@ void xinerama_init( unsigned int width, unsigned int height )
            wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height );
 
     wine_tsx11_unlock();
+    ClipCursor( NULL );  /* reset the cursor clip rectangle */
 }