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

compositor: Load xwayland module first

Browse Source 
This is so the systemd-notify module, if used, will notify readiness after
we're ready to accept X connections, instead of before.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman
2022-07-14 13:29:42 -05:00
committed by Daniel Stone
parent 0972c6b2da
commit 2badd284a5
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+11 -7
View File
@@ -3729,13 +3729,10 @@ wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
if (wet_load_shell(wet.compositor, shell, &argc, argv) < 0) if (wet_load_shell(wet.compositor, shell, &argc, argv) < 0)
goto out; goto out;
weston_config_section_get_string(section, "modules", &modules, ""); /* Load xwayland before other modules - this way if we're using
if (load_modules(wet.compositor, modules, &argc, argv) < 0) * the systemd-notify module it will notify after we're ready
goto out; * to receive xwayland connections.
*/
if (load_modules(wet.compositor, option_modules, &argc, argv) < 0)
goto out;
if (!xwayland) { if (!xwayland) {
weston_config_section_get_bool(section, "xwayland", &xwayland, weston_config_section_get_bool(section, "xwayland", &xwayland,
false); false);
@@ -3745,6 +3742,13 @@ wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
goto out; goto out;
} }
weston_config_section_get_string(section, "modules", &modules, "");
if (load_modules(wet.compositor, modules, &argc, argv) < 0)
goto out;
if (load_modules(wet.compositor, option_modules, &argc, argv) < 0)
goto out;
section = weston_config_get_section(config, "keyboard", NULL, NULL); section = weston_config_get_section(config, "keyboard", NULL, NULL);
weston_config_section_get_bool(section, "numlock-on", &numlock_on, false); weston_config_section_get_bool(section, "numlock-on", &numlock_on, false);
if (numlock_on) { if (numlock_on) {