alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

config/xwayland: retain xwayland status on reload

Browse source 
Since xwayland can only be enabled/disabled at launch, the xwayland
status should be retained on reload. Having `xwayland enabled|disabled`
in the config, should not cause `config->xwayland` to be invalid on
reload. This also returns `CMD_FAILURE` with a message that xwayland
can only be enabled/disabled on launch when trying to set the invalid
status on reload. This allows swaynag to notify the user that the
change will not take effect until sway is restarted.
This commit is contained in:
Brian Ashworth 2019-06-18 22:27:57 -04:00 committed by Simon Ser
parent ddad41f423
commit 5069b53d6c
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/commands/xwayland.c
View file

@ -11,7 +11,12 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
}
#ifdef HAVE_XWAYLAND
config->xwayland = parse_boolean(argv[0], config->xwayland);
bool xwayland = parse_boolean(argv[0], true);
if (config->reloading && config->xwayland != xwayland) {
return cmd_results_new(CMD_FAILURE,
"xwayland can only be enabled/disabled at launch");
}
config->xwayland = xwayland;
#else
sway_log(SWAY_INFO, "Ignoring `xwayland` command, "
"sway hasn't been built with Xwayland support");

5
sway/config.c
View file

@ -441,6 +441,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
config->reloading = true;
config->active = true;
// xwayland can only be enabled/disabled at launch
sway_log(SWAY_DEBUG, "xwayland will remain %s",
old_config->xwayland ? "enabled" : "disabled");
config->xwayland = old_config->xwayland;
if (old_config->swaybg_client != NULL) {
wl_client_destroy(old_config->swaybg_client);
}