fix: readd stack, unstack

Author: dy-tea

include/scroller.h

@@ -61,6 +61,9 @@ bool scroller_focus_down(desktop_t *d);
 bool scroller_focus_up(desktop_t *d);
 void scroller_center_window(desktop_t *d, client_t *client);
 
+bool scroller_consume_into_column(desktop_t *d);
+bool scroller_expel_from_column(desktop_t *d);
+
 bool scroller_is_tiled(const client_t *c);
 void scroller_apply_client_rules(client_t *c, float rule_proportion, float rule_proportion_single);
 

src/ipc_cmd/scroller.c

@@ -72,25 +72,11 @@ void ipc_cmd_scroller(char **args, int num, int client_fd) {
 			return;
 		}
 
-		node_t *target = prev_leaf(desk->focus, desk->root);
-		if (!target || !target->client) {
-			send_failure(client_fd, "scroller stack: no target to stack with\n");
+		if (!scroller_consume_into_column(desk)) {
+			send_failure(client_fd, "scroller stack: nothing to stack into\n");
 			return;
 		}
 
-		// find target's column and move focused client into it
-		if (!s) {
-			send_failure(client_fd, "scroller stack: not in scroller layout\n");
-			return;
-		}
-
-		int target_col, target_tile;
-		if (!find_focused_tile(desk, &target_col, &target_tile)) {
-			send_failure(client_fd, "scroller stack: find focused failed\n");
-			return;
-		}
-
-		// TODO: proper consume or expel window logic
 		arrange(mon, desk, true);
 		send_success(client_fd, "stacked\n");
 	} else if (streq("unstack", *args)) {
@@ -99,7 +85,11 @@ void ipc_cmd_scroller(char **args, int num, int client_fd) {
 			return;
 		}
 
-		// TODO: proper unstack (remove from column, create new column).
+		if (!scroller_expel_from_column(desk)) {
+			send_failure(client_fd, "scroller unstack: nothing to unstack\n");
+			return;
+		}
+
 		arrange(mon, desk, true);
 		send_success(client_fd, "unstacked\n");
 	} else if (streq("resize", *args)) {

src/scroller.c

@@ -504,18 +504,56 @@ bool scroller_focus_up(desktop_t *d) {
 }
 
 void scroller_center_window(desktop_t *d, client_t *client) {
-	scroller_state_t *s = d->scroller_state;
-	if (!s || !client)
-		return;
+    scroller_state_t *s = d->scroller_state;
+    if (!s || !client)
+        return;
+
+    int col_idx, tile_idx;
+    if (!find_tile(s, client, &col_idx, &tile_idx))
+        return;
+
+    s->active_column_idx = col_idx;
+    s->columns[col_idx].active_tile_idx = tile_idx;
+    s->view_offset = 0.0;
+    apply_active_focus(d);
+}
 
-	int col_idx, tile_idx;
-	if (!find_tile(s, client, &col_idx, &tile_idx))
-		return;
+// ── Consume / Expel ────────────────────────────────────────────────────────
 
-	s->active_column_idx = col_idx;
-	s->columns[col_idx].active_tile_idx = tile_idx;
-	s->view_offset = 0.0;
-	apply_active_focus(d);
+bool scroller_consume_into_column(desktop_t *d) {
+    scroller_state_t *s = d ? d->scroller_state : NULL;
+    if (!s || s->column_count < 2) return false;
+
+    int col = s->active_column_idx;
+    if (col == 0) return false;
+
+    scroller_column_t *src = &s->columns[col];
+    if (src->tile_count == 0) return false;
+
+    client_t *cl = src->tiles[src->active_tile_idx].client;
+    if (!cl) return false;
+
+    scroller_remove_tile(s, cl, NULL);
+
+    int target_col = col - 1;
+    if (target_col >= s->column_count) return false;
+
+    return scroller_add_tile_to_column(s, cl, target_col, true);
+}
+
+bool scroller_expel_from_column(desktop_t *d) {
+    scroller_state_t *s = d ? d->scroller_state : NULL;
+    if (!s || s->column_count == 0) return false;
+
+    int col = s->active_column_idx;
+    scroller_column_t *src = &s->columns[col];
+    if (src->tile_count < 2) return false;
+
+    client_t *cl = src->tiles[src->active_tile_idx].client;
+    if (!cl) return false;
+
+    scroller_remove_tile(s, cl, NULL);
+    return scroller_add_tile(s, cl, true);
 }
 
 bool scroller_is_tiled(const client_t *c) {