refactor: split scroller_stack consume/expel into standalone dispatchers

docs/bindings/keys.md

@@ -145,8 +145,8 @@ bindr=Super,Super_L,spawn,rofi -show run
 | `set_proportion` | `float` | Set scroller window proportion (0.0–1.0). |
 | `switch_proportion_preset` | - | Cycle proportion presets of scroller window. |
 | `scroller_stack` | `left/right/up/down` | Move window inside/outside scroller stack by direction. |
-| `scroller_stack` | `consume` | Add the adjacent neighbor into the current stack. |
+| `scroller_stack_consume` | - | Add the adjacent neighbor into the current stack. |
-| `scroller_stack` | `expel` | Remove the last window from the current stack. |
+| `scroller_stack_expel` | - | Remove the last window from the current stack. |
 | `incgaps` | `+/-value` | Adjust gap size. |
 | `togglegaps` | - | Toggle gaps. |
 

src/config/parse_config.h

@@ -537,10 +537,6 @@ int32_t parse_direction(const char *str) {
 		return LEFT;
 	} else if (strcmp(lowerStr, "right") == 0) {
 		return RIGHT;
-	} else if (strcmp(lowerStr, "consume") == 0) {
-		return CONSUME;
-	} else if (strcmp(lowerStr, "expel") == 0) {
-		return EXPEL;
 	} else {
 		return UNDIR;
 	}
@@ -1216,6 +1212,10 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
 	} else if (strcmp(func_name, "scroller_stack") == 0) {
 		func = scroller_stack;
 		(*arg).i = parse_direction(arg_value);
+	} else if (strcmp(func_name, "scroller_stack_consume") == 0) {
+		func = scroller_stack_consume;
+	} else if (strcmp(func_name, "scroller_stack_expel") == 0) {
+		func = scroller_stack_expel;
 	} else if (strcmp(func_name, "toggle_all_floating") == 0) {
 		func = toggle_all_floating;
 	} else {

src/dispatch/bind_declare.h

@@ -70,4 +70,6 @@ int32_t disable_monitor(const Arg *arg);
 int32_t enable_monitor(const Arg *arg);
 int32_t toggle_monitor(const Arg *arg);
 int32_t scroller_stack(const Arg *arg);
+int32_t scroller_stack_consume(const Arg *arg);
+int32_t scroller_stack_expel(const Arg *arg);
 int32_t toggle_all_floating(const Arg *arg);

src/dispatch/bind_define.h

@@ -1855,44 +1855,58 @@ int32_t scroller_stack(const Arg *arg) {
 	if (!c || !c->mon || c->isfloating || !is_scroller_layout(selmon))
 		return 0;
 
-	if (arg->i == CONSUME) {
+	Client *target_client = find_client_by_direction(c, arg, false, true);
-		bool is_horizontal_layout =
-			c->mon->pertag->ltidxs[c->mon->pertag->curtag]->id == SCROLLER;
-		int32_t consume_dir = is_horizontal_layout ? RIGHT : DOWN;
 
-		Client *target_client = find_client_by_direction(c, &(Arg){.i = consume_dir}, false, true);
+	return scroller_apply_stack(c, target_client, arg->i);
+}
 
-		if (target_client) {
+int32_t scroller_stack_consume(const Arg *arg) {
-			Client *stack_tail = get_scroll_stack_head(c);
+	if (!selmon)
-			while (stack_tail->next_in_stack) {
+		return 0;
-				stack_tail = stack_tail->next_in_stack;
+	Client *c = selmon->sel;
-			}
+	if (!c || !c->mon || c->isfloating || !is_scroller_layout(selmon))
-
-			scroller_insert_stack(target_client, stack_tail, false);
-		}
 		return 0;
-	}
 
-	if (arg->i == EXPEL) {
+	bool is_horizontal_layout =
-		Client *stack_head = get_scroll_stack_head(c);
+		c->mon->pertag->ltidxs[c->mon->pertag->curtag]->id == SCROLLER;
-		Client *stack_tail = stack_head;
+	int32_t consume_dir = is_horizontal_layout ? RIGHT : DOWN;
 
+	Client *target_client = find_client_by_direction(c, &(Arg){.i = consume_dir}, false, true);
+
+	if (target_client) {
+		Client *stack_tail = get_scroll_stack_head(c);
 		while (stack_tail->next_in_stack) {
 			stack_tail = stack_tail->next_in_stack;
 		}
 
-		if (stack_tail != stack_head) {
+		if (target_client != stack_tail) {
-			exit_scroller_stack(stack_tail);
+			scroller_insert_stack(target_client, stack_tail, false);
-			wl_list_remove(&stack_tail->link);
-			wl_list_insert(&stack_head->link, &stack_tail->link);
-			arrange(selmon, false, false);
 		}
+	}
+	return 0;
+}
+
+int32_t scroller_stack_expel(const Arg *arg) {
+	if (!selmon)
 		return 0;
+	Client *c = selmon->sel;
+	if (!c || !c->mon || c->isfloating || !is_scroller_layout(selmon))
+		return 0;
+
+	Client *stack_head = get_scroll_stack_head(c);
+	Client *stack_tail = stack_head;
+
+	while (stack_tail->next_in_stack) {
+		stack_tail = stack_tail->next_in_stack;
 	}
 
-	Client *target_client = find_client_by_direction(c, arg, false, true);
+	if (stack_tail != stack_head) {
-
+		exit_scroller_stack(stack_tail);
-	return scroller_apply_stack(c, target_client, arg->i);
+		wl_list_remove(&stack_tail->link);
+		wl_list_insert(&stack_head->link, &stack_tail->link);
+		arrange(selmon, false, false);
+	}
+	return 0;
 }
 
 int32_t toggle_all_floating(const Arg *arg) {

src/mango.c

@@ -172,7 +172,7 @@ enum {
 	NetLast
 }; /* EWMH atoms */
 #endif
-enum { UP, DOWN, LEFT, RIGHT, UNDIR, CONSUME, EXPEL }; /* smartmovewin */
+enum { UP, DOWN, LEFT, RIGHT, UNDIR }; /* smartmovewin */
 enum { NONE, OPEN, MOVE, CLOSE, TAG, FOCUS, OPAFADEIN, OPAFADEOUT };
 enum { UNFOLD, FOLD, INVALIDFOLD };
 enum { PREV, NEXT };