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

compositor: Move various functions to their correct namespace

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4131>
This commit is contained in:
Bilal Elmoussaoui
2024-12-11 12:22:50 +01:00
parent 38a4b2e102
commit 1d7740d537
12 changed files with 68 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tests/meta-ref-test.c
View File

@ -52,7 +52,7 @@
#include "backends/meta-gpu.h"
#include "backends/meta-stage-private.h"
#include "clutter/clutter/clutter-stage-view-private.h"
#include "meta/compositor-mutter.h"
#include "meta/compositor.h"
#include "tests/meta-ref-test-utils.h"
static void
@ -154,9 +154,10 @@ capture_view (ClutterStageView *stage_view)
MetaStage *stage = META_STAGE (meta_backend_get_stage (backend));
MetaContext *context = meta_backend_get_context (backend);
MetaDisplay *display = meta_context_get_display (context);
MetaCompositor *compositor = meta_display_get_compositor (display);
CaptureViewData data = { 0 };
meta_disable_unredirect_for_display (display);
meta_compositor_disable_unredirect (compositor);
data.loop = g_main_loop_new (NULL, FALSE);
data.watch = meta_stage_watch_view (stage, stage_view,
@ -172,7 +173,7 @@ capture_view (ClutterStageView *stage_view)
g_assert_null (data.watch);
g_assert_nonnull (data.out_image);
meta_enable_unredirect_for_display (display);
meta_compositor_enable_unredirect (compositor);
return data.out_image;
}

14
src/tests/meta-test-shell.c
View File

@ -212,7 +212,8 @@ on_switch_workspace_effect_stopped (ClutterTimeline *timeline,
MetaPlugin *plugin = META_PLUGIN (data);
MetaTestShell *test_shell = META_TEST_SHELL (plugin);
MetaDisplay *display = meta_plugin_get_display (plugin);
GList *l = meta_get_window_actors (display);
MetaCompositor *compositor = meta_display_get_compositor (display);
GList *l = meta_compositor_get_window_actors (compositor);
while (l)
{
@ -347,13 +348,14 @@ meta_test_shell_start (MetaPlugin *plugin)
{
MetaTestShell *test_shell = META_TEST_SHELL (plugin);
MetaDisplay *display = meta_plugin_get_display (plugin);
MetaCompositor *compositor = meta_display_get_compositor (display);
MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context);
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
test_shell->background_group = meta_background_group_new ();
clutter_actor_insert_child_below (meta_get_window_group_for_display (display),
clutter_actor_insert_child_below (meta_compositor_get_window_group (compositor),
test_shell->background_group, NULL);
g_signal_connect (monitor_manager, "monitors-changed",
@ -415,7 +417,9 @@ meta_test_shell_switch_workspace (MetaPlugin *plugin,
clutter_actor_add_child (stage, workspace1);
clutter_actor_add_child (stage, workspace2);
for (l = g_list_last (meta_get_window_actors (display)); l; l = l->prev)
for (l = g_list_last (meta_compositor_get_window_actors (compositor));
l;
l = l->prev)
{
MetaWindowActor *window_actor = l->data;
ActorPrivate *actor_priv = get_actor_private (window_actor);
@ -713,6 +717,7 @@ static DisplayTilePreview *
get_display_tile_preview (MetaDisplay *display)
{
DisplayTilePreview *preview;
MetaCompositor *compositor;
if (!display_tile_preview_data_quark)
{
@ -730,7 +735,8 @@ get_display_tile_preview (MetaDisplay *display)
clutter_actor_set_background_color (preview->actor, &COGL_COLOR_INIT (0, 0, 255, 255));
clutter_actor_set_opacity (preview->actor, 100);
clutter_actor_add_child (meta_get_window_group_for_display (display),
compositor = meta_display_get_compositor (display);
clutter_actor_add_child (meta_compositor_get_window_group (compositor),
preview->actor);
g_signal_connect (display,
"closing",