brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

canvas: Use macros for subclassing boilerplate

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3387>
This commit is contained in:
Bilal Elmoussaoui 2023-11-10 15:00:14 +01:00
parent e32268e181
commit d6b4c3a5d1
3 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-autocleanups.h
View File

@ -37,7 +37,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindingPool, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBlurEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBlurEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBoxLayout, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBoxLayout, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterCanvas, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref)

59
clutter/clutter/clutter-canvas.c
View File

@ -54,7 +54,7 @@
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"
#include "clutter/clutter-settings.h" #include "clutter/clutter-settings.h"
struct _ClutterCanvasPrivate typedef struct _ClutterCanvasPrivate
{ {
cairo_t *cr; cairo_t *cr;
@ -66,7 +66,7 @@ struct _ClutterCanvasPrivate
gboolean dirty; gboolean dirty;
CoglBitmap *buffer; CoglBitmap *buffer;
}; } ClutterCanvasPrivate;
enum enum
{ {
@ -122,7 +122,8 @@ clutter_cairo_context_draw_marshaller (GClosure *closure,
static void static void
clutter_canvas_finalize (GObject *gobject) clutter_canvas_finalize (GObject *gobject)
{ {
ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (CLUTTER_CANVAS (gobject));
g_clear_object (&priv->buffer); g_clear_object (&priv->buffer);
g_clear_object (&priv->texture); g_clear_object (&priv->texture);
@ -136,7 +137,8 @@ clutter_canvas_set_property (GObject *gobject,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (CLUTTER_CANVAS (gobject));
switch (prop_id) switch (prop_id)
{ {
@ -191,7 +193,8 @@ clutter_canvas_get_property (GObject *gobject,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (CLUTTER_CANVAS (gobject));
switch (prop_id) switch (prop_id)
{ {
@ -293,11 +296,11 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
static void static void
clutter_canvas_init (ClutterCanvas *self) clutter_canvas_init (ClutterCanvas *self)
{ {
self->priv = clutter_canvas_get_instance_private (self); ClutterCanvasPrivate *priv = clutter_canvas_get_instance_private (self);
self->priv->width = -1; priv->width = -1;
self->priv->height = -1; priv->height = -1;
self->priv->scale_factor = 1.0f; priv->scale_factor = 1.0f;
} }
static void static void
@ -307,7 +310,8 @@ clutter_canvas_paint_content (ClutterContent *content,
ClutterPaintContext *paint_context) ClutterPaintContext *paint_context)
{ {
ClutterCanvas *self = CLUTTER_CANVAS (content); ClutterCanvas *self = CLUTTER_CANVAS (content);
ClutterCanvasPrivate *priv = self->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (self);
ClutterPaintNode *node; ClutterPaintNode *node;
if (priv->buffer == NULL) if (priv->buffer == NULL)
@ -333,7 +337,8 @@ clutter_canvas_paint_content (ClutterContent *content,
static void static void
clutter_canvas_emit_draw (ClutterCanvas *self) clutter_canvas_emit_draw (ClutterCanvas *self)
{ {
ClutterCanvasPrivate *priv = self->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (self);
int real_width, real_height; int real_width, real_height;
cairo_surface_t *surface; cairo_surface_t *surface;
gboolean mapped_buffer; gboolean mapped_buffer;
@ -397,7 +402,7 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
priv->scale_factor, priv->scale_factor,
priv->scale_factor); priv->scale_factor);
self->priv->cr = cr = cairo_create (surface); priv->cr = cr = cairo_create (surface);
g_signal_emit (self, canvas_signals[DRAW], 0, g_signal_emit (self, canvas_signals[DRAW], 0,
cr, priv->width, priv->height, cr, priv->width, priv->height,
@ -412,7 +417,7 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
} }
#endif #endif
self->priv->cr = NULL; priv->cr = NULL;
cairo_destroy (cr); cairo_destroy (cr);
if (mapped_buffer) if (mapped_buffer)
@ -433,7 +438,8 @@ static void
clutter_canvas_invalidate (ClutterContent *content) clutter_canvas_invalidate (ClutterContent *content)
{ {
ClutterCanvas *self = CLUTTER_CANVAS (content); ClutterCanvas *self = CLUTTER_CANVAS (content);
ClutterCanvasPrivate *priv = self->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (self);
g_clear_object (&priv->buffer); g_clear_object (&priv->buffer);
@ -448,7 +454,8 @@ clutter_canvas_get_preferred_size (ClutterContent *content,
gfloat *width, gfloat *width,
gfloat *height) gfloat *height)
{ {
ClutterCanvasPrivate *priv = CLUTTER_CANVAS (content)->priv; ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (CLUTTER_CANVAS (content));
if (priv->width < 0 || priv->height < 0) if (priv->width < 0 || priv->height < 0)
return FALSE; return FALSE;
@ -494,6 +501,8 @@ clutter_canvas_invalidate_internal (ClutterCanvas *canvas,
int width, int width,
int height) int height)
{ {
ClutterCanvasPrivate *priv =
clutter_canvas_get_instance_private (canvas);
gboolean width_changed = FALSE, height_changed = FALSE; gboolean width_changed = FALSE, height_changed = FALSE;
gboolean res = FALSE; gboolean res = FALSE;
GObject *obj; GObject *obj;
@ -502,17 +511,17 @@ clutter_canvas_invalidate_internal (ClutterCanvas *canvas,
g_object_freeze_notify (obj); g_object_freeze_notify (obj);
if (canvas->priv->width != width) if (priv->width != width)
{ {
canvas->priv->width = width; priv->width = width;
width_changed = TRUE; width_changed = TRUE;
g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]); g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]);
} }
if (canvas->priv->height != height) if (priv->height != height)
{ {
canvas->priv->height = height; priv->height = height;
height_changed = TRUE; height_changed = TRUE;
g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]);
@ -577,12 +586,15 @@ void
clutter_canvas_set_scale_factor (ClutterCanvas *canvas, clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
float scale) float scale)
{ {
ClutterCanvasPrivate *priv;
g_return_if_fail (CLUTTER_IS_CANVAS (canvas)); g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
g_return_if_fail (scale > 0.0f); g_return_if_fail (scale > 0.0f);
if (canvas->priv->scale_factor != scale) priv = clutter_canvas_get_instance_private (canvas);
if (priv->scale_factor != scale)
{ {
canvas->priv->scale_factor = scale; priv->scale_factor = scale;
g_object_freeze_notify (G_OBJECT (canvas)); g_object_freeze_notify (G_OBJECT (canvas));
clutter_content_invalidate (CLUTTER_CONTENT (canvas)); clutter_content_invalidate (CLUTTER_CONTENT (canvas));
@ -603,7 +615,10 @@ clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
float float
clutter_canvas_get_scale_factor (ClutterCanvas *canvas) clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
{ {
ClutterCanvasPrivate *priv;
g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1.0f); g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1.0f);
return canvas->priv->scale_factor; priv = clutter_canvas_get_instance_private (canvas);
return priv->scale_factor;
} }

25
clutter/clutter/clutter-canvas.h
View File

@ -33,23 +33,13 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_CANVAS (clutter_canvas_get_type ()) #define CLUTTER_TYPE_CANVAS (clutter_canvas_get_type ())
#define CLUTTER_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CANVAS, ClutterCanvas))
#define CLUTTER_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CANVAS))
#define CLUTTER_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CANVAS, ClutterCanvasClass))
#define CLUTTER_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CANVAS))
#define CLUTTER_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CANVAS, ClutterCanvasClass))
typedef struct _ClutterCanvas ClutterCanvas; CLUTTER_EXPORT
typedef struct _ClutterCanvasPrivate ClutterCanvasPrivate; G_DECLARE_DERIVABLE_TYPE (ClutterCanvas,
typedef struct _ClutterCanvasClass ClutterCanvasClass; clutter_canvas,
CLUTTER,
struct _ClutterCanvas CANVAS,
{ GObject)
/*< private >*/
GObject parent_instance;
ClutterCanvasPrivate *priv;
};
/** /**
* ClutterCanvasClass: * ClutterCanvasClass:
@ -70,9 +60,6 @@ struct _ClutterCanvasClass
int height); int height);
}; };
CLUTTER_EXPORT
GType clutter_canvas_get_type (void) G_GNUC_CONST;
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterContent * clutter_canvas_new (void); ClutterContent * clutter_canvas_new (void);
CLUTTER_EXPORT CLUTTER_EXPORT