winex11: Reset clipping by calling NtUserClipCursor directly.

dlls/winex11.drv/event.c

@@ -814,7 +814,7 @@ static void focus_out( Display *display , HWND hwnd )
 
     if (is_virtual_desktop())
     {
-        if (hwnd == NtUserGetDesktopWindow()) reset_clipping_window();
+        if (hwnd == NtUserGetDesktopWindow()) NtUserClipCursor( NULL );
         return;
     }
     if (hwnd != NtUserGetForegroundWindow()) return;
@@ -858,7 +858,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev )
 
     if (event->detail == NotifyPointer)
     {
-        if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window();
+        if (!hwnd && event->window == x11drv_thread_data()->clip_window) NtUserClipCursor( NULL );
         return TRUE;
     }
     if (!hwnd) return FALSE;

dlls/winex11.drv/mouse.c

@@ -470,17 +470,6 @@ static void ungrab_clipping_window(void)
 }
 
 /***********************************************************************
- *		reset_clipping_window
- *
- * Forcibly reset the window clipping on external events.
- */
-void reset_clipping_window(void)
-{
-    ungrab_clipping_window();
-    NtUserClipCursor( NULL );  /* make sure the clip rectangle is reset too */
-}
-
-/***********************************************************************
  *      retry_grab_clipping_window
  *
  * Restore the current clip rectangle or retry the last one if it has

dlls/winex11.drv/window.c

@@ -2687,7 +2687,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
         {
             release_win_data( data );
             unmap_window( hwnd );
-            if (NtUserIsWindowRectFullScreen( &old_window_rect )) reset_clipping_window();
+            if (NtUserIsWindowRectFullScreen( &old_window_rect )) NtUserClipCursor( NULL );
             if (!(data = get_win_data( hwnd ))) return;
         }
     }

dlls/winex11.drv/x11drv.h

@@ -686,7 +686,6 @@ extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;
 extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN;
 extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN;
 extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN;
-extern void reset_clipping_window(void) DECLSPEC_HIDDEN;
 extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
 extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;
 extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;