itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '49cef51e6e'
${ noResults }
convince/sway/commands/xwayland.c

35 lines
897 B
Raw Normal View History Unescape

Add xwayland command
6 years ago
#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 HAVE_XWAYLAND
cmd_xwayland: add force for immediate launch This just adds a force option to cmd_xwayland that allows for xwayland to be immediately launched instead of lazily launched. This is useful for slower machines so it can be part of the startup time instead of when the user is actively trying to use it
5 years ago
enum xwayland_mode xwayland;
if (strcmp(argv[0], "force") == 0) {
Fix typo for the force/immediate option in xwayland_mode enum
5 years ago
xwayland = XWAYLAND_MODE_IMMEDIATE;
cmd_xwayland: add force for immediate launch This just adds a force option to cmd_xwayland that allows for xwayland to be immediately launched instead of lazily launched. This is useful for slower machines so it can be part of the startup time instead of when the user is actively trying to use it
5 years ago
} else if (parse_boolean(argv[0], true)) {
xwayland = XWAYLAND_MODE_LAZY;
} else {
xwayland = XWAYLAND_MODE_DISABLED;
}
config/xwayland: retain xwayland status on reload 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.
6 years ago
if (config->reloading && config->xwayland != xwayland) {
return cmd_results_new(CMD_FAILURE,
"xwayland can only be enabled/disabled at launch");
}
config->xwayland = xwayland;
Add xwayland command
6 years ago
#else
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
6 years ago
sway_log(SWAY_INFO, "Ignoring `xwayland` command, "
Add xwayland command
6 years ago
"sway hasn't been built with Xwayland support");
#endif
Remove now-unused "input" argument of cmd_results_new Patch tested by compiling with `__attribute__ ((format (printf, 2, 3)))` applied to `cmd_results_new`. String usage constants have been converted from pointers to arrays when encountered. General handler format strings were sometimes modified to include the old input string, especially for unknown command errors.
6 years ago
return cmd_results_new(CMD_SUCCESS, NULL);
Add xwayland command
6 years ago
}