mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the default desktop shell client configurable

Browse Source 
The default can be set by passing WESTON_SHELL_CLIENT as an argument
to configure, similarly to WESTON_NATIVE_BACKEND.

Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
This commit is contained in:
Emilio Pozuelo Monfort 2013-12-02 12:53:32 +01:00 committed by Kristian Høgsberg
parent 3e12e63f03
commit 8a81b83900
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -35,6 +35,8 @@ LT_INIT([disable-static])
AC_ARG_VAR([WESTON_NATIVE_BACKEND], AC_ARG_VAR([WESTON_NATIVE_BACKEND],
[Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@]) [Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@])
AC_ARG_VAR([WESTON_SHELL_CLIENT],
[Set the default desktop shell client to load if none is specified in weston.ini. @<:@default=weston-desktop-shell@:>@])
PKG_PROG_PKG_CONFIG() PKG_PROG_PKG_CONFIG()
@ -456,6 +458,13 @@ AC_MSG_NOTICE([Weston's native backend: $WESTON_NATIVE_BACKEND])
AC_DEFINE_UNQUOTED([WESTON_NATIVE_BACKEND], ["$WESTON_NATIVE_BACKEND"], AC_DEFINE_UNQUOTED([WESTON_NATIVE_BACKEND], ["$WESTON_NATIVE_BACKEND"],
[The default backend to load, if not wayland nor x11.]) [The default backend to load, if not wayland nor x11.])
if test "x$WESTON_SHELL_CLIENT" = "x"; then
WESTON_SHELL_CLIENT="weston-desktop-shell"
fi
AC_MSG_NOTICE([Weston's default desktop shell client: $WESTON_SHELL_CLIENT])
AC_DEFINE_UNQUOTED([WESTON_SHELL_CLIENT], ["$WESTON_SHELL_CLIENT"],
[The default desktop shell client to load.])
AC_ARG_ENABLE(demo-clients, AC_ARG_ENABLE(demo-clients,
AS_HELP_STRING([--enable-demo-clients], AS_HELP_STRING([--enable-demo-clients],
[install demo clients built with weston]),, [install demo clients built with weston]),,

1
man/Makefile.am
View File

@ -7,6 +7,7 @@ endif
MAN_SUBSTS = \ MAN_SUBSTS = \
-e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \ -e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \
-e 's|__weston_modules_dir__|$(pkglibdir)|g' \ -e 's|__weston_modules_dir__|$(pkglibdir)|g' \
-e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g' \
-e 's|__version__|$(PACKAGE_VERSION)|g' -e 's|__version__|$(PACKAGE_VERSION)|g'
SUFFIXES = .1 .5 .7 .man SUFFIXES = .1 .5 .7 .man

3
man/weston.ini.man
View File

@ -141,7 +141,8 @@ The entries that can appear in this section are:
.TP 7 .TP 7
.BI "client=" file .BI "client=" file
sets the path for the shell client to run. If not specified sets the path for the shell client to run. If not specified
weston-desktop-shell is launched (string). .I __weston_shell_client__
is launched (string).
.TP 7 .TP 7
.BI "background-image=" file .BI "background-image=" file
sets the path for the background image file (string). sets the path for the background image file (string).

2
src/shell.c
View File

@ -587,7 +587,7 @@ shell_configuration(struct desktop_shell *shell)
section = weston_config_get_section(shell->compositor->config, section = weston_config_get_section(shell->compositor->config,
"shell", NULL, NULL); "shell", NULL, NULL);
weston_config_section_get_string(section, weston_config_section_get_string(section,
"client", &s, LIBEXECDIR "/weston-desktop-shell"); "client", &s, LIBEXECDIR "/" WESTON_SHELL_CLIENT);
shell->client = s; shell->client = s;
weston_config_section_get_string(section, weston_config_section_get_string(section,
"binding-modifier", &s, "super"); "binding-modifier", &s, "super");