marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Store a copy of the surface region.

oldstable
Alexandre Julliard 2012-12-03 15:26:27 +01:00
parent 6262bc7cc8
commit aa85f33c31
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/winex11.drv/bitblt.c
View File

@ -1565,6 +1565,7 @@ struct x11drv_window_surface
BOOL byteswap; BOOL byteswap;
BOOL is_argb; BOOL is_argb;
COLORREF color_key; COLORREF color_key;
HRGN region;
void *bits; void *bits;
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM
XShmSegmentInfo shminfo; XShmSegmentInfo shminfo;
@ -1857,16 +1858,25 @@ static void x11drv_surface_set_region( struct window_surface *window_surface, HR
TRACE( "updating surface %p with %p\n", surface, region ); TRACE( "updating surface %p with %p\n", surface, region );
window_surface->funcs->lock( window_surface );
if (!region) if (!region)
{ {
if (surface->region) DeleteObject( surface->region );
surface->region = 0;
XSetClipMask( gdi_display, surface->gc, None ); XSetClipMask( gdi_display, surface->gc, None );
} }
else if ((data = X11DRV_GetRegionData( region, 0 ))) else
{ {
XSetClipRectangles( gdi_display, surface->gc, 0, 0, if (!surface->region) surface->region = CreateRectRgn( 0, 0, 0, 0 );
(XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); CombineRgn( surface->region, region, 0, RGN_COPY );
HeapFree( GetProcessHeap(), 0, data ); if ((data = X11DRV_GetRegionData( surface->region, 0 )))
{
XSetClipRectangles( gdi_display, surface->gc, 0, 0,
(XRectangle *)data->Buffer, data->rdh.nCount, YXBanded );
HeapFree( GetProcessHeap(), 0, data );
}
} }
window_surface->funcs->unlock( window_surface );
} }
/*********************************************************************** /***********************************************************************
@ -1955,6 +1965,7 @@ static void x11drv_surface_destroy( struct window_surface *window_surface )
} }
surface->crit.DebugInfo->Spare[0] = 0; surface->crit.DebugInfo->Spare[0] = 0;
DeleteCriticalSection( &surface->crit ); DeleteCriticalSection( &surface->crit );
if (surface->region) DeleteObject( surface->region );
HeapFree( GetProcessHeap(), 0, surface ); HeapFree( GetProcessHeap(), 0, surface );
} }