Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cairocontext: Turn cairo_create() function into a vfunc

Browse Source
This commit is contained in:
Benjamin Otte
2018-04-14 02:17:47 +02:00
parent a6553b0e20
commit 7a6871ea5f
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gdk/gdkcairocontext.c
View File

@@ -77,6 +77,34 @@ gdk_surface_get_content (GdkSurface *surface)
return content;
}
static cairo_t *
gdk_cairo_context_default_cairo_create (GdkCairoContext *self)
{
GdkSurface *surface;
cairo_region_t *region;
cairo_surface_t *cairo_surface;
cairo_t *cr;
g_return_val_if_fail (GDK_IS_CAIRO_CONTEXT (self), NULL);
surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
if (surface->drawing_context == NULL ||
gdk_drawing_context_get_paint_context (surface->drawing_context) != GDK_DRAW_CONTEXT (self))
return NULL;
cairo_surface = _gdk_surface_ref_cairo_surface (surface);
cr = cairo_create (cairo_surface);
region = gdk_surface_get_current_paint_region (surface);
gdk_cairo_region (cr, region);
cairo_clip (cr);
cairo_region_destroy (region);
cairo_surface_destroy (cairo_surface);
return cr;
}
static void
gdk_surface_clear_backing_region (GdkSurface *surface)
{
@@ -215,6 +243,8 @@ gdk_cairo_context_class_init (GdkCairoContextClass *klass)
draw_context_class->begin_frame = gdk_cairo_context_begin_frame;
draw_context_class->end_frame = gdk_cairo_context_end_frame;
draw_context_class->surface_resized = gdk_cairo_context_surface_resized;
klass->cairo_create = gdk_cairo_context_default_cairo_create;
}
static void
@@ -240,28 +270,6 @@ gdk_cairo_context_init (GdkCairoContext *self)
cairo_t *
gdk_cairo_context_cairo_create (GdkCairoContext *self)
{
GdkSurface *surface;
cairo_region_t *region;
cairo_surface_t *cairo_surface;
cairo_t *cr;
g_return_val_if_fail (GDK_IS_CAIRO_CONTEXT (self), NULL);
surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
if (surface->drawing_context == NULL ||
gdk_drawing_context_get_paint_context (surface->drawing_context) != GDK_DRAW_CONTEXT (self))
return NULL;
cairo_surface = _gdk_surface_ref_cairo_surface (surface);
cr = cairo_create (cairo_surface);
region = gdk_surface_get_current_paint_region (surface);
gdk_cairo_region (cr, region);
cairo_clip (cr);
cairo_region_destroy (region);
cairo_surface_destroy (cairo_surface);
return cr;
return GDK_CAIRO_CONTEXT_GET_CLASS (self)->cairo_create (self);
}

2
gdk/gdkcairocontextprivate.h
View File

@@ -43,6 +43,8 @@ struct _GdkCairoContext
struct _GdkCairoContextClass
{
GdkDrawContextClass parent_class;
cairo_t * (* cairo_create) (GdkCairoContext *self);
};
G_END_DECLS