shell-utils: Integrate shell-utils into libweston

These shell utils functions are potentially useful to other shells as
well, so make them widely available.

Renamed all functions to weston_shell_utils namespace.

No functional change, copied ad litteram.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/tests/meson.build b/tests/meson.build
index 85b6cf25..331afda3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,7 +2,7 @@ plugin_test_shell_desktop = shared_library(
 	'weston-test-desktop-shell',
 	'weston-test-desktop-shell.c',
 	include_directories: common_inc,
-	dependencies: [ dep_libweston_public, dep_libexec_weston, dep_shell_utils ],
+	dependencies: [ dep_libweston_public, dep_libexec_weston ],
 	name_prefix: '',
 	install: false
 )
@@ -266,7 +266,7 @@ tests = [
 		'sources': [
 		  'safe-signal-output-removal-test.c',
 		],
-		'dep_objs': [ dep_shell_utils ]
+		'dep_objs': [ dep_libweston_public ]
 	},
 ]
 
diff --git a/tests/safe-signal-output-removal-test.c b/tests/safe-signal-output-removal-test.c
index 596ca498..3ff22599 100644
--- a/tests/safe-signal-output-removal-test.c
+++ b/tests/safe-signal-output-removal-test.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 #include "../shared/signal.h"
-#include "shell-utils.h"
+#include <libweston/shell-utils.h>
 #include "weston-test-client-helper.h"
 #include "weston-test-fixture-compositor.h"
 
@@ -61,7 +61,7 @@ output_destroy(struct test_output *t_output)
        t_output->output_destroy_listener.notify = NULL;
 
        if (t_output->curtain)
-               weston_curtain_destroy(t_output->curtain);
+               weston_shell_utils_curtain_destroy(t_output->curtain);
 
        wl_list_remove(&t_output->output_destroy_listener.link);
        free(t_output);
@@ -88,8 +88,8 @@ output_create_view(struct test_output *t_output)
 	       .surface_private = NULL,
        };
 
-       t_output->curtain = weston_curtain_create(t_output->compositor,
-						 &curtain_params);
+       t_output->curtain = weston_shell_utils_curtain_create(t_output->compositor,
+							     &curtain_params);
        weston_view_set_output(t_output->curtain->view, t_output->output);
 
        /* weston_compositor_remove_output() has to be patched with
diff --git a/tests/weston-test-desktop-shell.c b/tests/weston-test-desktop-shell.c
index eaa0ad26..84855c9e 100644
--- a/tests/weston-test-desktop-shell.c
+++ b/tests/weston-test-desktop-shell.c
@@ -39,7 +39,7 @@
 #include "compositor/weston.h"
 #include <libweston/config-parser.h>
 #include "shared/helpers.h"
-#include "shell-utils.h"
+#include <libweston/shell-utils.h>
 #include <libweston/desktop.h>
 
 struct desktest_shell {
@@ -174,7 +174,7 @@ shell_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&dts->compositor_destroy_listener.link);
 
 	weston_desktop_destroy(dts->desktop);
-	weston_curtain_destroy(dts->background);
+	weston_shell_utils_curtain_destroy(dts->background);
 
 	weston_layer_fini(&dts->layer);
 	weston_layer_fini(&dts->background_layer);
@@ -215,7 +215,7 @@ wet_shell_init(struct weston_compositor *ec,
 	weston_layer_set_position(&dts->background_layer,
 				  WESTON_LAYER_POSITION_BACKGROUND);
 
-	dts->background = weston_curtain_create(ec, &background_params);
+	dts->background = weston_shell_utils_curtain_create(ec, &background_params);
 	if (dts->background == NULL)
 		goto out_free;
 	weston_surface_set_role(dts->background->view->surface,
@@ -236,7 +236,7 @@ wet_shell_init(struct weston_compositor *ec,
 	return 0;
 
 out_view:
-	weston_curtain_destroy(dts->background);
+	weston_shell_utils_curtain_destroy(dts->background);
 
 out_free:
 	wl_list_remove(&dts->compositor_destroy_listener.link);