AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Move clip offsetting into _gdk_gc_intersect_clip_region

Browse Source
This commit is contained in:
Alexander Larsson 2008-12-04 19:36:13 +01:00 committed by Alexander Larsson
parent 6a82287005
commit 5ff017e64e
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkgc.c
View File

@ -564,17 +564,25 @@ _gdk_gc_set_clip_region_internal (GdkGC *gc,
_gdk_windowing_gc_set_clip_region (gc, region, reset_origin);
}
/* Takes ownership of passed in region, returns old clip region */
/* returns old clip region */
void
_gdk_gc_intersect_clip_region (GdkGC *gc,
GdkRegion *region,
int offset_x,
int offset_y,
GdkRegion **old_clip_region)
{
GdkGCPrivate *priv = GDK_GC_GET_PRIVATE (gc);
GdkRegion *old_clip;
gboolean free;
old_clip = priv->clip_region;
region = gdk_region_copy (region);
if (offset_x != 0 || offset_y != 0)
gdk_region_offset (region, offset_x, offset_y);
priv->clip_region = region;
if (old_clip)
gdk_region_intersect (region, old_clip);

2
gdk/gdkinternals.h
View File

@ -295,6 +295,8 @@ guint32 _gdk_gc_get_fg_pixel (GdkGC *gc);
guint32 _gdk_gc_get_bg_pixel (GdkGC *gc);
void _gdk_gc_intersect_clip_region (GdkGC *gc,
GdkRegion *region,
int offset_x,
int offset_y,
GdkRegion **old_region);
void _gdk_gc_set_clip_region_internal (GdkGC *gc,
GdkRegion *region,

33
gdk/gdkwindow.c
View File

@ -1983,6 +1983,7 @@ gdk_window_begin_paint_region (GdkWindow *window,
clip_box.x, clip_box.y,
clip_box.width, clip_box.height);
}
#endif /* USE_BACKING_STORE */
}
@ -2270,16 +2271,15 @@ setup_clip_for_draw (GdkDrawable *drawable,
GdkRegion *clip;
if (_gdk_gc_get_subwindow (gc) == GDK_CLIP_BY_CHILDREN)
clip = gdk_region_copy (private->clip_region_with_children);
clip = private->clip_region_with_children;
else
clip = gdk_region_copy (private->clip_region);
clip = private->clip_region;
/* There was a clip origin set appart from the window offset,
need to take this into consideration */
if (old_clip_x != 0 || old_clip_y != 0)
gdk_region_offset (clip, -old_clip_x, -old_clip_y);
_gdk_gc_intersect_clip_region (gc, clip, old_clip_region);
_gdk_gc_intersect_clip_region (gc, clip,
/* If there was a clip origin set appart from the
* window offset, need to take that into consideration */
-old_clip_x, -old_clip_y,
old_clip_region);
}
static void
@ -2289,16 +2289,13 @@ setup_clip_for_paint (GdkDrawable *drawable,
int old_clip_x, int old_clip_y,
GdkRegion **old_clip_region)
{
GdkRegion *clip;
clip = gdk_region_copy (paint->region);
/* There was a clip origin set appart from the window offset,
need to take this into consideration */
if (old_clip_x != 0 || old_clip_y != 0)
gdk_region_offset (clip, -old_clip_x, -old_clip_y);
_gdk_gc_intersect_clip_region (gc, clip, old_clip_region);
_gdk_gc_intersect_clip_region (gc,
/* This includes the window clip */
paint->region,
/* If there was a clip origin set appart from the
* window offset, need to take that into consideration */
-old_clip_x, -old_clip_y,
old_clip_region);
}