mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-26 07:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd_output: support current output alias

Browse source 
Similar to seat command, this provides an alias for the current output.
Instead of the output name or identifier, `-` can be used to operate on
the focused output by name and `--` can be used to operate on the
focused output by its identifier. This will prevent operating on the
no-op output when using either alias.
This commit is contained in:
Brian Ashworth 2019-07-17 19:48:28 -04:00 • committed by Drew DeVault
parent 37308f6549
commit 92b22ee9ea
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
sway/commands/output.c
View file

@ -36,7 +36,32 @@ struct cmd_results *cmd_output(int argc, char **argv) {
"Refusing to configure the no op output");
}
struct output_config *output = new_output_config(argv[0]);
struct output_config *output = NULL;
if (strcmp(argv[0], "-") == 0 || strcmp(argv[0], "--") == 0) {
if (config->reading) {
return cmd_results_new(CMD_FAILURE,
"Current output alias (%s) cannot be used in the config",
argv[0]);
}
struct sway_output *sway_output = config->handler_context.node ?
node_get_output(config->handler_context.node) : NULL;
if (!sway_output) {
return cmd_results_new(CMD_FAILURE, "Unknown output");
}
if (sway_output == root->noop_output) {
return cmd_results_new(CMD_FAILURE,
"Refusing to configure the no op output");
}
if (strcmp(argv[0], "-") == 0) {
output = new_output_config(sway_output->wlr_output->name);
} else {
char identifier[128];
output_get_identifier(identifier, 128, sway_output);
output = new_output_config(identifier);
}
} else {
output = new_output_config(argv[0]);
}
if (!output) {
sway_log(SWAY_ERROR, "Failed to allocate output config");
return NULL;