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

surface: Put opaque_region in the priv structure

Browse Source 
This is in preparation for future patches.
This commit is contained in:
Benjamin Otte
2024-08-09 05:46:10 +02:00
parent 3b3b6036f8
commit 58aebc4447
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/gdksurface.c
View File

@@ -75,6 +75,8 @@ struct _GdkSurfacePrivate
GdkMemoryDepth egl_surface_depth; GdkMemoryDepth egl_surface_depth;
#endif #endif
cairo_region_t *opaque_region;
gpointer widget; gpointer widget;
GdkColorState *color_state; GdkColorState *color_state;
@@ -510,6 +512,12 @@ gdk_surface_real_create_subsurface (GdkSurface *surface)
return NULL; return NULL;
} }
static void
gdk_surface_default_set_opaque_region (GdkSurface *surface,
cairo_region_t *region)
{
}
static void static void
gdk_surface_constructed (GObject *object) gdk_surface_constructed (GObject *object)
{ {
@@ -533,6 +541,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
klass->beep = gdk_surface_real_beep; klass->beep = gdk_surface_real_beep;
klass->get_scale = gdk_surface_real_get_scale; klass->get_scale = gdk_surface_real_get_scale;
klass->create_subsurface = gdk_surface_real_create_subsurface; klass->create_subsurface = gdk_surface_real_create_subsurface;
klass->set_opaque_region = gdk_surface_default_set_opaque_region;
/** /**
* GdkSurface:cursor: (attributes org.gtk.Property.get=gdk_surface_get_cursor org.gtk.Property.set=gdk_surface_set_cursor) * GdkSurface:cursor: (attributes org.gtk.Property.get=gdk_surface_get_cursor org.gtk.Property.set=gdk_surface_set_cursor)
@@ -771,7 +780,7 @@ gdk_surface_finalize (GObject *object)
g_clear_object (&surface->display); g_clear_object (&surface->display);
g_clear_pointer (&surface->opaque_region, cairo_region_destroy); g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
if (surface->parent) if (surface->parent)
surface->parent->children = g_list_remove (surface->parent->children, surface); surface->parent->children = g_list_remove (surface->parent->children, surface);
@@ -2660,22 +2669,20 @@ void
gdk_surface_set_opaque_region (GdkSurface *surface, gdk_surface_set_opaque_region (GdkSurface *surface,
cairo_region_t *region) cairo_region_t *region)
{ {
GdkSurfaceClass *class; GdkSurfacePrivate *priv = gdk_surface_get_instance_private (surface);
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
g_return_if_fail (!GDK_SURFACE_DESTROYED (surface)); g_return_if_fail (!GDK_SURFACE_DESTROYED (surface));
if (cairo_region_equal (surface->opaque_region, region)) if (cairo_region_equal (priv->opaque_region, region))
return; return;
g_clear_pointer (&surface->opaque_region, cairo_region_destroy); g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
if (region != NULL) if (region != NULL)
surface->opaque_region = cairo_region_reference (region); priv->opaque_region = cairo_region_reference (region);
class = GDK_SURFACE_GET_CLASS (surface); GDK_SURFACE_GET_CLASS (surface)->set_opaque_region (surface, region);
if (class->set_opaque_region)
class->set_opaque_region (surface, region);
} }
void void

2
gdk/gdksurfaceprivate.h
View File

@@ -96,8 +96,6 @@ struct _GdkSurface
GSList *draw_contexts; GSList *draw_contexts;
GdkDrawContext *paint_context; GdkDrawContext *paint_context;
cairo_region_t *opaque_region;
GdkSeat *current_shortcuts_inhibited_seat; GdkSeat *current_shortcuts_inhibited_seat;
GPtrArray *subsurfaces; GPtrArray *subsurfaces;