From 88d96bc41ff638bdc767e30bf6ccbbd530258420 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Thu, 20 Dec 2018 13:02:45 -0500 Subject: Combine output_by_name and output_by_identifier 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. --- sway/commands/focus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/commands/focus.c') diff --git a/sway/commands/focus.c b/sway/commands/focus.c index 689edfec..97ffe91c 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -193,7 +193,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat, "Expected 'focus output '"); } 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; -- cgit v1.2.3-54-g00ecf