8 files changed, 37 insertions, 28 deletions

diff --git a/include/log.h b/include/log.h
index dd526143..6fb2f277 100644
--- a/include/log.h
+++ b/include/log.h
@@ -15,7 +15,7 @@ void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2);
 
 bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3);
 #define sway_assert(COND, FMT, ...) \
-        _sway_assert(COND, "[%s:%d] %s:" FMT, _wlr_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
+        _sway_assert(COND, "[%s:%d] %s:" FMT, _wlr_strip_path(__FILE__), __LINE__, __func__, ##__VA_ARGS__)
 
 void error_handler(int sig);
 
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 83b8c64a..58721b7e 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -102,6 +102,9 @@ static struct sway_node *node_get_in_direction(struct sway_container *container,
                 // Fullscreen container with a direction - go straight to outputs
                 struct sway_output *output = container->workspace->output;
                 struct sway_output *new_output = output_get_in_direction(output, dir);
+                if (!new_output) {
+                        return NULL;
+                }
                 return get_node_in_output_direction(new_output, dir);
         }
         if (dir == MOVE_PARENT) {
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 44ce2970..ef3ec1cb 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -29,7 +29,7 @@ static enum sway_container_layout get_layout_toggle(int argc, char **argv,
                 enum sway_container_layout layout,
                 enum sway_container_layout prev_split_layout) {
         // "layout toggle"
-        if (argc == 0) {
+        if (argc == 1) {
                 return layout == L_HORIZ ? L_VERT : L_HORIZ;
         }
 
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 7b503624..59f1cf78 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -117,7 +117,8 @@ static void container_move_to_container_from_direction(
                 struct sway_container *container, struct sway_container *destination,
                 enum movement_direction move_dir) {
         if (destination->view) {
-                if (destination->parent == container->parent) {
+                if (destination->parent == container->parent &&
+                                destination->workspace == container->workspace) {
                         wlr_log(WLR_DEBUG, "Swapping siblings");
                         list_t *siblings = container_get_siblings(container);
                         int container_index = list_find(siblings, container);
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 9d80f3c7..bb3902ec 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -266,7 +266,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
         struct sway_view *view = con->view;
         if (view->saved_buffer) {
                 render_saved_view(view, output, damage, view->container->alpha);
-        } else {
+        } else if (view->surface) {
                 render_view_toplevels(view, output, damage, view->container->alpha);
         }
 
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 92d9d7ec..b1808793 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -168,11 +168,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
 
                 // the structure change might have caused it to move up to the top of
                 // the focus stack without sending focus notifications to the view
-                if (seat_get_focus(seat) == next_focus) {
-                        seat_send_focus(next_focus, seat);
-                } else {
-                        seat_set_focus(seat, next_focus);
-                }
+                seat_send_focus(next_focus, seat);
+                seat_set_focus(seat, next_focus);
         }
 }
 
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index edb05f86..d50be25d 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -97,15 +97,14 @@ static void apply_tabbed_layout(list_t *children, struct wlr_box *parent) {
         if (!children->length) {
                 return;
         }
-        size_t parent_offset = container_titlebar_height();
-        size_t parent_height = parent->height - parent_offset;
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
+                size_t parent_offset = child->view ? 0 : container_titlebar_height();
                 container_remove_gaps(child);
                 child->x = parent->x;
                 child->y = parent->y + parent_offset;
                 child->width = parent->width;
-                child->height = parent_height;
+                child->height = parent->height - parent_offset;
                 container_add_gaps(child);
         }
 }
@@ -114,15 +113,15 @@ static void apply_stacked_layout(list_t *children, struct wlr_box *parent) {
         if (!children->length) {
                 return;
         }
-        size_t parent_offset = container_titlebar_height() * children->length;
-        size_t parent_height = parent->height - parent_offset;
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
+                size_t parent_offset = child->view ?  0 :
+                        container_titlebar_height() * children->length;
                 container_remove_gaps(child);
                 child->x = parent->x;
                 child->y = parent->y + parent_offset;
                 child->width = parent->width;
-                child->height = parent_height;
+                child->height = parent->height - parent_offset;
                 container_add_gaps(child);
         }
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index f63a35b5..f9dcb11a 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -219,14 +219,17 @@ void view_autoconfigure(struct sway_view *view) {
         x = y = width = height = 0;
         double y_offset = 0;
 
-        // In a tabbed or stacked container, the swayc's y is the bottom of the
-        // title area. We have to disable any top border because the title bar is
-        // rendered by the parent.
+        // In a tabbed or stacked container, the container's y is the top of the
+        // title area. We have to offset the surface y by the height of the title,
+        // bar, and disable any top border because we'll always have the title bar.
         enum sway_container_layout layout = container_parent_layout(con);
-        if (layout == L_TABBED || layout == L_STACKED) {
-                view->border_top = false;
-        } else {
+        if (layout == L_TABBED) {
                 y_offset = container_titlebar_height();
+                view->border_top = false;
+        } else if (layout == L_STACKED) {
+                list_t *siblings = container_get_siblings(con);
+                y_offset = container_titlebar_height() * siblings->length;
+                view->border_top = false;
         }
 
         enum sway_container_border border = view->border;
@@ -237,17 +240,17 @@ void view_autoconfigure(struct sway_view *view) {
         switch (border) {
         case B_NONE:
                 x = con->x;
-                y = con->y;
+                y = con->y + y_offset;
                 width = con->width;
-                height = con->height;
+                height = con->height - y_offset;
                 break;
         case B_PIXEL:
                 x = con->x + view->border_thickness * view->border_left;
-                y = con->y + view->border_thickness * view->border_top;
+                y = con->y + view->border_thickness * view->border_top + y_offset;
                 width = con->width
                         - view->border_thickness * view->border_left
                         - view->border_thickness * view->border_right;
-                height = con->height
+                height = con->height - y_offset
                         - view->border_thickness * view->border_top
                         - view->border_thickness * view->border_bottom;
                 break;
@@ -257,9 +260,15 @@ void view_autoconfigure(struct sway_view *view) {
                 width = con->width
                         - view->border_thickness * view->border_left
                         - view->border_thickness * view->border_right;
-                y = con->y + y_offset;
-                height = con->height - y_offset
-                        - view->border_thickness * view->border_bottom;
+                if (y_offset) {
+                        y = con->y + y_offset;
+                        height = con->height - y_offset
+                                - view->border_thickness * view->border_bottom;
+                } else {
+                        y = con->y + container_titlebar_height();
+                        height = con->height - container_titlebar_height()
+                                - view->border_thickness * view->border_bottom;
+                }
                 break;
         }