From 9d53a1ae2bea737f5842dfcb53cfbeee5c8a8932 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 26 Jun 2008 16:21:32 +0200 Subject: [PATCH] winex11: Get rid of the explicit colormap management. --- dlls/winex11.drv/window.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 22de5caee53..b984bca2df9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1879,7 +1879,6 @@ void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) * SetFocus (X11DRV.@) * * Set the X focus. - * Explicit colormap management seems to work only with OLVWM. */ void X11DRV_SetFocus( HWND hwnd ) { @@ -1887,18 +1886,7 @@ void X11DRV_SetFocus( HWND hwnd ) struct x11drv_win_data *data; XWindowChanges changes; - /* If setting the focus to 0, uninstall the colormap */ - if (!hwnd && root_window == DefaultRootWindow(display)) - { - wine_tsx11_lock(); - if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) - XUninstallColormap( display, X11DRV_PALETTE_PaletteXColormap ); - wine_tsx11_unlock(); - return; - } - - hwnd = GetAncestor( hwnd, GA_ROOT ); - + if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (data->managed || !data->whole_window) return; @@ -1913,8 +1901,6 @@ void X11DRV_SetFocus( HWND hwnd ) XSetInputFocus( display, data->whole_window, RevertToParent, /* CurrentTime */ GetMessageTime() - EVENT_x11_time_to_win32_time(0)); - if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) - XInstallColormap( display, X11DRV_PALETTE_PaletteXColormap ); } wine_tsx11_unlock(); }