Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
300e6b84
Commit
300e6b84
authored
Jun 28, 2010
by
Benjamin Otte
Browse files
s/GdkRegion/cairo_region_t/ in all of gtk
https://bugzilla.gnome.org/show_bug.cgi?id=613284
parent
3e96cfe8
Changes
49
Expand all
Hide whitespace changes
Inline
Side-by-side
gdk/directfb/gdkdrawable-directfb.c
View file @
300e6b84
...
...
@@ -44,7 +44,6 @@
#include
"gdkinternals.h"
#include
"gdkregion-generic.h"
#include
"gdkalias.h"
#include
"cairo-directfb.h"
...
...
@@ -226,7 +225,7 @@ void
gdk_directfb_clip_region
(
GdkDrawable
*
drawable
,
GdkGC
*
gc
,
GdkRectangle
*
draw_rect
,
GdkR
egion
*
ret_clip
)
cairo_r
egion
_t
*
ret_clip
)
{
GdkDrawableImplDirectFB
*
private
;
GdkRectangle
rect
;
...
...
@@ -264,7 +263,7 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
if
(
gc
)
{
GdkGCDirectFB
*
gc_private
=
GDK_GC_DIRECTFB
(
gc
);
GdkR
egion
*
region
=
&
gc_private
->
clip_region
;
cairo_r
egion
_t
*
region
=
&
gc_private
->
clip_region
;
if
(
region
->
numRects
)
{
...
...
@@ -299,7 +298,7 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
!
GDK_WINDOW_OBJECT
(
private
->
wrapper
)
->
input_only
)
{
GList
*
cur
;
GdkR
egion
temp
;
cairo_r
egion
_t
temp
;
temp
.
numRects
=
1
;
temp
.
rects
=
&
temp
.
extents
;
...
...
@@ -428,7 +427,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
gint
height
)
{
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
GdkGCDirectFB
*
gc_private
=
NULL
;
IDirectFBSurface
*
surface
=
NULL
;
gint
i
;
...
...
@@ -543,7 +542,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
for
(
i
=
0
;
i
<
clip
.
numRects
;
i
++
)
{
GdkR
egionBox
*
box
=
&
clip
.
rects
[
i
];
cairo_r
egion
_t
Box
*
box
=
&
clip
.
rects
[
i
];
rects
[
i
].
x
=
box
->
x1
;
rects
[
i
].
y
=
box
->
y1
;
...
...
@@ -606,7 +605,7 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
points
[
0
].
y
==
points
[
npoints
-
1
].
y
))
{
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
gint
i
;
impl
=
GDK_DRAWABLE_IMPL_DIRECTFB
(
drawable
);
...
...
@@ -671,7 +670,7 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
{
GdkDrawableImplDirectFB
*
impl
;
GdkDrawableImplDirectFB
*
src_impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
GdkRectangle
dest_rect
=
{
xdest
,
ydest
,
xdest
+
width
,
...
...
@@ -721,7 +720,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
gint
npoints
)
{
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
DFBRegion
region
=
{
points
->
x
,
points
->
y
,
points
->
x
,
points
->
y
};
...
...
@@ -769,7 +768,7 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
gint
nsegs
)
{
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
gint
i
;
// DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
...
...
@@ -847,7 +846,7 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
gint
npoints
)
{
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
gint
i
;
DFBRegion
lines
[
npoints
>
1
?
npoints
-
1
:
1
];
...
...
@@ -920,7 +919,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
{
GdkDrawableImplDirectFB
*
impl
;
GdkImageDirectFB
*
image_private
;
GdkR
egion
clip
;
cairo_r
egion
_t
clip
;
GdkRectangle
dest_rect
=
{
xdest
,
ydest
,
width
,
height
};
gint
pitch
=
0
;
...
...
@@ -1156,8 +1155,8 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
{
GdkPixbuf
*
composited
=
NULL
;
#if 0
GdkR
egion *clip;
GdkR
egion *drect;
cairo_r
egion
_t
*clip;
cairo_r
egion
_t
*drect;
GdkRectangle tmp_rect;
#endif
GdkDrawableImplDirectFB
*
impl
=
GDK_DRAWABLE_IMPL_DIRECTFB
(
drawable
);
...
...
gdk/directfb/gdkgc-directfb.c
View file @
300e6b84
...
...
@@ -42,7 +42,6 @@
#include
"gdkgc.h"
#include
"gdkpixmap.h"
#include
"gdkregion-generic.h"
#include
"gdkalias.h"
...
...
@@ -313,7 +312,7 @@ gc_unset_clip_mask (GdkGC *gc)
void
_gdk_windowing_gc_set_clip_region
(
GdkGC
*
gc
,
const
GdkR
egion
*
region
,
const
cairo_r
egion
_t
*
region
,
gboolean
reset_origin
)
{
GdkGCDirectFB
*
data
;
...
...
gdk/directfb/gdkgeometry-directfb.c
View file @
300e6b84
...
...
@@ -53,7 +53,7 @@ _gdk_directfb_window_get_offsets (GdkWindow *window,
gboolean
_gdk_windowing_window_queue_antiexpose
(
GdkWindow
*
window
,
GdkR
egion
*
area
)
cairo_r
egion
_t
*
area
)
{
return
FALSE
;
}
...
...
@@ -75,7 +75,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
{
GdkWindowObject
*
private
;
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
*
invalidate_region
=
NULL
;
cairo_r
egion
_t
*
invalidate_region
=
NULL
;
GList
*
list
;
g_return_if_fail
(
GDK_IS_WINDOW
(
window
));
...
...
@@ -104,7 +104,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
(
!
private
->
update_area
||
!
cairo_region_contains_rectangle
(
private
->
update_area
,
&
rect
)))
{
GdkR
egion
*
region
;
cairo_r
egion
_t
*
region
;
region
=
cairo_region_create_rectangle
(
&
rect
);
cairo_region_subtract
(
invalidate_region
,
region
);
...
...
@@ -148,7 +148,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
/**
* gdk_window_move_region:
* @window: a #GdkWindow
* @region: The #
GdkR
egion to move
* @region: The #
cairo_r
egion
_t
to move
* @dx: Amount to move in the X direction
* @dy: Amount to move in the Y direction
*
...
...
@@ -162,17 +162,17 @@ _gdk_directfb_window_scroll (GdkWindow *window,
**/
void
_gdk_directfb_window_move_region
(
GdkWindow
*
window
,
const
GdkR
egion
*
region
,
const
cairo_r
egion
_t
*
region
,
gint
dx
,
gint
dy
)
{
GdkWindowObject
*
private
;
GdkDrawableImplDirectFB
*
impl
;
GdkR
egion
*
window_clip
;
GdkR
egion
*
src_region
;
GdkR
egion
*
brought_in
;
GdkR
egion
*
dest_region
;
GdkR
egion
*
moving_invalid_region
;
cairo_r
egion
_t
*
window_clip
;
cairo_r
egion
_t
*
src_region
;
cairo_r
egion
_t
*
brought_in
;
cairo_r
egion
_t
*
dest_region
;
cairo_r
egion
_t
*
moving_invalid_region
;
GdkRectangle
dest_extents
;
g_return_if_fail
(
GDK_IS_WINDOW
(
window
));
...
...
gdk/directfb/gdkprivate-directfb.h
View file @
300e6b84
...
...
@@ -38,7 +38,6 @@
#include
"gdkinternals.h"
#include
"gdkcursor.h"
#include
"gdkdisplay-directfb.h"
#include
"gdkregion-generic.h"
#include
<cairo.h>
#include
<string.h>
...
...
@@ -72,14 +71,14 @@ struct _GdkDrawableImplDirectFB
gboolean
buffered
;
GdkR
egion
paint_region
;
cairo_r
egion
_t
paint_region
;
gint
paint_depth
;
gint
width
;
gint
height
;
gint
abs_x
;
gint
abs_y
;
GdkR
egion
clip_region
;
cairo_r
egion
_t
clip_region
;
GdkColormap
*
colormap
;
...
...
@@ -179,7 +178,7 @@ void _gdk_directfb_window_scroll (GdkWindow *window,
gint
dx
,
gint
dy
);
void
_gdk_directfb_window_move_region
(
GdkWindow
*
window
,
const
GdkR
egion
*
region
,
const
cairo_r
egion
_t
*
region
,
gint
dx
,
gint
dy
);
...
...
@@ -213,7 +212,7 @@ typedef struct
{
GdkGC
parent_instance
;
GdkR
egion
clip_region
;
cairo_r
egion
_t
clip_region
;
GdkGCValuesMask
values_mask
;
GdkGCValues
values
;
...
...
@@ -335,14 +334,14 @@ void gdk_fb_window_set_child_handler (GdkWindow *window,
void
gdk_directfb_clip_region
(
GdkDrawable
*
drawable
,
GdkGC
*
gc
,
GdkRectangle
*
draw_rect
,
GdkR
egion
*
ret_clip
);
cairo_r
egion
_t
*
ret_clip
);
/* Utilities for avoiding mallocs */
static
inline
void
temp_region_init_copy
(
GdkR
egion
*
region
,
const
GdkR
egion
*
source
)
temp_region_init_copy
(
cairo_r
egion
_t
*
region
,
const
cairo_r
egion
_t
*
source
)
{
if
(
region
!=
source
)
/* don't want to copy to itself */
{
...
...
@@ -351,19 +350,19 @@ temp_region_init_copy( GdkRegion *region,
if
(
region
->
rects
&&
region
->
rects
!=
&
region
->
extents
)
g_free
(
region
->
rects
);
region
->
rects
=
g_new
(
GdkR
egionBox
,
source
->
numRects
);
region
->
rects
=
g_new
(
cairo_r
egion
_t
Box
,
source
->
numRects
);
region
->
size
=
source
->
numRects
;
}
region
->
numRects
=
source
->
numRects
;
region
->
extents
=
source
->
extents
;
memcpy
(
region
->
rects
,
source
->
rects
,
source
->
numRects
*
sizeof
(
GdkR
egionBox
)
);
memcpy
(
region
->
rects
,
source
->
rects
,
source
->
numRects
*
sizeof
(
cairo_r
egion
_t
Box
)
);
}
}
static
inline
void
temp_region_init_rectangle
(
GdkR
egion
*
region
,
temp_region_init_rectangle
(
cairo_r
egion
_t
*
region
,
const
GdkRectangle
*
rect
)
{
region
->
numRects
=
1
;
...
...
@@ -376,7 +375,7 @@ temp_region_init_rectangle( GdkRegion *region,
}
static
inline
void
temp_region_init_rectangle_vals
(
GdkR
egion
*
region
,
temp_region_init_rectangle_vals
(
cairo_r
egion
_t
*
region
,
int
x
,
int
y
,
int
w
,
...
...
@@ -392,7 +391,7 @@ temp_region_init_rectangle_vals( GdkRegion *region,
}
static
inline
void
temp_region_reset
(
GdkR
egion
*
region
)
temp_region_reset
(
cairo_r
egion
_t
*
region
)
{
if
(
region
->
size
>
32
&&
region
->
rects
&&
region
->
rects
!=
&
region
->
extents
)
{
g_free
(
region
->
rects
);
...
...
@@ -405,7 +404,7 @@ temp_region_reset( GdkRegion *region )
}
static
inline
void
temp_region_deinit
(
GdkR
egion
*
region
)
temp_region_deinit
(
cairo_r
egion
_t
*
region
)
{
if
(
region
->
rects
&&
region
->
rects
!=
&
region
->
extents
)
{
g_free
(
region
->
rects
);
...
...
gdk/directfb/gdkwindow-directfb.c
View file @
300e6b84
...
...
@@ -40,8 +40,6 @@
#include
"gdkprivate-directfb.h"
#include
"gdkdisplay-directfb.h"
#include
"gdkregion-generic.h"
#include
"gdkinternals.h"
#include
"gdkalias.h"
#include
"cairo.h"
...
...
@@ -57,7 +55,7 @@ D_DEBUG_DOMAIN( GDKDFB_Paintable, "GDKDFB/Paintable", "GDK DirectFB Paintable" )
D_DEBUG_DOMAIN
(
GDKDFB_Window
,
"GDKDFB/Window"
,
"GDK DirectFB Window"
);
static
GdkR
egion
*
gdk_window_impl_directfb_get_visible_region
(
GdkDrawable
*
drawable
);
static
cairo_r
egion
_t
*
gdk_window_impl_directfb_get_visible_region
(
GdkDrawable
*
drawable
);
static
void
gdk_window_impl_directfb_set_colormap
(
GdkDrawable
*
drawable
,
GdkColormap
*
colormap
);
static
void
gdk_window_impl_directfb_init
(
GdkWindowImplDirectFB
*
window
);
...
...
@@ -209,7 +207,7 @@ gdk_window_impl_directfb_finalize (GObject *object)
G_OBJECT_CLASS
(
parent_class
)
->
finalize
(
object
);
}
static
GdkR
egion
*
static
cairo_r
egion
_t
*
gdk_window_impl_directfb_get_visible_region
(
GdkDrawable
*
drawable
)
{
GdkDrawableImplDirectFB
*
priv
=
GDK_DRAWABLE_IMPL_DIRECTFB
(
drawable
);
...
...
@@ -1942,7 +1940,7 @@ gdk_directfb_window_set_events (GdkWindow *window,
static
void
gdk_directfb_window_shape_combine_region
(
GdkWindow
*
window
,
const
GdkR
egion
*
shape_region
,
const
cairo_r
egion
_t
*
shape_region
,
gint
offset_x
,
gint
offset_y
)
{
...
...
@@ -1950,7 +1948,7 @@ gdk_directfb_window_shape_combine_region (GdkWindow *window,
void
gdk_directfb_window_input_shape_combine_region
(
GdkWindow
*
window
,
const
GdkR
egion
*
shape_region
,
const
cairo_r
egion
_t
*
shape_region
,
gint
offset_x
,
gint
offset_y
)
{
...
...
@@ -1959,7 +1957,7 @@ gdk_directfb_window_input_shape_combine_region (GdkWindow *window,
static
void
gdk_directfb_window_queue_translation
(
GdkWindow
*
window
,
GdkGC
*
gc
,
GdkR
egion
*
region
,
cairo_r
egion
_t
*
region
,
gint
dx
,
gint
dy
)
{
...
...
@@ -2622,7 +2620,7 @@ gdk_window_set_urgency_hint (GdkWindow *window,
static
void
gdk_window_impl_directfb_begin_paint_region
(
GdkPaintable
*
paintable
,
GdkWindow
*
window
,
const
GdkR
egion
*
region
)
const
cairo_r
egion
_t
*
region
)
{
GdkDrawableImplDirectFB
*
impl
;
GdkWindowImplDirectFB
*
wimpl
;
...
...
@@ -2679,7 +2677,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
for
(
i
=
0
;
i
<
region
->
numRects
;
i
++
)
{
GdkR
egionBox
*
box
=
&
region
->
rects
[
i
];
cairo_r
egion
_t
Box
*
box
=
&
region
->
rects
[
i
];
D_DEBUG_AT
(
GDKDFB_Window
,
" -> [%2d] %4d,%4d-%4dx%4d
\n
"
,
i
,
GDKDFB_RECTANGLE_VALS_FROM_BOX
(
box
)
);
...
...
@@ -2766,13 +2764,13 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
D_DEBUG_AT
(
GDKDFB_Window
,
" -> depth is still %d
\n
"
,
impl
->
paint_depth
);
}
GdkR
egion
*
cairo_r
egion
_t
*
_gdk_windowing_get_shape_for_mask
(
GdkBitmap
*
mask
)
{
return
NULL
;
}
GdkR
egion
*
cairo_r
egion
_t
*
_gdk_windowing_window_get_shape
(
GdkWindow
*
window
)
{
return
NULL
;
...
...
@@ -2784,7 +2782,7 @@ _gdk_windowing_window_get_next_serial (GdkDisplay *display)
return
0
;
}
GdkR
egion
*
cairo_r
egion
_t
*
_gdk_windowing_window_get_input_shape
(
GdkWindow
*
window
)
{
return
NULL
;
...
...
@@ -2802,7 +2800,7 @@ _gdk_windowing_after_process_all_updates (void)
void
_gdk_windowing_window_process_updates_recurse
(
GdkWindow
*
window
,
GdkR
egion
*
region
)
cairo_r
egion
_t
*
region
)
{
_gdk_window_process_updates_recurse
(
window
,
region
);
}
...
...
@@ -2861,7 +2859,7 @@ gdk_directfb_window_get_root_coords (GdkWindow *window,
static
gboolean
gdk_directfb_window_queue_antiexpose
(
GdkWindow
*
window
,
GdkR
egion
*
area
)
cairo_r
egion
_t
*
area
)
{
return
FALSE
;
}
...
...
gdk/gdkcairo.c
View file @
300e6b84
...
...
@@ -132,7 +132,7 @@ gdk_cairo_rectangle (cairo_t *cr,
/**
* gdk_cairo_region:
* @cr: a #cairo_t
* @region: a #
GdkR
egion
* @region: a #
cairo_r
egion
_t
*
* Adds the given region to the current path of @cr.
*
...
...
@@ -140,7 +140,7 @@ gdk_cairo_rectangle (cairo_t *cr,
**/
void
gdk_cairo_region
(
cairo_t
*
cr
,
const
GdkR
egion
*
region
)
const
cairo_r
egion
_t
*
region
)
{
cairo_rectangle_int_t
box
;
gint
n_boxes
,
i
;
...
...
gdk/gdkcairo.h
View file @
300e6b84
...
...
@@ -48,7 +48,7 @@ void gdk_cairo_set_source_pixmap (cairo_t *cr,
void
gdk_cairo_rectangle
(
cairo_t
*
cr
,
const
GdkRectangle
*
rectangle
);
void
gdk_cairo_region
(
cairo_t
*
cr
,
const
GdkR
egion
*
region
);
const
cairo_r
egion
_t
*
region
);
G_END_DECLS
...
...
gdk/gdkdraw.c
View file @
300e6b84
...
...
@@ -48,7 +48,7 @@ static GdkDrawable* gdk_drawable_real_get_composite_drawable (GdkDrawable *draw
gint
height
,
gint
*
composite_x_offset
,
gint
*
composite_y_offset
);
static
GdkR
egion
*
gdk_drawable_real_get_visible_region
(
GdkDrawable
*
drawable
);
static
cairo_r
egion
_t
*
gdk_drawable_real_get_visible_region
(
GdkDrawable
*
drawable
);
static
void
gdk_drawable_real_draw_pixbuf
(
GdkDrawable
*
drawable
,
GdkGC
*
gc
,
GdkPixbuf
*
pixbuf
,
...
...
@@ -1059,10 +1059,10 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
* but no area outside of this region will be affected by drawing
* primitives.
*
* Returns: a #
GdkR
egion. This must be freed with cairo_region_destroy()
* Returns: a #
cairo_r
egion
_t
. This must be freed with cairo_region_destroy()
* when you are done.
**/
GdkR
egion
*
cairo_r
egion
_t
*
gdk_drawable_get_clip_region
(
GdkDrawable
*
drawable
)
{
g_return_val_if_fail
(
GDK_IS_DRAWABLE
(
drawable
),
NULL
);
...
...
@@ -1079,10 +1079,10 @@ gdk_drawable_get_clip_region (GdkDrawable *drawable)
* obscured by other windows, but no area outside of this region
* is visible.
*
* Returns: a #
GdkR
egion. This must be freed with cairo_region_destroy()
* Returns: a #
cairo_r
egion
_t
. This must be freed with cairo_region_destroy()
* when you are done.
**/
GdkR
egion
*
cairo_r
egion
_t
*
gdk_drawable_get_visible_region
(
GdkDrawable
*
drawable
)
{
g_return_val_if_fail
(
GDK_IS_DRAWABLE
(
drawable
),
NULL
);
...
...
@@ -1090,7 +1090,7 @@ gdk_drawable_get_visible_region (GdkDrawable *drawable)
return
GDK_DRAWABLE_GET_CLASS
(
drawable
)
->
get_visible_region
(
drawable
);
}
static
GdkR
egion
*
static
cairo_r
egion
_t
*
gdk_drawable_real_get_visible_region
(
GdkDrawable
*
drawable
)
{
GdkRectangle
rect
;
...
...
@@ -1371,8 +1371,8 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
{
GdkPixbuf
*
composited
=
NULL
;
gint
dwidth
,
dheight
;
GdkR
egion
*
clip
;
GdkR
egion
*
drect
;
cairo_r
egion
_t
*
clip
;
cairo_r
egion
_t
*
drect
;
GdkRectangle
tmp_rect
;
GdkDrawable
*
real_drawable
;
...
...
gdk/gdkdrawable.h
View file @
300e6b84
...
...
@@ -140,8 +140,8 @@ struct _GdkDrawableClass
gint
width
,
gint
height
);
GdkR
egion
*
(
*
get_clip_region
)
(
GdkDrawable
*
drawable
);
GdkR
egion
*
(
*
get_visible_region
)
(
GdkDrawable
*
drawable
);
cairo_r
egion
_t
*
(
*
get_clip_region
)
(
GdkDrawable
*
drawable
);
cairo_r
egion
_t
*
(
*
get_visible_region
)
(
GdkDrawable
*
drawable
);
GdkDrawable
*
(
*
get_composite_drawable
)
(
GdkDrawable
*
drawable
,
gint
x
,
...
...
@@ -372,8 +372,8 @@ GdkImage *gdk_drawable_copy_to_image (GdkDrawable *drawable,
gint
width
,
gint
height
);
GdkR
egion
*
gdk_drawable_get_clip_region
(
GdkDrawable
*
drawable
);
GdkR
egion
*
gdk_drawable_get_visible_region
(
GdkDrawable
*
drawable
);
cairo_r
egion
_t
*
gdk_drawable_get_clip_region
(
GdkDrawable
*
drawable
);
cairo_r
egion
_t
*
gdk_drawable_get_visible_region
(
GdkDrawable
*
drawable
);
G_END_DECLS
...
...
gdk/gdkevents.h
View file @
300e6b84
...
...
@@ -279,7 +279,7 @@ struct _GdkEventExpose
GdkWindow
*
window
;
gint8
send_event
;
GdkRectangle
area
;
GdkR
egion
*
region
;
cairo_r
egion
_t
*
region
;
gint
count
;
/* If non-zero, how many more events follow. */
};
...
...
gdk/gdkgc.c
View file @
300e6b84
...
...
@@ -41,13 +41,13 @@ typedef struct _GdkGCPrivate GdkGCPrivate;
struct
_GdkGCPrivate
{
GdkR
egion
*
clip_region
;
cairo_r
egion
_t
*
clip_region
;
guint32
region_tag_applied
;
int
region_tag_offset_x
;
int
region_tag_offset_y
;
GdkR
egion
*
old_clip_region
;
cairo_r
egion
_t
*
old_clip_region
;
GdkPixmap
*
old_clip_mask
;
GdkBitmap
*
stipple
;
...
...
@@ -538,7 +538,7 @@ gdk_gc_set_clip_mask (GdkGC *gc,
/* Takes ownership of passed in region */
static
void
_gdk_gc_set_clip_region_real
(
GdkGC
*
gc
,
GdkR
egion
*
region
,
cairo_r
egion
_t
*
region
,
gboolean
reset_origin
)
{
GdkGCPrivate
*
priv
=
GDK_GC_GET_PRIVATE
(
gc
);
...
...
@@ -560,7 +560,7 @@ _gdk_gc_set_clip_region_real (GdkGC *gc,
/* Doesn't copy region, allows not to reset origin */
void
_gdk_gc_set_clip_region_internal
(
GdkGC
*
gc
,
GdkR
egion
*
region
,
cairo_r
egion
_t
*
region
,
gboolean
reset_origin
)
{
_gdk_gc_remove_drawable_clip
(
gc
);
...
...
@@ -571,7 +571,7 @@ _gdk_gc_set_clip_region_internal (GdkGC *gc,
void
_gdk_gc_add_drawable_clip
(
GdkGC
*
gc
,
guint32
region_tag
,
GdkR
egion
*
region
,
cairo_r
egion
_t
*
region
,
int
offset_x
,
int
offset_y
)
{
...
...
@@ -634,7 +634,7 @@ _gdk_gc_add_drawable_clip (GdkGC *gc,
else
if
(
overlap
==
CAIRO_REGION_OVERLAP_OUT
)
{
/* No intersection, set empty clip region */
GdkR
egion
*
empty
=
cairo_region_create
();
cairo_r
egion
_t
*
empty
=
cairo_region_create
();
cairo_region_destroy
(
region
);
priv
->
old_clip_mask
=
g_object_ref
(
priv
->
clip_mask
);
...
...
@@ -704,7 +704,7 @@ void
gdk_gc_set_clip_rectangle
(
GdkGC
*
gc
,
const
GdkRectangle
*
rectangle
)
{
GdkR
egion
*
region
;
cairo_r
egion
_t
*
region
;
g_return_if_fail
(
GDK_IS_GC
(
gc
));
...
...
@@ -721,7 +721,7 @@ gdk_gc_set_clip_rectangle (GdkGC *gc,
/**
* gdk_gc_set_clip_region:
* @gc: a #GdkGC.
* @region: the #
GdkR
egion.
* @region: the #
cairo_r
egion
_t
.
*
* Sets the clip mask for a graphics context from a region structure.
* The clip mask is interpreted relative to the clip origin. (See
...
...
@@ -729,9 +729,9 @@ gdk_gc_set_clip_rectangle (GdkGC *gc,
**/
void
gdk_gc_set_clip_region
(
GdkGC
*
gc
,
const
GdkR
egion
*
region
)
const
cairo_r
egion
_t
*
region
)
{
GdkR
egion
*
copy
;
cairo_r
egion
_t
*
copy
;
g_return_if_fail
(
GDK_IS_GC
(
gc
));
...
...
@@ -755,7 +755,7 @@ gdk_gc_set_clip_region (GdkGC *gc,
* (if a clip mask is set, the return will be %NULL)
* This value is owned by the GC and must not be freed.
**/
GdkR
egion
*
cairo_r
egion
_t
*
_gdk_gc_get_clip_region
(
GdkGC
*
gc
)
{
g_return_val_if_fail
(
GDK_IS_GC
(
gc
),
NULL
);
...
...
gdk/gdkgc.h
View file @
300e6b84
...
...
@@ -252,7 +252,7 @@ void gdk_gc_set_clip_mask (GdkGC *gc,
void
gdk_gc_set_clip_rectangle
(
GdkGC
*
gc
,
const
GdkRectangle
*
rectangle
);
void
gdk_gc_set_clip_region
(
GdkGC
*
gc
,
const
GdkR
egion
*
region
);
const
cairo_r
egion
_t
*
region
);
void
gdk_gc_set_subwindow
(
GdkGC
*
gc
,
GdkSubwindowMode
mode
);
void
gdk_gc_set_exposures
(
GdkGC
*
gc
,
...
...
gdk/gdkinternals.h
View file @
300e6b84
...
...
@@ -212,7 +212,7 @@ struct _GdkWindowObject
GSList
*
paint_stack
;
GdkR
egion
*
update_area
;
cairo_r
egion
_t
*
update_area
;
guint
update_freeze_count
;
guint8
window_type
;
...
...
@@ -248,8 +248,8 @@ struct _GdkWindowObject
int
abs_x
,
abs_y
;
/* Absolute offset in impl */
gint
width
,
height
;