commit 30a133fe00dc087a770e663bc8b6eedf6f3147bc
author Alexandre Julliard <julliard@winehq.org> Tue May 13 10:43:48 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue May 13 10:43:48 2008 +0200
tree a3c2e1ad695503d99dcae16495225cbec4e406b0
parent 8354e6a93a9b4c11f9d54a6ac40d11cf31c97741

winex11: When re-creating a client window check the new visual against the current one instead of the default one.

dlls/winex11.drv/window.c

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 191931a..674afaa 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -257,6 +257,7 @@
     int cx, cy, mask;
     XSetWindowAttributes attr;
     Window client;
+    Visual *client_visual = vis ? vis->visual : visual;
 
     attr.bit_gravity = NorthWestGravity;
     attr.win_gravity = NorthWestGravity;
@@ -282,7 +283,7 @@
                             data->client_rect.left - data->whole_rect.left,
                             data->client_rect.top - data->whole_rect.top,
                             cx, cy, 0, screen_depth, InputOutput,
-                            vis ? vis->visual : visual, mask, &attr );
+                            client_visual, mask, &attr );
     if (!client)
     {
         wine_tsx11_unlock();
@@ -297,6 +298,7 @@
         XDestroyWindow( display, data->client_window );
     }
     data->client_window = client;
+    data->visualid = XVisualIDFromVisual( client_visual );
 
     if (data->colormap) XFreeColormap( display, data->colormap );
     data->colormap = vis ? attr.colormap : 0;
@@ -431,7 +433,7 @@
         Display *display = thread_display();
         Window client = data->client_window;
 
-        if (vis->visualid != XVisualIDFromVisual(visual))
+        if (vis->visualid != data->visualid)
         {
             client = create_client_window( display, data, vis );
             TRACE( "re-created client window %lx for %p fbconfig %lx\n", client, data->hwnd, fbconfig_id );