aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/view.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-12-20 13:02:45 -0500
committerLibravatar emersion <contact@emersion.fr>2018-12-20 19:55:29 +0100
commit88d96bc41ff638bdc767e30bf6ccbbd530258420 (patch)
tree5d822da99812aab4e849e566c53d3a6ba87ba496 /sway/tree/view.c
parentTerminate swaybg in output_disable (diff)
downloadsway-88d96bc41ff638bdc767e30bf6ccbbd530258420.tar.gz
sway-88d96bc41ff638bdc767e30bf6ccbbd530258420.tar.zst
sway-88d96bc41ff638bdc767e30bf6ccbbd530258420.zip
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.
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r--sway/tree/view.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index e890f4f3..deb20676 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -459,7 +459,7 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
459 for (int i = 0; i < criterias->length; ++i) { 459 for (int i = 0; i < criterias->length; ++i) {
460 struct criteria *criteria = criterias->items[i]; 460 struct criteria *criteria = criterias->items[i];
461 if (criteria->type == CT_ASSIGN_OUTPUT) { 461 if (criteria->type == CT_ASSIGN_OUTPUT) {
462 struct sway_output *output = output_by_name(criteria->target); 462 struct sway_output *output = output_by_name_or_id(criteria->target);
463 if (output) { 463 if (output) {
464 ws = output_get_active_workspace(output); 464 ws = output_get_active_workspace(output);
465 break; 465 break;