1 files changed, 38 insertions, 39 deletions

diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 921b7d19..8dd7789d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -48,7 +48,7 @@ struct sway_output *workspace_get_initial_output(const char *name) {
         if (focus && focus->type == N_WORKSPACE) {
                 return focus->sway_workspace->output;
         } else if (focus && focus->type == N_CONTAINER) {
-                return focus->sway_container->workspace->output;
+                return focus->sway_container->pending.workspace->output;
         }
         // Fallback to the first output or noop output for headless
         return root->outputs->length ? root->outputs->items[0] : root->noop_output;
@@ -222,10 +222,8 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
                 // not a command about workspaces
                 if (strcmp(_target, "next") == 0 ||
                                 strcmp(_target, "prev") == 0 ||
-                                strncmp(_target, "next_on_output",
-                                        strlen("next_on_output")) == 0 ||
-                                strncmp(_target, "prev_on_output",
-                                        strlen("next_on_output")) == 0 ||
+                                strcmp(_target, "next_on_output") == 0 ||
+                                strcmp(_target, "prev_on_output") == 0 ||
                                 strcmp(_target, "number") == 0 ||
                                 strcmp(_target, "back_and_forth") == 0 ||
                                 strcmp(_target, "current") == 0) {
@@ -363,11 +361,11 @@ struct sway_workspace *workspace_by_name(const char *name) {
         if (current && strcmp(name, "prev") == 0) {
                 return workspace_prev(current);
         } else if (current && strcmp(name, "prev_on_output") == 0) {
-                return workspace_output_prev(current, false);
+                return workspace_output_prev(current);
         } else if (current && strcmp(name, "next") == 0) {
                 return workspace_next(current);
         } else if (current && strcmp(name, "next_on_output") == 0) {
-                return workspace_output_next(current, false);
+                return workspace_output_next(current);
         } else if (strcmp(name, "current") == 0) {
                 return current;
         } else if (strcasecmp(name, "back_and_forth") == 0) {
@@ -530,7 +528,7 @@ struct sway_workspace *workspace_next(struct sway_workspace *workspace) {
  * otherwise the next one is returned.
  */
 static struct sway_workspace *workspace_output_prev_next_impl(
-                struct sway_output *output, int dir, bool create) {
+                struct sway_output *output, int dir) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *workspace = seat_get_focused_workspace(seat);
         if (!workspace) {
@@ -540,46 +538,43 @@ static struct sway_workspace *workspace_output_prev_next_impl(
         }
 
         int index = list_find(output->workspaces, workspace);
-        if (!workspace_is_empty(workspace) && create &&
-                        (index + dir < 0 || index + dir == output->workspaces->length)) {
-                struct sway_output *output = workspace->output;
-                char *next = workspace_next_name(output->wlr_output->name);
-                workspace_create(output, next);
-                free(next);
-        }
         size_t new_index = wrap(index + dir, output->workspaces->length);
         return output->workspaces->items[new_index];
 }
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, 1, create);
+
+struct sway_workspace *workspace_output_next(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, 1);
 }
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, -1, create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, -1);
 }
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth) {
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *active_ws = NULL;
         struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
         if (focus && focus->type == N_WORKSPACE) {
                 active_ws = focus->sway_workspace;
         } else if (focus && focus->type == N_CONTAINER) {
-                active_ws = focus->sway_container->workspace;
+                active_ws = focus->sway_container->pending.workspace;
         }
 
-        if (!no_auto_back_and_forth && config->auto_back_and_forth && active_ws
-                        && active_ws == workspace && seat->prev_workspace_name) {
+        if (config->auto_back_and_forth && active_ws && active_ws == workspace &&
+                        seat->prev_workspace_name) {
                 struct sway_workspace *new_ws =
                         workspace_by_name(seat->prev_workspace_name);
                 workspace = new_ws ?
                         new_ws :
                         workspace_create(NULL, seat->prev_workspace_name);
         }
+        return workspace;
+}
+
+bool workspace_switch(struct sway_workspace *workspace) {
+        struct sway_seat *seat = input_manager_current_seat();
 
         sway_log(SWAY_DEBUG, "Switching to workspace %p:%s",
                 workspace, workspace->name);
@@ -736,13 +731,13 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
 }
 
 static void set_workspace(struct sway_container *container, void *data) {
-        container->workspace = container->parent->workspace;
+        container->pending.workspace = container->pending.parent->pending.workspace;
 }
 
 static void workspace_attach_tiling(struct sway_workspace *ws,
                 struct sway_container *con) {
         list_add(ws->tiling, con);
-        con->workspace = ws;
+        con->pending.workspace = ws;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(ws);
@@ -753,7 +748,7 @@ static void workspace_attach_tiling(struct sway_workspace *ws,
 struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
         struct sway_container *fs = ws->fullscreen;
         struct sway_container *middle = container_create(NULL);
-        middle->layout = ws->layout;
+        middle->pending.layout = ws->layout;
         while (ws->tiling->length) {
                 struct sway_container *child = ws->tiling->items[0];
                 container_detach(child);
@@ -771,9 +766,9 @@ void workspace_unwrap_children(struct sway_workspace *ws,
                 return;
         }
 
-        ws->layout = wrap->layout;
-        while (wrap->children->length) {
-                struct sway_container *child = wrap->children->items[0];
+        ws->layout = wrap->pending.layout;
+        while (wrap->pending.children->length) {
+                struct sway_container *child = wrap->pending.children->items[0];
                 container_detach(child);
                 workspace_add_tiling(ws, child);
         }
@@ -793,14 +788,18 @@ void workspace_detach(struct sway_workspace *workspace) {
 
 struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
+                struct sway_container *old_parent = con->pending.parent;
                 container_detach(con);
+                if (old_parent) {
+                        container_reap_empty(old_parent);
+                }
         }
         if (config->default_layout != L_NONE) {
                 con = container_split(con, config->default_layout);
         }
         list_add(workspace->tiling, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -811,11 +810,11 @@ struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
 
 void workspace_add_floating(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         list_add(workspace->floating, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         node_set_dirty(&workspace->node);
@@ -825,7 +824,7 @@ void workspace_add_floating(struct sway_workspace *workspace,
 void workspace_insert_tiling_direct(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
         list_insert(workspace->tiling, index, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -835,7 +834,7 @@ void workspace_insert_tiling_direct(struct sway_workspace *workspace,
 
 struct sway_container *workspace_insert_tiling(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         if (config->default_layout != L_NONE) {
@@ -905,7 +904,7 @@ struct sway_container *workspace_split(struct sway_workspace *workspace,
         enum sway_container_layout old_layout = workspace->layout;
         struct sway_container *middle = workspace_wrap_children(workspace);
         workspace->layout = layout;
-        middle->layout = old_layout;
+        middle->pending.layout = old_layout;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {