mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Combine output_by_name and output_by_identifier

Browse source 
This combines `output_by_name` and `output_by_identifier` into a single
function called `output_by_name_or_id`. This allows for output
identifiers to be used in all commands, simplifies the logic of the
callers, and is more efficient since worst case is a single pass through
the output list.
This commit is contained in:
Brian Ashworth 2018-12-20 13:02:45 -05:00 • committed by emersion
parent 477bca5e28
commit 88d96bc41f
8 changed files with 22 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/focus.c
View file

@ -193,7 +193,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
"Expected 'focus output <direction|name>'");
}
char *identifier = join_args(argv, argc);
struct sway_output *output = output_by_name(identifier);
struct sway_output *output = output_by_name_or_id(identifier);
if (!output) {
enum wlr_direction direction;

2
sway/commands/move.c
View file

@ -64,7 +64,7 @@ static struct sway_output *output_in_direction(const char *direction_string,
}
}
return output_by_name(direction_string);
return output_by_name_or_id(direction_string);
}
static bool is_parallel(enum sway_container_layout layout,

2
sway/commands/output/transform.c
View file

@ -45,7 +45,7 @@ struct cmd_results *output_cmd_transform(int argc, char **argv) {
return cmd_results_new(CMD_INVALID, "output",
"Cannot apply relative transform to all outputs.");
}
struct sway_output *s_output = output_by_name(output->name);
struct sway_output *s_output = output_by_name_or_id(output->name);
if (s_output == NULL) {
return cmd_results_new(CMD_INVALID, "output",
"Cannot apply relative transform to unknown output %s", output->name);