Commit f3ae5f52 authored by Alexandre Julliard's avatar Alexandre Julliard

winex11: Don't set the cursor on the desktop window since it's managed by another process.

parent 7d9739e2
...@@ -879,6 +879,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) ...@@ -879,6 +879,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr )
*/ */
void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
{ {
struct x11drv_thread_data *data = x11drv_thread_data();
Cursor cursor; Cursor cursor;
if (lpCursor) if (lpCursor)
...@@ -887,24 +888,7 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) ...@@ -887,24 +888,7 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
else else
TRACE("NULL\n"); TRACE("NULL\n");
if (root_window != DefaultRootWindow(gdi_display)) /* set the same cursor for all top-level windows of the current thread */
{
/* If in desktop mode, set the cursor on the desktop window */
wine_tsx11_lock();
cursor = create_cursor( gdi_display, lpCursor );
if (cursor)
{
XDefineCursor( gdi_display, root_window, cursor );
/* Make the change take effect immediately */
XFlush(gdi_display);
XFreeCursor( gdi_display, cursor );
}
wine_tsx11_unlock();
}
else /* set the same cursor for all top-level windows of the current thread */
{
struct x11drv_thread_data *data = x11drv_thread_data();
wine_tsx11_lock(); wine_tsx11_lock();
cursor = create_cursor( data->display, lpCursor ); cursor = create_cursor( data->display, lpCursor );
...@@ -920,7 +904,6 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) ...@@ -920,7 +904,6 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
} }
} }
wine_tsx11_unlock(); wine_tsx11_unlock();
}
} }
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment