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

Add [core] backend option

Browse Source 
This allows specifying a particular backend to load in a manner similar to
modules.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
This commit is contained in:
Lubomir Rintel
2013-11-15 14:18:15 +01:00
committed by Kristian Høgsberg
parent cdb4d29096
commit ba44c6bf2e
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/weston.ini.man
+17
View File
@@ -105,6 +105,23 @@ directory are:
.fi .fi
.RE .RE
.TP 7 .TP 7
.TP 7
.BI "backend=" headless-backend.so
overrides defaults backend. Available backend modules in the
.IR "__weston_modules_dir__"
directory are:
.PP
.RS 10
.nf
.BR drm-backend.so
.BR fbdev-backend.so
.BR headless-backend.so
.BR rdp-backend.so
.BR rpi-backend.so
.BR wayland-backend.so
.BR x11-backend.so
.fi
.RE
.BI "gbm-format="format .BI "gbm-format="format
sets the GBM format used for the framebuffer for the GBM backend. Can be sets the GBM format used for the framebuffer for the GBM backend. Can be
.B xrgb8888, .B xrgb8888,
src/compositor.c
+15 -9
View File
@@ -3772,6 +3772,7 @@ int main(int argc, char *argv[])
struct weston_config *config); struct weston_config *config);
int i; int i;
char *backend = NULL; char *backend = NULL;
char *option_backend = NULL;
char *shell = NULL; char *shell = NULL;
char *modules, *option_modules = NULL; char *modules, *option_modules = NULL;
char *log = NULL; char *log = NULL;
@@ -3783,7 +3784,7 @@ int main(int argc, char *argv[])
struct weston_config_section *section; struct weston_config_section *section;
const struct weston_option core_options[] = { const struct weston_option core_options[] = {
{ WESTON_OPTION_STRING, "backend", 'B', &backend }, { WESTON_OPTION_STRING, "backend", 'B', &option_backend },
{ WESTON_OPTION_STRING, "shell", 0, &shell }, { WESTON_OPTION_STRING, "shell", 0, &shell },
{ WESTON_OPTION_STRING, "socket", 'S', &socket_name }, { WESTON_OPTION_STRING, "socket", 'S', &socket_name },
{ WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time }, { WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time },
@@ -3829,6 +3830,19 @@ int main(int argc, char *argv[])
signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
NULL); NULL);
config = weston_config_parse("weston.ini");
if (config != NULL) {
weston_log("Using config file '%s'\n",
weston_config_get_full_path(config));
} else {
weston_log("Starting with no config file.\n");
}
section = weston_config_get_section(config, "core", NULL, NULL);
weston_config_section_get_string(section, "backend", &backend, NULL);
if (option_backend) {
backend = option_backend;
}
if (!backend) { if (!backend) {
if (getenv("WAYLAND_DISPLAY")) if (getenv("WAYLAND_DISPLAY"))
backend = "wayland-backend.so"; backend = "wayland-backend.so";
@@ -3838,14 +3852,6 @@ int main(int argc, char *argv[])
backend = WESTON_NATIVE_BACKEND; backend = WESTON_NATIVE_BACKEND;
} }
config = weston_config_parse("weston.ini");
if (config != NULL) {
weston_log("Using config file '%s'\n",
weston_config_get_full_path(config));
} else {
weston_log("Starting with no config file.\n");
}
section = weston_config_get_section(config, "core", NULL, NULL);
weston_config_section_get_string(section, "modules", &modules, ""); weston_config_section_get_string(section, "modules", &modules, "");
backend_init = weston_load_module(backend, "backend_init"); backend_init = weston_load_module(backend, "backend_init");