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

winex11: Use a separate XRender format for the root window. 

When using a custom visual, the default format may not work with the
root window.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-01-26 13:36:21 +01:00
parent d6332e0e57
commit a2a2b5bc88
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/winex11.drv/xrender.c
View File

@ -68,6 +68,7 @@ enum wxr_format
WXR_FORMAT_B8G8R8A8, WXR_FORMAT_B8G8R8A8,
WXR_FORMAT_X8R8G8B8, WXR_FORMAT_X8R8G8B8,
WXR_FORMAT_B8G8R8X8, WXR_FORMAT_B8G8R8X8,
WXR_FORMAT_ROOT, /* placeholder for the format to use on the root window */
WXR_NB_FORMATS, WXR_NB_FORMATS,
WXR_INVALID_FORMAT = WXR_NB_FORMATS WXR_INVALID_FORMAT = WXR_NB_FORMATS
}; };
@ -273,6 +274,13 @@ static int load_xrender_formats(void)
{ {
XRenderPictFormat templ; XRenderPictFormat templ;
if (i == WXR_FORMAT_ROOT)
{
pict_formats[i] = pXRenderFindVisualFormat(gdi_display,
DefaultVisual( gdi_display, DefaultScreen(gdi_display) ));
TRACE( "Loaded root pict_format with id=%#lx\n", pict_formats[i]->id );
continue;
}
if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i])) if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i]))
{ {
pict_formats[i] = pXRenderFindVisualFormat(gdi_display, default_visual.visual); pict_formats[i] = pXRenderFindVisualFormat(gdi_display, default_visual.visual);
@ -875,6 +883,16 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
return ret; return ret;
} }
static void set_physdev_format( struct xrender_physdev *physdev, enum wxr_format format )
{
if (physdev->x11dev->drawable == DefaultRootWindow( gdi_display ))
physdev->format = WXR_FORMAT_ROOT;
else
physdev->format = format;
physdev->pict_format = pict_formats[physdev->format];
}
static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format )
{ {
X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev );
@ -883,8 +901,7 @@ static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format )
if (!physdev) return FALSE; if (!physdev) return FALSE;
physdev->x11dev = x11dev; physdev->x11dev = x11dev;
physdev->cache_index = -1; physdev->cache_index = -1;
physdev->format = format; set_physdev_format( physdev, format );
physdev->pict_format = pict_formats[format];
push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); push_dc_driver( pdev, &physdev->dev, &xrender_funcs );
return TRUE; return TRUE;
} }
@ -974,7 +991,11 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID
if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE)
{ {
BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data );
if (ret) free_xrender_picture( physdev ); /* pict format doesn't change, only drawable */ if (ret)
{
free_xrender_picture( physdev );
set_physdev_format( physdev, default_format );
}
return ret; return ret;
} }
} }