mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-25 21:58:31 +01:00
9704152414
Instead of having a build-time option to enable/disable xwayland support, just use the wlroots build config: enable xwayland in Sway if it was enabled when building wlroots. I don't see any use-case for disabling xwayland in Sway when enabled in wlroots: Sway doesn't pull in any additional dependency (just pulls in dependencies that wlroots already needs). We have a config command to disable xwayland at runtime anyways. This makes it so xwayland behaves the same way as other features such as libinput backend and session support. This also reduces the build matrix (less combinations of build options). I think we originally introduced the xwayland option when we didn't have a good way to figure out the wlroots build config from the Sway build system.
36 lines
988 B
C
36 lines
988 B
C
#include "sway/config.h"
|
|
#include "log.h"
|
|
#include "sway/commands.h"
|
|
#include "sway/server.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results *cmd_xwayland(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "xwayland", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
|
|
#ifdef WLR_HAS_XWAYLAND
|
|
enum xwayland_mode xwayland;
|
|
if (strcmp(argv[0], "force") == 0) {
|
|
xwayland = XWAYLAND_MODE_IMMEDIATE;
|
|
} else if (parse_boolean(argv[0], true)) {
|
|
xwayland = XWAYLAND_MODE_LAZY;
|
|
} else {
|
|
xwayland = XWAYLAND_MODE_DISABLED;
|
|
}
|
|
|
|
// config->xwayland is reset to the previous value on reload in
|
|
// load_main_config()
|
|
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");
|
|
#endif
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|