wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=488910,b=484864; fix directdraw path for aliased windows that aren't within screen bounds; r=vlad

Browse Source
This commit is contained in:
Kenneth Waters 2009-04-24 12:00:13 -07:00
parent 03f71abbf7
commit 518ee9b649
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/cairo/cairo/src/cairo-ddraw-private.h
View File

@ -48,6 +48,7 @@ typedef struct _cairo_ddraw_surface {
cairo_surface_t *image;
cairo_surface_t *alias;
cairo_point_int_t origin;
cairo_rectangle_int_t acquirable_rect;
uint32_t data_offset;
LPDIRECTDRAWCLIPPER lpddc;
LPDIRECTDRAWCLIPPER installed_clipper;

60
gfx/cairo/cairo/src/cairo-ddraw-surface.c
View File

@ -127,6 +127,7 @@ _cairo_ddraw_surface_set_clip_list (cairo_ddraw_surface_t * surface)
RGNDATA * rgn;
DWORD size;
cairo_status_t status;
cairo_point_int_t offset;
HRESULT hr;
RECT * prect;
int i;
@ -153,15 +154,18 @@ _cairo_ddraw_surface_set_clip_list (cairo_ddraw_surface_t * surface)
if ((rgn = (RGNDATA *) malloc (size)) == 0)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
}
offset.x = MAX (0, surface->origin.x);
offset.y = MAX (0, surface->origin.y);
rgn->rdh.dwSize = sizeof(RGNDATAHEADER);
rgn->rdh.iType = RDH_RECTANGLES;
rgn->rdh.nCount = num_boxes;
rgn->rdh.nRgnSize = num_boxes * sizeof (RECT);
rgn->rdh.rcBound.left = extents.x + surface->origin.x;
rgn->rdh.rcBound.top = extents.y + surface->origin.y;
rgn->rdh.rcBound.right = extents.x + extents.width + surface->origin.x;
rgn->rdh.rcBound.bottom = extents.y + extents.height + surface->origin.y;
rgn->rdh.rcBound.left = extents.x + offset.x;
rgn->rdh.rcBound.top = extents.y + offset.y;
rgn->rdh.rcBound.right = extents.x + extents.width + offset.x;
rgn->rdh.rcBound.bottom = extents.y + extents.height + offset.y;
prect = (RECT *) &rgn->Buffer;
for (i = 0; i < num_boxes; ++i) {
@ -169,10 +173,10 @@ _cairo_ddraw_surface_set_clip_list (cairo_ddraw_surface_t * surface)
_cairo_region_get_box (&surface->clip_region, i, &box);
prect->left = box.p1.x + surface->origin.x;
prect->top = box.p1.y + surface->origin.y;
prect->right = box.p2.x + surface->origin.x;
prect->bottom = box.p2.y + surface->origin.y;
prect->left = box.p1.x + offset.x;
prect->top = box.p1.y + offset.y;
prect->right = box.p2.x + offset.x;
prect->bottom = box.p2.y + offset.y;
++prect;
}
@ -217,13 +221,14 @@ _cairo_ddraw_surface_lock (cairo_ddraw_surface_t *surface)
}
surface->data_offset =
surface->origin.y * base_img->stride + surface->origin.x * 4;
MAX (0, surface->origin.y) * base_img->stride +
MAX (0, surface->origin.x) * 4;
surface->image =
cairo_image_surface_create_for_data (base_img->data +
surface->data_offset,
surface->format,
surface->extents.width,
surface->extents.height,
surface->acquirable_rect.width,
surface->acquirable_rect.height,
base_img->stride);
if (surface->image->status)
return surface->image->status;
@ -364,7 +369,7 @@ _cairo_ddraw_surface_finish (void *abstract_surface)
return CAIRO_STATUS_SUCCESS;
}
static cairo_status_t
static cairo_status_t
_cairo_ddraw_surface_acquire_source_image (void *abstract_surface,
cairo_image_surface_t **image_out,
void **image_extra)
@ -372,6 +377,9 @@ _cairo_ddraw_surface_acquire_source_image (void *abstract_sur
cairo_ddraw_surface_t *surface = abstract_surface;
cairo_status_t status;
if (surface->alias)
return CAIRO_INT_STATUS_UNSUPPORTED;
if ((status = _cairo_ddraw_surface_lock (surface)))
return status;
@ -398,13 +406,12 @@ _cairo_ddraw_surface_acquire_dest_image (void *abstract_surfa
return status;
*image_out = (cairo_image_surface_t *) surface->image;
*image_rect = surface->extents;
*image_rect = surface->acquirable_rect;
*image_extra = NULL;
return CAIRO_STATUS_SUCCESS;
}
static cairo_int_status_t
_cairo_ddraw_surface_get_extents (void *abstract_surface,
cairo_rectangle_int_t *rectangle)
@ -420,6 +427,7 @@ cairo_int_status_t
_cairo_ddraw_surface_set_clip_region (void *abstract_surface,
cairo_region_t *region)
{
cairo_status_t status;
cairo_ddraw_surface_t * surface =
(cairo_ddraw_surface_t *) abstract_surface;
@ -427,7 +435,15 @@ _cairo_ddraw_surface_set_clip_region (void *abstract_surface,
surface->has_clip_region = TRUE;
surface->image_clip_invalid = TRUE;
surface->clip_list_invalid = TRUE;
return _cairo_region_copy (&surface->clip_region, region);
status = _cairo_region_copy (&surface->clip_region, region);
if (status)
return status;
if (surface->origin.x < 0 || surface->origin.y < 0)
_cairo_region_translate (&surface->clip_region,
MIN (0, surface->origin.x),
MIN (0, surface->origin.y));
} else {
surface->has_clip_region = FALSE;
surface->image_clip_invalid = surface->has_image_clip;
@ -519,6 +535,11 @@ cairo_ddraw_surface_create (LPDIRECTDRAW lpdd,
surface->origin.x = 0;
surface->origin.y = 0;
surface->acquirable_rect.x = 0;
surface->acquirable_rect.y = 0;
surface->acquirable_rect.width = ddsd.dwWidth;
surface->acquirable_rect.height = ddsd.dwHeight;
_cairo_surface_init (&surface->base, &cairo_ddraw_surface_backend,
_cairo_content_from_format (format));
@ -595,10 +616,17 @@ cairo_ddraw_surface_create_alias (cairo_surface_t *base_surface,
surface->extents.y = 0;
surface->extents.width = width;
surface->extents.height = height;
surface->origin.x = x;
surface->origin.y = y;
surface->acquirable_rect.x = MAX (0, -x);
surface->acquirable_rect.y = MAX (0, -y);
surface->acquirable_rect.width =
MIN (x + width, (int)base->extents.width) - MAX (x, 0);
surface->acquirable_rect.height =
MIN (y + height, (int)base->extents.height) - MAX (y, 0);
_cairo_surface_init (&surface->base, &cairo_ddraw_surface_backend,
base_surface->content);