ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Add support for per-window visuals.

This commit is contained in:
Alexandre Julliard 2012-09-26 12:19:37 +02:00
parent a81c23a450
commit 8dcbeff760
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/winex11.drv/desktop.c
View File

@ -190,8 +190,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam
changes.x = data->whole_rect.left - virtual_screen_rect.left; changes.x = data->whole_rect.left - virtual_screen_rect.left;
changes.y = data->whole_rect.top - virtual_screen_rect.top; changes.y = data->whole_rect.top - virtual_screen_rect.top;
XReconfigureWMWindow( data->display, data->whole_window, XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes );
DefaultScreen(data->display), mask, &changes );
} }
release_win_data( data ); release_win_data( data );
if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE );

24
dlls/winex11.drv/window.c
View File

@ -312,7 +312,7 @@ static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect )
static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr )
{ {
attr->override_redirect = !data->managed; attr->override_redirect = !data->managed;
attr->colormap = default_colormap; attr->colormap = data->colormap ? data->colormap : default_colormap;
attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0);
attr->bit_gravity = NorthWestGravity; attr->bit_gravity = NorthWestGravity;
attr->win_gravity = StaticGravity; attr->win_gravity = StaticGravity;
@ -1110,7 +1110,7 @@ static void unmap_window( HWND hwnd )
if (data->embedded) set_xembed_flags( data, 0 ); if (data->embedded) set_xembed_flags( data, 0 );
else if (!data->managed) XUnmapWindow( data->display, data->whole_window ); else if (!data->managed) XUnmapWindow( data->display, data->whole_window );
else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); else XWithdrawWindow( data->display, data->whole_window, data->vis.screen );
data->mapped = FALSE; data->mapped = FALSE;
data->net_wm_state = 0; data->net_wm_state = 0;
@ -1132,7 +1132,7 @@ void make_window_embedded( HWND hwnd )
if (data->mapped) if (data->mapped)
{ {
if (data->managed) XUnmapWindow( data->display, data->whole_window ); if (data->managed) XUnmapWindow( data->display, data->whole_window );
else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); else XWithdrawWindow( data->display, data->whole_window, data->vis.screen );
data->net_wm_state = 0; data->net_wm_state = 0;
} }
data->embedded = TRUE; data->embedded = TRUE;
@ -1244,8 +1244,7 @@ static void sync_window_position( struct x11drv_win_data *data,
set_size_hints( data, style ); set_size_hints( data, style );
set_mwm_hints( data, style, ex_style ); set_mwm_hints( data, style, ex_style );
data->configure_serial = NextRequest( data->display ); data->configure_serial = NextRequest( data->display );
XReconfigureWMWindow( data->display, data->whole_window, XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes );
DefaultScreen(data->display), mask, &changes );
#ifdef HAVE_LIBXSHAPE #ifdef HAVE_LIBXSHAPE
if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect ))
sync_window_region( data, (HRGN)1 ); sync_window_region( data, (HRGN)1 );
@ -1367,6 +1366,9 @@ static void create_whole_window( struct x11drv_win_data *data )
} }
data->shaped = (win_rgn != 0); data->shaped = (win_rgn != 0);
if (data->vis.visualid != default_visual.visualid)
data->colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone );
mask = get_window_attributes( data, &attr ); mask = get_window_attributes( data, &attr );
data->whole_rect = data->window_rect; data->whole_rect = data->window_rect;
@ -1379,8 +1381,8 @@ static void create_whole_window( struct x11drv_win_data *data )
data->whole_window = XCreateWindow( data->display, root_window, data->whole_window = XCreateWindow( data->display, root_window,
data->whole_rect.left - virtual_screen_rect.left, data->whole_rect.left - virtual_screen_rect.left,
data->whole_rect.top - virtual_screen_rect.top, data->whole_rect.top - virtual_screen_rect.top,
cx, cy, 0, default_visual.depth, InputOutput, cx, cy, 0, data->vis.depth, InputOutput,
default_visual.visual, mask, &attr ); data->vis.visual, mask, &attr );
if (!data->whole_window) goto done; if (!data->whole_window) goto done;
set_initial_wm_hints( data->display, data->whole_window ); set_initial_wm_hints( data->display, data->whole_window );
@ -1435,7 +1437,9 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des
TRACE( "win %p xwin %lx\n", data->hwnd, data->whole_window ); TRACE( "win %p xwin %lx\n", data->hwnd, data->whole_window );
XDeleteContext( data->display, data->whole_window, winContext ); XDeleteContext( data->display, data->whole_window, winContext );
if (!already_destroyed) XDestroyWindow( data->display, data->whole_window ); if (!already_destroyed) XDestroyWindow( data->display, data->whole_window );
if (data->colormap) XFreeColormap( data->display, data->colormap );
data->whole_window = 0; data->whole_window = 0;
data->colormap = 0;
data->wm_state = WithdrawnState; data->wm_state = WithdrawnState;
data->net_wm_state = 0; data->net_wm_state = 0;
data->mapped = FALSE; data->mapped = FALSE;
@ -1542,6 +1546,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd )
if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data))))
{ {
data->display = display; data->display = display;
data->vis = default_visual;
data->hwnd = hwnd; data->hwnd = hwnd;
EnterCriticalSection( &win_data_section ); EnterCriticalSection( &win_data_section );
XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data );
@ -2034,6 +2039,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag
if (!data->whole_window) goto done; if (!data->whole_window) goto done;
if (swp_flags & SWP_HIDEWINDOW) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done;
if (data->vis.visualid != default_visual.visualid) goto done;
if (*surface) window_surface_release( *surface ); if (*surface) window_surface_release( *surface );
*surface = NULL; /* indicate that we want to draw directly to the window */ *surface = NULL; /* indicate that we want to draw directly to the window */
@ -2059,7 +2065,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag
if (!layered || !GetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY)) if (!layered || !GetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY))
key = CLR_INVALID; key = CLR_INVALID;
*surface = create_surface( data->whole_window, &default_visual, &surface_rect, key ); *surface = create_surface( data->whole_window, &data->vis, &surface_rect, key );
done: done:
release_win_data( data ); release_win_data( data );
@ -2185,7 +2191,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags
data->iconic = (new_style & WS_MINIMIZE) != 0; data->iconic = (new_style & WS_MINIMIZE) != 0;
TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic );
if (data->iconic) if (data->iconic)
XIconifyWindow( data->display, data->whole_window, DefaultScreen(data->display) ); XIconifyWindow( data->display, data->whole_window, data->vis.screen );
else if (is_window_rect_mapped( rectWindow )) else if (is_window_rect_mapped( rectWindow ))
XMapWindow( data->display, data->whole_window ); XMapWindow( data->display, data->whole_window );
update_net_wm_states( data ); update_net_wm_states( data );

2
dlls/winex11.drv/x11drv.h
View File

@ -530,6 +530,8 @@ enum x11drv_net_wm_state
struct x11drv_win_data struct x11drv_win_data
{ {
Display *display; /* display connection for the thread owning the window */ Display *display; /* display connection for the thread owning the window */
XVisualInfo vis; /* X visual used by this window */
Colormap colormap; /* colormap if non-default visual */
HWND hwnd; /* hwnd that this private data belongs to */ HWND hwnd; /* hwnd that this private data belongs to */
Window whole_window; /* X window for the complete window */ Window whole_window; /* X window for the complete window */
RECT window_rect; /* USER window rectangle relative to parent */ RECT window_rect; /* USER window rectangle relative to parent */