1 files changed, 11 insertions, 19 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index d649100f..04c9b4f6 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -29,23 +29,13 @@
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 
-struct sway_output *output_by_name(const char *name) {
+struct sway_output *output_by_name_or_id(const char *name_or_id) {
         for (int i = 0; i < root->outputs->length; ++i) {
                 struct sway_output *output = root->outputs->items[i];
-                if (strcasecmp(output->wlr_output->name, name) == 0) {
-                        return output;
-                }
-        }
-        return NULL;
-}
-
-struct sway_output *output_by_identifier(const char *identifier) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                char output_identifier[128];
-                snprintf(output_identifier, sizeof(output_identifier), "%s %s %s", output->wlr_output->make,
-                        output->wlr_output->model, output->wlr_output->serial);
-                if (strcasecmp(output_identifier, identifier) == 0) {
+                char identifier[128];
+                output_get_identifier(identifier, sizeof(identifier), output);
+                if (strcasecmp(identifier, name_or_id) == 0
+                                || strcasecmp(output->wlr_output->name, name_or_id) == 0) {
                         return output;
                 }
         }
@@ -110,7 +100,7 @@ static bool get_surface_box(struct surface_iterator_data *data,
         }
 
         struct wlr_box rotated_box;
-        wlr_box_rotated_bounds(&box, data->rotation, &rotated_box);
+        wlr_box_rotated_bounds(&rotated_box, &box, data->rotation);
 
         struct wlr_box output_box = {
                 .width = output->width,
@@ -118,7 +108,7 @@ static bool get_surface_box(struct surface_iterator_data *data,
         };
 
         struct wlr_box intersection;
-        return wlr_box_intersection(&output_box, &rotated_box, &intersection);
+        return wlr_box_intersection(&intersection, &output_box, &rotated_box);
 }
 
 static void output_for_each_surface_iterator(struct wlr_surface *surface,
@@ -310,7 +300,7 @@ static int scale_length(int length, int offset, float scale) {
         return round((offset + length) * scale) - round(offset * scale);
 }
 
-static void scale_box(struct wlr_box *box, float scale) {
+void scale_box(struct wlr_box *box, float scale) {
         box->width = scale_length(box->width, box->x, scale);
         box->height = scale_length(box->height, box->y, scale);
         box->x = round(box->x * scale);
@@ -433,7 +423,7 @@ static void damage_surface_iterator(struct sway_output *output,
         }
 
         if (whole) {
-                wlr_box_rotated_bounds(&box, rotation, &box);
+                wlr_box_rotated_bounds(&box, &box, rotation);
                 wlr_output_damage_add_box(output->damage, &box);
         }
 
@@ -568,6 +558,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 
         if (!oc || oc->enabled) {
                 output_enable(output, oc);
+        } else {
+                wlr_output_enable(output->wlr_output, false);
         }
 
         transaction_commit_dirty();