feat: tabbed layout ux improvements (e/w focus for tab next/prev, middle click close, scroll for cycle, hide_lone_tab config option)

Author: dy-tea

examples/README.md

@@ -124,6 +124,12 @@ Controls how window decorations (titlebars, borders) are displayed:
 
 Clients that do not support `xdg-decoration` keep their own client-side decorations in `none` and `tabs` modes.
 
+```
+doorsctl config hide_lone_tab true|false
+```
+
+When true, the tab bar is hidden when a tabbed container has only one window.
+
 ```
 doorsctl config edge_scroller_pointer_focus true|false
 ```

include/tabs.h

@@ -34,7 +34,8 @@ extern float color_tab_text[4];
 extern float color_tab_text_active[4];
 extern float color_tab_sep[4];
 
-int tab_bar_height(void);
+size_t tabbed_leaf_count(node_t *n);
+int tab_bar_height(node_t *n);
 
 void tabs_create(node_t *n);
 void tabs_destroy(node_t *n);

include/types.h

@@ -237,6 +237,7 @@ extern bool allow_tearing;
 extern bool auto_float_dialogs;
 extern decoration_mode_t decoration_mode;
 extern bool enable_animations;
+extern bool hide_lone_tab;
 extern workspace_anim_direction_t workspace_anim_direction;
 extern bool workspace_anim_slide_up;
 extern int mapping_events_count;

src/cursor.c

@@ -727,6 +727,22 @@ void cursor_button(struct wl_listener *listener, void *data) {
 			}
 		}
 
+		// middle-click on tab bar closes the tab
+		if (event->button == BTN_MIDDLE) {
+			for (output_t *m = mon_head; m != NULL; m = m->next) {
+				desktop_t *d = m->desk;
+				if (d == NULL)
+					continue;
+
+				node_t *tab_leaf = tabs_hit_test_desktop(d, server.cursor->x, server.cursor->y);
+				if (tab_leaf != NULL) {
+					kill_node(d, tab_leaf);
+					server.cursor_buttons |= 1 << (event->button - 272);
+					return;
+				}
+			}
+		}
+
 		double sx, sy;
 		struct wlr_surface *surface = NULL;
 		void *type = desktop_type_at(server.cursor->x, server.cursor->y, &surface, &sx, &sy);
@@ -931,6 +947,33 @@ void cursor_button(struct wl_listener *listener, void *data) {
 void cursor_axis(struct wl_listener *listener, void *data) {
 	(void)listener;
 	struct wlr_pointer_axis_event *event = data;
+
+	// cycle through tabs when cursor is over a tab bar
+	for (output_t *m = mon_head; m != NULL; m = m->next) {
+		desktop_t *d = m->desk;
+		if (d == NULL)
+			continue;
+
+		node_t *tab_leaf = tabs_hit_test_desktop(d, server.cursor->x, server.cursor->y);
+		if (tab_leaf != NULL) {
+			node_t *tab_node = tabbed_ancestor(tab_leaf);
+			if (tab_node != NULL) {
+				node_t *next;
+				double delta = event->delta_discrete != 0 ? (double)event->delta_discrete : event->delta;
+				if (delta < 0)
+					next = tab_prev_leaf(tab_node, d->focus);
+				else
+					next = tab_next_leaf(tab_node, d->focus);
+
+				if (next != NULL && next != d->focus) {
+					focus_node(m, d, next);
+					arrange(m, d, true);
+				}
+			}
+			return;
+		}
+	}
+
 	wlr_seat_pointer_notify_axis(server.seat, event->time_msec, event->orientation, event->delta,
 		event->delta_discrete, event->source, event->relative_direction);
 	wlr_idle_notifier_v1_notify_activity(server.idle_notifier, server.seat);

src/ipc_cmd/config.c

@@ -113,6 +113,8 @@ void ipc_cmd_config(char **args, int num, int client_fd) {
 			snprintf(buf, sizeof(buf), "%s\n", mode);
 			send_success(client_fd, buf);
 		}
+	} else if (streq("hide_lone_tab", *args)) {
+		ipc_handle_bool(args, num, client_fd, &hide_lone_tab, IPC_FLAG_COMMIT);
 	} else if (streq("gapless_monocle", *args)) {
 		ipc_handle_bool(args, num, client_fd, &gapless_monocle, IPC_FLAG_COMMIT);
 	} else if (streq("decoration_mode", *args)) {

src/keyboard.c

@@ -10,6 +10,7 @@
 #include "scroller.h"
 #include "seat.h"
 #include "server.h"
+#include "tabs.h"
 #include "toplevel.h"
 #include "transaction.h"
 #include "tree.h"
@@ -288,6 +289,18 @@ void focus_west(void) {
 	if (mon == NULL || mon->desk == NULL || mon->desk->focus == NULL)
 		return;
 
+	// cycle to previous tab
+	node_t *tab_anc = tabbed_ancestor(mon->desk->focus);
+	if (tab_anc != NULL) {
+		node_t *prev = tab_prev_leaf(tab_anc, mon->desk->focus);
+		if (prev != NULL && prev != mon->desk->focus) {
+			focus_node(mon, mon->desk, prev);
+			arrange(mon, mon->desk, true);
+			wlr_log(WLR_DEBUG, "Focused previous tab");
+		}
+		return;
+	}
+
 	if (mon->desk->layout == LAYOUT_SCROLLER) {
 		if (scroller_focus_prev(mon->desk)) {
 			focus_node(mon, mon->desk, mon->desk->focus);
@@ -327,6 +340,18 @@ void focus_east(void) {
 	if (mon == NULL || mon->desk == NULL || mon->desk->focus == NULL)
 		return;
 
+	// cycle to next tab
+	node_t *tab_anc = tabbed_ancestor(mon->desk->focus);
+	if (tab_anc != NULL) {
+		node_t *next = tab_next_leaf(tab_anc, mon->desk->focus);
+		if (next != NULL && next != mon->desk->focus) {
+			focus_node(mon, mon->desk, next);
+			arrange(mon, mon->desk, true);
+			wlr_log(WLR_DEBUG, "Focused next tab");
+		}
+		return;
+	}
+
 	if (mon->desk->layout == LAYOUT_SCROLLER) {
 		if (scroller_focus_next(mon->desk)) {
 			focus_node(mon, mon->desk, mon->desk->focus);

src/tabs.c

@@ -56,7 +56,9 @@ float color_tab_sep[4] = {
 	1.0f
 };
 
-int tab_bar_height(void) {
+int tab_bar_height(node_t *n) {
+	if (hide_lone_tab && n && tabbed_leaf_count(n) <= 1)
+		return 0;
 	return TAB_BAR_HEIGHT;
 }
 
@@ -88,7 +90,7 @@ static size_t collect_leaves(node_t *n, node_t **out, size_t cap) {
 	return used;
 }
 
-static size_t count_leaves(node_t *n) {
+size_t tabbed_leaf_count(node_t *n) {
 	return collect_leaves(n, NULL, 0);
 }
 
@@ -112,7 +114,7 @@ node_t *tab_focus_leaf(node_t *tabbed_node, node_t *focus) {
 node_t *tab_next_leaf(node_t *tabbed_node, node_t *focus) {
 	if (tabbed_node == NULL)
 		return NULL;
-	size_t n = count_leaves(tabbed_node);
+	size_t n = tabbed_leaf_count(tabbed_node);
 	if (n == 0)
 		return NULL;
 	node_t **arr = calloc(n, sizeof(node_t *));
@@ -134,7 +136,7 @@ node_t *tab_next_leaf(node_t *tabbed_node, node_t *focus) {
 node_t *tab_prev_leaf(node_t *tabbed_node, node_t *focus) {
 	if (tabbed_node == NULL)
 		return NULL;
-	size_t n = count_leaves(tabbed_node);
+	size_t n = tabbed_leaf_count(tabbed_node);
 	if (n == 0)
 		return NULL;
 	node_t **arr = calloc(n, sizeof(node_t *));
@@ -177,7 +179,7 @@ static void destroy_entries(struct tab_bar_t *bar) {
 static void build_entries(struct tab_bar_t *bar) {
 	destroy_entries(bar);
 
-	size_t count = count_leaves(bar->owner);
+	size_t count = tabbed_leaf_count(bar->owner);
 	if (count == 0)
 		return;
 

src/tree.c

@@ -38,6 +38,7 @@ bool allow_tearing = false;
 bool auto_float_dialogs = false;
 decoration_mode_t decoration_mode = DECORATION_ALWAYS;
 bool enable_animations = false;
+bool hide_lone_tab = false;
 workspace_anim_direction_t workspace_anim_direction = WORKSPACE_ANIM_VERTICAL;
 bool workspace_anim_slide_up = false;
 int mapping_events_count = 0;
@@ -621,8 +622,7 @@ void apply_layout(output_t *m, desktop_t *d, node_t *n, struct wlr_box rect,
 		bool show_deco = decoration_mode == DECORATION_ALWAYS || decoration_mode == DECORATION_TABS;
 
 		if (show_deco) {
-			int bar_h = tab_bar_height();
-
+			int bar_h = tab_bar_height(n);
 			int wg = compute_window_gap(d);
 			struct wlr_box bar_rect = {
 				.x = rect.x,
@@ -642,7 +642,7 @@ void apply_layout(output_t *m, desktop_t *d, node_t *n, struct wlr_box rect,
 
 		struct wlr_box content_rect = rect;
 		if (show_deco) {
-			int bar_h = tab_bar_height();
+			int bar_h = tab_bar_height(n);
 			content_rect.y += bar_h;
 			content_rect.height = (bar_h < content_rect.height) ? content_rect.height - bar_h : 0;
 		}