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

winex11: Always paint to the whole window.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-08-30 14:40:31 +02:00
parent 2967599286
commit 044f790bcb
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2218,10 +2218,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
{ {
escape.drawable = data->icon_window; escape.drawable = data->icon_window;
} }
else if (flags & DCX_WINDOW) else escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd );
escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd );
else
escape.drawable = escape.gl_drawable;
if (escape.gl_drawable) escape.gl_type = DC_GL_WINDOW; if (escape.gl_drawable) escape.gl_type = DC_GL_WINDOW;
/* special case: when repainting the root window, clip out top-level windows */ /* special case: when repainting the root window, clip out top-level windows */
@ -2231,21 +2228,22 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
{ {
/* find the first ancestor that has a drawable */ /* find the first ancestor that has a drawable */
for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT ))
if ((escape.drawable = X11DRV_get_client_window( parent ))) break; if ((escape.drawable = X11DRV_get_whole_window( parent ))) break;
if (escape.drawable) if (escape.drawable)
{ {
POINT pt = { 0, 0 }; POINT pt = { 0, 0 };
MapWindowPoints( top, parent, &pt, 1 ); MapWindowPoints( 0, parent, &pt, 1 );
escape.dc_rect = *win_rect;
OffsetRect( &escape.dc_rect, pt.x, pt.y ); OffsetRect( &escape.dc_rect, pt.x, pt.y );
if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren;
} }
else escape.drawable = X11DRV_get_client_window( top ); else escape.drawable = X11DRV_get_whole_window( top );
escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop );
escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop );
escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop );
if (escape.gl_drawable) escape.gl_type = escape.pixmap ? DC_GL_PIXMAP_WIN : DC_GL_CHILD_WIN; if (escape.gl_drawable) escape.gl_type = escape.pixmap ? DC_GL_PIXMAP_WIN : DC_GL_CHILD_WIN;
if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren;
} }
ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );

2
server/window.c
View File

@ -2311,7 +2311,7 @@ DECL_HANDLER(get_visible_region)
if (data) set_reply_data_ptr( data, reply->total_size ); if (data) set_reply_data_ptr( data, reply->total_size );
} }
reply->top_win = top->handle; reply->top_win = top->handle;
reply->top_rect = (top == win && (req->flags & DCX_WINDOW)) ? top->visible_rect : top->client_rect; reply->top_rect = top->visible_rect;
if (!is_desktop_window(win)) if (!is_desktop_window(win))
{ {