1 files changed, 45 insertions, 33 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index d4ca4fb4..2b4b2027 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output.h>
@@ -115,9 +114,10 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                 // Horizontal axis
                 const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                         | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-                if ((state->anchor & both_horiz) && box.width == 0) {
+                if (box.width == 0) {
                         box.x = bounds.x;
-                        box.width = bounds.width;
+                } else if ((state->anchor & both_horiz) == both_horiz) {
+                        box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
                         box.x = bounds.x;
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
@@ -128,9 +128,10 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                 // Vertical axis
                 const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                         | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-                if ((state->anchor & both_vert) && box.height == 0) {
+                if (box.height == 0) {
                         box.y = bounds.y;
-                        box.height = bounds.height;
+                } else if ((state->anchor & both_vert) == both_vert) {
+                        box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
                         box.y = bounds.y;
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
@@ -139,29 +140,37 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                         box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
                 }
                 // Margin
-                if ((state->anchor & both_horiz) == both_horiz) {
+                if (box.width == 0) {
                         box.x += state->margin.left;
-                        box.width -= state->margin.left + state->margin.right;
+                        box.width = bounds.width -
+                                (state->margin.left + state->margin.right);
+                } else if ((state->anchor & both_horiz) == both_horiz) {
+                        // don't apply margins
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
                         box.x += state->margin.left;
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
                         box.x -= state->margin.right;
                 }
-                if ((state->anchor & both_vert) == both_vert) {
+                if (box.height == 0) {
                         box.y += state->margin.top;
-                        box.height -= state->margin.top + state->margin.bottom;
+                        box.height = bounds.height -
+                                (state->margin.top + state->margin.bottom);
+                } else if ((state->anchor & both_vert) == both_vert) {
+                        // don't apply margins
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
                         box.y += state->margin.top;
                 } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
                         box.y -= state->margin.bottom;
                 }
-                if (box.width < 0 || box.height < 0) {
-                        // TODO: Bubble up a protocol error?
-                        wlr_layer_surface_v1_close(layer);
+                if (!sway_assert(box.width >= 0 && box.height >= 0,
+                                "Expected layer surface to have positive size")) {
                         continue;
                 }
                 // Apply
                 sway_layer->geo = box;
+                wlr_surface_get_extends(layer->surface, &sway_layer->extent);
+                sway_layer->extent.x += box.x;
+                sway_layer->extent.y += box.y;
                 apply_exclusive(usable_area, state->anchor, state->exclusive_zone,
                                 state->margin.top, state->margin.right,
                                 state->margin.bottom, state->margin.left);
@@ -191,7 +200,7 @@ void arrange_layers(struct sway_output *output) {
                 arrange_output(output);
         }
 
-        // Arrange non-exlusive surfaces from top->bottom
+        // Arrange non-exclusive surfaces from top->bottom
         arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
                         &usable_area, false);
         arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
@@ -277,7 +286,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
         }
 
         sway_layer->layer_surface->output = NULL;
-        wlr_layer_surface_v1_close(sway_layer->layer_surface);
+        wlr_layer_surface_v1_destroy(sway_layer->layer_surface);
 }
 
 static void handle_surface_commit(struct wl_listener *listener, void *data) {
@@ -288,13 +297,17 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
         if (wlr_output == NULL) {
                 return;
         }
+        if (layer_surface->current.committed == 0) {
+                // The layer surface state didn't change
+                return;
+        }
 
         struct sway_output *output = wlr_output->data;
-        struct wlr_box old_geo = layer->geo;
+        struct wlr_box old_extent = layer->extent;
         arrange_layers(output);
 
-        bool geo_changed =
-                memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0;
+        bool extent_changed =
+                memcmp(&old_extent, &layer->extent, sizeof(struct wlr_box)) != 0;
         bool layer_changed = layer->layer != layer_surface->current.layer;
         if (layer_changed) {
                 wl_list_remove(&layer->link);
@@ -302,9 +315,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
                         &layer->link);
                 layer->layer = layer_surface->current.layer;
         }
-        if (geo_changed || layer_changed) {
-                output_damage_surface(output, old_geo.x, old_geo.y,
-                        layer_surface->surface, true);
+        if (extent_changed || layer_changed) {
+                output_damage_box(output, &old_extent);
                 output_damage_surface(output, layer->geo.x, layer->geo.y,
                         layer_surface->surface, true);
         } else {
@@ -429,7 +441,7 @@ static struct sway_layer_subsurface *create_subsurface(
                 struct wlr_subsurface *wlr_subsurface,
                 struct sway_layer_surface *layer_surface) {
         struct sway_layer_subsurface *subsurface =
-                        calloc(1, sizeof(struct sway_layer_surface));
+                        calloc(1, sizeof(struct sway_layer_subsurface));
         if (subsurface == NULL) {
                 return NULL;
         }
@@ -590,14 +602,14 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32
                         " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",",
                 layer_surface->namespace,
-                layer_surface->client_pending.layer,
-                layer_surface->client_pending.anchor,
-                layer_surface->client_pending.desired_width,
-                layer_surface->client_pending.desired_height,
-                layer_surface->client_pending.margin.top,
-                layer_surface->client_pending.margin.right,
-                layer_surface->client_pending.margin.bottom,
-                layer_surface->client_pending.margin.left);
+                layer_surface->pending.layer,
+                layer_surface->pending.anchor,
+                layer_surface->pending.desired_width,
+                layer_surface->pending.desired_height,
+                layer_surface->pending.margin.top,
+                layer_surface->pending.margin.right,
+                layer_surface->pending.margin.bottom,
+                layer_surface->pending.margin.left);
 
         if (!layer_surface->output) {
                 // Assign last active output
@@ -614,7 +626,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                                 sway_log(SWAY_ERROR,
                                                 "no output to auto-assign layer surface '%s' to",
                                                 layer_surface->namespace);
-                                wlr_layer_surface_v1_close(layer_surface);
+                                wlr_layer_surface_v1_destroy(layer_surface);
                                 return;
                         }
                         output = root->outputs->items[0];
@@ -651,13 +663,13 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         sway_layer->output_destroy.notify = handle_output_destroy;
         wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
 
-        wl_list_insert(&output->layers[layer_surface->client_pending.layer],
+        wl_list_insert(&output->layers[layer_surface->pending.layer],
                         &sway_layer->link);
 
-        // Temporarily set the layer's current state to client_pending
+        // Temporarily set the layer's current state to pending
         // So that we can easily arrange it
         struct wlr_layer_surface_v1_state old_state = layer_surface->current;
-        layer_surface->current = layer_surface->client_pending;
+        layer_surface->current = layer_surface->pending;
         arrange_layers(output);
         layer_surface->current = old_state;
 }