merge ov_tab_mode to switcher

Author: DreamMaoMao

docs/bindings/keys.md

@@ -117,9 +117,8 @@ bindr=Super,Super_L,spawn,rofi -show run
 | `focusdir` | `left/right/up/down` | Focus window in direction. |
 | `focus_window_or_workspace` | `left/right/up/down` | Focus window in direction; otherwise jump to the nearest adjacent tag that has clients, falling back to the next/previous tag if none. |
 | `focusstack` | `next/prev` | Cycle focus within the stack. |
-| `overcicle` | - | Open overview when closed; while it is open, each trigger cycles focus to the next window on the current monitor. |
 | `focuslast` | - | Focus the previously active window. |
-| `switcher` | `next/prev` | Open or cycle the all-tag, all-monitor thumbnail switcher. Releasing any modifier key selects. |
+| `switcher` | `next/prev`, `all_tag_next/all_tag_prev`, `all_next/all_prev` | Open or cycle the thumbnail switcher. `next`/`prev` list the current tag's windows, `all_tag_next`/`all_tag_prev` list all tags on the current monitor, `all_next`/`all_prev` list all monitors and tags. Releasing any modifier key selects. |
 | `exchange_client` | `left/right/up/down` | Swap window with neighbor in direction. |
 | `exchange_stack_client` | `next/prev` | Exchange window position in stack. |
 | `zoom` | - | Swap focused window with Master. |

docs/window-management/overview.md

@@ -21,9 +21,9 @@ description: Configure the overview mode for window navigation.
 - `hotarea_corner` — Corner that triggers the hot area (0: top-left, 1: top-right, 2: bottom-left, 3: bottom-right).
 - `jump_labels` — Defines the ordered characters used for jump hints when in overview jump mode. Each visible window is assigned a label in this order, and pressing the corresponding key jumps to that window. The number of labels limits how many windows can be assigned hints at once.
 
-[`overcicle`](/docs/bindings/keys#focus--movement) opens overview; while
-overview is open, each trigger cycles focus to the next window on the current
-monitor. Release a modifier key or run `toggleoverview` to close it.
+To cycle through windows, use the
+[`switcher`](/docs/bindings/keys#focus--movement) command; release a modifier
+key to select.
 
 ### Mouse Interaction in Overview
 

src/config/parse_config.h

@@ -1214,8 +1214,6 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
 	if (strcmp(func_name, "focusstack") == 0) {
 		func = focusstack;
 		(*arg).i = parse_circle_direction(arg_value);
-	} else if (strcmp(func_name, "overcicle") == 0) {
-		func = overcicle;
 	} else if (strcmp(func_name, "groupfocus") == 0) {
 		func = groupfocus;
 		(*arg).i = parse_circle_direction(arg_value);
@@ -1299,7 +1297,25 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
 		func = focuslast;
 	} else if (strcmp(func_name, "switcher") == 0) {
 		func = switcher;
-		(*arg).i = parse_circle_direction(arg_value);
+		if (strcmp(arg_value, "all_next") == 0) {
+			(*arg).i = NEXT;
+			(*arg).i2 = SW_ALL_MON;
+		} else if (strcmp(arg_value, "all_prev") == 0) {
+			(*arg).i = PREV;
+			(*arg).i2 = SW_ALL_MON;
+		} else if (strcmp(arg_value, "all_tag_next") == 0) {
+			(*arg).i = NEXT;
+			(*arg).i2 = SW_ALL_TAG;
+		} else if (strcmp(arg_value, "all_tag_prev") == 0) {
+			(*arg).i = PREV;
+			(*arg).i2 = SW_ALL_TAG;
+		} else if (strcmp(arg_value, "prev") == 0) {
+			(*arg).i = PREV;
+			(*arg).i2 = SW_CURRENT_TAG;
+		} else {
+			(*arg).i = NEXT;
+			(*arg).i2 = SW_CURRENT_TAG;
+		}
 	} else if (strcmp(func_name, "toggle_trackpad_enable") == 0) {
 		func = toggle_trackpad_enable;
 	} else if (strcmp(func_name, "setoption") == 0) {

src/dispatch/bind_declare.h

@@ -44,7 +44,6 @@ void toggleglobal(const Arg *arg);
 void incnmaster(const Arg *arg);
 void focusmon(const Arg *arg);
 void focusstack(const Arg *arg);
-void overcicle(const Arg *arg);
 void groupfocus(const Arg *arg);
 void chvt(const Arg *arg);
 void reload_config(const Arg *arg);

src/dispatch/bind_define.h

@@ -384,115 +384,6 @@ void focusstack(const Arg *arg) {
 	return;
 }
 
-static bool overcicle_candidate(Client *c, Monitor *m) {
-	return c && c->mon == m && !c->isunglobal && !c->iskilling &&
-		   !c->isminimized && !client_is_unmanaged(c) &&
-		   !client_is_x11_popup(c) && client_surface(c) &&
-		   client_surface(c)->mapped && VISIBLEON(c, m);
-}
-
-static void overcicle_clear(Monitor *m) {
-	if (!m)
-		return;
-	free(m->overcicle_clients);
-	m->overcicle_clients = NULL;
-	m->overcicle_count = 0;
-	m->overcicle_index = 0;
-}
-
-/* 打开 overview 时按 fstack/flink 顺序建立循环快照：
- * 当前焦点在第 0 位，上一次切换的焦点在第 1 位；
- * 首次触发即切到第 1 位，之后单向遍历全部窗口 */
-static void overcicle_build(Monitor *m) {
-	overcicle_clear(m);
-	if (!m)
-		return;
-
-	Client *c;
-	int n = 0;
-	wl_list_for_each(c, &fstack, flink) {
-		if (overcicle_candidate(c, m))
-			n++;
-	}
-	if (n <= 0)
-		return;
-
-	m->overcicle_clients = ecalloc(n, sizeof(Client *));
-	n = 0;
-	wl_list_for_each(c, &fstack, flink) {
-		if (overcicle_candidate(c, m))
-			m->overcicle_clients[n++] = c;
-	}
-	m->overcicle_count = n;
-	m->overcicle_index = 0;
-}
-
-/* 窗口销毁时从快照中移除，避免悬挂指针 */
-static void overcicle_remove_client(Client *c) {
-	if (!c || !c->mon || !c->mon->overcicle_clients ||
-		c->mon->overcicle_count <= 0)
-		return;
-
-	Monitor *m = c->mon;
-	int i;
-	for (i = 0; i < m->overcicle_count; i++) {
-		if (m->overcicle_clients[i] == c)
-			break;
-	}
-	if (i == m->overcicle_count)
-		return;
-
-	if (m->overcicle_index > i)
-		m->overcicle_index--;
-	memmove(&m->overcicle_clients[i], &m->overcicle_clients[i + 1],
-			(m->overcicle_count - i - 1) * sizeof(Client *));
-	m->overcicle_count--;
-	if (m->overcicle_count <= 0) {
-		overcicle_clear(m);
-		return;
-	}
-	if (m->overcicle_index >= m->overcicle_count)
-		m->overcicle_index = m->overcicle_count - 1;
-}
-
-/* overcicle: 打开/循环 overview（居中 tab 布局）
- * - 未进入 overview：进入 overview，并按 flink 建立循环快照
- * - 已在 overview 中：每次触发单向向前遍历快照（首次切到上一次切换的焦点） */
-void overcicle(const Arg *arg) {
-	if (!selmon || grabc)
-		return;
-
-	Client *sel = arg->tc ? arg->tc : selmon->sel;
-
-	if (selmon->isoverview && !selmon->is_jump_mode &&
-		!selmon->ov_normal_mode && sel) {
-		/* 快照缺失时（如由 toggleoverview 等进入）先按 flink 建立 */
-		if (selmon->overcicle_count <= 0)
-			overcicle_build(selmon);
-		if (selmon->overcicle_count <= 0)
-			return;
-
-		selmon->overcicle_index =
-			(selmon->overcicle_index + 1 + selmon->overcicle_count) %
-			selmon->overcicle_count;
-
-		Client *tc = selmon->overcicle_clients[selmon->overcicle_index];
-		focusclient(tc, 1);
-		if (config.warpcursor)
-			warp_cursor(tc);
-
-		/* 切换焦点后重排，让 tab 布局跟随焦点 */
-		arrange(selmon, true, false);
-		return;
-	}
-
-	/* 未进入 overview：打开（tab 布局），并按 flink 建立循环快照 */
-	toggleoverview(arg);
-
-	if (selmon && selmon->isoverview)
-		overcicle_build(selmon);
-}
-
 void groupfocus(const Arg *arg) {
 	Client *c = arg->tc ? arg->tc : selmon->sel;
 	if (!c || !c->mon)
@@ -2035,10 +1926,8 @@ void toggleoverview(const Arg *arg) {
 	uint32_t target;
 	uint32_t visible_client_number = 0;
 
-	if (!selmon->isoverview) {
-		overcicle_clear(selmon);
-		if (selmon->is_jump_mode)
-			finish_jump_mode(selmon);
+	if (!selmon->isoverview && selmon->is_jump_mode) {
+		finish_jump_mode(selmon);
 	}
 
 	if (selmon->isoverview) {

src/manage/client.h

@@ -2028,7 +2028,6 @@ void unmapnotify(struct wl_listener *listener, void *data) {
 	Client *nextfocus = NULL;
 	c->iskilling = 1;
 	switcher_remove_client(c);
-	overcicle_remove_client(c);
 	struct ScrollerStackNode *target_node =
 		c->mon ? find_scroller_node(
 					 c->mon->pertag->scroller_state[c->mon->pertag->curtag], c)
@@ -2210,7 +2209,6 @@ destroynotify(struct wl_listener *listener, void *data) {
 		wl_list_remove(&c->set_decoration_mode.link);
 	}
 	switcher_remove_client(c);
-	overcicle_remove_client(c);
 	free(c);
 }
 

src/manage/monitor.h

@@ -480,9 +480,6 @@ void createmon(struct wl_listener *listener, void *data) {
 	m->sel = NULL;
 	m->is_in_hotarea = 0;
 	m->ov_normal_mode = 0;
-	m->overcicle_clients = NULL;
-	m->overcicle_count = 0;
-	m->overcicle_index = 0;
 	m->m.x = INT32_MAX;
 	m->m.y = INT32_MAX;
 
@@ -669,8 +666,6 @@ void cleanupmon(struct wl_listener *listener, void *data) {
 
 	m->iscleanuping = true;
 
-	overcicle_clear(m);
-
 	/* m->layers[i] are intentionally not unlinked */
 	for (i = 0; i < LENGTH(m->layers); i++) {
 		wl_list_for_each_safe(l, tmp, &m->layers[i], link)

src/mango.c

@@ -222,6 +222,7 @@ enum { UP, DOWN, LEFT, RIGHT, UNDIR }; /* smartmovewin */
 enum { NONE, OPEN, MOVE, CLOSE, TAG, FOCUS, OPAFADEIN, OPAFADEOUT, OVERVIEW };
 enum { UNFOLD, FOLD, INVALIDFOLD };
 enum { PREV, NEXT };
+enum { SW_CURRENT_TAG, SW_ALL_TAG, SW_ALL_MON }; /* switcher 候选范围 */
 enum { STATE_UNSPECIFIED = 0, STATE_ENABLED, STATE_DISABLED };
 enum { FORCE, UNFORCE };
 
@@ -616,10 +617,7 @@ struct Monitor {
 	int32_t isoverview;
 	int32_t is_jump_mode;
 	int32_t is_in_hotarea;
-	int32_t ov_normal_mode;		/* 热区进入时使用普通网格布局 */
-	Client **overcicle_clients; /* overcicle 快照：打开时按 flink 排序 */
-	int overcicle_count;
-	int overcicle_index;
+	int32_t ov_normal_mode; /* 热区进入时使用普通网格布局 */
 	int32_t only_sleep;
 	uint32_t visible_clients;
 	uint32_t visible_tiling_clients;

src/switcher/switcher.h

@@ -39,6 +39,7 @@ static struct {
 	int count;
 	int index;
 	int tile_h;
+	int scope;
 } sw;
 
 static bool switcher_is_active(void) { return sw.tree != NULL; }
@@ -48,6 +49,11 @@ static bool switcher_candidate(Client *c) {
 		c->is_logic_hide || !client_surface(c) || !client_surface(c)->mapped ||
 		client_is_unmanaged(c) || client_is_x11_popup(c))
 		return false;
+
+	if (sw.scope == SW_CURRENT_TAG)
+		return c->mon == sw.mon && VISIBLEON(c, sw.mon);
+	if (sw.scope == SW_ALL_TAG)
+		return c->mon == sw.mon;
 	return (int32_t)c->tags > 0;
 }
 
@@ -381,7 +387,10 @@ static void switcher_remove_client(Client *c) {
 
 static void switcher_commit_client(Client *tc) {
 	switcher_close();
-	if (!switcher_candidate(tc))
+	if (!tc || !tc->mon || tc->iskilling || tc->isminimized || tc->isunglobal ||
+		tc->is_logic_hide || !client_surface(tc) ||
+		!client_surface(tc)->mapped || client_is_unmanaged(tc) ||
+		client_is_x11_popup(tc))
 		return;
 	if (!VISIBLEON(tc, tc->mon))
 		view_in_mon(&(Arg){.ui = get_tags_first_tag(tc->tags)}, true, tc->mon,
@@ -412,7 +421,7 @@ static Client *switcher_client_at(double lx, double ly) {
 	return NULL;
 }
 
-static void switcher_open(void) {
+static void switcher_open(int scope) {
 	Client *c;
 	Monitor *m;
 	int n = 0;
@@ -421,14 +430,17 @@ static void switcher_open(void) {
 		if (m->isoverview)
 			return;
 	}
+
+	sw.mon = selmon;
+	sw.scope = scope;
+
 	wl_list_for_each(c, &fstack, flink) {
 		if (switcher_candidate(c))
 			n++;
 	}
 	if (n == 0)
 		return;
 
-	sw.mon = selmon;
 	int max_row_w = (int)(sw.mon->m.width * SW_PANEL_FRAC) - 2 * SW_MARGIN;
 	int max_panel_h = (int)(sw.mon->m.height * SW_PANEL_FRAC);
 	// size against the widest allowed tile so the panel always fits
@@ -477,10 +489,17 @@ static void switcher_cycle(int dir) {
 
 void switcher(const Arg *arg) {
 	int dir = arg && arg->i == PREV ? -1 : 1;
+	int scope = arg ? arg->i2 : SW_CURRENT_TAG;
 	if (locked || !selmon || selmon->is_jump_mode)
 		return;
-	if (switcher_is_active())
-		switcher_cycle(dir);
-	else
-		switcher_open();
+	if (switcher_is_active()) {
+		if (scope != sw.scope) {
+			switcher_close();
+			switcher_open(scope);
+		} else {
+			switcher_cycle(dir);
+		}
+	} else {
+		switcher_open(scope);
+	}
 }