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

stage: Move N_WATCH_MODES next to the enum

Browse Source 
This makes it harder to forget to update.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4067>
This commit is contained in:
Jonas Ådahl 2024-10-02 14:53:42 +02:00 committed by Marge Bot
parent 3806c0bd44
commit 57cd2bc4f7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ typedef enum
META_STAGE_WATCH_AFTER_OVERLAY_PAINT, META_STAGE_WATCH_AFTER_OVERLAY_PAINT,
META_STAGE_WATCH_AFTER_PAINT, META_STAGE_WATCH_AFTER_PAINT,
} MetaStageWatchPhase; } MetaStageWatchPhase;
#define META_N_WATCH_MODES (META_STAGE_WATCH_AFTER_PAINT + 1)
typedef void (* MetaStageWatchFunc) (MetaStage *stage, typedef void (* MetaStageWatchFunc) (MetaStage *stage,
ClutterStageView *view, ClutterStageView *view,

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

@ -29,8 +29,6 @@
#include "meta/meta-monitor-manager.h" #include "meta/meta-monitor-manager.h"
#include "meta/util.h" #include "meta/util.h"
#define N_WATCH_MODES 4
struct _MetaStageWatch struct _MetaStageWatch
{ {
ClutterStageView *view; ClutterStageView *view;
@ -59,7 +57,7 @@ struct _MetaStage
MetaBackend *backend; MetaBackend *backend;
GPtrArray *watchers[N_WATCH_MODES]; GPtrArray *watchers[META_N_WATCH_MODES];
GList *overlays; GList *overlays;
}; };
@ -160,7 +158,7 @@ meta_stage_finalize (GObject *object)
l = g_list_delete_link (l, l); l = g_list_delete_link (l, l);
} }
for (i = 0; i < N_WATCH_MODES; i++) for (i = 0; i < META_N_WATCH_MODES; i++)
g_clear_pointer (&stage->watchers[i], g_ptr_array_unref); g_clear_pointer (&stage->watchers[i], g_ptr_array_unref);
G_OBJECT_CLASS (meta_stage_parent_class)->finalize (object); G_OBJECT_CLASS (meta_stage_parent_class)->finalize (object);
@ -311,7 +309,7 @@ meta_stage_init (MetaStage *stage)
{ {
int i; int i;
for (i = 0; i < N_WATCH_MODES; i++) for (i = 0; i < META_N_WATCH_MODES; i++)
stage->watchers[i] = g_ptr_array_new_with_free_func (g_free); stage->watchers[i] = g_ptr_array_new_with_free_func (g_free);
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
@ -483,7 +481,7 @@ meta_stage_remove_watch (MetaStage *stage,
gboolean removed = FALSE; gboolean removed = FALSE;
int i; int i;
for (i = 0; i < N_WATCH_MODES; i++) for (i = 0; i < META_N_WATCH_MODES; i++)
{ {
watchers = stage->watchers[i]; watchers = stage->watchers[i];
removed = g_ptr_array_remove_fast (watchers, watch); removed = g_ptr_array_remove_fast (watchers, watch);