weston: Make the shell entrypoint specific
This avoids loading a shell as a module, so we are sure to have only one
shell loaded at a time.
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/compositor/main.c b/compositor/main.c
index af093f1..74b404b 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -829,6 +829,21 @@
}
static int
+wet_load_shell(struct weston_compositor *compositor,
+ const char *name, int *argc, char *argv[])
+{
+ int (*shell_init)(struct weston_compositor *ec,
+ int *argc, char *argv[]);
+
+ shell_init = wet_load_module_entrypoint(name, "wet_shell_init");
+ if (!shell_init)
+ return -1;
+ if (shell_init(compositor, argc, argv) < 0)
+ return -1;
+ return 0;
+}
+
+static int
load_modules(struct weston_compositor *ec, const char *modules,
int *argc, char *argv[])
{
@@ -1895,7 +1910,7 @@
weston_config_section_get_string(section, "shell", &shell,
"desktop-shell.so");
- if (load_modules(ec, shell, &argc, argv) < 0)
+ if (wet_load_shell(ec, shell, &argc, argv) < 0)
goto out;
weston_config_section_get_string(section, "modules", &modules, "");
diff --git a/compositor/weston.h b/compositor/weston.h
index 6229b34..5708aca 100644
--- a/compositor/weston.h
+++ b/compositor/weston.h
@@ -64,6 +64,9 @@
wet_load_module_entrypoint(const char *name, const char *entrypoint);
int
+wet_shell_init(struct weston_compositor *ec,
+ int *argc, char *argv[]);
+int
wet_module_init(struct weston_compositor *ec,
int *argc, char *argv[]);
int
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 5e10924..d8ef3fd 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4874,8 +4874,8 @@
}
WL_EXPORT int
-wet_module_init(struct weston_compositor *ec,
- int *argc, char *argv[])
+wet_shell_init(struct weston_compositor *ec,
+ int *argc, char *argv[])
{
struct weston_seat *seat;
struct desktop_shell *shell;
diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index d75c239..7368cb4 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -897,8 +897,8 @@
}
WL_EXPORT int
-wet_module_init(struct weston_compositor *compositor,
- int *argc, char *argv[])
+wet_shell_init(struct weston_compositor *compositor,
+ int *argc, char *argv[])
{
struct fullscreen_shell *shell;
struct weston_seat *seat;
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 4332995..67619b8 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -492,8 +492,8 @@
* Initialization of ivi-shell.
*/
WL_EXPORT int
-wet_module_init(struct weston_compositor *compositor,
- int *argc, char *argv[])
+wet_shell_init(struct weston_compositor *compositor,
+ int *argc, char *argv[])
{
struct ivi_shell *shell;
struct ivi_shell_setting setting = { };