<div dir="ltr">Looks good and works good for me.</div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/8/23 Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">Signed-off-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br>
---<br>
</div> src/compositor.c | 12 ++++++++++--<br>
weston.ini | 3 ++-<br>
2 files changed, 12 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/compositor.c b/src/compositor.c<br>
index e9ba0fd..bb66fc7 100644<br>
--- a/src/compositor.c<br>
+++ b/src/compositor.c<br>
@@ -3224,6 +3224,7 @@ usage(int error_code)<br>
<div class="im HOEnZb"> " -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n"<br>
"\t\t\t\tfbdev-backend.so, x11-backend.so or\n"<br>
"\t\t\t\twayland-backend.so\n"<br>
</div><div class="im HOEnZb">+ " --shell=MODULE\tShell module, defaults to desktop-shell.so\n"<br>
" -S, --socket=NAME\tName of socket to listen on\n"<br>
" -i, --idle-time=SECS\tIdle time in seconds\n"<br>
" --modules\t\tLoad the comma-separated list of modules\n"<br>
</div><div class="HOEnZb"><div class="h5">@@ -3311,6 +3312,7 @@ int main(int argc, char *argv[])<br>
struct weston_config *config);<br>
int i, config_fd;<br>
char *backend = NULL;<br>
+ char *shell = NULL;<br>
char *modules, *option_modules = NULL;<br>
char *log = NULL;<br>
int32_t idle_time = 300;<br>
@@ -3322,6 +3324,7 @@ int main(int argc, char *argv[])<br>
<br>
const struct weston_option core_options[] = {<br>
{ WESTON_OPTION_STRING, "backend", 'B', &backend },<br>
+ { WESTON_OPTION_STRING, "shell", 0, &shell },<br>
{ WESTON_OPTION_STRING, "socket", 'S', &socket_name },<br>
{ WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time },<br>
{ WESTON_OPTION_STRING, "modules", 0, &option_modules },<br>
@@ -3380,8 +3383,7 @@ int main(int argc, char *argv[])<br>
close(config_fd);<br>
<br>
section = weston_config_get_section(config, "core", NULL, NULL);<br>
- weston_config_section_get_string(section, "modules",<br>
- &modules, "desktop-shell.so");<br>
+ weston_config_section_get_string(section, "modules", &modules, "");<br>
<br>
backend_init = load_module(backend, "backend_init");<br>
if (!backend_init)<br>
@@ -3400,6 +3402,12 @@ int main(int argc, char *argv[])<br>
<br>
setenv("WAYLAND_DISPLAY", socket_name, 1);<br>
<br>
+ if (!shell)<br>
+ weston_config_section_get_string(section, "shell", &shell,<br>
+ "desktop-shell.so");<br>
+ if (load_modules(ec, shell, &argc, argv) < 0)<br>
+ goto out;<br>
+<br>
if (load_modules(ec, modules, &argc, argv) < 0)<br>
goto out;<br>
if (load_modules(ec, option_modules, &argc, argv) < 0)<br>
diff --git a/weston.ini b/weston.ini<br>
index f2abceb..60d10f6 100644<br>
--- a/weston.ini<br>
+++ b/weston.ini<br>
@@ -1,5 +1,6 @@<br>
[core]<br>
-#modules=desktop-shell.so,xwayland.so,cms-colord.so<br>
+#modules=xwayland.so,cms-colord.so<br>
+#shell=desktop-shell.so<br>
<br>
[shell]<br>
background-image=/usr/share/backgrounds/gnome/Aqua.jpg<br>
--<br>
1.8.3.1<br>
<br>
</div></div><div class="HOEnZb"><div class="h5">_______________________________________________<br>
wayland-devel mailing list<br>
<a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a><br>
</div></div></blockquote></div><br></div>