isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends/stage: Remove MetaStagePrivate

Browse Source 
The empty MetaStage was in meta-stage-private.h for no reason, so lets
move it to the C file. This makes it pointless to have a private
instance struct, so just move the fields to the private struct
_MetaStage.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/170
This commit is contained in:
Jonas Ådahl 2018-07-12 14:59:18 +02:00
parent 80d5f326e8
commit 19930c6577
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/meta-stage-private.h
View File

@ -28,11 +28,6 @@ G_BEGIN_DECLS
typedef struct _MetaOverlay MetaOverlay; typedef struct _MetaOverlay MetaOverlay;
struct _MetaStage
{
ClutterStage parent;
};
ClutterActor *meta_stage_new (void); ClutterActor *meta_stage_new (void);
MetaOverlay *meta_stage_create_cursor_overlay (MetaStage *stage); MetaOverlay *meta_stage_create_cursor_overlay (MetaStage *stage);

32
src/backends/meta-stage.c
View File

@ -41,13 +41,15 @@ struct _MetaOverlay {
gboolean previous_is_valid; gboolean previous_is_valid;
}; };
struct _MetaStagePrivate { struct _MetaStage
{
ClutterStage parent;
GList *overlays; GList *overlays;
gboolean is_active; gboolean is_active;
}; };
typedef struct _MetaStagePrivate MetaStagePrivate;
G_DEFINE_TYPE_WITH_PRIVATE (MetaStage, meta_stage, CLUTTER_TYPE_STAGE); G_DEFINE_TYPE (MetaStage, meta_stage, CLUTTER_TYPE_STAGE);
static MetaOverlay * static MetaOverlay *
meta_overlay_new (void) meta_overlay_new (void)
@ -119,9 +121,9 @@ static void
meta_stage_finalize (GObject *object) meta_stage_finalize (GObject *object)
{ {
MetaStage *stage = META_STAGE (object); MetaStage *stage = META_STAGE (object);
MetaStagePrivate *priv = meta_stage_get_instance_private (stage); GList *l;
GList *l = priv->overlays;
l = stage->overlays;
while (l) while (l)
{ {
meta_overlay_free (l->data); meta_overlay_free (l->data);
@ -135,12 +137,11 @@ static void
meta_stage_paint (ClutterActor *actor) meta_stage_paint (ClutterActor *actor)
{ {
MetaStage *stage = META_STAGE (actor); MetaStage *stage = META_STAGE (actor);
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
GList *l; GList *l;
CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor); CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor);
for (l = priv->overlays; l; l = l->next) for (l = stage->overlays; l; l = l->next)
meta_overlay_paint (l->data); meta_overlay_paint (l->data);
} }
@ -148,22 +149,20 @@ static void
meta_stage_activate (ClutterStage *actor) meta_stage_activate (ClutterStage *actor)
{ {
MetaStage *stage = META_STAGE (actor); MetaStage *stage = META_STAGE (actor);
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
CLUTTER_STAGE_CLASS (meta_stage_parent_class)->activate (actor); CLUTTER_STAGE_CLASS (meta_stage_parent_class)->activate (actor);
priv->is_active = TRUE; stage->is_active = TRUE;
} }
static void static void
meta_stage_deactivate (ClutterStage *actor) meta_stage_deactivate (ClutterStage *actor)
{ {
MetaStage *stage = META_STAGE (actor); MetaStage *stage = META_STAGE (actor);
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
CLUTTER_STAGE_CLASS (meta_stage_parent_class)->deactivate (actor); CLUTTER_STAGE_CLASS (meta_stage_parent_class)->deactivate (actor);
priv->is_active = FALSE; stage->is_active = FALSE;
} }
static void static void
@ -226,11 +225,10 @@ queue_redraw_for_overlay (MetaStage *stage,
MetaOverlay * MetaOverlay *
meta_stage_create_cursor_overlay (MetaStage *stage) meta_stage_create_cursor_overlay (MetaStage *stage)
{ {
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
MetaOverlay *overlay; MetaOverlay *overlay;
overlay = meta_overlay_new (); overlay = meta_overlay_new ();
priv->overlays = g_list_prepend (priv->overlays, overlay); stage->overlays = g_list_prepend (stage->overlays, overlay);
return overlay; return overlay;
} }
@ -239,14 +237,13 @@ void
meta_stage_remove_cursor_overlay (MetaStage *stage, meta_stage_remove_cursor_overlay (MetaStage *stage,
MetaOverlay *overlay) MetaOverlay *overlay)
{ {
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
GList *link; GList *link;
link = g_list_find (priv->overlays, overlay); link = g_list_find (stage->overlays, overlay);
if (!link) if (!link)
return; return;
priv->overlays = g_list_delete_link (priv->overlays, link); stage->overlays = g_list_delete_link (stage->overlays, link);
meta_overlay_free (overlay); meta_overlay_free (overlay);
} }
@ -266,7 +263,6 @@ void
meta_stage_set_active (MetaStage *stage, meta_stage_set_active (MetaStage *stage,
gboolean is_active) gboolean is_active)
{ {
MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
ClutterEvent event = { 0 }; ClutterEvent event = { 0 };
/* Used by the native backend to inform accessibility technologies /* Used by the native backend to inform accessibility technologies
@ -276,7 +272,7 @@ meta_stage_set_active (MetaStage *stage,
* for us. * for us.
*/ */
if (priv->is_active == is_active) if (stage->is_active == is_active)
return; return;
event.type = CLUTTER_STAGE_STATE; event.type = CLUTTER_STAGE_STATE;