image: move basic fallback into image.c

Scale SIXEL rasters uniformly when clients have different cell dimensions, while retaining the original logical cell canvas as blank padding.

Map crops using real cell boundaries so partial final cells are not stretched or compressed.

.github/workflows/lock.yml

@@ -16,10 +16,8 @@ concurrency:
 jobs:
   action:
     runs-on: ubuntu-latest
-    if: github.repository == 'tmux/tmux'
-    timeout-minutes: 10
     steps:
-      - uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v6
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '30'

.github/workflows/regress.yml

@@ -16,8 +16,7 @@ jobs:
   regress:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    if: github.repository == 'tmux/tmux'
-    timeout-minutes: 300
+    timeout-minutes: 45
 
     strategy:
       fail-fast: false
@@ -38,9 +37,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4
 
       - name: dependencies
         if: runner.os == 'Linux'
@@ -83,7 +80,7 @@ jobs:
 
       - name: logs
         if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@v4
         with:
           name: regress-logs-${{ matrix.name }}
           path: regress/logs/*.log

CHANGES

@@ -1,4 +1,7 @@
-CHANGES FROM 3.7c TO 3.8
+CHANGES FROM 3.7b TO 3.8
+
+* Build with jemalloc on macOS to avoid what appears to be a bug in the system
+  calloc(3) (issue 5385).
 
 * Many improvements to floating panes:
 
@@ -9,12 +12,7 @@ CHANGES FROM 3.7c TO 3.8
 
   - modal panes may be created with new-pane -O; a window can have one modal
     pane and it prevents interaction with the other panes while it is active.
-    -C closes the pane when the mouse is clicked outside it and -K sends all
-    keys, including the prefix key, to the pane. A modal pane is now used for
-    the editor in buffer mode;
-
-  - new-pane -A creates a floating pane which remains above a zoomed pane;
-    modal panes do this by default;
+    A modal pane is now used for the editor in buffer mode;
 
   - move-pane and resize-pane can now move and resize floating panes, including
     mouse dragging;
@@ -29,15 +27,10 @@ CHANGES FROM 3.7c TO 3.8
     -k for choose commands kills the pane when the mode exits, which is useful
     for modes in floating panes;
 
-  - command-prompt -P opens a prompt inside a pane rather than on the status
-    line;
-
   - pane-border-status has top-floating and bottom-floating, and there are new
-    default bindings under C-b g for common move and resize operations.
+    default bindings under C-b g for common move and resize operations;
 
-* Layout strings now use a JSON subset format which includes floating panes.
-  The old format is still accepted; control mode clients receive old layouts
-  unless they set the new-layouts flag.
+  - floating panes are unzoomed before creation to avoid a crash.
 
 * Add support for themes and improve default colours:
 
@@ -84,7 +77,7 @@ CHANGES FROM 3.7c TO 3.8
 
   - new hooks to cover areas including client create and destroy, pane
     activity, pane mode and prompt changes, pane movement and resizing, session
-    group changes and window creation, close, swap and zoom;
+    group changes and window creation, close and zoom;
 
   - OSC 133 escape sequences now trigger events: pane-command-started,
     pane-command-finished and pane-shell-prompt.
@@ -97,23 +90,10 @@ CHANGES FROM 3.7c TO 3.8
   while scrolling or while hovered and disappears after pane-scrollbars-timeout
   (Michael Grant).
 
-* Add a clear-on-attach server option. When disabled, tmux does not enter the
-  alternate screen on attach and instead scrolls the existing terminal content
-  into the scrollback buffer so it remains accessible (issue 5508).
-
-* Copy mode can now automatically refresh as pane content changes with the
-  refresh-on, refresh-off and refresh-toggle commands. Automatic refresh is off
-  by default; refresh-now refreshes once and is bound to r. These replace
-  refresh-from-pane (issue 5165).
-
 * Extend the fill-character option so both inside and outside the window can be
-  changed, with a new default for unused areas inside the window.
+  changed.
 
-* Change show-options and show-hooks to use formats and add a -F flag to each.
-
-* Allow individual terminal features to be disabled by adding @ to their names
-  in terminal-features, and add a utf8 feature for terminals which support
-  UTF-8 output.
+* Change set-option and set-hooks to use formats and add a -F flag to each.
 
 * Add a #{A/count:frames} modifier to show a series of frames as an animation
   in the status line (issue 5412 from Fernando Daciuk).
@@ -128,12 +108,6 @@ CHANGES FROM 3.7c TO 3.8
 * Add new-window -E, respawn-pane -E and respawn-window -E as more convenient
   methods to create an empty pane (rather than using '' for the command).
 
-* Add capture-pane -I to include the time each line entered history.
-
-* Various memory leak fixes from Heon Jeong.
-
-* Add a default C-b T binding to change the current pane title.
-
 * Menus now belong to the window, so appear on all clients.
 
 * Dragging over an existing copy mode selection now adjusts it (Michael Grant).
@@ -147,12 +121,7 @@ CHANGES FROM 3.7c TO 3.8
 * Copy mode no longer exits at the bottom while a selection is in progress
   (issue 5349).
 
-* Add copy-mode-current-line-style to set the style of the line containing the
-  cursor in copy mode (issue 5391).
-
-* Copy mode word commands now recognise all Unicode whitespace characters; a
-  space in word-separators matches any Unicode whitespace character (issue
-  5562).
+* Fix scrollbar initial state so scrollbars appear on new windows (issue 5339).
 
 * Add style attributes for dimming colours (dim=) and for hyperlinks (link= and
   nolink) (issues 4842 and 4280 from Moritz Angermann).
@@ -164,9 +133,7 @@ CHANGES FROM 3.7c TO 3.8
 
 * Add or improve format variables including client_colours,
   pane_start_command_list, window_manual_width, window_manual_height,
-  pane_last_output_time, pane_modal_flag, window_modal_pane, pane_private_modes,
-  pane_output_generation, history_added, history_collected, history_generation,
-  hook_fire_count and hook_fire_time.
+  pane_last_output_time, pane_modal_flag and window_modal_pane.
 
 * Add additional pane sort orders, and a z sort order for choose-tree so
   floating panes can be sorted by z-index.
@@ -178,18 +145,12 @@ CHANGES FROM 3.7c TO 3.8
 
 * The mouse option now defaults to on.
 
-* The active-pane client flag has been removed.
-
 * Fix send-keys -K so keys are inserted in the correct place in the input
   queue, like keys from key bindings (issue 3476).
 
 * Fix control mode clients hanging on exit if pty data was still queued (Ben
   Maurer, issue 5356), and avoid sending notifications to clients which are
-  already exiting (Ben Maurer, issue 5357). Queue notifications so they are not
-  sent inside %begin/%end (issue 5458), do not let a stuck client prevent the
-  server from exiting (issue 5444), and reset control mode offsets when a pane
-  is respawned (issue 5498). Bound buffered command replies so a control mode
-  client that stops reading cannot consume unlimited memory (issue 5565).
+  already exiting (Ben Maurer, issue 5357).
 
 * Fix grouped sessions sometimes being left as unusable command targets while
   they are being killed (Bryce Miller, issue 5180).
@@ -208,18 +169,7 @@ CHANGES FROM 3.7c TO 3.8
 * Do not crash looking for the next or previous session (issue 5344), or when
   no client is available.
 
-CHANGES FROM 3.7b TO 3.7c
-
-* Build with jemalloc on macOS to avoid what appears to be a bug in calloc
-  (issue 5385).
-
-* Fix scrollbar initial state so they appear on new windows (issue 5339).
-
-* Check time periodically in loops rather than every one (issue 5367).
-
-* Use message-style again as default for message-format.
-
-* Unzoom before creating floating panes to avoid a crash.
+* Check time periodically in loops rather than for every item (issue 5367).
 
 CHANGES FROM 3.7a TO 3.7b
 

Makefile.am

@@ -174,7 +174,6 @@ dist_tmux_SOURCES = \
 	input-keys.c \
 	input.c \
 	job.c \
-	json.c \
 	key-bindings.c \
 	key-string.c \
 	layout-custom.c \
@@ -247,8 +246,8 @@ if HAVE_UTF8PROC
 nodist_tmux_SOURCES += compat/utf8proc.c
 endif
 
-# Enable sixel support.
-if ENABLE_SIXEL
+# Enable image support.
+if ENABLE_IMAGES
 dist_tmux_SOURCES += image.c image-sixel.c
 endif
 

arguments.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: arguments.c,v 1.67 2026/08/25 06:04:33 nicm Exp $ */
+/* $OpenBSD: arguments.c,v 1.66 2026/06/26 09:54:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -762,6 +762,8 @@ args_make_commands_now(struct cmd *self, struct cmdq_item *item, u_int idx,
 		cmdq_error(item, "%s", error);
 		free(error);
 	}
+	else
+		cmdlist->references++;
 	args_make_commands_free(state);
 	return (cmdlist);
 }
@@ -825,10 +827,8 @@ args_make_commands(struct args_command_state *state, int argc, char **argv,
 	int			 i;
 
 	if (state->cmdlist != NULL) {
-		if (argc == 0) {
-			state->cmdlist->references++;
+		if (argc == 0)
 			return (state->cmdlist);
-		}
 		return (cmd_list_copy(state->cmdlist, argc, argv));
 	}
 

cfg.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.91 2026/08/03 13:38:42 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.90 2026/07/14 17:17:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -223,15 +223,13 @@ cfg_print_causes(struct cmdq_item *item)
 {
 	struct client	*c = cmdq_get_client(item);
 	u_int		 i;
-	char		*cause;
 
 	for (i = 0; i < cfg_ncauses; i++) {
-		cause = cfg_causes[i];
 		if (c != NULL && (c->flags & CLIENT_CONTROL))
-			control_notify_write(c, "%%config-error %s", cause);
+			control_write(c, "%%config-error %s", cfg_causes[i]);
 		else
-			cmdq_print(item, "%s", cause);
-		free(cause);
+			cmdq_print(item, "%s", cfg_causes[i]);
+		free(cfg_causes[i]);
 	}
 
 	free(cfg_causes);
@@ -246,16 +244,14 @@ cfg_show_causes(struct session *s)
 	struct window_pane		*wp;
 	struct window_mode_entry	*wme;
 	u_int				 i;
-	char				*cause;
 
 	if (cfg_ncauses == 0)
 		return;
 
 	if (c != NULL && (c->flags & CLIENT_CONTROL)) {
 		for (i = 0; i < cfg_ncauses; i++) {
-			cause = cfg_causes[i];
-			control_notify_write(c, "%%config-error %s", cause);
-			free(cause);
+			control_write(c, "%%config-error %s", cfg_causes[i]);
+			free(cfg_causes[i]);
 		}
 		goto out;
 	}

client.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.168 2026/08/17 20:14:31 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.166 2026/07/10 15:45:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -276,7 +276,7 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
 	proc_set_signals(client_proc, client_signal);
 
 	/* Save the flags. */
-	client_flags = flags|CLIENT_WRITE_ACK;
+	client_flags = flags;
 	log_debug("flags are %#llx", (unsigned long long)client_flags);
 
 	/* Initialize the client socket and start the server. */
@@ -712,9 +712,6 @@ client_dispatch_wait(struct imsg *imsg)
 		fprintf(stderr, "server version is too old for client\n");
 		proc_exit(client_proc);
 		break;
-	default:
-		log_debug("unknown message type %u", imsg->hdr.type);
-		break;
 	}
 }
 
@@ -801,8 +798,5 @@ client_dispatch_attached(struct imsg *imsg)
 		system(data);
 		proc_send(client_peer, MSG_UNLOCK, -1, NULL, 0);
 		break;
-	default:
-		log_debug("unknown message type %u", imsg->hdr.type);
-		break;
 	}
 }

cmd-break-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-break-pane.c,v 1.76 2026/08/17 07:04:45 nicm Exp $ */
+/* $OpenBSD: cmd-break-pane.c,v 1.75 2026/07/23 09:38:27 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -174,14 +174,13 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	}
 	window_set_fill_cells(w);
 
-	if (idx == -1)
-		idx = -1 - options_get_number(dst_s->options, "base-index");
-	wl = session_attach(dst_s, w, idx, &cause); /* can't fail */
-
 	layout_init(w, wp);
 	wp->flags |= PANE_CHANGED;
 	colour_palette_from_option(&wp->palette, wp->options);
 
+	if (idx == -1)
+		idx = -1 - options_get_number(dst_s->options, "base-index");
+	wl = session_attach(dst_s, w, idx, &cause); /* can't fail */
 	window_remove_ref(w, __func__);
 	events_fire_window("window-created", w);
 	window_fire_pane_moved(wp, old_w, old_idx, w, wl->idx);

cmd-capture-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-capture-pane.c,v 1.69 2026/09/08 07:31:59 nicm Exp $ */
+/* $OpenBSD: cmd-capture-pane.c,v 1.68 2026/07/20 11:16:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
@@ -42,8 +42,8 @@ const struct cmd_entry cmd_capture_pane_entry = {
 	.name = "capture-pane",
 	.alias = "capturep",
 
-	.args = { "ab:CeE:FHIJLMNpPqRS:Tt:", 0, 0, NULL },
-	.usage = "[-aCeFHIJLMNpPqRT] " CMD_BUFFER_USAGE " [-E end-line] "
+	.args = { "ab:CeE:FHJLMNpPqRS:Tt:", 0, 0, NULL },
+	.usage = "[-aCeFHJLMNpPqRT] " CMD_BUFFER_USAGE " [-E end-line] "
 		 "[-S start-line] " CMD_TARGET_PANE_USAGE,
 
 	.target = { 't', CMD_FIND_PANE, 0 },
@@ -200,7 +200,7 @@ cmd_capture_pane_pending(struct args *args, struct window_pane *wp,
 				tmp[0] = line[i];
 				tmp[1] = '\0';
 			} else
-				snprintf(tmp, sizeof tmp, "\\%03hho", line[i]);
+				xsnprintf(tmp, sizeof tmp, "\\%03hho", line[i]);
 			buf = cmd_capture_pane_append(buf, len, tmp,
 			    strlen(tmp));
 		}
@@ -259,7 +259,7 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
 	struct grid_cell		*gc = NULL;
 	struct window_mode_entry	*wme;
 	int				 n, join_lines, number_lines, flags = 0;
-	int				 show_flags, show_time, hyperlinks;
+	int				 show_flags, hyperlinks;
 	u_int				*links = NULL, nlinks = 0;
 	u_int				 i, sx, top, bottom, tmp;
 	char				*cause, *buf = NULL, *line, b[64], *cp;
@@ -342,7 +342,6 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
 		flags |= GRID_STRING_TRIM_SPACES;
 	number_lines = args_has(args, 'L');
 	show_flags = args_has(args, 'F');
-	show_time = args_has(args, 'I');
 	hyperlinks = args_has(args, 'H');
 	if (hyperlinks)
 		links = xreallocarray(NULL, gd->sx, sizeof *links);
@@ -359,7 +358,6 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
 			free(line);
 			continue;
 		}
-		gl = grid_peek_line(gd, i);
 
 		if (number_lines) {
 			if (i >= gd->hsize)
@@ -370,16 +368,11 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
 			if (n >= 0)
 				buf = cmd_capture_pane_append(buf, len, b, n);
 		}
-		if (show_time) {
-			n = snprintf(b, sizeof b, "%llu ",
-			    (unsigned long long)grid_line_time(gl));
-			if (n >= 0)
-				buf = cmd_capture_pane_append(buf, len, b, n);
-		}
 		if (show_flags) {
 			cp = b;
 			*cp = '\0';
 
+			gl = grid_peek_line(gd, i);
 			if (gl->flags & GRID_LINE_DEAD)
 				*cp++ = 'D';
 			if (gl->flags & GRID_LINE_HYPERLINK)
@@ -400,6 +393,7 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
 		}
 		buf = cmd_capture_pane_append(buf, len, line, linelen);
 
+		gl = grid_peek_line(gd, i);
 		if (!join_lines || !(gl->flags & GRID_LINE_WRAPPED))
 			buf[(*len)++] = '\n';
 

cmd-command-prompt.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-command-prompt.c,v 1.76 2026/08/25 06:04:33 nicm Exp $ */
+/* $OpenBSD: cmd-command-prompt.c,v 1.75 2026/06/25 11:39:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -242,11 +242,9 @@ cmd_command_prompt_callback(struct client *c, void *data, const char *s,
 	} else if (item == NULL) {
 		new_item = cmdq_get_command(cmdlist, NULL);
 		cmdq_append(c, new_item);
-		cmd_list_free(cmdlist);
 	} else {
 		new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
 		cmdq_insert_after(item, new_item);
-		cmd_list_free(cmdlist);
 	}
 	cmd_free_argv(argc, argv);
 

cmd-display-menu.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-menu.c,v 1.53 2026/08/31 07:46:55 nicm Exp $ */
+/* $OpenBSD: cmd-display-menu.c,v 1.52 2026/07/14 19:07:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -591,8 +591,6 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 		server_client_clear_overlay(tc);
 		return (CMD_RETURN_NORMAL);
 	}
-	if (tc->flags & CLIENT_CONTROL)
-		return (CMD_RETURN_NORMAL);
 	if (!modify && tc->overlay_draw != NULL)
 		return (CMD_RETURN_NORMAL);
 

cmd-display-message.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-message.c,v 1.66 2026/09/08 08:33:10 nicm Exp $ */
+/* $OpenBSD: cmd-display-message.c,v 1.65 2026/02/23 08:46:57 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -39,8 +39,8 @@ const struct cmd_entry cmd_display_message_entry = {
 	.name = "display-message",
 	.alias = "display",
 
-	.args = { "aCc:d:jlINpt:F:v", 0, 1, NULL },
-	.usage = "[-aCIjlNpv] [-c target-client] [-d delay] [-F format] "
+	.args = { "aCc:d:lINpt:F:v", 0, 1, NULL },
+	.usage = "[-aCIlNpv] [-c target-client] [-d delay] [-F format] "
 		 CMD_TARGET_PANE_USAGE " [message]",
 
 	.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
@@ -67,15 +67,14 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 	struct winlink		*wl = target->wl;
 	struct window_pane	*wp = target->wp;
 	const char		*template;
-	char			*msg, *cause = NULL;
+	char			*msg, *cause;
 	int			 delay = -1, flags, Nflag = args_has(args, 'N');
 	int			 Cflag = args_has(args, 'C');
 	struct format_tree	*ft;
 	u_int			 count = args_count(args);
 	struct evbuffer		*evb;
-	struct json_node	*jn;
 
-	if (args_has(args, 'I') && !args_has(args, 'j')) {
+	if (args_has(args, 'I')) {
 		if (wp == NULL)
 			return (CMD_RETURN_NORMAL);
 		switch (window_pane_start_input(wp, item, &cause)) {
@@ -108,9 +107,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 		template = args_string(args, 0);
 	else
 		template = args_get(args, 'F');
-	if (args_has(args, 'j') && template == NULL)
-		template = "";
-	else if (template == NULL)
+	if (template == NULL)
 		template = DISPLAY_MESSAGE_TEMPLATE;
 
 	/*
@@ -132,7 +129,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 	ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, flags);
 	format_defaults(ft, c, s, wl, wp);
 
-	if (args_has(args, 'a') && !args_has(args, 'j')) {
+	if (args_has(args, 'a')) {
 		format_each(ft, cmd_display_message_each, item);
 		format_free(ft);
 		return (CMD_RETURN_NORMAL);
@@ -142,19 +139,6 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 		msg = xstrdup(template);
 	else
 		msg = format_expand_time(ft, template);
-	if (args_has(args, 'j')) {
-		jn = json_parse(msg, &cause);
-		if (jn == NULL) {
-			cmdq_error(item, "%s", cause);
-			free(cause);
-			free(msg);
-			format_free(ft);
-			return (CMD_RETURN_ERROR);
-		}
-		free(msg);
-		msg = json_to_string(jn);
-		json_destroy_node(jn);
-	}
 
 	if (cmdq_get_client(item) == NULL)
 		cmdq_error(item, "%s", msg);

cmd-find.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find.c,v 1.88 2026/09/07 12:05:12 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.87 2026/07/17 12:42:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -388,11 +388,9 @@ cmd_find_get_window_with_session(struct cmd_find_state *fs, const char *window)
 
 	/* Try as an offset. */
 	if (!exact && (window[0] == '+' || window[0] == '-')) {
-		if (window[1] != '\0') {
-			n = strtonum(window + 1, 1, INT_MAX, &errstr);
-			if (errstr != NULL)
-				return (-1);
-		} else
+		if (window[1] != '\0')
+			n = strtonum(window + 1, 1, INT_MAX, NULL);
+		else
 			n = 1;
 		s = fs->s;
 		if (fs->flags & CMD_FIND_WINDOW_INDEX) {
@@ -628,11 +626,9 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
 
 	/* Try as an offset. */
 	if (pane[0] == '+' || pane[0] == '-') {
-		if (pane[1] != '\0') {
-			n = strtonum(pane + 1, 1, INT_MAX, &errstr);
-			if (errstr != NULL)
-				return (-1);
-		} else
+		if (pane[1] != '\0')
+			n = strtonum(pane + 1, 1, INT_MAX, NULL);
+		else
 			n = 1;
 		wp = fs->w->active;
 		if (pane[0] == '+')

cmd-if-shell.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-if-shell.c,v 1.87 2026/08/25 06:04:33 nicm Exp $ */
+/* $OpenBSD: cmd-if-shell.c,v 1.86 2025/08/01 09:05:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -98,7 +98,6 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 			return (CMD_RETURN_ERROR);
 		new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
 		cmdq_insert_after(item, new_item);
-		cmd_list_free(cmdlist);
 		return (CMD_RETURN_NORMAL);
 	}
 
@@ -165,11 +164,9 @@ cmd_if_shell_callback(struct job *job)
 	} else if (item == NULL) {
 		new_item = cmdq_get_command(cmdlist, NULL);
 		cmdq_append(c, new_item);
-		cmd_list_free(cmdlist);
 	} else {
 		new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
 		cmdq_insert_after(item, new_item);
-		cmd_list_free(cmdlist);
 	}
 
 out:

cmd-join-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-join-pane.c,v 1.74 2026/08/03 20:29:52 nicm Exp $ */
+/* $OpenBSD: cmd-join-pane.c,v 1.73 2026/07/17 15:24:30 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 George Nachman <tmux@georgester.com>
@@ -431,23 +431,25 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
 	if (cmd_get_entry(self) == &cmd_move_pane_entry) {
 		if (args_has(args, 'M'))
 			return (cmd_join_pane_mouse_update(item));
-		if (args_has(args, 'P') ||
-		    args_has(args, 'z') ||
-		    args_has(args, 'X') ||
+		if (!window_pane_is_floating(dst_wp)) {
+			cmdq_error(item, "pane is not floating");
+			return (CMD_RETURN_ERROR);
+		}
+		if ((s = args_get(args, 'P')) != NULL) {
+			server_unzoom_window(dst_w);
+			return (cmd_join_pane_place(item, dst_wl, dst_wp, s));
+		}
+		if ((s = args_get(args, 'z')) != NULL) {
+			server_unzoom_window(dst_w);
+			return (cmd_join_pane_zindex(item, dst_wl, dst_wp, s));
+		}
+		if (args_has(args, 'X') ||
 		    args_has(args, 'Y') ||
 		    args_has(args, 'U') ||
 		    args_has(args, 'D') ||
 		    args_has(args, 'L') ||
 		    args_has(args, 'R')) {
-			if (!window_pane_is_floating(dst_wp)) {
-				cmdq_error(item, "pane is not floating");
-				return (CMD_RETURN_ERROR);
-			}
 			server_unzoom_window(dst_w);
-			if ((s = args_get(args, 'P')) != NULL)
-				return (cmd_join_pane_place(item, dst_wl, dst_wp, s));
-			if ((s = args_get(args, 'z')) != NULL)
-				return (cmd_join_pane_zindex(item, dst_wl, dst_wp, s));
 			return (cmd_join_pane_move(item, args, dst_wl, dst_wp));
 		}
 	}

cmd-list-panes.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-panes.c,v 1.41 2026/09/08 10:20:08 nicm Exp $ */
+/* $OpenBSD: cmd-list-panes.c,v 1.40 2026/06/01 14:01:09 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -97,7 +97,6 @@ cmd_list_panes_window(struct cmd *self, struct session *s, struct winlink *wl,
     struct cmdq_item *item, int type)
 {
 	struct args		*args = cmd_get_args(self);
-	struct client		*c = cmdq_get_client(item);
 	struct window_pane	*wp, **l;
 	u_int			 i, n;
 	struct format_tree	*ft;
@@ -148,7 +147,7 @@ cmd_list_panes_window(struct cmd *self, struct session *s, struct winlink *wl,
 		wp = l[i];
 		ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", n);
-		format_defaults(ft, c, s, wl, wp);
+		format_defaults(ft, NULL, s, wl, wp);
 
 		if (filter != NULL) {
 			expanded = format_expand(ft, filter);

cmd-list-sessions.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-sessions.c,v 1.37 2026/09/08 10:20:08 nicm Exp $ */
+/* $OpenBSD: cmd-list-sessions.c,v 1.36 2026/02/27 08:25:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,7 +53,6 @@ static enum cmd_retval
 cmd_list_sessions_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		 *args = cmd_get_args(self);
-	struct client		 *c = cmdq_get_client(item);
 	struct session		**l;
 	u_int		 	  n, i;
 	struct format_tree	 *ft;
@@ -77,7 +76,7 @@ cmd_list_sessions_exec(struct cmd *self, struct cmdq_item *item)
 	for (i = 0; i < n; i++) {
 		ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", i);
-		format_defaults(ft, c, l[i], NULL, NULL);
+		format_defaults(ft, NULL, l[i], NULL, NULL);
 
 		if (filter != NULL) {
 			expanded = format_expand(ft, filter);

cmd-list-windows.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-windows.c,v 1.51 2026/09/08 10:20:08 nicm Exp $ */
+/* $OpenBSD: cmd-list-windows.c,v 1.50 2026/02/27 08:25:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -60,7 +60,6 @@ cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c = cmdq_get_client(item);
 	struct winlink		*wl, **l;
 	struct session		*s;
 	u_int			 i, n;
@@ -95,7 +94,7 @@ cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item)
 		s = wl->session;
 		ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", n);
-		format_defaults(ft, c, s, wl, NULL);
+		format_defaults(ft, NULL, s, wl, NULL);
 
 		if (filter != NULL) {
 			expanded = format_expand(ft, filter);

cmd-new-window.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-window.c,v 1.104 2026/09/03 21:04:11 nicm Exp $ */
+/* $OpenBSD: cmd-new-window.c,v 1.103 2026/07/08 08:07:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -60,8 +60,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 	struct client		*tc = cmdq_get_target_client(item);
 	struct session		*s = target->s;
 	struct winlink		*wl = target->wl, *new_wl = NULL;
-	int			 idx = target->idx, before;
-	int			 count = args_count(args);
+	int			 idx = target->idx, before, count = args_count(args);
 	char			*cause = NULL, *cp, *expanded, *wname = NULL;
 	const char		*template, *name;
 	struct cmd_find_state	 fs;
@@ -75,10 +74,8 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	/*
-	 * If -S is given, select an existing window instead of creating a
-	 * new one: preferring -t if it already points at a window, or
-	 * otherwise -n if one exists with that name. If neither matches,
-	 * fall through and create a window as normal.
+	 * If -S and -n are given and -t is not and a single window with this
+	 * name already exists, select it.
 	 */
 	name = args_get(args, 'n');
 	if (name != NULL) {
@@ -91,39 +88,32 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 		wname = clean_name(expanded, 0);
 		free(expanded);
 	}
-	if (args_has(args, 'S')) {
-		if (idx != -1)
-			new_wl = winlink_find_by_index(&s->windows, idx);
-		else if (wname != NULL) {
-			expanded = format_single(item, wname, c, s, NULL, NULL);
-			RB_FOREACH(wl, winlinks, &s->windows) {
-				if (strcmp(wl->window->name, expanded) != 0)
-					continue;
-				if (new_wl == NULL) {
-					new_wl = wl;
-					continue;
-				}
-				cmdq_error(item, "multiple windows named %s",
-				    wname);
-				free(wname);
-				free(expanded);
-				return (CMD_RETURN_ERROR);
+	if (args_has(args, 'S') && wname != NULL && target->idx == -1) {
+		expanded = format_single(item, wname, c, s, NULL, NULL);
+		RB_FOREACH(wl, winlinks, &s->windows) {
+			if (strcmp(wl->window->name, expanded) != 0)
+				continue;
+			if (new_wl == NULL) {
+				new_wl = wl;
+				continue;
 			}
+			cmdq_error(item, "multiple windows named %s", wname);
+			free(wname);
 			free(expanded);
+			return (CMD_RETURN_ERROR);
 		}
-	}
-
-	/* Found an existing window to select instead of creating a new one. */
-	if (new_wl != NULL) {
-		free(wname);
-		if (args_has(args, 'd'))
+		free(expanded);
+		if (new_wl != NULL) {
+			free(wname);
+			if (args_has(args, 'd'))
+				return (CMD_RETURN_NORMAL);
+			if (session_set_current(s, new_wl) == 0)
+				server_redraw_session(s);
+			if (c != NULL && c->session != NULL)
+				s->curw->window->latest = c;
+			recalculate_sizes();
 			return (CMD_RETURN_NORMAL);
-		if (session_set_current(s, new_wl) == 0)
-			server_redraw_session(s);
-		if (c != NULL && c->session != NULL)
-			s->curw->window->latest = c;
-		recalculate_sizes();
-		return (CMD_RETURN_NORMAL);
+		}
 	}
 
 	before = args_has(args, 'b');

cmd-parse.y

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-parse.y,v 1.60 2026/09/08 10:20:08 nicm Exp $ */
+/* $OpenBSD: cmd-parse.y,v 1.58 2026/04/27 12:31:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -210,7 +210,7 @@ expanded	: format
 				cmd_find_from_client(&fs, c, 0);
 				fsp = &fs;
 			}
-			ft = format_create(c, pi->item, FORMAT_NONE, flags);
+			ft = format_create(NULL, pi->item, FORMAT_NONE, flags);
 			format_defaults(ft, c, fsp->s, fsp->wl, fsp->wp);
 
 			$$ = format_expand(ft, $1);
@@ -802,7 +802,6 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
 	if (last == NULL) {
 		pr->status = CMD_PARSE_SUCCESS;
 		pr->cmdlist = cmd_list_new();
-		cmd_parse_free_commands(cmds);
 		return (1);
 	}
 
@@ -815,7 +814,6 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
 	pi->flags |= CMD_PARSE_NOALIAS;
 	cmd_parse_build_commands(cmds, pi, pr);
 	pi->flags &= ~CMD_PARSE_NOALIAS;
-	cmd_parse_free_commands(cmds);
 	return (1);
 }
 

cmd-queue.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.123 2026/08/24 20:34:26 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.121 2026/07/14 17:17:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -802,7 +802,7 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags)
 	u_int		 number = item->number;
 
 	if (c != NULL && (c->flags & CLIENT_CONTROL))
-		control_write_guard(c, guard, t, number, flags);
+		control_write(c, "%%%s %ld %u %d", guard, t, number, flags);
 }
 
 /* Show message from command. */
@@ -850,18 +850,7 @@ cmdq_error(struct cmdq_item *item, const char *fmt, ...)
 
 	if (c == NULL) {
 		cmd_get_source(cmd, &file, &line);
-		if (!cfg_finished) {
-			if (file != NULL)
-				cfg_add_cause("%s:%u: %s", file, line, msg);
-			else
-				cfg_add_cause("%s", msg);
-		} else {
-			if (file != NULL) {
-				server_add_message("message: %s:%u: %s", file,
-				    line, msg);
-			} else
-				server_add_message("message: %s", msg);
-		}
+		cfg_add_cause("%s:%u: %s", file, line, msg);
 	} else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
 		server_add_message("%s message: %s", c->name, msg);
 		if (~c->flags & CLIENT_UTF8) {

cmd-resize-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-resize-pane.c,v 1.68 2026/08/31 07:44:39 nicm Exp $ */
+/* $OpenBSD: cmd-resize-pane.c,v 1.67 2026/07/10 13:38:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -92,7 +92,6 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_NORMAL);
 	}
 	server_unzoom_window(w);
-	lc = wp->layout_cell; /* may have been replaced by unzoom */
 
 	if (args_has(args, 'x')) {
 		x = args_percentage(args, 'x', 0, PANE_MAXIMUM, w->sx, &cause);

cmd-run-shell.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.94 2026/08/25 06:04:33 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.93 2026/07/17 12:42:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -233,11 +233,9 @@ cmd_run_shell_timer(__unused int fd, __unused short events, void* arg)
 	} else if (item == NULL) {
 		new_item = cmdq_get_command(cmdlist, NULL);
 		cmdq_append(c, new_item);
-		cmd_list_free(cmdlist);
 	} else {
 		new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
 		cmdq_insert_after(item, new_item);
-		cmd_list_free(cmdlist);
 	}
 
 	if (cdata->item != NULL)

cmd-select-layout.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-layout.c,v 1.45 2026/09/09 07:03:39 nicm Exp $ */
+/* $OpenBSD: cmd-select-layout.c,v 1.43 2026/07/10 13:38:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -73,13 +73,12 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c = cmdq_get_target_client(item);
 	struct winlink		*wl = target->wl;
 	struct window		*w = wl->window;
 	struct window_pane	*wp = target->wp;
 	const char		*layoutname;
-	char			*oldlayout, *cause = NULL;
-	int			 next, previous, layout, flags = 0;
+	char			*oldlayout, *cause;
+	int			 next, previous, layout;
 
 	server_unzoom_window(w);
 
@@ -90,12 +89,8 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'p'))
 		previous = 1;
 
-	if (c != NULL &&
-	    (c->flags & CLIENT_CONTROL) &&
-	    (~c->flags & CLIENT_CONTROL_NEWLAYOUTS))
-		flags |= LAYOUT_CUSTOM_OLD_FORMAT;
 	oldlayout = w->old_layout;
-	w->old_layout = layout_dump(w, w->layout_root, flags);
+	w->old_layout = layout_dump(w, w->layout_root);
 
 	if (next || previous) {
 		if (next)

cmd-select-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-pane.c,v 1.78 2026/08/20 09:19:24 nicm Exp $ */
+/* $OpenBSD: cmd-select-pane.c,v 1.77 2026/07/17 12:42:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -160,7 +160,6 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
 	char			*title;
 	const char		*style;
 	struct options_entry	*o;
-	int			 visible, Zflag = args_has(args, 'Z');
 
 	if (entry == &cmd_last_pane_entry || args_has(args, 'l')) {
 		/*
@@ -186,18 +185,14 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
 			server_redraw_window_borders(lastwp->window);
 			server_status_window(lastwp->window);
 		} else {
-			if (w->modal != NULL && lastwp != w->modal)
-				visible = 1;
-			else
-				visible = window_pane_is_visible(lastwp);
-			if (!visible && window_push_zoom(w, 0, Zflag))
+			if (window_push_zoom(w, 0, args_has(args, 'Z')))
 				server_redraw_window(w);
 			window_redraw_active_switch(w, lastwp);
 			if (window_set_active_pane(w, lastwp, 1)) {
 				cmd_find_from_winlink(current, wl, 0);
 				cmd_select_pane_redraw(w);
 			}
-			if (!visible && window_pop_zoom(w))
+			if (window_pop_zoom(w))
 				server_redraw_window(w);
 		}
 		return (CMD_RETURN_NORMAL);
@@ -273,18 +268,14 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
 
 	if (wp == w->active)
 		return (CMD_RETURN_NORMAL);
-	if (w->modal != NULL && wp != w->modal)
-		visible = 1;
-	else
-		visible = window_pane_is_visible(wp);
-	if (!visible && window_push_zoom(w, 0, Zflag))
+	if (window_push_zoom(w, 0, args_has(args, 'Z')))
 		server_redraw_window(w);
 	window_redraw_active_switch(w, wp);
 	if (window_set_active_pane(w, wp, 1))
 		cmd_find_from_winlink_pane(current, wl, wp, 0);
 	cmdq_insert_hook(s, item, current, "after-select-pane");
 	cmd_select_pane_redraw(w);
-	if (!visible && window_pop_zoom(w))
+	if (window_pop_zoom(w))
 		server_redraw_window(w);
 
 	return (CMD_RETURN_NORMAL);

cmd-set-buffer.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-buffer.c,v 1.38 2026/08/24 07:05:23 nicm Exp $ */
+/* $OpenBSD: cmd-set-buffer.c,v 1.37 2026/02/15 17:43:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -100,7 +100,6 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
 			cmdq_error(item, "%s", cause);
 			goto fail;
 		}
-		free(bufname);
 		return (CMD_RETURN_NORMAL);
 	}
 
@@ -108,10 +107,8 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
 		cmdq_error(item, "no data specified");
 		goto fail;
 	}
-	if ((newsize = strlen(args_string(args, 0))) == 0) {
-		free(bufname);
+	if ((newsize = strlen(args_string(args, 0))) == 0)
 		return (CMD_RETURN_NORMAL);
-	}
 
 	if (args_has(args, 'a') && pb != NULL) {
 		olddata = paste_buffer_data(pb, &bufsize);
@@ -130,7 +127,6 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'w') && tc != NULL)
  		tty_set_selection(&tc->tty, "", bufdata, bufsize);
 
-	free(bufname);
 	return (CMD_RETURN_NORMAL);
 
 fail:

cmd-source-file.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-source-file.c,v 1.63 2026/08/18 08:05:05 nicm Exp $ */
+/* $OpenBSD: cmd-source-file.c,v 1.62 2025/11/18 08:42:09 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -50,7 +50,6 @@ const struct cmd_entry cmd_source_file_entry = {
 
 struct cmd_source_file_data {
 	struct cmdq_item	 *item;
-	struct client		 *client;
 	int			  flags;
 
 	struct cmdq_item	 *after;
@@ -61,24 +60,10 @@ struct cmd_source_file_data {
 	u_int			  nfiles;
 };
 
-static void
-cmd_source_file_free_data(struct cmd_source_file_data *cdata)
-{
-	u_int	i;
-
-	for (i = 0; i < cdata->nfiles; i++)
-		free(cdata->files[i]);
-	free(cdata->files);
-	if (cdata->client != NULL)
-		server_client_unref(cdata->client);
-	free(cdata);
-}
-
 static enum cmd_retval
-cmd_source_file_complete_cb(struct cmdq_item *item, void *data)
+cmd_source_file_complete_cb(struct cmdq_item *item, __unused void *data)
 {
-	struct cmd_source_file_data	*cdata = data;
-	struct client			*c = cdata->client;
+	struct client	*c = cmdq_get_client(item);
 
 	if (c == NULL) {
 		cmd_source_file_depth--;
@@ -89,36 +74,36 @@ cmd_source_file_complete_cb(struct cmdq_item *item, void *data)
 	}
 
 	cfg_print_causes(item);
-	cmd_source_file_free_data(cdata);
 	return (CMD_RETURN_NORMAL);
 }
 
 static void
-cmd_source_file_complete(struct cmd_source_file_data *cdata)
+cmd_source_file_complete(struct client *c, struct cmd_source_file_data *cdata)
 {
-	struct client		*c = cdata->client;
 	struct cmdq_item	*new_item;
+	u_int			 i;
 
-	if (!cfg_finished) {
-		cmd_source_file_free_data(cdata);
-		return;
+	if (cfg_finished) {
+		if (cdata->retval == CMD_RETURN_ERROR &&
+		    c != NULL &&
+		    c->session == NULL)
+			c->retval = 1;
+		new_item = cmdq_get_callback(cmd_source_file_complete_cb, NULL);
+		cmdq_insert_after(cdata->after, new_item);
 	}
 
-	if (cdata->retval == CMD_RETURN_ERROR &&
-	    c != NULL &&
-	    c->session == NULL)
-		c->retval = 1;
-	new_item = cmdq_get_callback(cmd_source_file_complete_cb, cdata);
-	cmdq_insert_after(cdata->after, new_item);
+	for (i = 0; i < cdata->nfiles; i++)
+		free(cdata->files[i]);
+	free(cdata->files);
+	free(cdata);
 }
 
 static void
-cmd_source_file_done(__unused struct client *oc, const char *path,
-    int error, int closed, struct evbuffer *buffer, void *data)
+cmd_source_file_done(struct client *c, const char *path, int error,
+    int closed, struct evbuffer *buffer, void *data)
 {
 	struct cmd_source_file_data	*cdata = data;
 	struct cmdq_item		*item = cdata->item;
-	struct client			*c = cdata->client;
 	void				*bdata = EVBUFFER_DATA(buffer);
 	size_t				 bsize = EVBUFFER_LENGTH(buffer);
 	u_int				 n;
@@ -142,7 +127,7 @@ cmd_source_file_done(__unused struct client *oc, const char *path,
 	if (n < cdata->nfiles)
 		file_read(c, cdata->files[n], cmd_source_file_done, cdata);
 	else {
-		cmd_source_file_complete(cdata);
+		cmd_source_file_complete(c, cdata);
 		cmdq_continue(item);
 	}
 }
@@ -202,9 +187,6 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 
 	cdata = xcalloc(1, sizeof *cdata);
 	cdata->item = item;
-	cdata->client = c;
-	if (c != NULL)
-		c->references++;
 
 	if (args_has(args, 'q'))
 		cdata->flags |= CMD_PARSE_QUIET;
@@ -267,7 +249,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 		file_read(c, cdata->files[0], cmd_source_file_done, cdata);
 		retval = CMD_RETURN_WAIT;
 	} else
-		cmd_source_file_complete(cdata);
+		cmd_source_file_complete(c, cdata);
 
 	free(cwd);
 	return (retval);

cmd-split-window.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.151 2026/09/10 11:02:18 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.146 2026/07/21 12:28:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -40,8 +40,8 @@ const struct cmd_entry cmd_new_pane_entry = {
 	.name = "new-pane",
 	.alias = "newp",
 
-	.args = { "AbB:Cc:Dde:EfF:hIkl:KLMm:Op:PR:s:S:t:T:vWx:X:y:Y:Z", 0, -1, NULL },
-	.usage = "[-AbCDefhIkKLMOPvWZ] [-B border-lines] "
+	.args = { "bB:Cc:de:EfF:hIkl:LMm:Op:PR:s:S:t:T:vWx:X:y:Y:Z", 0, -1, NULL },
+	.usage = "[-bCdefhIklMOPvWZ] [-B border-lines] "
 		 "[-c start-directory] [-e environment] "
 		 "[-F format] [-l size] [-m message] [-p percentage] "
 		 "[-s style] [-S active-border-style] "
@@ -89,7 +89,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_find_state	 fs;
 	struct key_event	*event = cmdq_get_event(item);
 	int			 input, empty, is_floating, flags = 0;
-	int			 restore_zoom = 0;
 	const char		*template, *style, *value;
 	char			*cause = NULL, *cp, *title;
 	const struct options_table_entry *oe;
@@ -97,16 +96,9 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	enum pane_lines		 lines;
 	u_int			 count = args_count(args);
 
-	if (window_active_pane_is_over_zoom(w))
-		restore_zoom = 1;
-
 	if (cmd_get_entry(self) == &cmd_new_pane_entry)
 		is_floating = !args_has(args, 'L');
 	else {
-		if (!window_pane_is_visible(wp))
-			restore_zoom = 0;
-		if (!restore_zoom)
-			window_unzoom(w, 1);
 		is_floating = window_pane_is_floating(wp);
 		flags |= SPAWN_SPLIT;
 	}
@@ -140,11 +132,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'Z'))
 		flags |= SPAWN_ZOOM;
 	if (args_has(args, 'O'))
-		flags |= SPAWN_MODAL|SPAWN_FLOATOVERZOOM;
-	if (is_floating && args_has(args, 'A'))
-		flags |= SPAWN_FLOATOVERZOOM;
-	if ((w->flags & WINDOW_ZOOMED) && (flags & SPAWN_FLOATOVERZOOM))
-		restore_zoom = 1;
+		flags |= SPAWN_MODAL;
 
 	input = args_has(args, 'I');
 	if (input || (count == 1 && *args_string(args, 0) == '\0'))
@@ -180,8 +168,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	if (cause != NULL) {
 		cmdq_error(item, "%s", cause);
 		free(cause);
-		if (restore_zoom)
-			window_pop_zoom(w);
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -215,12 +201,8 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 		 */
 		goto fail;
 	}
-	if (args_has(args, 'K') && args_has(args, 'O'))
-		new_wp->flags |= PANE_CAPTUREALLKEYS;
 	if (args_has(args, 'C') && args_has(args, 'O'))
 		new_wp->flags |= PANE_CLOSEONCLICK;
-	if (args_has(args, 'D') && args_has(args, 'O'))
-		new_wp->flags |= PANE_CLOSEONCANCEL;
 
 	style = args_get(args, 's');
 	if (style != NULL) {
@@ -288,10 +270,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	if (~flags & SPAWN_DETACHED)
 		cmd_find_from_winlink_pane(current, wl, new_wp, 0);
 
-	if (restore_zoom) {
-		window_pop_zoom(wp->window);
-		server_redraw_window(wp->window);
-	} else if ((~flags & SPAWN_FLOATING) && !args_has(args, 'O')) {
+	if ((~flags & SPAWN_FLOATING) && !args_has(args, 'O')) {
 		window_pop_zoom(wp->window);
 		server_redraw_window(wp->window);
 	}
@@ -342,9 +321,8 @@ fail:
 		if (!is_floating)
 			layout_close_pane(new_wp);
 		window_remove_pane(wp->window, new_wp);
-	}
-	if (restore_zoom || (~flags & SPAWN_FLOATING))
-		window_pop_zoom(wp->window);
+	} else if (args_has(args, 'O'))
+		window_pop_modal_zoom(wp->window);
 	if (sc.argv != NULL)
 		cmd_free_argv(sc.argc, sc.argv);
 	environ_free(sc.environ);

cmd-switch-client.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-switch-client.c,v 1.75 2026/08/20 09:19:24 nicm Exp $ */
+/* $OpenBSD: cmd-switch-client.c,v 1.74 2026/05/22 15:22:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,7 +53,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_find_state	 target;
 	const char		*tflag = args_get(args, 't');
 	enum cmd_find_type	 type;
-	int			 flags, visible, Zflag = args_has(args, 'Z');
+	int			 flags;
 	struct client		*c = cmdq_get_client(item);
 	struct client		*tc = cmdq_get_target_client(item);
 	struct session		*s;
@@ -139,15 +139,11 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 			return (CMD_RETURN_NORMAL);
 		if (wl != NULL && wp != NULL && wp != wl->window->active) {
 			w = wl->window;
-			if (w->modal != NULL && wp != w->modal)
-				visible = 1;
-			else
-				visible = window_pane_is_visible(wp);
-			if (!visible && window_push_zoom(w, 0, Zflag))
+			if (window_push_zoom(w, 0, args_has(args, 'Z')))
 				server_redraw_window(w);
 			window_redraw_active_switch(w, wp);
 			window_set_active_pane(w, wp, 1);
-			if (!visible && window_pop_zoom(w))
+			if (window_pop_zoom(w))
 				server_redraw_window(w);
 		}
 		if (wl != NULL) {

compat/getpeereid.c

@@ -31,7 +31,7 @@ getpeereid(int s, uid_t *uid, gid_t *gid)
 {
 #ifdef HAVE_SO_PEERCRED
 	struct ucred	uc;
-	socklen_t	len = sizeof uc;
+	int		len = sizeof uc;
 
 	if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &uc, &len) == -1)
 		return (-1);

configure.ac

@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], next-3.9)
+AC_INIT([tmux], next-3.8)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)
@@ -530,15 +530,24 @@ if test "x$enable_cgroups" = xyes; then
 	fi
 fi
 
-# Enable sixel support.
+# Enable image support.
+AC_ARG_ENABLE(
+	images,
+	AS_HELP_STRING(--enable-images, enable SIXEL and ASCII images)
+)
+
+# Keep the old option as an alias for one compatibility cycle.
 AC_ARG_ENABLE(
 	sixel,
-	AS_HELP_STRING(--enable-sixel, enable sixel images)
+	AS_HELP_STRING(--enable-sixel, deprecated alias for --enable-images)
 )
 if test "x$enable_sixel" = xyes; then
-	AC_DEFINE(ENABLE_SIXEL)
+	enable_images=yes
 fi
-AM_CONDITIONAL(ENABLE_SIXEL, [test "x$enable_sixel" = xyes])
+if test "x$enable_images" = xyes; then
+	AC_DEFINE(ENABLE_IMAGES)
+fi
+AM_CONDITIONAL(ENABLE_IMAGES, [test "x$enable_images" = xyes])
 
 # Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well.
 AC_MSG_CHECKING(for b64_ntop)
@@ -1137,10 +1146,10 @@ if test "x$enable_asan" = xyes; then
 else
 	AC_MSG_NOTICE([ASAN: off])
 fi
-if test "x$enable_sixel" = xyes; then
-	AC_MSG_NOTICE([SIXEL: on])
+if test "x$enable_images" = xyes; then
+	AC_MSG_NOTICE([images: on])
 else
-	AC_MSG_NOTICE([SIXEL: off])
+	AC_MSG_NOTICE([images: off])
 fi
 if test "x$enable_debug" = xyes; then
 	AC_MSG_NOTICE([debug: on])

control-notify.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: control-notify.c,v 1.39 2026/09/08 10:20:08 nicm Exp $ */
+/* $OpenBSD: control-notify.c,v 1.37 2026/07/10 13:38:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -44,8 +44,7 @@ control_pane_mode_changed_cb(__unused const char *name,
 		TAILQ_FOREACH(c, &clients, entry) {
 			if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 				continue;
-			control_notify_write(c, "%%pane-mode-changed %%%u",
-			    wp->id);
+			control_write(c, "%%pane-mode-changed %%%u", wp->id);
 		}
 		return;
 	}
@@ -54,9 +53,8 @@ control_pane_mode_changed_cb(__unused const char *name,
 	if (value == NULL)
 		return;
 	TAILQ_FOREACH(c, &clients, entry) {
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
-			continue;
-		control_notify_write(c, "%%pane-mode-changed %s", value);
+		if (CONTROL_SHOULD_NOTIFY_CLIENT(c))
+			control_write(c, "%%pane-mode-changed %s", value);
 	}
 	free(value);
 }
@@ -70,7 +68,6 @@ control_window_layout_changed_cb(__unused const char *name,
 	struct session		*s;
 	struct winlink		*wl;
 	struct window		*w = event_payload_get_window(ep, "window");
-	struct format_tree	*ft;
 	const char		*template;
 	char			*cp;
 
@@ -85,25 +82,19 @@ control_window_layout_changed_cb(__unused const char *name,
 	 * and we don't need to inform the client about the layout change
 	 * because the whole window will go away soon.
 	 */
-	if (TAILQ_FIRST(&w->winlinks) == NULL || w->layout_root == NULL)
+	wl = TAILQ_FIRST(&w->winlinks);
+	if (wl == NULL || w->layout_root == NULL)
 		return;
+	cp = format_single(NULL, template, NULL, NULL, wl, NULL);
 
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
 		s = c->session;
-		wl = winlink_find_by_window_id(&s->windows, w->id);
-		if (wl == NULL)
-			continue;
-
-		ft = format_create(c, NULL, FORMAT_NONE, 0);
-		format_defaults(ft, c, s, wl, NULL);
-		cp = format_expand(ft, template);
-		format_free(ft);
-
-		control_notify_write(c, "%s", cp);
-		free(cp);
+		if (winlink_find_by_window_id(&s->windows, w->id) != NULL)
+			control_write(c, "%s", cp);
 	}
+	free(cp);
 }
 
 /* Notify control clients that window pane changed. */
@@ -120,7 +111,7 @@ control_window_pane_changed_cb(__unused const char *name,
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
 
-		control_notify_write(c, "%%window-pane-changed @%u %%%u", w->id,
+		control_write(c, "%%window-pane-changed @%u %%%u", w->id,
 		    w->active->id);
 	}
 }
@@ -142,11 +133,9 @@ control_window_unlinked_cb(__unused const char *name, struct event_payload *ep,
 		cs = c->session;
 
 		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
-			control_notify_write(c, "%%window-close @%u", w->id);
-		else {
-			control_notify_write(c, "%%unlinked-window-close @%u",
-			    w->id);
-		}
+			control_write(c, "%%window-close @%u", w->id);
+		else
+			control_write(c, "%%unlinked-window-close @%u", w->id);
 	}
 }
 
@@ -167,11 +156,9 @@ control_window_linked_cb(__unused const char *name, struct event_payload *ep,
 		cs = c->session;
 
 		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
-			control_notify_write(c, "%%window-add @%u", w->id);
-		else {
-			control_notify_write(c, "%%unlinked-window-add @%u",
-			    w->id);
-		}
+			control_write(c, "%%window-add @%u", w->id);
+		else
+			control_write(c, "%%unlinked-window-add @%u", w->id);
 	}
 }
 
@@ -192,11 +179,11 @@ control_window_renamed_cb(__unused const char *name, struct event_payload *ep,
 		cs = c->session;
 
 		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL) {
-			control_notify_write(c, "%%window-renamed @%u %s",
-			    w->id, w->name);
+			control_write(c, "%%window-renamed @%u %s", w->id,
+			    w->name);
 		} else {
-			control_notify_write(c,
-			    "%%unlinked-window-renamed @%u %s", w->id, w->name);
+			control_write(c, "%%unlinked-window-renamed @%u %s",
+			    w->id, w->name);
 		}
 	}
 }
@@ -219,12 +206,11 @@ control_client_session_changed_cb(__unused const char *name,
 			continue;
 
 		if (cc == c) {
-			control_notify_write(c, "%%session-changed $%u %s",
-			    s->id, s->name);
+			control_write(c, "%%session-changed $%u %s", s->id,
+			    s->name);
 		} else {
-			control_notify_write(c,
-			    "%%client-session-changed %s $%u %s", cc->name,
-			    s->id, s->name);
+			control_write(c, "%%client-session-changed %s $%u %s",
+			    cc->name, s->id, s->name);
 		}
 	}
 }
@@ -240,9 +226,8 @@ control_client_detached_cb(__unused const char *name, struct event_payload *ep,
 	if (cc == NULL)
 		return;
 	TAILQ_FOREACH(c, &clients, entry) {
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
-			continue;
-		control_notify_write(c, "%%client-detached %s", cc->name);
+		if (CONTROL_SHOULD_NOTIFY_CLIENT(c))
+			control_write(c, "%%client-detached %s", cc->name);
 	}
 }
 
@@ -259,8 +244,8 @@ control_session_renamed_cb(__unused const char *name, struct event_payload *ep,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%session-renamed $%u %s", s->id,
-		    s->name);
+
+		control_write(c, "%%session-renamed $%u %s", s->id, s->name);
 	}
 }
 
@@ -274,7 +259,8 @@ control_session_created_cb(__unused const char *name,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%sessions-changed");
+
+		control_write(c, "%%sessions-changed");
 	}
 }
 
@@ -288,7 +274,8 @@ control_session_closed_cb(__unused const char *name,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%sessions-changed");
+
+		control_write(c, "%%sessions-changed");
 	}
 }
 
@@ -311,8 +298,9 @@ control_session_window_changed_cb(__unused const char *name,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%session-window-changed $%u @%u",
-		    s->id, s->curw->window->id);
+
+		control_write(c, "%%session-window-changed $%u @%u", s->id,
+		    s->curw->window->id);
 	}
 }
 
@@ -329,7 +317,8 @@ control_paste_buffer_changed_cb(__unused const char *name,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%paste-buffer-changed %s", pbname);
+
+		control_write(c, "%%paste-buffer-changed %s", pbname);
 	}
 }
 
@@ -346,7 +335,8 @@ control_paste_buffer_deleted_cb(__unused const char *name,
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
-		control_notify_write(c, "%%paste-buffer-deleted %s", pbname);
+
+		control_write(c, "%%paste-buffer-deleted %s", pbname);
 	}
 }
 

control.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.68 2026/09/09 08:30:05 nicm Exp $ */
+/* $OpenBSD: control.c,v 1.62 2026/07/17 08:37:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,17 +53,6 @@ struct control_block {
 	TAILQ_ENTRY(control_block)	 all_entry;
 };
 
-/*
- * A notification line deferred because it was generated while a command's
- * %begin/%end guard block was open. Notifications must never appear inside a
- * guard block, so they are held here and flushed once the block closes.
- */
-struct control_line {
-	char				*line;
-
-	TAILQ_ENTRY(control_line)	 entry;
-};
-
 /* Control client pane. */
 struct control_pane {
 	u_int				 pane;
@@ -108,19 +97,11 @@ struct control_state {
 	u_int				 pending_count;
 
 	TAILQ_HEAD(, control_block)	 all_blocks;
-	size_t				 queued_reply_bytes;
 
 	struct bufferevent		*read_event;
 	struct bufferevent		*write_event;
 
 	struct monitor_set		*subs;
-
-	/*
-	 * Depth of open %begin/%end guard blocks and notifications deferred
-	 * until the outermost block closes.
-	 */
-	int				 guard_depth;
-	TAILQ_HEAD(, control_line)	 deferred;
 };
 
 /* Low and high watermarks. */
@@ -133,9 +114,6 @@ struct control_state {
 /* Maximum age for clients that are not using pause mode. */
 #define CONTROL_MAXIMUM_AGE 300000
 
-/* Maximum buffered command replies for a client that is not reading. */
-#define CONTROL_MAXIMUM_REPLY_BUFFER (64 * 1024 * 1024)
-
 /* Flags to ignore client. */
 #define CONTROL_IGNORE_FLAGS \
 	(CLIENT_CONTROL_NOOUTPUT| \
@@ -169,15 +147,6 @@ RB_GENERATE_STATIC(control_windows, control_window, entry, control_window_cmp);
 static void
 control_free_block(struct control_state *cs, struct control_block *cb)
 {
-	size_t	 size;
-
-	if (cb->size == 0 && cb->line != NULL) {
-		size = strlen(cb->line) + 1;
-		if (cs->queued_reply_bytes > size)
-			cs->queued_reply_bytes -= size;
-		else
-			cs->queued_reply_bytes = 0;
-	}
 	free(cb->line);
 	TAILQ_REMOVE(&cs->all_blocks, cb, all_entry);
 	free(cb);
@@ -383,7 +352,7 @@ control_continue_pane(struct client *c, struct window_pane *wp)
 		cp->flags &= ~CONTROL_PANE_PAUSED;
 		memcpy(&cp->offset, &wp->offset, sizeof cp->offset);
 		memcpy(&cp->queued, &wp->offset, sizeof cp->queued);
-		control_notify_write(c, "%%continue %%%u", wp->id);
+		control_write(c, "%%continue %%%u", wp->id);
 	}
 }
 
@@ -397,186 +366,52 @@ control_pause_pane(struct client *c, struct window_pane *wp)
 	if (~cp->flags & CONTROL_PANE_PAUSED) {
 		cp->flags |= CONTROL_PANE_PAUSED;
 		control_discard_pane(c, cp);
-		control_notify_write(c, "%%pause %%%u", wp->id);
+		control_write(c, "%%pause %%%u", wp->id);
 	}
 }
 
-/*
- * Reset a pane after its buffer has been replaced: drop any output still
- * queued from the old buffer and start again from the pane's own offset.
- */
-void
-control_reset_pane(struct client *c, struct window_pane *wp)
-{
-	struct control_pane	*cp;
-
-	if (c->control_state == NULL)
-		return;
-	cp = control_get_pane(c, wp);
-	if (cp == NULL)
-		return;
-	control_discard_pane(c, cp);
-	memcpy(&cp->offset, &wp->offset, sizeof cp->offset);
-	memcpy(&cp->queued, &wp->offset, sizeof cp->queued);
-}
-
-/*
- * Check if the replies buffered for a client, including one about to be
- * added, have grown too large and kill it if so. Returns 1 if further output
- * for the client should be dropped.
- */
-static int
-control_check_reply_buffer(struct client *c, size_t added)
+/* Write a line. */
+static void printflike(2, 0)
+control_vwrite(struct client *c, const char *fmt, va_list ap)
 {
 	struct control_state	*cs = c->control_state;
-	size_t			 size;
+	char			*s;
 
-	if (c->flags & CLIENT_CONTROL_DISCARD)
-		return (1);
-	size = EVBUFFER_LENGTH(cs->write_event->output);
-	size += cs->queued_reply_bytes;
-	size += added;
-	if (size < CONTROL_MAXIMUM_REPLY_BUFFER)
-		return (0);
+	xvasprintf(&s, fmt, ap);
+	log_debug("%s: %s: writing line: %s", __func__, c->name, s);
 
-	log_debug("%s: %s: %zu bytes of replies buffered", __func__, c->name,
-	    size);
-	if (~c->flags & CLIENT_EXIT) {
-		c->exit_message = xstrdup("too far behind");
-		c->flags |= CLIENT_EXIT;
-		control_discard(c);
-	}
-	c->flags |= CLIENT_CONTROL_DISCARD;
-	return (1);
-}
+	bufferevent_write(cs->write_event, s, strlen(s));
+	bufferevent_write(cs->write_event, "\n", 1);
 
-/* Write an already-formatted line, queueing it behind %output if needed. */
-static void
-control_write_line(struct client *c, char *line)
-{
-	struct control_state	*cs = c->control_state;
-	struct control_block	*cb;
-	size_t			 size = strlen(line) + 1;
-
-	if (control_check_reply_buffer(c, size)) {
-		free(line);
-		return;
-	}
-
-	if (TAILQ_EMPTY(&cs->all_blocks)) {
-		log_debug("%s: %s: writing line: %s", __func__, c->name, line);
-		bufferevent_write(cs->write_event, line, size - 1);
-		bufferevent_write(cs->write_event, "\n", 1);
-		bufferevent_enable(cs->write_event, EV_WRITE);
-		free(line);
-		return;
-	}
-
-	cb = xcalloc(1, sizeof *cb);
-	cb->line = line;
-	TAILQ_INSERT_TAIL(&cs->all_blocks, cb, all_entry);
-	cs->queued_reply_bytes += size;
-	cb->t = get_timer();
-
-	log_debug("%s: %s: storing line: %s", __func__, c->name, cb->line);
 	bufferevent_enable(cs->write_event, EV_WRITE);
+	free(s);
 }
 
-/* Flush notifications that were deferred while a guard block was open. */
-static void
-control_flush_deferred(struct client *c)
-{
-	struct control_state	*cs = c->control_state;
-	struct control_line	*cl, *cl1;
-
-	TAILQ_FOREACH_SAFE(cl, &cs->deferred, entry, cl1) {
-		TAILQ_REMOVE(&cs->deferred, cl, entry);
-		control_write_line(c, cl->line);
-		free(cl);
-	}
-}
-
-/*
- * Write a line of command output or error text. This is a sink for arbitrary
- * user-controlled text (command output, capture-pane, error messages), so it
- * must never try to interpret the content: guard tracking is done only in
- * control_write_guard.
- */
+/* Write a line. */
 void
 control_write(struct client *c, const char *fmt, ...)
 {
 	struct control_state	*cs = c->control_state;
-	char			*line;
+	struct control_block	*cb;
 	va_list			 ap;
 
-	if (cs == NULL)
-		return;
-
 	va_start(ap, fmt);
-	xvasprintf(&line, fmt, ap);
-	va_end(ap);
 
-	control_write_line(c, line);
-}
-
-/*
- * Write a %begin, %end or %error guard around a command's output. This is the
- * only place guard lines are produced, so the block depth is maintained here;
- * when the outermost block closes any deferred notifications are flushed after
- * it. "guard" is always one of the fixed strings from cmdq_guard, never user
- * text.
- */
-void
-control_write_guard(struct client *c, const char *guard, long t, u_int number,
-    int flags)
-{
-	struct control_state	*cs = c->control_state;
-	char			*line;
-
-	if (cs == NULL)
-		return;
-
-	if (strcmp(guard, "begin") == 0)
-		cs->guard_depth++;
-
-	xasprintf(&line, "%%%s %ld %u %d", guard, t, number, flags);
-	control_write_line(c, line);
-
-	if (strcmp(guard, "begin") != 0 && cs->guard_depth > 0 &&
-	    --cs->guard_depth == 0)
-		control_flush_deferred(c);
-}
-
-/*
- * Write a notification line. Notifications must never appear inside a command's
- * %begin/%end guard block, so if one is open the line is deferred until it
- * closes.
- */
-void
-control_notify_write(struct client *c, const char *fmt, ...)
-{
-	struct control_state	*cs = c->control_state;
-	struct control_line	*cl;
-	va_list			 ap;
-	char			*line;
-
-	if (cs == NULL)
-		return;
-
-	va_start(ap, fmt);
-	xvasprintf(&line, fmt, ap);
-	va_end(ap);
-
-	if (cs->guard_depth == 0) {
-		control_write_line(c, line);
+	if (TAILQ_EMPTY(&cs->all_blocks)) {
+		control_vwrite(c, fmt, ap);
+		va_end(ap);
 		return;
 	}
 
-	log_debug("%s: %s: deferring notification: %s", __func__, c->name,
-	    line);
-	cl = xcalloc(1, sizeof *cl);
-	cl->line = line;
-	TAILQ_INSERT_TAIL(&cs->deferred, cl, entry);
+	cb = xcalloc(1, sizeof *cb);
+	xvasprintf(&cb->line, fmt, ap);
+	TAILQ_INSERT_TAIL(&cs->all_blocks, cb, all_entry);
+	cb->t = get_timer();
+
+	log_debug("%s: %s: storing line: %s", __func__, c->name, cb->line);
+	bufferevent_enable(cs->write_event, EV_WRITE);
+
+	va_end(ap);
 }
 
 /* Check age for this pane. */
@@ -603,7 +438,7 @@ control_check_age(struct client *c, struct window_pane *wp,
 			return (0);
 		cp->flags |= CONTROL_PANE_PAUSED;
 		control_discard_pane(c, cp);
-		control_notify_write(c, "%%pause %%%u", wp->id);
+		control_write(c, "%%pause %%%u", wp->id);
 	} else {
 		if (age < CONTROL_MAXIMUM_AGE)
 			return (0);
@@ -970,17 +805,14 @@ control_sub_change(struct monitor_change *change, __unused void *data)
 
 	if (wp != NULL) {
 		w = wp->window;
-		control_notify_write(c,
-		    "%%subscription-changed %s $%u @%u %u %%%u : %s",
+		control_write(c, "%%subscription-changed %s $%u @%u %u %%%u : %s",
 		    change->name, s->id, w->id, wl->idx, wp->id, change->value);
 	} else if (wl != NULL) {
 		w = wl->window;
-		control_notify_write(c,
-		    "%%subscription-changed %s $%u @%u %u - : %s",
+		control_write(c, "%%subscription-changed %s $%u @%u %u - : %s",
 		    change->name, s->id, w->id, wl->idx, change->value);
 	} else {
-		control_notify_write(c,
-		    "%%subscription-changed %s $%u - - - : %s",
+		control_write(c, "%%subscription-changed %s $%u - - - : %s",
 		    change->name, s->id, change->value);
 	}
 }
@@ -1003,7 +835,6 @@ control_start(struct client *c)
 	RB_INIT(&cs->windows);
 	TAILQ_INIT(&cs->pending_list);
 	TAILQ_INIT(&cs->all_blocks);
-	TAILQ_INIT(&cs->deferred);
 	cs->subs = monitor_create_client(c, control_sub_change, NULL);
 
 	cs->read_event = bufferevent_new(c->fd, control_read_callback,
@@ -1047,20 +878,6 @@ control_discard(struct client *c)
 	bufferevent_disable(cs->read_event, EV_READ);
 }
 
-/* Discard all tmux-owned queued control blocks and stop writing. */
-void
-control_discard_all(struct client *c)
-{
-	struct control_state	*cs = c->control_state;
-	struct control_block	*cb, *cb1;
-
-	control_discard(c);
-	TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1)
-		control_free_block(cs, cb);
-	cs->queued_reply_bytes = 0;
-	bufferevent_disable(cs->write_event, EV_WRITE);
-}
-
 /* Stop control mode. */
 void
 control_stop(struct client *c)
@@ -1068,19 +885,12 @@ control_stop(struct client *c)
 	struct control_state	*cs = c->control_state;
 	struct control_block	*cb, *cb1;
 	struct control_window	*cw, *cw1;
-	struct control_line	*cl, *cl1;
 
 	if (cs == NULL)
 		return;
 
 	monitor_destroy(cs->subs);
 
-	TAILQ_FOREACH_SAFE(cl, &cs->deferred, entry, cl1) {
-		TAILQ_REMOVE(&cs->deferred, cl, entry);
-		free(cl->line);
-		free(cl);
-	}
-
 	if (~c->flags & CLIENT_CONTROLCONTROL)
 		bufferevent_free(cs->write_event);
 	bufferevent_free(cs->read_event);

file.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.22 2026/08/17 07:56:56 nicm Exp $ */
+/* $OpenBSD: file.c,v 1.21 2026/07/26 15:08:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -502,8 +502,7 @@ file_push(struct client_file *cf)
 	} else if (cf->stream > 2) {
 		close.stream = cf->stream;
 		proc_send(cf->peer, MSG_WRITE_CLOSE, -1, &close, sizeof close);
-		if (cf->c == NULL || (~cf->c->flags & CLIENT_WRITE_ACK))
-			file_fire_done(cf);
+		file_fire_done(cf);
 	}
 	free(msg);
 }
@@ -528,48 +527,14 @@ file_write_left(struct client_files *files)
 	return (waiting != 0);
 }
 
-/* Finish writing a client file. */
-static void
-file_write_finished(struct client_file *cf)
-{
-	struct msg_write_done	 msg;
-
-	if (cf->event != NULL) {
-		bufferevent_free(cf->event);
-		cf->event = NULL;
-	}
-	if (cf->fd != -1) {
-		if (close(cf->fd) != 0 && cf->error == 0)
-			cf->error = errno;
-		cf->fd = -1;
-	}
-
-	msg.stream = cf->stream;
-	msg.error = cf->error;
-	proc_send(cf->peer, MSG_WRITE_DONE, -1, &msg, sizeof msg);
-
-	if (cf->cb != NULL)
-		cf->cb(NULL, NULL, 0, -1, NULL, cf->data);
-	file_free(cf);
-}
-
 /* Client file write error callback. */
 static void
-file_write_error_callback(__unused struct bufferevent *bev, short what,
+file_write_error_callback(__unused struct bufferevent *bev, __unused short what,
     void *arg)
 {
 	struct client_file	*cf = arg;
-	int			 error;
-
-	if (what & EVBUFFER_ERROR)
-		error = errno;
-	else
-		error = EIO;
-	if (error == 0)
-		error = EIO;
 
 	log_debug("write error file %d", cf->stream);
-	cf->error = error;
 
 	bufferevent_free(cf->event);
 	cf->event = NULL;
@@ -577,9 +542,7 @@ file_write_error_callback(__unused struct bufferevent *bev, short what,
 	close(cf->fd);
 	cf->fd = -1;
 
-	if (cf->closed)
-		file_write_finished(cf);
-	else if (cf->cb != NULL)
+	if (cf->cb != NULL)
 		cf->cb(NULL, NULL, 0, -1, NULL, cf->data);
 }
 
@@ -591,10 +554,15 @@ file_write_callback(__unused struct bufferevent *bev, void *arg)
 
 	log_debug("write check file %d", cf->stream);
 
-	if (cf->closed && EVBUFFER_LENGTH(cf->event->output) == 0)
-		file_write_finished(cf);
-	else if (cf->cb != NULL)
+	if (cf->cb != NULL)
 		cf->cb(NULL, NULL, 0, -1, NULL, cf->data);
+
+	if (cf->closed && EVBUFFER_LENGTH(cf->event->output) == 0) {
+		bufferevent_free(cf->event);
+		close(cf->fd);
+		RB_REMOVE(client_files, cf->tree, cf);
+		file_free(cf);
+	}
 }
 
 /* Handle a file write open message (client). */
@@ -695,10 +663,14 @@ file_write_close(struct client_files *files, struct imsg *imsg)
 	if ((cf = RB_FIND(client_files, files, &find)) == NULL)
 		fatalx("unknown stream number");
 	log_debug("close file %d", cf->stream);
-	cf->closed = 1;
 
 	if (cf->event == NULL || EVBUFFER_LENGTH(cf->event->output) == 0) {
-		file_write_finished(cf);
+		if (cf->event != NULL)
+			bufferevent_free(cf->event);
+		if (cf->fd != -1)
+			close(cf->fd);
+		RB_REMOVE(client_files, files, cf);
+		file_free(cf);
 	}
 }
 
@@ -857,28 +829,6 @@ file_write_ready(struct client_files *files, struct imsg *imsg)
 	return (0);
 }
 
-/* Handle a write done message (server). */
-int
-file_write_done(struct client_files *files, struct imsg *imsg)
-{
-	struct msg_write_done	*msg = imsg->data;
-	size_t			 msglen = imsg->hdr.len - IMSG_HEADER_SIZE;
-	struct client_file	 find, *cf;
-
-	if (msglen != sizeof *msg)
-		return (-1);
-	find.stream = msg->stream;
-	if ((cf = RB_FIND(client_files, files, &find)) == NULL)
-		return (0);
-	if (cf->c == NULL || (~cf->c->flags & CLIENT_WRITE_ACK))
-		return (0);
-
-	log_debug("file %d write done", cf->stream);
-	cf->error = msg->error;
-	file_fire_done(cf);
-	return (0);
-}
-
 /* Handle read data message (server). */
 int
 file_read_data(struct client_files *files, struct imsg *imsg)

format.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.417 2026/09/08 15:42:26 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.410 2026/07/29 20:43:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -855,42 +855,26 @@ format_cb_window_active_clients_list(struct format_tree *ft)
 static void *
 format_cb_window_layout(struct format_tree *ft)
 {
-	struct client		*c = ft->client;
-	struct window		*w = ft->w;
-	struct layout_cell	*lcroot;
-	int			 flags = 0;
+	struct window	*w = ft->w;
 
 	if (w == NULL)
 		return (NULL);
 
 	if (w->saved_layout_root != NULL)
-		lcroot = w->saved_layout_root;
-	else
-		lcroot = w->layout_root;
-
-	if (c != NULL &&
-	    (c->flags & CLIENT_CONTROL) &&
-	    (~c->flags & CLIENT_CONTROL_NEWLAYOUTS))
-		flags |= LAYOUT_CUSTOM_OLD_FORMAT;
-	return (layout_dump(w, lcroot, flags));
+		return (layout_dump(w, w->saved_layout_root));
+	return (layout_dump(w, w->layout_root));
 }
 
 /* Callback for window_visible_layout. */
 static void *
 format_cb_window_visible_layout(struct format_tree *ft)
 {
-	struct client	*c = ft->client;
 	struct window	*w = ft->w;
-	int		 flags = 0;
 
 	if (w == NULL)
 		return (NULL);
 
-	if (c != NULL &&
-	    (c->flags & CLIENT_CONTROL) &&
-	    (~c->flags & CLIENT_CONTROL_NEWLAYOUTS))
-		flags |= LAYOUT_CUSTOM_OLD_FORMAT;
-	return (layout_dump(w, w->layout_root, flags));
+	return (layout_dump(w, w->layout_root));
 }
 
 /* Callback for pane_start_command. */
@@ -1903,37 +1887,6 @@ format_cb_cursor_blinking(struct format_tree *ft)
 	return (NULL);
 }
 
-/* Callback for history_added. */
-static void *
-format_cb_history_added(struct format_tree *ft)
-{
-	if (ft->wp != NULL)
-		return (format_printf("%u", ft->wp->base.grid->scroll_added));
-	return (NULL);
-}
-
-/* Callback for history_collected. */
-static void *
-format_cb_history_collected(struct format_tree *ft)
-{
-	struct window_pane	*wp = ft->wp;
-
-	if (wp != NULL)
-		return (format_printf("%u", wp->base.grid->scroll_collected));
-	return (NULL);
-}
-
-/* Callback for history_generation. */
-static void *
-format_cb_history_generation(struct format_tree *ft)
-{
-	struct window_pane	*wp = ft->wp;
-
-	if (wp != NULL)
-		return (format_printf("%u", wp->base.grid->scroll_generation));
-	return (NULL);
-}
-
 /* Callback for history_limit. */
 static void *
 format_cb_history_limit(struct format_tree *ft)
@@ -2148,60 +2101,6 @@ format_cb_synchronized_output_flag(struct format_tree *ft)
 	return (NULL);
 }
 
-/* Callback for pane_private_modes. */
-static void *
-format_cb_pane_private_modes(struct format_tree *ft)
-{
-	static const struct {
-		int	mode;
-		int	number;
-	} table[] = {
-		{ MODE_KCURSOR,		1 },	/* DECCKM */
-		{ MODE_ORIGIN,		6 },	/* DECOM */
-		{ MODE_WRAP,		7 },	/* DECAWM */
-		{ MODE_CURSOR_BLINKING,	12 },	/* cursor blinking */
-		{ MODE_CURSOR,		25 },	/* DECTCEM */
-		{ MODE_MOUSE_STANDARD,	1000 },	/* mouse normal tracking */
-		{ MODE_MOUSE_BUTTON,	1002 },	/* mouse button tracking */
-		{ MODE_MOUSE_ALL,	1003 },	/* mouse any tracking */
-		{ MODE_FOCUSON,		1004 },	/* focus reporting */
-		{ MODE_MOUSE_UTF8,	1005 },	/* mouse: UTF-8 */
-		{ MODE_MOUSE_SGR,	1006 },	/* mouse: SGR */
-		{ MODE_BRACKETPASTE,	2004 },	/* bracketed paste */
-		{ MODE_SYNC,		2026 },	/* synchronized output */
-		{ MODE_THEME_UPDATES,	2031 },	/* theme update notifications */
-	};
-	int	 mode;
-	char	*value = NULL, *tmp;
-	u_int	 i;
-
-	if (ft->wp == NULL)
-		return (NULL);
-	mode = ft->wp->base.mode;
-
-	for (i = 0; i < nitems(table); i++) {
-		if (~mode & table[i].mode)
-			continue;
-		/*
-		 * Only report cursor blinking when set by the application, not
-		 * when it comes from the cursor-style option.
-		 */
-		if (table[i].mode == MODE_CURSOR_BLINKING &&
-		    (~mode & MODE_CURSOR_BLINKING_SET))
-			continue;
-		if (value == NULL)
-			xasprintf(&value, "%d", table[i].number);
-		else {
-			xasprintf(&tmp, "%s,%d", value, table[i].number);
-			free(value);
-			value = tmp;
-		}
-	}
-	if (value == NULL)
-		return (xstrdup(""));
-	return (value);
-}
-
 /* Callback for pane_active. */
 static void *
 format_cb_pane_active(struct format_tree *ft)
@@ -2323,19 +2222,6 @@ format_cb_pane_last_output_time(struct format_tree *ft)
 	return (NULL);
 }
 
-/* Callback for pane_output_generation. */
-static void *
-format_cb_pane_output_generation(struct format_tree *ft)
-{
-	unsigned long long	 value;
-
-	if (ft->wp != NULL) {
-		value = ft->wp->output_generation;
-		return (format_printf("%llu", value));
-	}
-	return (NULL);
-}
-
 /* Callback for pane_last_prompt_time. */
 static void *
 format_cb_pane_last_prompt_time(struct format_tree *ft)
@@ -3078,6 +2964,17 @@ format_cb_sixel_support(__unused struct format_tree *ft)
 #endif
 }
 
+/* Callback for image_support. */
+static void *
+format_cb_image_support(__unused struct format_tree *ft)
+{
+#ifdef ENABLE_IMAGES
+	return (xstrdup("1"));
+#else
+	return (xstrdup("0"));
+#endif
+}
+
 /* Callback for active_window_index. */
 static void *
 format_cb_active_window_index(struct format_tree *ft)
@@ -3723,21 +3620,12 @@ static const struct format_table_entry format_table[] = {
 	{ "cursor_y", FORMAT_TABLE_STRING,
 	  format_cb_cursor_y
 	},
-	{ "history_added", FORMAT_TABLE_STRING,
-	  format_cb_history_added
-	},
 	{ "history_all_bytes", FORMAT_TABLE_STRING,
 	  format_cb_history_all_bytes
 	},
 	{ "history_bytes", FORMAT_TABLE_STRING,
 	  format_cb_history_bytes
 	},
-	{ "history_collected", FORMAT_TABLE_STRING,
-	  format_cb_history_collected
-	},
-	{ "history_generation", FORMAT_TABLE_STRING,
-	  format_cb_history_generation
-	},
 	{ "history_limit", FORMAT_TABLE_STRING,
 	  format_cb_history_limit
 	},
@@ -3750,6 +3638,9 @@ static const struct format_table_entry format_table[] = {
 	{ "host_short", FORMAT_TABLE_STRING,
 	  format_cb_host_short
 	},
+	{ "image_support", FORMAT_TABLE_STRING,
+	  format_cb_image_support
+	},
 	{ "insert_flag", FORMAT_TABLE_STRING,
 	  format_cb_insert_flag
 	},
@@ -3918,9 +3809,6 @@ static const struct format_table_entry format_table[] = {
 	{ "pane_mode", FORMAT_TABLE_STRING,
 	  format_cb_pane_mode
 	},
-	{ "pane_output_generation", FORMAT_TABLE_STRING,
-	  format_cb_pane_output_generation
-	},
 	{ "pane_path", FORMAT_TABLE_STRING,
 	  format_cb_pane_path
 	},
@@ -3939,9 +3827,6 @@ static const struct format_table_entry format_table[] = {
 	{ "pane_pipe_pid", FORMAT_TABLE_STRING,
 	  format_cb_pane_pipe_pid
 	},
-	{ "pane_private_modes", FORMAT_TABLE_STRING,
-	  format_cb_pane_private_modes
-	},
 	{ "pane_right", FORMAT_TABLE_STRING,
 	  format_cb_pane_right
 	},
@@ -4329,8 +4214,6 @@ format_log_debug_cb(const char *key, const char *value, void *arg)
 void
 format_log_debug(struct format_tree *ft, const char *prefix)
 {
-	if (log_get_level() == 0)
-		return;
 	format_each(ft, format_log_debug_cb, (void *)prefix);
 }
 
@@ -4459,7 +4342,7 @@ format_quote_shell(const char *s)
 
 	at = out = xmalloc(strlen(s) * 2 + 1);
 	for (cp = s; *cp != '\0'; cp++) {
-		if (strchr("|&;<>(){}$`\\\"'*?[# =%\n\t", *cp) != NULL)
+		if (strchr("|&;<>()$`\\\"'*?[# =%\n\t", *cp) != NULL)
 			*at++ = '\\';
 		*at++ = *cp;
 	}
@@ -5250,7 +5133,6 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
 		format_log(es, "session loop: $%u", s->id);
 		if (active != NULL &&
 		    ft->c != NULL &&
-		    ft->c->session != NULL &&
 		    s->id == ft->c->session->id)
 			use = active;
 		else

grid-view.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: grid-view.c,v 1.39 2026/08/03 12:58:53 nicm Exp $ */
+/* $OpenBSD: grid-view.c,v 1.38 2026/01/22 08:55:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -47,9 +47,9 @@ grid_view_set_cell(struct grid *gd, u_int px, u_int py,
 
 /* Set padding. */
 void
-grid_view_set_padding(struct grid *gd, u_int px, u_int py, int bg)
+grid_view_set_padding(struct grid *gd, u_int px, u_int py)
 {
-	grid_set_padding(gd, grid_view_x(gd, px), grid_view_y(gd, py), bg);
+	grid_set_padding(gd, grid_view_x(gd, px), grid_view_y(gd, py));
 }
 
 /* Set cells. */

grid.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: grid.c,v 1.158 2026/09/01 12:49:49 nicm Exp $ */
+/* $OpenBSD: grid.c,v 1.155 2026/07/29 17:42:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -41,6 +41,9 @@
 /* Default grid cell data. */
 const struct grid_cell grid_default_cell = {
 	{ { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 8, 0
+#ifdef ENABLE_IMAGES
+	, 0, 0, 0
+#endif
 };
 
 /*
@@ -49,16 +52,38 @@ const struct grid_cell grid_default_cell = {
  */
 static const struct grid_cell grid_padding_cell = {
 	{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 8, 0
+#ifdef ENABLE_IMAGES
+	, 0, 0, 0
+#endif
 };
 
 /* Cleared grid cell data. */
 static const struct grid_cell grid_cleared_cell = {
 	{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 8, 0
+#ifdef ENABLE_IMAGES
+	, 0, 0, 0
+#endif
 };
 static const struct grid_cell_entry grid_cleared_entry = {
 	{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
 };
 
+#ifdef ENABLE_IMAGES
+/* Return the image referenced by a stored cell, or zero. */
+static u_int
+grid_entry_image(struct grid_line *gl, struct grid_cell_entry *gce)
+{
+	struct grid_extd_entry	*gee;
+
+	if (~gce->flags & GRID_FLAG_EXTENDED || gce->offset >= gl->extdsize)
+		return (0);
+	gee = &gl->extddata[gce->offset];
+	if (~gee->flags & GRID_FLAG_IMAGE)
+		return (0);
+	return (image_get_id_by_grid_id(gee->image_id));
+}
+#endif
+
 #ifdef __APPLE__
 void
 grid_check_is_clear(struct grid *gd)
@@ -134,6 +159,10 @@ grid_need_extended_cell(const struct grid_cell_entry *gce,
 		return (1);
 	if (gc->flags & GRID_FLAG_TAB)
 		return (1);
+#ifdef ENABLE_IMAGES
+	if (gc->flags & GRID_FLAG_IMAGE)
+		return (1);
+#endif
 	return (0);
 }
 
@@ -181,6 +210,11 @@ grid_extended_cell(struct grid_line *gl, struct grid_cell_entry *gce,
 	gee->bg = gc->bg;
 	gee->us = gc->us;
 	gee->link = gc->link;
+#ifdef ENABLE_IMAGES
+	gee->image_id = image_get_grid_id(gc->image_id);
+	gee->image_x = gc->image_x;
+	gee->image_y = gc->image_y;
+#endif
 	return (gee);
 }
 
@@ -268,6 +302,12 @@ grid_clear_cell(struct grid *gd, u_int px, u_int py, u_int bg, int moved)
 	struct grid_extd_entry	*gee;
 	u_int			 old_offset = gce->offset;
 	int			 had_extd = (gce->flags & GRID_FLAG_EXTENDED);
+#ifdef ENABLE_IMAGES
+	u_int			 image_id = grid_entry_image(gl, gce);
+
+	if (!moved && image_id != 0)
+		image_free(image_id);
+#endif
 
 	memcpy(gce, &grid_cleared_entry, sizeof *gce);
 	if (!moved && had_extd && old_offset < gl->extdsize) {
@@ -314,6 +354,13 @@ grid_cells_look_equal(const struct grid_cell *gc1, const struct grid_cell *gc2)
 		return (0);
 	if (gc1->link != gc2->link)
 		return (0);
+#ifdef ENABLE_IMAGES
+	if ((gc1->flags & GRID_FLAG_IMAGE) &&
+	    (gc1->image_id != gc2->image_id ||
+	    gc1->image_x != gc2->image_x ||
+	    gc1->image_y != gc2->image_y))
+		return (0);
+#endif
 	return (1);
 }
 
@@ -346,6 +393,10 @@ static void
 grid_free_line(struct grid *gd, u_int py)
 {
 	struct grid_line	*gl = &gd->linedata[py];
+#ifdef ENABLE_IMAGES
+	struct grid_cell_entry	*gce;
+	u_int			 image_id, px;
+#endif
 
 #ifdef __APPLE__
 	assert(gl->cellused <= gl->cellsize);
@@ -353,6 +404,14 @@ grid_free_line(struct grid *gd, u_int py)
 	assert(gl->cellsize == 0 || gl->celldata != NULL);
 #endif
 
+#ifdef ENABLE_IMAGES
+	for (px = 0; px < gl->cellsize; px++) {
+		gce = &gl->celldata[px];
+		image_id = grid_entry_image(gl, gce);
+		if (image_id != 0)
+			image_free(image_id);
+	}
+#endif
 	free(gl->celldata);
 	free(gl->extddata);
 	memset(gl, 0, sizeof *gl);
@@ -624,6 +683,11 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
 			gc->bg = gee->bg;
 			gc->us = gee->us;
 			gc->link = gee->link;
+#ifdef ENABLE_IMAGES
+			gc->image_id = image_get_id_by_grid_id(gee->image_id);
+			gc->image_x = gee->image_x;
+			gc->image_y = gee->image_y;
+#endif
 
 			if (gc->flags & GRID_FLAG_TAB)
 				grid_set_tab(gc, gee->data);
@@ -644,6 +708,11 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
 	gc->us = 8;
 	utf8_set(&gc->data, gce->data.data);
 	gc->link = 0;
+#ifdef ENABLE_IMAGES
+	gc->image_id = 0;
+	gc->image_x = 0;
+	gc->image_y = 0;
+#endif
 }
 
 /* Get cell for reading. */
@@ -663,6 +732,9 @@ grid_set_cell(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc)
 {
 	struct grid_line	*gl;
 	struct grid_cell_entry	*gce;
+#ifdef ENABLE_IMAGES
+	u_int			 old_id, new_id = 0;
+#endif
 
 	if (grid_check_y(gd, __func__, py) != 0)
 		return;
@@ -674,6 +746,17 @@ grid_set_cell(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc)
 		gl->cellused = px + 1;
 
 	gce = &gl->celldata[px];
+#ifdef ENABLE_IMAGES
+	old_id = grid_entry_image(gl, gce);
+	if (gc->flags & GRID_FLAG_IMAGE)
+		new_id = gc->image_id;
+	if (old_id != new_id) {
+		if (old_id != 0)
+			image_free(old_id);
+		if (new_id != 0)
+			image_ref(new_id);
+	}
+#endif
 	if (grid_need_extended_cell(gce, gc))
 		grid_extended_cell(gl, gce, gc);
 	else
@@ -682,13 +765,9 @@ grid_set_cell(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc)
 
 /* Set padding at position. */
 void
-grid_set_padding(struct grid *gd, u_int px, u_int py, int bg)
+grid_set_padding(struct grid *gd, u_int px, u_int py)
 {
-	struct grid_cell	gc;
-
-	memcpy(&gc, &grid_padding_cell, sizeof gc);
-	gc.bg = bg;
-	grid_set_cell(gd, px, py, &gc);
+	grid_set_cell(gd, px, py, &grid_padding_cell);
 }
 
 /* Set cells at position. */
@@ -699,6 +778,10 @@ grid_set_cells(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc,
 	struct grid_line	*gl;
 	struct grid_cell_entry	*gce;
 	struct grid_extd_entry	*gee;
+	const struct grid_cell	*new_gc;
+#ifdef ENABLE_IMAGES
+	struct grid_cell	 old_gc, image_gc;
+#endif
 	u_int			 i;
 
 	if (grid_check_y(gd, __func__, py) != 0)
@@ -712,11 +795,39 @@ grid_set_cells(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc,
 
 	for (i = 0; i < slen; i++) {
 		gce = &gl->celldata[px + i];
-		if (grid_need_extended_cell(gce, gc)) {
-			gee = grid_extended_cell(gl, gce, gc);
+		new_gc = gc;
+#ifdef ENABLE_IMAGES
+		{
+			u_int old_id = grid_entry_image(gl, gce);
+			u_int new_id;
+
+			if (old_id != 0 && (~gc->flags & GRID_FLAG_IMAGE)) {
+				grid_get_cell1(gl, px + i, &old_gc);
+				memcpy(&image_gc, gc, sizeof image_gc);
+				image_gc.flags |= GRID_FLAG_IMAGE|GRID_FLAG_IMAGE_DAMAGED;
+				image_gc.image_id = old_gc.image_id;
+				image_gc.image_x = old_gc.image_x;
+				image_gc.image_y = old_gc.image_y;
+				new_gc = &image_gc;
+			}
+			if (new_gc->flags & GRID_FLAG_IMAGE)
+				new_id = new_gc->image_id;
+			else
+				new_id = 0;
+
+			if (old_id != new_id) {
+				if (old_id != 0)
+					image_free(old_id);
+				if (new_id != 0)
+					image_ref(new_id);
+			}
+		}
+#endif
+		if (grid_need_extended_cell(gce, new_gc)) {
+			gee = grid_extended_cell(gl, gce, new_gc);
 			gee->data = utf8_build_one(s[i]);
 		} else
-			grid_store_cell(gce, gc, s[i]);
+			grid_store_cell(gce, new_gc, s[i]);
 	}
 }
 
@@ -831,6 +942,9 @@ grid_move_cells(struct grid *gd, u_int dx, u_int px, u_int py, u_int nx,
 {
 	struct grid_line	*gl;
 	u_int			 xx;
+#ifdef ENABLE_IMAGES
+	u_int			 image_id;
+#endif
 
 	if (nx == 0 || px == dx)
 		return;
@@ -841,6 +955,16 @@ grid_move_cells(struct grid *gd, u_int dx, u_int px, u_int py, u_int nx,
 
 	grid_expand_line(gd, py, px + nx, 8);
 	grid_expand_line(gd, py, dx + nx, 8);
+#ifdef ENABLE_IMAGES
+	/* References in the source range are transferred, not duplicated. */
+	for (xx = dx; xx < dx + nx; xx++) {
+		if (xx >= px && xx < px + nx)
+			continue;
+		image_id = grid_entry_image(gl, &gl->celldata[xx]);
+		if (image_id != 0)
+			image_free(image_id);
+	}
+#endif
 	memmove(&gl->celldata[dx], &gl->celldata[px],
 	    nx * sizeof *gl->celldata);
 	if (dx + nx > gl->cellused)
@@ -1213,6 +1337,13 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
 		grid_get_cell(gd, xx, py, &gc);
 		if (gc.flags & GRID_FLAG_PADDING)
 			continue;
+#ifdef ENABLE_IMAGES
+		if (gc.flags & GRID_FLAG_IMAGE) {
+			utf8_set(&gc.data, ' ');
+			gc.flags &= ~(GRID_FLAG_IMAGE|GRID_FLAG_IMAGE_DAMAGED);
+			gc.image_id = gc.image_x = gc.image_y = 0;
+		}
+#endif
 
 		if (lastgc != NULL && (flags & GRID_STRING_WITH_SEQUENCES)) {
 			grid_string_cells_code(*lastgc, &gc, code, sizeof code,
@@ -1280,6 +1411,9 @@ grid_duplicate_lines(struct grid *dst, u_int dy, struct grid *src, u_int sy,
 {
 	struct grid_line	*dstl, *srcl;
 	u_int			 yy;
+#ifdef ENABLE_IMAGES
+	u_int			 px, image_id;
+#endif
 
 	if (dy + ny > dst->hsize + dst->sy)
 		ny = dst->hsize + dst->sy - dy;
@@ -1308,6 +1442,13 @@ grid_duplicate_lines(struct grid *dst, u_int dy, struct grid *src, u_int sy,
 		} else
 			dstl->extddata = NULL;
 
+#ifdef ENABLE_IMAGES
+		for (px = 0; px < dstl->cellsize; px++) {
+			image_id = grid_entry_image(dstl, &dstl->celldata[px]);
+			if (image_id != 0)
+				image_ref(image_id);
+		}
+#endif
 		sy++;
 		dy++;
 	}
@@ -1321,6 +1462,30 @@ grid_reflow_dead(struct grid_line *gl)
 	gl->flags = GRID_LINE_DEAD;
 }
 
+/* Image rows are cell-aligned and must not be reflowed like text. */
+static int
+grid_reflow_has_image(struct grid_line *gl)
+{
+	struct grid_cell	 gc;
+	u_int			 i;
+
+	if (~gl->flags & GRID_LINE_EXTENDED)
+		return (0);
+	for (i = 0; i < gl->cellused; i++) {
+		grid_get_cell1(gl, i, &gc);
+#ifdef ENABLE_IMAGES
+		if (gc.flags & GRID_FLAG_IMAGE)
+			return (1);
+#endif
+		/* Kitty Unicode placeholder base character (U+10EEEE). */
+		if (gc.data.size >= 4 && gc.data.data[0] == 0xf4 &&
+		    gc.data.data[1] == 0x8e && gc.data.data[2] == 0xbb &&
+		    gc.data.data[3] == 0xae)
+			return (1);
+	}
+	return (0);
+}
+
 /* Add lines, return the first new one. */
 static struct grid_line *
 grid_reflow_add(struct grid *gd, u_int n)
@@ -1383,6 +1548,10 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
 			break;
 		line = yy + 1 + lines;
 
+		/* Do not join wrapped text to a cell-aligned image row. */
+		if (grid_reflow_has_image(&gd->linedata[line]))
+			break;
+
 		/* If the next line is empty, skip it. */
 		if (~gd->linedata[line].flags & GRID_LINE_WRAPPED)
 			wrapped = 0;
@@ -1443,8 +1612,7 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
 
 	/* Remove the lines that were completely consumed. */
 	for (i = yy + 1; i < yy + 1 + lines; i++) {
-		free(gd->linedata[i].celldata);
-		free(gd->linedata[i].extddata);
+		grid_free_line(gd, i);
 		grid_reflow_dead(&gd->linedata[i]);
 	}
 
@@ -1500,6 +1668,15 @@ grid_reflow_split(struct grid *target, struct grid *gd, u_int sx, u_int yy,
 		}
 		width += gc.data.width;
 		grid_set_cell(target, xx, line, &gc);
+#ifdef ENABLE_IMAGES
+		/*
+		 * The tail of the original line is discarded below. Transfer
+		 * its image reference to the new cell rather than duplicating
+		 * it.
+		 */
+		if (gc.flags & GRID_FLAG_IMAGE)
+			image_free(gc.image_id);
+#endif
 		xx++;
 	}
 	if (flags & GRID_LINE_WRAPPED)
@@ -1546,6 +1723,12 @@ grid_reflow(struct grid *gd, u_int sx)
 		if (gl->flags & GRID_LINE_DEAD)
 			continue;
 
+		/* Keep image markers at their original cell coordinates. */
+		if (grid_reflow_has_image(gl)) {
+			grid_reflow_move(target, gl);
+			continue;
+		}
+
 		/*
 		 * Work out the width of this line. at is the point at which
 		 * the available width is hit, and width is the full line
@@ -1635,7 +1818,7 @@ grid_wrap_position(struct grid *gd, u_int px, u_int py, u_int *wx, u_int *wy)
 void
 grid_unwrap_position(struct grid *gd, u_int *px, u_int *py, u_int wx, u_int wy)
 {
-	u_int	yy, ay = 0, ey = gd->hsize + gd->sy - 1;
+	u_int	yy, ay = 0;
 
 	for (yy = 0; yy < gd->hsize + gd->sy - 1; yy++) {
 		if (ay == wy)
@@ -1649,7 +1832,7 @@ grid_unwrap_position(struct grid *gd, u_int *px, u_int *py, u_int wx, u_int wy)
 	 * until we find the end or the line now containing wx.
 	 */
 	if (wx == UINT_MAX) {
-		while (yy < ey && gd->linedata[yy].flags & GRID_LINE_WRAPPED)
+		while (gd->linedata[yy].flags & GRID_LINE_WRAPPED)
 			yy++;
 		wx = gd->linedata[yy].cellused;
 	} else {
@@ -1711,29 +1894,21 @@ grid_in_set(struct grid *gd, u_int px, u_int py, const char *set)
 {
 	struct grid_cell	gc, tmp_gc;
 	u_int			pxx;
-	int			has_tab, has_space;
-
-	has_tab = (strchr(set, '\t') != NULL);
-	has_space = (strchr(set, ' ') != NULL);
 
 	grid_get_cell(gd, px, py, &gc);
-	if (gc.flags & GRID_FLAG_PADDING) {
-		if (!has_tab && !has_space)
-			return (0);
-		pxx = px;
-		do
-			grid_get_cell(gd, --pxx, py, &tmp_gc);
-		while (pxx > 0 && tmp_gc.flags & GRID_FLAG_PADDING);
-		if (((has_tab || has_space) &&
-		    (tmp_gc.flags & GRID_FLAG_TAB)) ||
-		    (has_space && utf8_has_whitespace(&tmp_gc.data)))
-			return (tmp_gc.data.width - (px - pxx));
-		return (0);
+	if (strchr(set, '\t')) {
+		if (gc.flags & GRID_FLAG_PADDING) {
+			pxx = px;
+			do
+				grid_get_cell(gd, --pxx, py, &tmp_gc);
+			while (pxx > 0 && tmp_gc.flags & GRID_FLAG_PADDING);
+			if (tmp_gc.flags & GRID_FLAG_TAB)
+				return (tmp_gc.data.width - (px - pxx));
+		} else if (gc.flags & GRID_FLAG_TAB)
+			return (gc.data.width);
 	}
-	if ((has_tab || has_space) && (gc.flags & GRID_FLAG_TAB))
-		return (gc.data.width);
-	if (has_space && utf8_has_whitespace(&gc.data))
-		return (gc.data.width == 0 ? 1 : gc.data.width);
+	if (gc.flags & GRID_FLAG_PADDING)
+		return (0);
 	return (utf8_cstrhas(set, &gc.data));
 }
 

image.c

@@ -2,6 +2,7 @@
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
+ * Copyright (c) 2026 Michael Grant <mgrant@grant.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,210 +19,708 @@
 
 #include <sys/types.h>
 
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
 
-static struct images	all_images = TAILQ_HEAD_INITIALIZER(all_images);
-static u_int		all_images_count;
-#define MAX_IMAGE_COUNT 20
+/* An average of part of an image cell. RGB is premultiplied. */
+struct image_sample {
+	u_char			 red;
+	u_char			 green;
+	u_char			 blue;
+	u_char			 alpha;
+	u_char			 brightness;
+};
 
-static void printflike(3, 4)
-image_log(struct image *im, const char* from, const char* fmt, ...)
+/* Half blocks, quadrants and sextants all divide evenly into a 2 by 6 grid. */
+#define IMAGE_SAMPLE_COLUMNS 2
+#define IMAGE_SAMPLE_ROWS 6
+struct image_cell {
+	struct image_sample	 whole;
+	struct image_sample	 samples[IMAGE_SAMPLE_ROWS][IMAGE_SAMPLE_COLUMNS];
+};
+
+/* Immutable image data and cell geometry. */
+struct image {
+	u_int			 id;
+	u_short			 grid_id;
+	u_int			 references;
+	u_int			 width;
+	u_int			 height;
+	u_int			 canvas_width;
+	u_int			 canvas_height;
+	u_int			 sx;
+	u_int			 sy;
+	size_t			 stride;
+	size_t			 size;
+	u_char			*pixels;
+	/* Original indexed SIXEL data, if this image arrived as SIXEL. */
+	struct sixel_image	*sixel;
+	struct image_cell	*cells; /* lazily generated text samples */
+
+	RB_ENTRY(image)		 entry;
+};
+RB_HEAD(images, image);
+
+/* A cell-aligned part of an image to draw at a terminal position. */
+struct image_rect {
+	struct image		*image;
+	struct grid_cell	 cell;
+	u_int			 source_x;
+	u_int			 source_y;
+	u_int			 width;
+	u_int			 height;
+	u_int			 destination_x;
+	u_int			 destination_y;
+};
+
+static struct images	images = RB_INITIALIZER(&images);
+static u_int		image_next_id;
+static u_short		image_next_grid_id;
+static struct image	*image_grid_ids[USHRT_MAX + 1];
+
+struct image_backend {
+	const char	*name;
+	int		 flags;
+	void		(*draw_rect)(struct tty *,
+		    const struct image_rect *, const struct tty_style_ctx *);
+	void		(*free)(struct tty *, int);
+};
+
+static const struct image_backend image_backend_ascii = {
+	"ascii", IMAGE_BACKEND_SCROLLS, NULL, NULL
+};
+static const struct image_backend image_backend_sixel = {
+	"sixel", IMAGE_BACKEND_GRAPHICAL|IMAGE_BACKEND_TEMPORAL,
+	sixel_draw_rect, sixel_free_output
+};
+
+/* Compare images by server ID. */
+static int
+image_cmp(struct image *a, struct image *b)
 {
-	va_list	ap;
-	char	s[128];
+	if (a->id < b->id)
+		return (-1);
+	if (a->id > b->id)
+		return (1);
+	return (0);
+}
+RB_GENERATE_STATIC(images, image, entry, image_cmp);
 
-	if (log_get_level() == 0)
-		return;
-
-	if (fmt == NULL) {
-		log_debug("%s: %p (%ux%u %u,%u)", from, im, im->sx, im->sy,
-		    im->px, im->py);
-		return;
-	}
-
-	va_start(ap, fmt);
-	vsnprintf(s, sizeof s, fmt, ap);
-	va_end(ap);
-
-	log_debug("%s: %p (%ux%u %u,%u): %s", from, im, im->sx, im->sy,
-	    im->px, im->py, s);
+/* Find the image backend supported by a terminal. */
+static const struct image_backend *
+image_tty_find_backend(struct tty *tty)
+{
+	if (tty->term != NULL && tty->term->flags & TERM_SIXEL &&
+	    tty->xpixel != 0 && tty->ypixel != 0)
+		return (&image_backend_sixel);
+	return (&image_backend_ascii);
 }
 
-static void
-image_free(struct image *im)
+/* Update a terminal's image backend after its capabilities change. */
+void
+image_tty_update(struct tty *tty)
 {
-	image_log(im, __func__, NULL);
+	const struct image_backend	*backend;
 
-	TAILQ_REMOVE(&all_images, im, all_entry);
-	all_images_count--;
+	backend = image_tty_find_backend(tty);
+	if (tty->image_backend == backend)
+		return;
 
-	TAILQ_REMOVE(im->list, im, entry);
-	sixel_free(im->data);
-	free(im->fallback);
-	free(im);
+	if (tty->image_backend != NULL && tty->image_backend->free != NULL)
+		tty->image_backend->free(tty, !!(tty->flags & TTY_OPENED));
+	tty->image_data = NULL;
+	tty->image_backend = backend;
+	log_debug("%s: %s image backend is %s", __func__,
+	    tty->client->name, backend->name);
 }
 
+/* Return the flags for a terminal's image backend. */
 int
-image_free_all(struct screen *s)
+image_backend_flags(struct tty *tty)
 {
-	struct image	*im, *im1;
-	int		 redraw = !TAILQ_EMPTY(&s->images);
-
-	if (redraw)
-		log_debug ("%s", __func__);
-	TAILQ_FOREACH_SAFE(im, &s->images, entry, im1)
-		image_free(im);
-	return (redraw);
+	image_tty_update(tty);
+	return (tty->image_backend->flags);
 }
 
-/* Create text placeholder for an image. */
+/* Discard image backend state after a terminal geometry change. */
+void
+image_tty_geometry_changed(struct tty *tty)
+{
+	image_tty_update(tty);
+	if (tty->image_backend->free != NULL)
+		tty->image_backend->free(tty, !!(tty->flags & TTY_OPENED));
+}
+
+/* Free image backend state for a terminal. */
+void
+image_tty_free(struct tty *tty, int send)
+{
+	if (tty->image_backend != NULL && tty->image_backend->free != NULL)
+		tty->image_backend->free(tty, send);
+	tty->image_backend = NULL;
+	tty->image_data = NULL;
+}
+
+/* Average a rectangle of image pixels into one fallback sample. */
 static void
-image_fallback(char **ret, u_int sx, u_int sy)
+image_sample(struct image *im, uint64_t sample_x, uint64_t sample_y,
+    uint64_t sample_columns, uint64_t sample_rows, struct image_sample *sample)
 {
-	char	*buf, *label;
-	u_int	 py, size, lsize;
+	const u_char	*pixel;
+	uint64_t	 red = 0, green = 0, blue = 0, alpha = 0;
+	uint64_t	 brightness = 0, count = 0;
+	u_int		 x, y, x0, x1, y0, y1;
 
-	if (sy == 0) {
-		*ret = xstrdup("");
+	x0 = sample_x * im->canvas_width / sample_columns;
+	x1 = ((sample_x + 1) * im->canvas_width + sample_columns - 1) /
+	    sample_columns;
+	y0 = sample_y * im->canvas_height / sample_rows;
+	y1 = ((sample_y + 1) * im->canvas_height + sample_rows - 1) /
+	    sample_rows;
+	if (x1 <= x0)
+		x1 = x0 + 1;
+	if (y1 <= y0)
+		y1 = y0 + 1;
+	count = (uint64_t)(x1 - x0) * (y1 - y0);
+	if (x0 >= im->width || y0 >= im->height)
 		return;
+	if (x1 > im->width)
+		x1 = im->width;
+	if (y1 > im->height)
+		y1 = im->height;
+
+	for (y = y0; y < y1; y++) {
+		for (x = x0; x < x1; x++) {
+			pixel = im->pixels + y * im->stride + x * 4;
+			red += pixel[0] * pixel[3] / 255;
+			green += pixel[1] * pixel[3] / 255;
+			blue += pixel[2] * pixel[3] / 255;
+			alpha += pixel[3];
+			brightness += ((2126ULL * pixel[0] +
+			    7152ULL * pixel[1] + 722ULL * pixel[2]) / 10000) *
+			    pixel[3] / 255;
+		}
 	}
-
-	/* Allocate first line. */
-	lsize = xasprintf(&label, "SIXEL IMAGE (%ux%u)\r\n", sx, sy) + 1;
-	if (sx < lsize - 3)
-		size = lsize - 1;
-	else
-		size = sx + 2;
-
-	/* Remaining lines. Every placeholder line has \r\n at the end. */
-	size += (sx + 2) * (sy - 1) + 1;
-	*ret = buf = xmalloc(size);
-
-	/* Render first line. */
-	if (sx < lsize - 3) {
-		memcpy(buf, label, lsize);
-		buf += lsize - 1;
-	} else {
-		memcpy(buf, label, lsize - 3);
-		buf += lsize - 3;
-		memset(buf, '+', sx - lsize + 3);
-		buf += sx - lsize + 3;
-		snprintf(buf, 3, "\r\n");
-		buf += 2;
-	}
-
-	/* Remaining lines. */
-	for (py = 1; py < sy; py++) {
-		memset(buf, '+', sx);
-		buf += sx;
-		snprintf(buf, 3, "\r\n");
-		buf += 2;
-	}
-
-	free(label);
+	if (count == 0)
+		return;
+	sample->red = red / count;
+	sample->green = green / count;
+	sample->blue = blue / count;
+	sample->alpha = alpha / count;
+	sample->brightness = brightness / count;
 }
 
-struct image*
-image_store(struct screen *s, struct sixel_image *si)
+/* Build fallback samples for every image cell. */
+static void
+image_make_cells(struct image *im)
+{
+	struct image_cell	*cell;
+	uint64_t		 columns, rows;
+	u_int			 x, y, sample_x, sample_y;
+
+	columns = (uint64_t)im->sx * IMAGE_SAMPLE_COLUMNS;
+	rows = (uint64_t)im->sy * IMAGE_SAMPLE_ROWS;
+	im->cells = xcalloc((size_t)im->sx * im->sy, sizeof *im->cells);
+	for (y = 0; y < im->sy; y++) {
+		for (x = 0; x < im->sx; x++) {
+			cell = &im->cells[(size_t)y * im->sx + x];
+			image_sample(im, x, y, im->sx, im->sy, &cell->whole);
+			for (sample_y = 0; sample_y < IMAGE_SAMPLE_ROWS;
+			    sample_y++) {
+				for (sample_x = 0;
+				    sample_x < IMAGE_SAMPLE_COLUMNS; sample_x++) {
+					image_sample(im,
+					    (uint64_t)x * IMAGE_SAMPLE_COLUMNS + sample_x,
+					    (uint64_t)y * IMAGE_SAMPLE_ROWS + sample_y,
+					    columns, rows,
+					    &cell->samples[sample_y][sample_x]);
+				}
+			}
+		}
+	}
+}
+
+/* Find an image by server ID. */
+struct image *
+image_find(u_int id)
+{
+	struct image	find;
+
+	find.id = id;
+	return (RB_FIND(images, &images, &find));
+}
+
+/* Return an image's server ID. */
+u_int
+image_get_id(const struct image *im)
+{
+	return (im->id);
+}
+
+/* Return an image's pixel dimensions. */
+void
+image_get_size(const struct image *im, u_int *width, u_int *height)
+{
+	if (width != NULL)
+		*width = im->width;
+	if (height != NULL)
+		*height = im->height;
+}
+
+/* Return an image canvas's pixel dimensions. */
+void
+image_get_canvas_size(const struct image *im, u_int *width,
+    u_int *height)
+{
+	if (width != NULL)
+		*width = im->canvas_width;
+	if (height != NULL)
+		*height = im->canvas_height;
+}
+
+/* Return an image's cell dimensions. */
+void
+image_get_size_in_cells(const struct image *im, u_int *sx, u_int *sy)
+{
+	if (sx != NULL)
+		*sx = im->sx;
+	if (sy != NULL)
+		*sy = im->sy;
+}
+
+/* Return an image's RGBA pixels and layout. */
+const u_char *
+image_get_pixels(const struct image *im, size_t *stride, size_t *size)
+{
+	if (stride != NULL)
+		*stride = im->stride;
+	if (size != NULL)
+		*size = im->size;
+	return (im->pixels);
+}
+
+/* Return an image's original SIXEL data. */
+struct sixel_image *
+image_get_sixel(const struct image *im)
+{
+	return (im->sixel);
+}
+
+/* Associate original SIXEL data with an image. */
+void
+image_set_sixel(struct image *im, struct sixel_image *si)
+{
+	im->sixel = si;
+}
+
+/* Return the image for a drawing rectangle. */
+struct image *
+image_rect_get_image(const struct image_rect *rectangle)
+{
+	return (rectangle->image);
+}
+
+/* Return the source and destination coordinates of a drawing rectangle. */
+void
+image_rect_get_coords(const struct image_rect *rectangle,
+    u_int *source_x, u_int *source_y, u_int *width, u_int *height,
+    u_int *destination_x, u_int *destination_y)
+{
+	*source_x = rectangle->source_x;
+	*source_y = rectangle->source_y;
+	*width = rectangle->width;
+	*height = rectangle->height;
+	*destination_x = rectangle->destination_x;
+	*destination_y = rectangle->destination_y;
+}
+
+/* Create and register an immutable image. */
+struct image *
+image_create(u_int width, u_int height, u_int canvas_width,
+    u_int canvas_height, u_int sx, u_int sy, u_char *pixels)
 {
 	struct image	*im;
+	u_int		 i;
+
+	if (width == 0 || height == 0 || canvas_width < width ||
+	    canvas_height < height || sx == 0 || sy == 0 || pixels == NULL)
+		return (NULL);
+	if ((uint64_t)width * height * 4 > SIZE_MAX)
+		return (NULL);
+	if ((uint64_t)sx * sy > SIZE_MAX / sizeof *im->cells)
+		return (NULL);
+	if (sx > USHRT_MAX || sy > USHRT_MAX)
+		return (NULL);
+	for (i = 0; i < USHRT_MAX; i++) {
+		if (++image_next_grid_id == 0)
+			image_next_grid_id++;
+		if (image_grid_ids[image_next_grid_id] == NULL)
+			break;
+	}
+	if (i == USHRT_MAX)
+		return (NULL);
 
 	im = xcalloc(1, sizeof *im);
-	im->s = s;
-	im->data = si;
+	do {
+		if (++image_next_id == 0)
+			image_next_id++;
+		im->id = image_next_id;
+	} while (image_find(im->id) != NULL);
 
-	im->px = s->cx;
-	im->py = s->cy;
-	sixel_size_in_cells(si, &im->sx, &im->sy);
-
-	image_fallback(&im->fallback, im->sx, im->sy);
-
-	image_log(im, __func__, NULL);
-	im->list = &s->images;
-	TAILQ_INSERT_TAIL(im->list, im, entry);
-
-	TAILQ_INSERT_TAIL(&all_images, im, all_entry);
-	if (++all_images_count == MAX_IMAGE_COUNT)
-		image_free(TAILQ_FIRST(&all_images));
+	im->references = 1;
+	im->grid_id = image_next_grid_id;
+	im->width = width;
+	im->height = height;
+	im->canvas_width = canvas_width;
+	im->canvas_height = canvas_height;
+	im->sx = sx;
+	im->sy = sy;
+	im->stride = (size_t)width * 4;
+	im->size = im->stride * height;
+	im->pixels = pixels;
 
+	RB_INSERT(images, &images, im);
+	image_grid_ids[im->grid_id] = im;
+	log_debug("%s: image %u is %ux%u pixels on %ux%u canvas, "
+	    "%ux%u cells", __func__, im->id, width, height, canvas_width,
+	    canvas_height, sx, sy);
 	return (im);
 }
 
-int
-image_check_line(struct screen *s, u_int py, u_int ny)
+/* Return the compact grid ID for an image. */
+u_short
+image_get_grid_id(u_int id)
 {
-	struct image	*im, *im1;
-	int		 redraw = 0, in;
+	struct image	*im = image_find(id);
 
-	TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
-		in = (py + ny > im->py && py < im->py + im->sy);
-		image_log(im, __func__, "py=%u, ny=%u, in=%d", py, ny, in);
-		if (in) {
-			image_free(im);
-			redraw = 1;
-		}
-	}
-	return (redraw);
+	if (im == NULL)
+		return (0);
+	return (im->grid_id);
 }
 
+/* Return the server image ID for a compact grid ID. */
+u_int
+image_get_id_by_grid_id(u_short grid_id)
+{
+	struct image	*im;
+
+	if (grid_id == 0 || (im = image_grid_ids[grid_id]) == NULL)
+		return (0);
+	return (im->id);
+}
+
+/* Add a reference to an image. */
+void
+image_ref(u_int id)
+{
+	struct image	*im = image_find(id);
+
+	if (im == NULL)
+		fatalx("reference to missing image %u", id);
+	if (im->references == UINT_MAX)
+		fatalx("too many references to image %u", id);
+	im->references++;
+}
+
+/* Drop a reference to an image. */
+void
+image_free(u_int id)
+{
+	struct image	*im = image_find(id);
+
+	if (im == NULL)
+		fatalx("free of missing image %u", id);
+	if (--im->references != 0)
+		return;
+
+	log_debug("%s: freeing image %u", __func__, id);
+	RB_REMOVE(images, &images, im);
+	image_grid_ids[im->grid_id] = NULL;
+	free(im->pixels);
+	if (im->sixel != NULL)
+		sixel_free(im->sixel);
+	free(im->cells);
+	free(im);
+}
+
+/* Return a precomputed fallback cell sample. */
+static const struct image_cell *
+image_get_cell(struct image *im, u_int x, u_int y)
+{
+	if (im == NULL || x >= im->sx || y >= im->sy)
+		return (NULL);
+	if (im->cells == NULL)
+		image_make_cells(im);
+	return (&im->cells[(size_t)y * im->sx + x]);
+}
+
+/* Return the brightness of an image cell. */
+u_char
+image_get_brightness(struct image *im, u_int x, u_int y)
+{
+	const struct image_cell	*cell;
+
+	cell = image_get_cell(im, x, y);
+	if (cell == NULL)
+		return (0);
+	return (cell->whole.brightness);
+}
+
+/* Fill a grid cell with an ASCII brightness glyph. */
+static void
+image_get_text_cell(struct image *im, u_int x, u_int y,
+    const struct grid_cell *gc, struct grid_cell *out)
+{
+	static const char	 ramp[] = " .:-=+*#%@";
+	u_int			 level;
+
+	memcpy(out, gc, sizeof *out);
+	level = image_get_brightness(im, x, y) * (sizeof ramp - 2) / 255;
+	utf8_set(&out->data, ramp[level]);
+	out->flags &= ~GRID_FLAG_IMAGE;
+}
+
+/* Get the terminal cell used to draw an image marker. */
 int
+image_get_draw_cell(struct tty *tty, const struct grid_cell *gc,
+    struct grid_cell *out)
+{
+	struct image	*im = image_find(gc->image_id);
+
+	if (image_backend_flags(tty) & IMAGE_BACKEND_GRAPHICAL) {
+		memcpy(out, gc, sizeof *out);
+		out->flags &= ~(GRID_FLAG_IMAGE|GRID_FLAG_IMAGE_DAMAGED|
+		    GRID_FLAG_SELECTED);
+		return (1);
+	}
+	if (gc->flags & GRID_FLAG_IMAGE_DAMAGED) {
+		memcpy(out, gc, sizeof *out);
+		out->flags &= ~(GRID_FLAG_IMAGE|GRID_FLAG_IMAGE_DAMAGED);
+		return (0);
+	}
+	image_get_text_cell(im, gc->image_x, gc->image_y, gc, out);
+	return (0);
+}
+
+/* Store an image marker in a grid cell. */
+void
+image_set_cell(struct grid_cell *gc, struct image *im, u_int x, u_int y)
+{
+	/* Keep the cell contents as the underlay for transparent pixels. */
+	gc->flags &= ~GRID_FLAG_IMAGE_DAMAGED;
+	gc->flags |= GRID_FLAG_IMAGE;
+	gc->image_id = im->id;
+	gc->image_x = x;
+	gc->image_y = y;
+}
+
+/* Convert a cell-aligned image rectangle into source pixel coordinates. */
+void
+image_get_pixel_rect(const struct image *im, u_int x, u_int y,
+    u_int width, u_int height, u_int *px, u_int *py, u_int *pwidth,
+    u_int *pheight)
+{
+	u_int	x1, y1;
+
+	*px = *py = *pwidth = *pheight = 0;
+	if (im == NULL || x >= im->sx || y >= im->sy || width == 0 ||
+	    height == 0)
+		return;
+	if (width > im->sx - x)
+		width = im->sx - x;
+	if (height > im->sy - y)
+		height = im->sy - y;
+
+	*px = (uint64_t)x * im->canvas_width / im->sx;
+	*py = (uint64_t)y * im->canvas_height / im->sy;
+	x1 = ((uint64_t)(x + width) * im->canvas_width + im->sx - 1) /
+	    im->sx;
+	y1 = ((uint64_t)(y + height) * im->canvas_height + im->sy - 1) /
+	    im->sy;
+	if (*px >= im->width || *py >= im->height) {
+		*px = *py = 0;
+		return;
+	}
+	if (x1 <= *px)
+		x1 = *px + 1;
+	if (y1 <= *py)
+		y1 = *py + 1;
+	if (x1 > im->width)
+		x1 = im->width;
+	if (y1 > im->height)
+		y1 = im->height;
+	*pwidth = x1 - *px;
+	*pheight = y1 - *py;
+}
+
+/* Calculate the cell dimensions required for pixel dimensions. */
+void
+image_size_in_cells(u_int width, u_int height, u_int xpixel, u_int ypixel,
+    u_int *sx, u_int *sy)
+{
+	if (xpixel == 0)
+		xpixel = 8;
+	if (ypixel == 0)
+		ypixel = 16;
+	*sx = width / xpixel + (width % xpixel != 0);
+	*sy = height / ypixel + (height % ypixel != 0);
+}
+
+/* Return if a screen area contains image markers. */
+static int
 image_check_area(struct screen *s, u_int px, u_int py, u_int nx, u_int ny)
 {
-	struct image	*im, *im1;
-	int		 redraw = 0, in;
+	struct grid_cell	 gc;
+	u_int			 x, y, ex, ey;
+	u_int			 sx = screen_size_x(s), sy = screen_size_y(s);
 
-	TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
-		in = (py < im->py + im->sy &&
-		    py + ny > im->py &&
-		    px < im->px + im->sx &&
-		    px + nx > im->px);
-		image_log(im, __func__, "py=%u, ny=%u, in=%d", py, ny, in);
-		if (in) {
-			image_free(im);
-			redraw = 1;
+	if (px >= sx || py >= sy || nx == 0 || ny == 0)
+		return (0);
+	if (nx > sx - px)
+		ex = sx;
+	else
+		ex = px + nx;
+	if (ny > sy - py)
+		ey = sy;
+	else
+		ey = py + ny;
+	for (y = py; y < ey; y++) {
+		for (x = px; x < ex; x++) {
+			grid_view_get_cell(s->grid, x, y, &gc);
+			if (gc.flags & GRID_FLAG_IMAGE)
+				return (1);
 		}
 	}
-	return (redraw);
+	return (0);
 }
 
-int
-image_scroll_up(struct screen *s, u_int lines)
+/* Redraw image markers in a screen area. */
+void
+image_redraw_area(struct screen_write_ctx *ctx, u_int px, u_int py, u_int nx,
+    u_int ny)
 {
-	struct image		*im, *im1;
-	int			 redraw = 0;
-	u_int			 sx, sy;
-	struct sixel_image	*new;
-
-	TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
-		if (im->py >= lines) {
-			image_log(im, __func__, "1, lines=%u", lines);
-			im->py -= lines;
-			redraw = 1;
-			continue;
-		}
-		if (im->py + im->sy <= lines) {
-			image_log(im, __func__, "2, lines=%u", lines);
-			image_free(im);
-			redraw = 1;
-			continue;
-		}
-		sx = im->sx;
-		sy = (im->py + im->sy) - lines;
-		image_log(im, __func__, "3, lines=%u, sy=%u", lines, sy);
-
-		new = sixel_scale(im->data, 0, 0, 0, im->sy - sy, sx, sy, 1);
-		sixel_free(im->data);
-		im->data = new;
-
-		im->py = 0;
-		sixel_size_in_cells(im->data, &im->sx, &im->sy);
-
-		free(im->fallback);
-		image_fallback(&im->fallback, im->sx, im->sy);
-		redraw = 1;
-	}
-	return (redraw);
+	if (ctx->wp != NULL && image_check_area(ctx->s, px, py, nx, ny))
+		ctx->wp->flags |= PANE_REDRAW;
+}
+
+/* Redraw all image markers on a screen. */
+void
+image_redraw_all(struct screen_write_ctx *ctx)
+{
+	image_redraw_area(ctx, 0, 0, screen_size_x(ctx->s),
+	    screen_size_y(ctx->s));
+}
+
+/* Redraw images after a scrolling operation. */
+void
+image_redraw_scroll(struct screen_write_ctx *ctx, __unused u_int lines)
+{
+	image_redraw_all(ctx);
+}
+
+/* Draw a span's graphical image markers before or after its text. */
+void
+image_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py,
+    u_int nx, u_int atx, u_int aty, int before,
+    const struct tty_style_ctx *style_ctx)
+{
+	const struct image_backend	*backend;
+	struct image_rect		 rectangle;
+	struct grid_cell		 gc, next;
+	struct image			*im;
+	u_int				 i, run;
+
+	image_tty_update(tty);
+	backend = tty->image_backend;
+	if (~backend->flags & IMAGE_BACKEND_GRAPHICAL)
+		return;
+	if (before && (~backend->flags & IMAGE_BACKEND_TEMPORAL))
+		return;
+
+	for (i = 0; i < nx; i += run) {
+		grid_view_get_cell(s->grid, px + i, py, &gc);
+		if (~gc.flags & GRID_FLAG_IMAGE) {
+			run = 1;
+			continue;
+		}
+		if (backend->flags & IMAGE_BACKEND_TEMPORAL) {
+			if ((before && (~gc.flags & GRID_FLAG_IMAGE_DAMAGED)) ||
+			    (!before && (gc.flags & GRID_FLAG_IMAGE_DAMAGED))) {
+				run = 1;
+				continue;
+			}
+		}
+		im = image_find(gc.image_id);
+		if (im == NULL) {
+			run = 1;
+			continue;
+		}
+		for (run = 1; i + run < nx; run++) {
+			grid_view_get_cell(s->grid, px + i + run, py, &next);
+			if (~next.flags & GRID_FLAG_IMAGE)
+				break;
+			if ((backend->flags & IMAGE_BACKEND_TEMPORAL) &&
+			    ((before && (~next.flags & GRID_FLAG_IMAGE_DAMAGED)) ||
+			    (!before && (next.flags & GRID_FLAG_IMAGE_DAMAGED))))
+				break;
+			if (next.image_id != gc.image_id ||
+			    next.image_y != gc.image_y ||
+			    next.image_x != gc.image_x + run)
+				break;
+		}
+		rectangle.image = im;
+		memcpy(&rectangle.cell, &gc, sizeof rectangle.cell);
+		rectangle.source_x = gc.image_x;
+		rectangle.source_y = gc.image_y;
+		rectangle.width = run;
+		rectangle.height = 1;
+		rectangle.destination_x = atx + i;
+		rectangle.destination_y = aty;
+		backend->draw_rect(tty, &rectangle, style_ctx);
+	}
+}
+
+/*
+ * Put image marker cells at the cursor. The pixel object is immutable; only
+ * the marker rectangle is clipped to the available pane cells.
+ */
+void
+image_write(struct screen_write_ctx *ctx, struct image *im, u_int bg)
+{
+	struct screen		*s = ctx->s;
+	struct grid		*gd = s->grid;
+	struct grid_cell		 gc;
+	u_int			 cx = s->cx, cy = s->cy;
+	u_int			 x, y, sx, sy, lines;
+
+	image_get_size_in_cells(im, &sx, &sy);
+	if (sx > screen_size_x(s) - cx)
+		sx = screen_size_x(s) - cx;
+	if (sy > screen_size_y(s) - 1)
+		sy = screen_size_y(s) - 1;
+	if (sx == 0 || sy == 0)
+		return;
+
+	if (screen_size_y(s) - cy <= sy) {
+		lines = sy - (screen_size_y(s) - cy) + 1;
+		screen_write_scrollup(ctx, lines, bg);
+		if (lines > cy)
+			screen_write_cursormove(ctx, -1, 0, 0);
+		else
+			screen_write_cursormove(ctx, -1, cy - lines, 0);
+		cy = s->cy;
+	}
+
+	for (y = 0; y < sy; y++) {
+		for (x = 0; x < sx; x++) {
+			grid_view_get_cell(gd, cx + x, cy + y, &gc);
+			image_set_cell(&gc, im, x, y);
+			grid_view_set_cell(gd, cx + x, cy + y, &gc);
+		}
+	}
+	image_redraw_area(ctx, cx, cy, sx, sy);
+	screen_write_cursormove(ctx, 0, cy + sy, 0);
 }

input.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.271 2026/08/31 19:34:09 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.269 2026/07/20 11:16:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1049,7 +1049,6 @@ input_parse_buffer(struct window_pane *wp, const u_char *buf, size_t len)
 	if (len == 0)
 		return;
 
-	wp->output_generation++;
 	window_update_activity(wp->window);
 	if (~wp->flags & PANE_ACTIVITY) {
 		wp->flags |= PANE_ACTIVITY;
@@ -1584,7 +1583,7 @@ input_csi_dispatch(struct input_ctx *ictx)
 		case -1:
 			break;
 		case 0:
-#ifdef ENABLE_SIXEL
+#ifdef ENABLE_IMAGES
 			input_reply(ictx, 1, "\033[?1;2;4c");
 #else
 			input_reply(ictx, 1, "\033[?1;2c");
@@ -1979,7 +1978,7 @@ input_csi_dispatch_rm_private(struct input_ctx *ictx)
 			screen_write_mode_clear(sctx, MODE_BRACKETPASTE);
 			break;
 		case 2026:
-			screen_write_end_sync(sctx);
+			screen_write_stop_sync(ictx->wp);
 			break;
 		case 2031:
 			screen_write_mode_clear(sctx, MODE_THEME_UPDATES);
@@ -2102,7 +2101,7 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx)
 static void
 input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx)
 {
-#ifdef ENABLE_SIXEL
+#ifdef ENABLE_IMAGES
 	int	n, m, o;
 
 	if (ictx->param_list_len > 3)
@@ -2627,10 +2626,10 @@ input_dcs_dispatch(struct input_ctx *ictx)
 	const char		 prefix[] = "tmux;";
 	const u_int		 prefixlen = (sizeof prefix) - 1;
 	long long		 allow_passthrough = 0;
-#ifdef ENABLE_SIXEL
+#ifdef ENABLE_IMAGES
 	struct window		*w;
 	struct sixel_image	*si;
-	int			 p2;
+	int			 p1, p2;
 #endif
 
 	if (wp == NULL)
@@ -2643,15 +2642,18 @@ input_dcs_dispatch(struct input_ctx *ictx)
 		return (0);
 	}
 
-#ifdef ENABLE_SIXEL
+#ifdef ENABLE_IMAGES
 	if (wp != NULL && buf[0] == 'q' && ictx->interm_len == 0) {
 		w = wp->window;
 		if (input_split(ictx) != 0)
 			return (0);
+		p1 = input_get(ictx, 0, 0, 0);
+		if (p1 == -1)
+			p1 = 0;
 		p2 = input_get(ictx, 1, 0, 0);
 		if (p2 == -1)
 			p2 = 0;
-		si = sixel_parse(buf, len, p2, w->xpixel, w->ypixel);
+		si = sixel_parse(buf, len, p1, p2, w->xpixel, w->ypixel);
 		if (si != NULL)
 			screen_write_sixelimage(sctx, si, ictx->cell.cell.bg);
 	}

key-bindings.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: key-bindings.c,v 1.192 2026/08/06 09:05:04 nicm Exp $ */
+/* $OpenBSD: key-bindings.c,v 1.190 2026/07/22 19:23:59 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,7 +53,6 @@
 	" '#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}' '>' {send -X history-bottom}" \
 	" ''" \
 	" '#{?#{==:#{pane_mode},copy-mode},#{?copy_line_numbers,Hide Line Numbers,Show Line Numbers},}' 'L' {send -X line-numbers-toggle}" \
-	" '#{?#{==:#{pane_mode},copy-mode},Edit,}' 'e' {if -F '#{selection_present}' {send -X open-selection} {send -X open-output}}" \
 	" '#{?#{==:#{pane_mode},copy-mode},#{?refresh_active,Refresh Off,Refresh On},}' 'r' {send -X refresh-toggle}" \
 	" ''" \
 	" '#{?#{&&:#{buffer_size},#{!:#{pane_in_mode}}},Paste #[underscore]#{=/9/...:buffer_sample},}' 'p' {paste-buffer}" \
@@ -422,7 +421,6 @@ key_bindings_init(void)
 		"bind -N 'Spread panes out evenly' E { select-layout -E }",
 		"bind -N 'Switch to the last client' L { switch-client -l }",
 		"bind -N 'Clear the marked pane' M { select-pane -M }",
-		"bind -N 'Change the pane title' T { command-prompt -I'#T' { select-pane -T '%%' } }",
 		"bind -N 'Enter copy mode' [ { copy-mode }",
 		"bind -N 'Paste the most recent paste buffer' ] { paste-buffer -p }",
 		"bind -N 'Create a new window' c { new-window }",
@@ -576,7 +574,6 @@ key_bindings_init(void)
 		"bind -Tcopy-mode C-l { send -X recentre-top-bottom }",
 		"bind -Tcopy-mode M-l { send -X cursor-centre-horizontal }",
 		"bind -Tcopy-mode C-n { send -X cursor-down }",
-		"bind -Tcopy-mode C-o { send -X select-output }",
 		"bind -Tcopy-mode C-p { send -X cursor-up }",
 		"bind -Tcopy-mode C-r { command-prompt -P -T search -ip'(search up)' -I'#{pane_search_string}' { send -X search-backward-incremental -- '%%' } }",
 		"bind -Tcopy-mode C-s { command-prompt -P -T search -ip'(search down)' -I'#{pane_search_string}' { send -X search-forward-incremental -- '%%' } }",
@@ -594,12 +591,11 @@ key_bindings_init(void)
 		"bind -Tcopy-mode R { send -X rectangle-toggle }",
 		"bind -Tcopy-mode T { command-prompt -P -1p'(jump to backward)' { send -X jump-to-backward -- '%%' } }",
 		"bind -Tcopy-mode X { send -X set-mark }",
-		"bind -Tcopy-mode e { if -F '#{selection_present}' { send -X open-selection } { send -X open-output } }",
 		"bind -Tcopy-mode f { command-prompt -P -1p'(jump forward)' { send -X jump-forward -- '%%' } }",
 		"bind -Tcopy-mode g { command-prompt -P -p'(goto line)' { send -X goto-line -- '%%' } }",
 		"bind -Tcopy-mode n { send -X search-again }",
 		"bind -Tcopy-mode q { send -X cancel }",
-		"bind -Tcopy-mode r { send -X refresh-now }",
+		"bind -Tcopy-mode r { send -X refresh-toggle }",
 		"bind -Tcopy-mode t { command-prompt -P -1p'(jump to forward)' { send -X jump-to-forward -- '%%' } }",
 		"bind -Tcopy-mode Home { send -X start-of-line }",
 		"bind -Tcopy-mode End { send -X end-of-line }",
@@ -690,8 +686,6 @@ key_bindings_init(void)
 		"bind -Tcopy-mode-vi K { send -X scroll-up }",
 		"bind -Tcopy-mode-vi L { send -X bottom-line }",
 		"bind -Tcopy-mode-vi M { send -X middle-line }",
-		"bind -Tcopy-mode-vi M-e { if -F '#{selection_present}' { send -X open-selection } { send -X open-output } }",
-		"bind -Tcopy-mode-vi M-o { send -X select-output }",
 		"bind -Tcopy-mode-vi N { send -X search-reverse }",
 		"bind -Tcopy-mode-vi P { send -X toggle-position }",
 		"bind -Tcopy-mode-vi T { command-prompt -P -1p'(jump to backward)' { send -X jump-to-backward -- '%%' } }",
@@ -711,7 +705,7 @@ key_bindings_init(void)
 		"bind -Tcopy-mode-vi n { send -X search-again }",
 		"bind -Tcopy-mode-vi o { send -X other-end }",
 		"bind -Tcopy-mode-vi q { send -X cancel }",
-		"bind -Tcopy-mode-vi r { send -X refresh-now }",
+		"bind -Tcopy-mode-vi r { send -X refresh-toggle }",
 		"bind -Tcopy-mode-vi t { command-prompt -P -1p'(jump to forward)' { send -X jump-to-forward -- '%%' } }",
 		"bind -Tcopy-mode-vi v { send -X rectangle-toggle }",
 		"bind -Tcopy-mode-vi w { send -X next-word }",

layout.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: layout.c,v 1.100 2026/09/11 08:16:14 nicm Exp $ */
+/* $OpenBSD: layout.c,v 1.96 2026/07/15 13:02:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -106,7 +106,7 @@ layout_free_cell(struct layout_cell *lc, int only_nodes)
 		}
 		break;
 	case LAYOUT_WINDOWPANE:
-		if (lc->wp != NULL && lc->wp->layout_cell != NULL) {
+		if (lc->wp != NULL) {
 			lc->wp->layout_cell->parent = NULL;
 			lc->wp->layout_cell = NULL;
 		}
@@ -233,6 +233,29 @@ layout_make_node(struct layout_cell *lc, enum layout_type type)
 	lc->wp = NULL;
 }
 
+/* Fix z-indexes. */
+void
+layout_fix_zindexes(struct window *w, struct layout_cell *lc)
+{
+	struct layout_cell	*lcchild;
+
+	if (lc == NULL)
+		return;
+
+	switch (lc->type) {
+	case LAYOUT_WINDOWPANE:
+		TAILQ_INSERT_TAIL(&w->z_index, lc->wp, zentry);
+		break;
+	case LAYOUT_LEFTRIGHT:
+	case LAYOUT_TOPBOTTOM:
+		TAILQ_FOREACH(lcchild, &lc->cells, entry)
+			layout_fix_zindexes(w, lcchild);
+		return;
+	default:
+		fatalx("bad layout type");
+	}
+}
+
 int
 layout_cell_is_tiled(struct layout_cell *lc)
 {
@@ -242,7 +265,7 @@ layout_cell_is_tiled(struct layout_cell *lc)
 	return is_leaf && !is_floating;
 }
 
-int
+static int
 layout_cell_has_tiled_child(struct layout_cell *lc)
 {
 	struct layout_cell      *lcchild;
@@ -486,20 +509,18 @@ layout_fix_panes(struct window *w, struct window_pane *skip)
 
 /* Count the number of available cells in a layout. */
 u_int
-layout_count_cells(struct layout_cell *lc, int with_floating)
+layout_count_cells(struct layout_cell *lc)
 {
 	struct layout_cell	*lcchild;
 	u_int			 count = 0;
 
 	switch (lc->type) {
 	case LAYOUT_WINDOWPANE:
-		if (lc->flags & LAYOUT_CELL_FLOATING && !with_floating)
-			return 0;
 		return (1);
 	case LAYOUT_LEFTRIGHT:
 	case LAYOUT_TOPBOTTOM:
 		TAILQ_FOREACH(lcchild, &lc->cells, entry)
-			count += layout_count_cells(lcchild, with_floating);
+			count += layout_count_cells(lcchild);
 		return (count);
 	default:
 		fatalx("bad layout type");
@@ -518,10 +539,6 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
 
 	status = window_get_pane_status(w);
 
-	/* Floating cells do not take space from the tiled layout. */
-	if (!layout_cell_is_tiled(lc) && !layout_cell_has_tiled_child(lc))
-		return (0);
-
 	if (lc->type == LAYOUT_WINDOWPANE) {
 		/* Space available in this cell only. */
 		if (type == LAYOUT_LEFTRIGHT) {
@@ -551,9 +568,6 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
 		/* Different type: minimum of available space in child cells. */
 		minimum = UINT_MAX;
 		TAILQ_FOREACH(lcchild, &lc->cells, entry) {
-			if (!layout_cell_is_tiled(lcchild) &&
-			    !layout_cell_has_tiled_child(lcchild))
-				continue;
 			available = layout_resize_check(w, lcchild, type);
 			if (available < minimum)
 				minimum = available;
@@ -647,7 +661,7 @@ layout_resize_set_size(struct window *w, struct layout_cell *lc,
 
 /* Find and return the nearest neighbour to a cell in a specific direction. */
 static struct layout_cell *
-layout_cell_get_neighbour_dir(struct layout_cell *lc, int direction)
+layout_cell_get_neighbour_direction(struct layout_cell *lc, int direction)
 {
 	struct layout_cell	*lcn = lc;
 
@@ -681,9 +695,9 @@ layout_cell_get_neighbour(struct layout_cell *lc)
 	if (lc == TAILQ_LAST(&lcparent->cells, layout_cells))
 		direction = !direction;
 
-	lcother = layout_cell_get_neighbour_dir(lc, direction);
+	lcother = layout_cell_get_neighbour_direction(lc, direction);
 	if (lcother == NULL)
-		lcother = layout_cell_get_neighbour_dir(lc, !direction);
+		lcother = layout_cell_get_neighbour_direction(lc, !direction);
 
 	return (lcother);
 }
@@ -700,7 +714,7 @@ layout_destroy_cell(struct window *w, struct layout_cell *lc,
 	/* If no parent, this is the last pane in a window. */
 	lcparent = lc->parent;
 	if (lcparent == NULL) {
-		if (*lcroot == lc)
+		if (lc->wp != NULL)
 			*lcroot = NULL;
 		layout_free_cell(lc, 0);
 		return;
@@ -768,49 +782,6 @@ layout_free(struct window *w, int only_nodes)
 	layout_free_cell(w->layout_root, only_nodes);
 }
 
-/* Move and resize floating panes so they stay inside the window. */
-static void
-layout_clamp_floating_panes(struct window *w, u_int sx, u_int sy)
-{
-	struct window_pane	*wp;
-	struct layout_cell	*lc;
-	u_int			 pad, avail, csx, csy;
-
-	TAILQ_FOREACH(wp, &w->z_index, zentry) {
-		lc = wp->layout_cell;
-		if (lc == NULL || (~lc->flags & LAYOUT_CELL_FLOATING))
-			continue;
-		if (window_pane_get_pane_lines(wp) == PANE_LINES_NONE)
-			pad = 0;
-		else
-			pad = 1;
-
-		csx = lc->g.sx;
-		avail = (sx > 2 * pad) ? sx - 2 * pad : 0;
-		if (csx > avail)
-			csx = (avail > PANE_MINIMUM) ? avail : PANE_MINIMUM;
-		csy = lc->g.sy;
-		avail = (sy > 2 * pad) ? sy - 2 * pad : 0;
-		if (csy > avail)
-			csy = (avail > PANE_MINIMUM) ? avail : PANE_MINIMUM;
-		if (csx != lc->g.sx || csy != lc->g.sy)
-			layout_set_size(lc, csx, csy, lc->g.xoff, lc->g.yoff);
-
-		if (lc->g.xoff + lc->g.sx + pad > sx) {
-			if (lc->g.sx + 2 * pad >= sx)
-				lc->g.xoff = pad;
-			else
-				lc->g.xoff = sx - lc->g.sx - pad;
-		}
-		if (lc->g.yoff + lc->g.sy + pad > sy) {
-			if (lc->g.sy + 2 * pad >= sy)
-				lc->g.yoff = pad;
-			else
-				lc->g.yoff = sy - lc->g.sy - pad;
-		}
-	}
-}
-
 /* Resize the entire layout after window resize. */
 void
 layout_resize(struct window *w, u_int sx, u_int sy)
@@ -831,11 +802,8 @@ layout_resize(struct window *w, u_int sx, u_int sy)
 	 * out proportionately - this should leave the layout fitting the new
 	 * window size.
 	 */
-	if (lc->type == LAYOUT_WINDOWPANE && (lc->flags & LAYOUT_CELL_FLOATING)) {
-		layout_clamp_floating_panes(w, sx, sy);
-		layout_fix_panes(w, NULL);
+	if (lc->type == LAYOUT_WINDOWPANE && (lc->flags & LAYOUT_CELL_FLOATING))
 		return;
-	}
 	xchange = sx - lc->g.sx;
 	xlimit = layout_resize_check(w, lc, LAYOUT_LEFTRIGHT);
 	if (xchange < 0 && xchange < -xlimit)
@@ -865,7 +833,6 @@ layout_resize(struct window *w, u_int sx, u_int sy)
 
 	/* Fix cell offsets. */
 	layout_fix_offsets(w);
-	layout_clamp_floating_panes(w, sx, sy);
 	layout_fix_panes(w, NULL);
 }
 
@@ -893,7 +860,7 @@ layout_resize_pane_to(struct window_pane *wp, enum layout_type type,
 		size = lc->g.sx;
 	else
 		size = lc->g.sy;
-	if (layout_cell_is_last_tiled(lc))
+	if (lc == TAILQ_LAST(&lcparent->cells, layout_cells))
 		change = size - new_size;
 	else
 		change = new_size - size;
@@ -1018,11 +985,11 @@ layout_resize_pane(struct window_pane *wp, enum layout_type type, int change,
 	if (lcparent == NULL)
 		return;
 
-	/* If this is the last tiled cell, move back one. */
-	if (layout_cell_is_last_tiled(lc)) {
-		lc = layout_cell_get_neighbour_dir(lc, 0);
-		if (lc == NULL)
-			return;
+	/* If this is the last cell, move back one. */
+	if (lc == TAILQ_LAST(&lcparent->cells, layout_cells)) {
+		do
+			lc = TAILQ_PREV(lc, layout_cells, entry);
+		while (lc->flags & LAYOUT_CELL_FLOATING);
 	}
 
 	layout_resize_layout(wp->window, lc, type, change, opposite);
@@ -1040,22 +1007,22 @@ layout_resize_pane_grow(struct window *w, struct layout_cell *lc,
 	lcadd = lc;
 
 	/* Look towards the tail for a suitable cell for reduction. */
-	lcremove = layout_cell_get_neighbour_dir(lc, 1);
+	lcremove = TAILQ_NEXT(lc, entry);
 	while (lcremove != NULL) {
 		size = layout_resize_check(w, lcremove, type);
 		if (size > 0)
 			break;
-		lcremove = layout_cell_get_neighbour_dir(lcremove, 1);
+		lcremove = TAILQ_NEXT(lcremove, entry);
 	}
 
 	/* If none found, look towards the head. */
 	if (opposite && lcremove == NULL) {
-		lcremove = layout_cell_get_neighbour_dir(lc, 0);
+		lcremove = TAILQ_PREV(lc, layout_cells, entry);
 		while (lcremove != NULL) {
 			size = layout_resize_check(w, lcremove, type);
 			if (size > 0)
 				break;
-			lcremove = layout_cell_get_neighbour_dir(lcremove, 0);
+			lcremove = TAILQ_PREV(lcremove, layout_cells, entry);
 		}
 	}
 	if (lcremove == NULL)
@@ -1083,13 +1050,13 @@ layout_resize_pane_shrink(struct window *w, struct layout_cell *lc,
 		size = layout_resize_check(w, lcremove, type);
 		if (size != 0)
 			break;
-		lcremove = layout_cell_get_neighbour_dir(lcremove, 0);
+		lcremove = TAILQ_PREV(lcremove, layout_cells, entry);
 	} while (lcremove != NULL);
 	if (lcremove == NULL)
 		return (0);
 
 	/* And add onto the next cell (from the original cell). */
-	lcadd = layout_cell_get_neighbour_dir(lc, 1);
+	lcadd = TAILQ_NEXT(lc, entry);
 	if (lcadd == NULL)
 		return (0);
 
@@ -1683,10 +1650,7 @@ layout_get_tiled_cell(struct cmdq_item *item, struct args *args,
 		return (NULL);
 	}
 
-	if (window_active_pane_is_over_zoom(w))
-		window_push_zoom(w, 0, 1);
-	else
-		window_push_zoom(w, 1, (flags & SPAWN_ZOOM));
+	window_push_zoom(wp->window, 1, (flags & SPAWN_ZOOM));
 	lc = layout_split_pane(wp, type, size, flags);
 	if (lc == NULL)
 		*cause = xstrdup("no space for a new pane");
@@ -1713,10 +1677,8 @@ layout_get_floating_cell(struct cmdq_item *item, struct args *args,
 			return (NULL);
 	}
 
-	if (flags & SPAWN_FLOATOVERZOOM)
-		window_push_zoom(wp->window, 0, 1);
-	else if (window_active_pane_is_over_zoom(w))
-		window_push_zoom(wp->window, 0, 1);
+	if (flags & SPAWN_MODAL)
+		window_push_modal_zoom(w);
 	else
 		window_push_zoom(wp->window, 1, (flags & SPAWN_ZOOM));
 	lcnew = layout_floating_pane(w, wp, &fg);

menu.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: menu.c,v 1.70 2026/08/17 07:33:55 nicm Exp $ */
+/* $OpenBSD: menu.c,v 1.69 2026/07/14 19:07:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -337,7 +337,6 @@ menu_key(struct client *c, struct menu_data *md, struct key_event *event)
 	struct cmdq_state		*state;
 	enum cmd_parse_status		 status;
 	char				*error;
-	key_code			 key;
 
 	if (KEYC_IS_MOUSE(event->key)) {
 		/*
@@ -388,8 +387,7 @@ menu_key(struct client *c, struct menu_data *md, struct key_event *event)
 		name = menu->items[i].name;
 		if (name == NULL || *name == '-')
 			continue;
-		key = (event->key & ~KEYC_MASK_FLAGS);
-		if (key == (menu->items[i].key & ~KEYC_MASK_FLAGS)) {
+		if ((event->key & ~KEYC_MASK_FLAGS) == menu->items[i].key) {
 			md->choice = i;
 			goto chosen;
 		}

mode-tree.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-tree.c,v 1.101 2026/08/05 07:50:21 nicm Exp $ */
+/* $OpenBSD: mode-tree.c,v 1.100 2026/07/14 19:07:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -47,7 +47,7 @@ enum mode_tree_preview {
 	"#[acs]x" MODE_TREE_PREFIX_STYLE "   }," \
 	"#{mode_tree_repeat}}" \
 	"#{?mode_tree_branch," \
-	"#[acs]#{?mode_tree_last,mq,tq}+" MODE_TREE_PREFIX_STYLE " ,}" \
+	"#[acs]#{?mode_tree_last,mq,tq}" MODE_TREE_PREFIX_STYLE "> ,}" \
 	"#{?mode_tree_has_children," \
 	"#{?mode_tree_expanded,#[fg=themered]-" MODE_TREE_PREFIX_STYLE " ," \
 	"#[fg=themegreen]+" MODE_TREE_PREFIX_STYLE " }," \

monitor.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.8 2026/09/07 10:15:25 nicm Exp $ */
+/* $OpenBSD: monitor.c,v 1.7 2026/07/27 19:15:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -614,10 +614,8 @@ monitor_parse(const char *value, char **name, enum monitor_type *type, int *id,
 		*type = MONITOR_ALL_WINDOWS;
 	else if (sscanf(what, "@%d", id) == 1 && *id >= 0)
 		*type = MONITOR_WINDOW;
-	else if (*what == '\0')
-		*type = MONITOR_SESSION;
 	else
-		goto fail;
+		*type = MONITOR_SESSION;
 	*name = xstrdup(copy);
 	*format = xstrdup(split);
 

options-table.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.246 2026/09/11 10:17:16 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.242 2026/07/27 08:03:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -76,8 +76,7 @@ static const char *options_table_pane_border_indicators_list[] = {
 	"off", "colour", "arrows", "both", NULL
 };
 static const char *options_table_pane_border_lines_list[] = {
-	"single", "double", "heavy", "simple", "number", "spaces", "none",
-	"rounded", NULL
+	"single", "double", "heavy", "simple", "number", "spaces", "none", NULL
 };
 static const char *options_table_popup_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "rounded", "padded", "none", NULL
@@ -92,7 +91,7 @@ static const char *options_table_window_size_list[] = {
 	"largest", "smallest", "manual", "latest", NULL
 };
 static const char *options_table_remain_on_exit_list[] = {
-	"off", "on", "failed", "key", "failed-key", NULL
+	"off", "on", "failed", "key", NULL
 };
 static const char *options_table_destroy_unattached_list[] = {
 	"off", "on", "keep-last", "keep-group", NULL
@@ -306,16 +305,6 @@ const struct options_table_entry options_table[] = {
 		  "When this is reached, the oldest buffer is deleted."
 	},
 
-	{ .name = "clear-on-attach",
-	  .type = OPTIONS_TABLE_FLAG,
-	  .scope = OPTIONS_TABLE_SERVER,
-	  .default_num = 1,
-	  .text = "Whether to use the alternate screen and clear it when "
-		  "a client is attached. When disabled, tmux does not "
-		  "enter the alternate screen on attach so terminal "
-		  "content before tmux remains in scrollback."
-	},
-
 	{ .name = "command-alias",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_SERVER,
@@ -1251,8 +1240,7 @@ const struct options_table_entry options_table[] = {
 	   * underscore.
 	   */
 	  .default_str = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~",
-	  .text = "Characters considered to separate words; a space matches "
-		  "any character with the Unicode White_Space property."
+	  .text = "Characters considered to separate words."
 	},
 
 	/* Window options. */
@@ -1699,8 +1687,7 @@ const struct options_table_entry options_table[] = {
 	  .choices = options_table_remain_on_exit_list,
 	  .default_num = 0,
 	  .text = "Whether panes should remain ('on'), remain until a key is "
-		  "pressed after any exit ('key') or after a failure "
-		  "('failed-key'), or be automatically killed ('off' or "
+		  "pressed ('key') or be automatically killed ('off' or "
 		  "'failed') when the program inside exits."
 	},
 

popup.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: popup.c,v 1.77 2026/08/28 08:02:16 nicm Exp $ */
+/* $OpenBSD: popup.c,v 1.76 2026/07/14 19:07:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -79,8 +79,7 @@ popup_free(struct popup_data *pd)
 
 	if (pd->job != NULL)
 		job_free(pd->job);
-	if (pd->ictx != NULL)
-		input_free(pd->ictx);
+	input_free(pd->ictx);
 
 	free(pd->r.ranges);
 	screen_free(&pd->s);

proc.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.32 2026/08/04 13:16:03 claudio Exp $ */
+/* $OpenBSD: proc.c,v 1.31 2026/06/08 21:38:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -79,7 +79,7 @@ static void
 proc_event_cb(__unused int fd, short events, void *arg)
 {
 	struct tmuxpeer	*peer = arg;
-	int		 n;
+	ssize_t		 n;
 	struct imsg	 imsg;
 
 	if (!(peer->flags & PEER_BAD) && (events & EV_READ)) {
@@ -88,7 +88,7 @@ proc_event_cb(__unused int fd, short events, void *arg)
 			return;
 		}
 		for (;;) {
-			if ((n = imsgbuf_get(&peer->ibuf, &imsg)) == -1) {
+			if ((n = imsg_get(&peer->ibuf, &imsg)) == -1) {
 				peer->dispatchcb(NULL, peer->arg);
 				return;
 			}

prompt.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: prompt.c,v 1.7 2026/09/09 07:53:03 nicm Exp $ */
+/* $OpenBSD: prompt.c,v 1.5 2026/07/13 10:29:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1334,7 +1334,7 @@ process_key:
 		if (pr->index != size) {
 			memmove(pr->buffer + pr->index,
 			    pr->buffer + pr->index + 1,
-			    (size - pr->index) *
+			    (size + 1 - pr->index) *
 			    sizeof *pr->buffer);
 			goto changed;
 		}
@@ -1493,11 +1493,9 @@ append_key:
 		utf8_set(&tmp, key);
 		if (key <= 0x1f || key == 0x7f)
 			tmp.width = 2;
-	} else if (KEYC_IS_UNICODE(key)) {
+	} else if (KEYC_IS_UNICODE(key))
 		utf8_to_data(key, &tmp);
-		if (tmp.size == 0)
-			return (PROMPT_KEY_HANDLED);
-	} else
+	else
 		return (PROMPT_KEY_HANDLED);
 
 	pr->buffer = xreallocarray(pr->buffer, size + 2,

regress/buffers.sh

@@ -28,7 +28,7 @@ $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
 TMP2=$(mktemp)
-trap 'rm -f "$TMP" "$TMP2" "$TMP".*; $TMUX kill-server 2>/dev/null' 0 1 15
+trap 'rm -f "$TMP" "$TMP2"; $TMUX kill-server 2>/dev/null' 0 1 15
 
 # check_ok $cmd...
 #
@@ -270,27 +270,6 @@ if [ $? -eq 0 ]; then
 	exit 1
 fi
 
-# A write error after a successful open must be reported to the server.
-dd if=/dev/zero of="$TMP.big" bs=100000 count=1 2>/dev/null
-check_ok load-buffer -b write-error "$TMP.big"
-mkfifo "$TMP.fifo" || exit 1
-dd if="$TMP.fifo" of="$TMP.got" bs=1 count=8 2>/dev/null &
-reader=$!
-exec 3>"$TMP.fifo"
-out=$($TMUX save-buffer -b write-error "$TMP.fifo" 3>&- 2>&1)
-status=$?
-exec 3>&-
-wait "$reader"
-if [ $status -eq 0 ]; then
-	echo "save-buffer after write error succeeded."
-	exit 1
-fi
-if [ "$(wc -c <"$TMP.got")" -ne 8 ]; then
-	echo "save-buffer write error test wrote wrong amount."
-	exit 1
-fi
-check_ok delete-buffer -b write-error
-
 # save-buffer - writes to stdout and load-buffer - reads from stdin.
 out=$($TMUX save-buffer -b sb -)
 if [ "$out" != "data" ]; then

regress/capture-pane-time.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# capture-pane -I line timestamps
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-TMP=$(mktemp)
-trap '$TMUX kill-server 2>/dev/null; rm -f "$TMP"' 0 1 15
-$TMUX kill-server 2>/dev/null
-
-before=$(date +%s)
-$TMUX new-session -d -x 40 -y 5 'seq 1 12; sleep 10' || exit 1
-sleep 1
-after=$(date +%s)
-
-$TMUX capture-pane -pILF -S - -E - >"$TMP" || exit 1
-awk -v before="$before" -v after="$after" '
-	$1 !~ /^-?[0-9]+$/ || $2 !~ /^[0-9]+$/ { exit 1 }
-	$4 == "1" {
-		if ($2 < before || $2 > after)
-			exit 1
-		history = 1
-	}
-	$4 == "9" {
-		if ($2 != 0)
-			exit 1
-		visible = 1
-	}
-	END { if (!history || !visible) exit 1 }
-' "$TMP" || {
-	cat "$TMP"
-	exit 1
-}
-
-exit 0

regress/choose-tree.sh

@@ -290,92 +290,4 @@ wait_count ': G4' 7
 	fail "window 1 of zzz not killed"
 exit_mode q
 
-# --- help and information preview --------------------------------------------
-# The complete tree help is taller than the 24-line test terminal, where the
-# help renderer deliberately leaves the tree unchanged.
-$TMUX2 resize-window -t out:0 -x 80 -y 50 || exit 1
-i=0
-while [ "$i" -lt 50 ]; do
-	# The inner session has a one-line status, leaving a 49-line window.
-	[ "$($TMUX display-message -p -t aaa:0 '#{window_height}')" -ge 49 ] &&
-		break
-	sleep 0.2
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "attached client did not resize for tree help"
-$TMUX choose-tree -t aaa:0 -F 'G5' -O index || exit 1
-wait_count ': G5' 7
-$TMUX2 send-keys -t out:0 F1 || fail "send-keys F1 failed"
-wait_for 'Swap current and previous window'
-# The first key closes help; the second exits the tree.
-$TMUX send-keys -t aaa:0 q q || fail "send-keys help exit failed"
-wait_mode aaa:0 0
-
-$TMUX choose-tree -t aaa:0 -F 'G6' -O index || exit 1
-wait_count ': G6' 7
-$TMUX send-keys -t aaa:0 i || fail "send-keys info failed"
-wait_for 'Session'
-$TMUX send-keys -t aaa:0 i || fail "send-keys preview failed"
-exit_mode q
-
-# --- window swapping and command prompt for current/tagged items -------------
-# Restrict a window-only tree to two disposable windows in aaa. J (the
-# Shift-Down equivalent) swaps their window objects while leaving their indexes
-# in place.
-$TMUX new-window -d -t aaa: -n swap-a 'cat' || exit 1
-$TMUX new-window -d -t aaa: -n swap-b 'cat' || exit 1
-aidx=$($TMUX list-windows -t aaa -F '#{window_index}:#{window_name}' | \
-    awk -F: '$2 == "swap-a" {print $1}')
-bidx=$($TMUX list-windows -t aaa -F '#{window_index}:#{window_name}' | \
-    awk -F: '$2 == "swap-b" {print $1}')
-$TMUX choose-tree -w -t aaa:0 -O index -F 'WT #{window_name}' \
-	-f '#{m:swap-*,#{window_name}}' || exit 1
-wait_count 'WT swap-' 2
-$TMUX send-keys -t aaa:0 g j J || fail "window tree swap failed"
-i=0
-while [ "$i" -lt 50 ]; do
-	aname=$($TMUX display-message -p -t "aaa:$aidx" '#{window_name}')
-	bname=$($TMUX display-message -p -t "aaa:$bidx" '#{window_name}')
-	[ "$aname:$bname" = 'swap-b:swap-a' ] && break
-	sleep 0.2
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "window tree did not swap the two windows"
-
-# ':' runs an entered command for the current item and rebuilds the tree when
-# its queued command completes.
-$TMUX set-option -g @tree-command '' || exit 1
-$TMUX send-keys -t aaa:0 : || fail "window tree command prompt failed"
-wait_for '(current)'
-$TMUX send-keys -t aaa:0 -l "set-option -g @tree-command '%%'" || exit 1
-$TMUX send-keys -t aaa:0 Enter || exit 1
-i=0
-while [ "$i" -lt 50 ]; do
-	value=$($TMUX show-option -gqv @tree-command)
-	[ -n "$value" ] && break
-	sleep 0.2
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "window tree entered command did not run"
-case "$value" in
-=aaa:*.) ;;
-*) fail "window tree command target was '$value'" ;;
-esac
-
-# Tag both disposable windows and kill them through the tagged confirmation
-# callback. The mode-hosting window is outside the filter and survives.
-$TMUX send-keys -t aaa:0 g j t j t X || fail "tagged kill keys failed"
-wait_for 'Kill 2 tagged?'
-$TMUX send-keys -t aaa:0 y || fail "tagged kill confirmation failed"
-i=0
-while [ "$i" -lt 50 ]; do
-	left=$($TMUX list-windows -t aaa -F '#{window_name}' | \
-	    grep -c '^swap-' || true)
-	[ "$left" -eq 0 ] && break
-	sleep 0.2
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "tagged windows were not killed"
-exit_mode q
-
 exit 0

regress/clear-on-attach.sh

@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# With clear-on-attach disabled tmux must preserve the terminal contents by
-# scrolling them away, rather than entering and clearing the alternate screen.
-# Capture the bytes written by a real attached client for both settings.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-INNER_ON="$TEST_TMUX -LtestIon$$ -f/dev/null"
-OUTER_ON="$TEST_TMUX -LtestOon$$ -f/dev/null"
-INNER_OFF="$TEST_TMUX -LtestIoff$$ -f/dev/null"
-OUTER_OFF="$TEST_TMUX -LtestOoff$$ -f/dev/null"
-DIR=$(mktemp -d) || exit 1
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER_ON kill-server 2>/dev/null
-	$INNER_ON kill-server 2>/dev/null
-	$OUTER_OFF kill-server 2>/dev/null
-	$INNER_OFF kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		$current_inner list-clients 2>/dev/null | grep -q . && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "inner client did not attach"
-}
-
-capture_attach()
-{
-	setting=$1
-	output=$2
-	go=$DIR/go-$setting
-	if [ "$setting" = on ]; then
-		current_inner=$INNER_ON
-		current_outer=$OUTER_ON
-	else
-		current_inner=$INNER_OFF
-		current_outer=$OUTER_OFF
-	fi
-
-	$current_inner new-session -d -s inner -x40 -y10 \
-	    'exec sleep 100' || exit 1
-	$current_inner set-option -g status off || exit 1
-	$current_inner set-option -g clear-on-attach "$setting" || exit 1
-	$current_outer new-session -d -s outer -x40 -y10 \
-	    "while [ ! -e '$go' ]; do sleep 0.01; done; exec $current_inner attach-session -t inner" || exit 1
-	$current_outer set-option -g status off || exit 1
-	$current_outer pipe-pane -O "cat >'$output'" || exit 1
-	touch "$go"
-	wait_for_client
-	sleep 0.5
-	$current_outer pipe-pane -O || exit 1
-}
-
-on=$DIR/on
-off=$DIR/off
-capture_attach on "$on"
-capture_attach off "$off"
-
-smcup=$(printf '\033[?1049h')
-grep -Fq "$smcup" "$on" || fail "clear-on-attach on did not use smcup"
-if grep -Fq "$smcup" "$off"; then
-	fail "clear-on-attach off used smcup"
-fi
-
-# Some screen terminfo entries have indn (CSI Ps S), while older ones only
-# have ind (newline). The preserving path uses indn once or repeats ind once
-# for every line in the terminal plus one.
-escape=$(printf '\033')
-if ! LC_ALL=C grep -Eq "${escape}\\[[0-9]+S" "$off"; then
-	hex=$(od -An -tx1 -v "$off" | tr -d ' \n')
-	case "$hex" in
-	*0a0a0a0a0a0a0a0a0a0a0a*) ;;
-	*) fail "clear-on-attach off did not scroll the old contents away" ;;
-	esac
-fi
-
-exit 0

regress/client-key-order-focus.sh

@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# send-keys -K injects a key into a client. Commands produced by that key must
-# be inserted immediately after send-keys, before later commands in the same
-# command list. Focus events arriving between a prefix and its following key
-# must be forwarded without cancelling the prefix table.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-}
-trap cleanup 0 1 15
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		client=$($INNER list-clients -F '#{client_name}' 2>/dev/null)
-		[ -n "$client" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "inner client did not attach"
-}
-
-wait_for_option()
-{
-	option=$1
-	expected=$2
-	i=0
-	while [ "$i" -lt 50 ]; do
-		actual=$($INNER show-option -gv "$option" 2>/dev/null)
-		[ "$actual" = "$expected" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "$option is '$actual', expected '$expected'"
-}
-
-cleanup
-$INNER new-session -d -s inner -x40 -y10 'exec sleep 100' || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g focus-events on || exit 1
-$OUTER new-session -d -s outer -x40 -y10 "$INNER attach -t inner" || exit 1
-$OUTER set-option -g status off || exit 1
-wait_for_client
-
-# The binding generated by send-keys -K must run before the command which
-# follows send-keys in this command list. Before the queue-ordering fix this
-# produces AB rather than BA.
-$INNER set-option -g @order '' || exit 1
-$INNER bind-key -n a set-option -gF @order '#{@order}B' || exit 1
-$INNER send-keys -K -c "$client" a \; \
-	set-option -gF @order '#{@order}A' || exit 1
-wait_for_option @order BA
-
-# Put the real attached client in the prefix table, deliver FocusIn, then the
-# bound key. FocusIn is not bindable and must not reset the prefix table.
-$INNER bind-key x set-option -g @focus-prefix yes || exit 1
-$OUTER send-keys C-b || exit 1
-focus_in=$(printf '\033[I')
-$OUTER send-keys -l "$focus_in" || exit 1
-$OUTER send-keys x || exit 1
-wait_for_option @focus-prefix yes
-
-exit 0

regress/clock-mode.sh

@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Exercise clock-mode initialization, all four styles, its one-second timer,
-# resize into the compact renderer, arbitrary-key exit, and cleanup.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -p -t outer:0.0 2>/dev/null
-}
-
-wait_mode()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER display-message -p -t clock:0 '#{pane_mode}' 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "pane mode is '$got', expected '$want'"
-}
-
-wait_hashes()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		captured=$(capture)
-		printf '%s\n' "$captured" | grep -q '#' && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "large clock did not render"
-}
-
-$INNER new-session -d -s clock -x80 -y24 'exec sleep 100' || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$INNER set-option -w clock-mode-colour red || exit 1
-$OUTER new-session -d -s outer -x80 -y24 "$INNER attach -t clock" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-sleep 1
-
-for style in 12 24 12-with-seconds 24-with-seconds; do
-	$INNER set-option -w -t clock:0 clock-mode-style "$style" || exit 1
-	$INNER clock-mode -t clock:0 || exit 1
-	wait_mode clock-mode
-	wait_hashes
-	# Let at least one timer callback observe a new second.
-	[ "$style" != 12-with-seconds ] || sleep 1.2
-	$INNER send-keys -t clock:0 x || exit 1
-	wait_mode ''
-done
-
-# Resizing an active mode below the large-glyph threshold selects the compact
-# renderer. A visible time contains a colon and no block-clock hash.
-$INNER clock-mode -t clock:0 || exit 1
-wait_mode clock-mode
-$INNER resize-window -t clock:0 -x20 -y5 || exit 1
-i=0
-while [ "$i" -lt 50 ]; do
-	captured=$(capture)
-	printf '%s\n' "$captured" | grep -Eq '[0-9][0-9]?:[0-9][0-9]' && break
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "compact clock did not render after resize"
-printf '%s\n' "$captured" | grep -q '#' &&
-	fail "compact clock still used large glyphs"
-$INNER send-keys -t clock:0 Enter || exit 1
-wait_mode ''
-
-$INNER has-session -t clock || fail "server died during clock-mode tests"
-exit 0

regress/confirm-before-lock.sh

@@ -1,150 +0,0 @@
-#!/bin/sh
-
-# Exercise confirm-before's waiting and background callbacks, custom keys and
-# prompts, default-yes handling and errors. Also cover all three lock command
-# entry points with a harmless lock-command which leaves a marker.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -p -t outer:0.0 2>/dev/null
-}
-
-wait_capture()
-{
-	marker=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		captured=$(capture)
-		printf '%s\n' "$captured" | grep -Fq "$marker" && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "timed out waiting for '$marker'"
-}
-
-wait_option()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER show-option -gqv @confirmed 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "@confirmed is '$got', expected '$want'"
-}
-
-wait_file()
-{
-	marker=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		[ -f "$marker" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "lock command did not create $marker"
-}
-
-$INNER new-session -d -s test -x80 -y24 'exec sleep 100' || exit 1
-$INNER set-option -g status on || exit 1
-$INNER set-option -g status-position bottom || exit 1
-$INNER set-option -g window-size manual || exit 1
-$OUTER new-session -d -s outer -x80 -y24 "$INNER attach -t test" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-sleep 1
-
-client=$($INNER list-clients -F '#{client_name}')
-[ -n "$client" ] || fail "inner client did not attach"
-
-$INNER bind-key -n M-a confirm-before \
-	'set-option -g @confirmed accepted' || exit 1
-$INNER bind-key -n M-b confirm-before -b -p 'Background?' \
-	'set-option -g @confirmed background' || exit 1
-$INNER bind-key -n M-c confirm-before -c x -p 'Custom?' \
-	'set-option -g @confirmed custom' || exit 1
-$INNER bind-key -n M-y confirm-before -y -p 'Default?' \
-	'set-option -g @confirmed default' || exit 1
-
-# A non-confirming response closes the waiting prompt without running its
-# command; reopening and accepting inserts the command after the waiting item.
-$INNER set-option -g @confirmed sentinel || exit 1
-$OUTER send-keys M-a || exit 1
-wait_capture "Confirm 'set-option'? (y/n)"
-$OUTER send-keys n || exit 1
-sleep 0.2
-wait_option sentinel
-$OUTER send-keys M-a || exit 1
-wait_capture "Confirm 'set-option'? (y/n)"
-$OUTER send-keys y || exit 1
-wait_option accepted
-
-# -b has no waiting queue item and appends its command to the client queue.
-$OUTER send-keys M-b || exit 1
-wait_capture 'Background?'
-$OUTER send-keys y || exit 1
-wait_option background
-
-# A custom printable key is accepted, and -y makes Enter affirmative.
-$OUTER send-keys M-c || exit 1
-wait_capture 'Custom?'
-$OUTER send-keys x || exit 1
-wait_option custom
-$OUTER send-keys M-y || exit 1
-wait_capture 'Default?'
-$OUTER send-keys Enter || exit 1
-wait_option default
-
-# Reject invalid multi-character and control confirmation keys.
-if $INNER confirm-before -b -t "$client" -c xx 'display-message x' \
-    >/dev/null 2>&1; then
-	fail "multi-character confirm key was accepted"
-fi
-if $INNER confirm-before -b -t "$client" -c "$(printf '\001')" \
-    'display-message x' >/dev/null 2>&1; then
-	fail "control confirm key was accepted"
-fi
-
-# lock-client, lock-session and lock-server all send lock-command to the real
-# attached client. The command returns immediately and unlocks the client.
-for kind in client session server; do
-	marker="$DIR/locked-$kind"
-	$INNER set-option -t test lock-command "printf locked >$marker" || exit 1
-	case "$kind" in
-	client) $INNER lock-client -t "$client" || exit 1 ;;
-	session) $INNER lock-session -t test || exit 1 ;;
-	server) $INNER lock-server || exit 1 ;;
-	esac
-	wait_file "$marker"
-done
-
-$INNER has-session -t test || fail "server died during prompt or lock tests"
-exit 0

regress/control-client-exit-stalled.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# A control client whose terminal has stopped accepting output (for example
-# its ssh connection or terminal emulator died) never drains the output that
-# server_client_check_exit waits on before sending MSG_EXIT, and may then
-# never close its socket either. This must not prevent the server from
-# exiting: after kill-server the server previously stayed alive forever with
-# server_exit set, closing every new connection immediately, so every new
-# client failed with "server exited unexpectedly" until the server was killed
-# by hand. The server now bounds the exit handshake: it discards output it
-# can never deliver and drops the client if it still does not close.
-#
-# The stalled terminal is simulated by a fifo whose read end is held open but
-# never read.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest"
-$TMUX kill-server 2>/dev/null
-
-DIR=$(mktemp -d)
-FIFO=$DIR/fifo
-SERVER=
-
-mkfifo "$FIFO" || exit 1
-
-cleanup() {
-	[ -n "$SERVER" ] && kill -9 "$SERVER" 2>/dev/null
-	$TMUX kill-server 2>/dev/null
-	exec 8<&- 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-# A detached session whose pane floods printable output forever.
-$TMUX -f/dev/null new -d -x 80 -y 24 -s rt 'cat /dev/zero | tr "\000" x' || exit 1
-SERVER=$($TMUX display -pt rt '#{pid}')
-
-# Attach a control client with output down the fifo; stdin held open by sleep
-# so it stays attached. The fifo fills and is never read, so a backlog forms
-# in the server that can never be delivered.
-( sleep 60 ) | $TMUX -f/dev/null -C attach -t rt >"$FIFO" 2>&1 &
-exec 8<"$FIFO"
-
-n=0
-while [ $n -lt 50 ]; do
-	$TMUX lsc -F '#{client_name}' 2>/dev/null | grep -q . && break
-	sleep 0.1
-	n=$((n + 1))
-done
-$TMUX lsc -F '#{client_name}' 2>/dev/null | grep -q . ||
-	{ echo "control client did not attach"; exit 1; }
-
-# Let the pane flood fill the fifo so the client's output is stuck.
-sleep 2
-
-# Ask the server to exit. This sets CLIENT_EXIT on the stalled client, whose
-# output can never drain.
-$TMUX kill-server 2>/dev/null
-
-# The server must exit within the exit timeout (10 seconds) plus slack,
-# rather than staying in limbo forever rejecting new clients.
-n=0
-while [ $n -lt 100 ]; do
-	if ! kill -0 "$SERVER" 2>/dev/null; then
-		SERVER=
-		exit 0
-	fi
-	sleep 0.2
-	n=$((n + 1))
-done
-
-echo "server did not exit after kill-server; new clients see:"
-$TMUX ls 2>&1
-exit 1

regress/control-client-new-layouts.sh

@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Check that control client flags are available in every format expansion path
-# used to produce layouts. The layout strings themselves are tested separately.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-LANG=C.UTF-8
-export PATH TERM LC_ALL LANG
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-
-DIR=$(mktemp -d) || exit 1
-FIFO=$DIR/input
-OUT=$DIR/output
-CFG=$DIR/flags.conf
-PID=
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	exec 3>&-
-	[ -n "$PID" ] && kill "$PID" 2>/dev/null
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup EXIT
-
-wait_for()
-{
-	pattern=$1
-	i=0
-
-	while [ "$i" -lt 50 ]; do
-		grep -F -- "$pattern" "$OUT" >/dev/null 2>&1 && return 0
-		if [ -n "$PID" ] && ! kill -0 "$PID" 2>/dev/null; then
-			fail "control client exited waiting for: $pattern"
-		fi
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "missing: $pattern"
-}
-
-send()
-{
-	printf '%s\n' "$*" >&3
-}
-
-check_commands()
-{
-	name=$1
-	expected=$2
-	match='#{m:*new-layouts*,#{client_flags}}'
-
-	send "display-message -p 'DISPLAY-$name $match'"
-	wait_for "DISPLAY-$name $expected"
-	send "list-panes -F 'PANES-$name $match'"
-	wait_for "PANES-$name $expected"
-	send "list-windows -F 'WINDOWS-$name $match'"
-	wait_for "WINDOWS-$name $expected"
-	send "list-sessions -F 'SESSIONS-$name $match'"
-	wait_for "SESSIONS-$name $expected"
-	send "list-clients -F 'CLIENTS-$name $match'"
-	wait_for "CLIENTS-$name $expected"
-}
-
-check_config()
-{
-	name=$1
-	expected=$2
-
-	send "source-file '$CFG'"
-	send "display-message -p 'CONFIG-$name #{@config-new-layouts}'"
-	wait_for "CONFIG-$name $expected"
-}
-
-cat >"$CFG" <<'EOF'
-%if #{m:*new-layouts*,#{client_flags}}
-set-option -g @config-new-layouts 1
-%else
-set-option -g @config-new-layouts 0
-%endif
-EOF
-
-$TMUX kill-server 2>/dev/null
-$TMUX new-session -d -s layouts -x 80 -y 24 || exit 1
-$TMUX split-window -h -t layouts: || exit 1
-
-mkfifo "$FIFO" || exit 1
-: >"$OUT"
-$TMUX -C attach-session -t layouts <"$FIFO" >"$OUT" 2>&1 &
-PID=$!
-exec 3>"$FIFO"
-
-send 'display-message -p READY'
-wait_for READY
-
-check_commands OFF 0
-check_config OFF 0
-
-send 'refresh-client -f new-layouts'
-check_commands ON 1
-check_config ON 1
-
-send 'refresh-client -f !new-layouts'
-check_commands OFF-AGAIN 0
-check_config OFF-AGAIN 0
-
-# The list commands also run for unattached command clients. Supplying that
-# client to formats must not make the session loop dereference a NULL session.
-$TMUX list-sessions -F '#{S:all,active}' >/dev/null ||
-	fail "session loop failed for unattached command client"
-$TMUX has-session -t layouts || fail "server exited"
-
-exit 0

regress/control-client-popup.sh

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Popups require a tty overlay and cannot be displayed by a control client.
-# A popup command from control mode must be ignored cleanly, leaving the
-# client command queue and server usable.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-DIR=$(mktemp -d) || exit 1
-FIFO=$DIR/input
-OUT=$DIR/output
-RAN=$DIR/popup-ran
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	exec 3>&-
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-mkfifo "$FIFO" || exit 1
-$TMUX new-session -d -s control -x40 -y10 'exec sleep 100' || exit 1
-$TMUX -C attach-session -t control <"$FIFO" >"$OUT" 2>&1 &
-control_pid=$!
-exec 3>"$FIFO"
-
-i=0
-while [ "$i" -lt 50 ]; do
-	$TMUX list-clients -F '#{client_flags}' 2>/dev/null |
-	    grep -q 'control-mode' && break
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "control client did not attach"
-
-printf '%s\n' "display-popup -E 'touch $RAN'" >&3
-printf '%s\n' "display-message -p CONTROL-POPUP-ALIVE" >&3
-
-i=0
-while [ "$i" -lt 50 ]; do
-	grep -q 'CONTROL-POPUP-ALIVE' "$OUT" 2>/dev/null && break
-	if ! kill -0 "$control_pid" 2>/dev/null; then
-		fail "control client exited after display-popup"
-	fi
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "command after control-client popup did not run"
-$TMUX has-session -t control || fail "server exited after control-client popup"
-[ ! -e "$RAN" ] || fail "control client started a popup command"
-
-exit 0

regress/control-client-run-shell-exit.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# A waited run-shell command can complete after a control client has closed its
-# input and exited. The command queue still references the client until the job
-# callback runs, but control_stop has already destroyed c->control_state. Late
-# command output must be discarded instead of dereferencing the stopped control
-# state and killing the server.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest"
-$TMUX kill-server 2>/dev/null
-
-OUT=$(mktemp)
-trap "$TMUX kill-server 2>/dev/null; rm -f $OUT" 0 1 15
-
-$TMUX -f/dev/null new-session -d -s main || exit 1
-
-printf '%s\n' 'run-shell "sleep 0.2; echo TEST"' |
-	$TMUX -f/dev/null -C >"$OUT" 2>&1
-
-sleep 1
-
-$TMUX has-session -t main 2>/dev/null || {
-	echo "server exited after late run-shell output"
-	cat "$OUT"
-	exit 1
-}
-
-grep -q '^%exit' "$OUT" || {
-	echo "control client did not exit"
-	cat "$OUT"
-	exit 1
-}
-
-exit 0

regress/control-client-sanity.sh

@@ -30,11 +30,8 @@ killw
 EOF
 sleep 1
 $TMUX has || exit 1
-# Use a control client to request legacy layouts, keeping only pane lines
-# from the control protocol output.
-$TMUX -C lsp -aF '#{pane_id} #{window_layout}' |
-	grep '^%[0-9]' >$TMP || exit 1
-cat <<EOF|cmp $TMP - || exit 1
+$TMUX lsp -aF '#{pane_id} #{window_layout}' >$TMP || exit 1
+cat <<EOF|cmp -s $TMP - || exit 1
 %0 f5ab,200x200,0,0[200x50,0,0,0,200x149,0,51,3]
 %3 f5ab,200x200,0,0[200x50,0,0,0,200x149,0,51,3]
 %2 dcbd,200x200,0,0[200x100,0,0,2,200x99,0,101,4]

regress/control-notify-guard.sh

@@ -1,158 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-LANG=C.UTF-8
-export TERM LC_ALL LANG
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-
-TMPDIR=$(mktemp -d)
-IN="$TMPDIR/in"
-OUT="$TMPDIR/out"
-BADCFG="$TMPDIR/bad.conf"
-PID=
-
-cleanup()
-{
-	exec 3>&- 2>/dev/null
-	[ -n "$PID" ] && kill "$PID" 2>/dev/null
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$TMPDIR"
-}
-trap cleanup EXIT
-
-fail()
-{
-	echo "$1" >&2
-	[ -s "$OUT" ] && cat "$OUT" >&2
-	exit 1
-}
-
-wait_for()
-{
-	pattern=$1
-	timeout=${2:-60}
-	i=0
-
-	while [ "$i" -lt "$timeout" ]; do
-		grep -F -- "$pattern" "$OUT" >/dev/null 2>&1 && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "missing: $pattern"
-}
-
-wait_for_count()
-{
-	pattern=$1
-	expected=$2
-	timeout=${3:-60}
-	i=0
-
-	while [ "$i" -lt "$timeout" ]; do
-		count=$(grep -F -c -- "$pattern" "$OUT" 2>/dev/null)
-		[ "$count" -ge "$expected" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "missing count $expected for: $pattern"
-}
-
-send()
-{
-	printf '%s\n' "$1" >&3 || fail "failed to send: $1"
-}
-
-# A notification is a standalone protocol message. It must never be part of
-# the response between the real %begin and matching %end or %error for a
-# command. Ignore guard-looking command output while a real guard is open.
-check_guards()
-{
-	awk '
-	function notification(line) {
-		return line ~ /^%(sessions-changed|session-changed |unlinked-window-add )/ ||
-		    line ~ /^%(pause |continue |config-error )/
-	}
-	!open && $0 ~ /^%begin [0-9]+ [0-9]+ [0-9]+$/ {
-		open = 1
-		time = $2
-		number = $3
-		flags = $4
-		next
-	}
-	open && ($0 == "%end " time " " number " " flags ||
-	    $0 == "%error " time " " number " " flags) {
-		open = 0
-		next
-	}
-	notification($0) {
-		seen[$1]++
-		if (open) {
-			print "notification inside guard: " $0 > "/dev/stderr"
-			bad = 1
-		}
-	}
-	END {
-		if (open) {
-			print "unterminated command guard" > "/dev/stderr"
-			bad = 1
-		}
-		if (seen["%sessions-changed"] < 2 ||
-		    seen["%session-changed"] < 1 ||
-		    seen["%unlinked-window-add"] < 2 ||
-		    seen["%pause"] < 1 || seen["%continue"] < 1 ||
-		    seen["%config-error"] < 1) {
-			print "missing expected notification" > "/dev/stderr"
-			bad = 1
-		}
-		exit bad
-	}' "$OUT" || fail "bad control protocol notification ordering"
-}
-
-$TMUX kill-server 2>/dev/null
-$TMUX new-session -d -s guard -x 80 -y 24 || exit 1
-pane=$($TMUX display-message -p -t guard:0.0 '#{pane_id}') || exit 1
-
-mkfifo "$IN" || exit 1
-: >"$OUT"
-$TMUX -C attach-session -t guard <"$IN" >"$OUT" 2>&1 &
-PID=$!
-exec 3>"$IN"
-
-# Attaching generates a session notification synchronously from inside the
-# attach command. It must follow the closing guard.
-wait_for '%session-changed '
-
-# Guard-looking output is arbitrary command output, not protocol state. Make
-# new-session both generate notifications and print an unmatched fake %begin;
-# it must not leave those notifications permanently deferred.
-send "set-option -g @fake-begin '%begin 1 2 3'"
-send "new-session -d -P -F '#{@fake-begin}' -s fake-begin"
-wait_for_count '%sessions-changed' 1
-
-# Likewise, fake %end output from a command that generates multiple
-# notifications must not flush them before the command actually ends.
-send "set-option -g @fake-end '%end 1 2 3'"
-send "new-session -d -P -F '#{@fake-end}' -s fake-end"
-wait_for_count '%sessions-changed' 2
-
-# Exercise notification paths outside control-notify.c.
-send "refresh-client -A '$pane:pause'"
-wait_for "%pause $pane"
-send "refresh-client -A '$pane:continue'"
-wait_for "%continue $pane"
-
-printf '%s\n' 'not-a-command' >"$BADCFG"
-send "source-file '$BADCFG'"
-wait_for '%config-error '
-
-# A final command guarantees all earlier command guards have completed before
-# the transcript is checked.
-send "display-message -p 'guard-check-done'"
-wait_for 'guard-check-done'
-check_guards
-
-exit 0

regress/copy-mode-commands.sh

@@ -1,253 +0,0 @@
-#!/bin/sh
-
-# Exercise the broad non-mouse copy-mode command surface: navigation, search,
-# jumps, state toggles, line/end-of-line copies, append, and pipe variants.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-x()
-{
-	$TMUX send-keys -t copy:0 -X "$@" || fail "copy command failed: $*"
-}
-
-wait_mode()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($TMUX display-message -p -t copy:0 '#{pane_in_mode}' 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "pane_in_mode is '$got', expected '$want'"
-}
-
-fresh()
-{
-	$TMUX copy-mode -t copy:0 || exit 1
-	wait_mode 1
-	x history-top
-	x start-of-line
-}
-
-select_text()
-{
-	fresh
-	x begin-selection
-	x cursor-right
-	x cursor-right
-}
-
-$TMUX new-session -d -s copy -x40 -y8 \
-    "sh -c 'i=0; while [ \$i -lt 40 ]; do printf \"  line-%02d needle (a[b]c) end\\n\" \$i; i=\$((i + 1)); done; printf \"\\nparagraph two needle\\n\\nparagraph three\\n\"; printf \"\\033]133;A\\007prompt-one\\n\\033]133;C\\007output-one\\n\\033]133;A\\007prompt-two\\n\\033]133;C\\007output-two\\n\"; exec sleep 100'" ||
-	exit 1
-$TMUX set-option -g status off || exit 1
-$TMUX set-option -g history-limit 200 || exit 1
-
-i=0
-while [ "$i" -lt 50 ]; do
-	history=$($TMUX display-message -p -t copy:0 '#{history_size}')
-	[ "$history" -ge 30 ] && break
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "history did not fill"
-
-fresh
-
-# Copy-mode-specific format callbacks expose the word, line, hyperlink and
-# active search match at the cursor.
-formats=$($TMUX display-message -p -t copy:0 \
-    '#{copy_cursor_word}|#{copy_cursor_line}|#{copy_cursor_hyperlink}|#{search_match}') ||
-	exit 1
-[ -n "$formats" ] || fail "copy-mode cursor formats were empty"
-
-# Cursor, viewport and paragraph commands. Each is asserted by successful
-# dispatch and the final mode-liveness check; detailed word/selection geometry
-# is covered by the existing copy-mode tests.
-for command in back-to-indentation bottom-line top-line middle-line \
-    cursor-centre-vertical cursor-centre-horizontal end-of-line history-bottom \
-    history-top halfpage-down halfpage-up page-down page-up next-paragraph \
-    previous-paragraph next-matching-bracket previous-matching-bracket; do
-	x "$command"
-done
-x goto-line 15
-x set-mark
-x cursor-down
-x jump-to-mark
-
-# OSC 133 prompt and output markers support shell-integration navigation.
-x history-top
-x next-prompt
-case "$($TMUX display-message -p -t copy:0 '#{copy_cursor_line}')" in
-*prompt-one*) ;;
-*) fail "next-prompt did not find prompt-one" ;;
-esac
-x next-prompt
-x previous-prompt
-case "$($TMUX display-message -p -t copy:0 '#{copy_cursor_line}')" in
-*prompt-one*) ;;
-*) fail "previous-prompt did not return to prompt-one" ;;
-esac
-x next-prompt -o
-case "$($TMUX display-message -p -t copy:0 '#{copy_cursor_line}')" in
-*output-one*) ;;
-*) fail "next-prompt -o did not find output-one" ;;
-esac
-
-# Character jumps remember their direction and character for repeat/reverse.
-x jump-forward e
-x jump-again
-x jump-reverse
-x jump-backward e
-x jump-to-forward e
-x jump-to-backward e
-
-# Direct, text and incremental searches cover both directions and the saved
-# search used by again/reverse.
-x search-forward needle
-x search-again
-x search-reverse
-x search-backward needle
-x search-forward-text needle
-x search-backward-text needle
-x search-forward-incremental '=needle'
-x search-forward-incremental '+needle'
-x search-backward-incremental '=needle'
-x search-backward-incremental '-needle'
-
-# Stateful display and behaviour toggles.
-for command in rectangle-on rectangle-off rectangle-toggle \
-    line-numbers-on line-numbers-off line-numbers-toggle \
-    refresh-on refresh-now refresh-off refresh-toggle \
-    scroll-exit-on scroll-exit-off scroll-exit-toggle toggle-position; do
-	x "$command"
-done
-wait_mode 1
-x cancel
-wait_mode 0
-
-# Line and end-of-line copy commands work without an explicit selection.
-fresh
-x select-line
-x copy-selection-and-cancel
-case "$($TMUX show-buffer)" in
-*line-00*) ;;
-*) fail "select-line did not select the current line" ;;
-esac
-
-fresh
-x copy-line
-[ -n "$($TMUX show-buffer)" ] || fail "copy-line produced an empty buffer"
-x cancel
-
-fresh
-x copy-end-of-line
-[ -n "$($TMUX show-buffer)" ] || fail "copy-end-of-line produced an empty buffer"
-x cancel
-
-# Append variants retain or close the mode as advertised.
-$TMUX set-buffer -b append-buffer prefix || exit 1
-select_text
-x append-selection
-appended=$($TMUX show-buffer -b append-buffer)
-case "$appended" in
-prefix*) ;;
-*) fail "append-selection produced '$appended'" ;;
-esac
-x cancel
-
-$TMUX set-buffer -b append-cancel-buffer prefix || exit 1
-select_text
-x append-selection-and-cancel
-wait_mode 0
-appended=$($TMUX show-buffer -b append-cancel-buffer)
-case "$appended" in
-prefix*) ;;
-*) fail "append-selection-and-cancel produced '$appended'" ;;
-esac
-
-# The explicit cancel variants close copy mode.
-fresh
-x copy-line-and-cancel
-wait_mode 0
-fresh
-x copy-end-of-line-and-cancel
-wait_mode 0
-select_text
-x copy-selection-and-cancel
-wait_mode 0
-
-# Pipe wrappers have distinct command handlers. /dev/null keeps the test
-# deterministic while exercising asynchronous pipe job creation and cleanup.
-fresh
-x copy-pipe-line 'cat >/dev/null'
-x cancel
-fresh
-x copy-pipe-line-and-cancel 'cat >/dev/null'
-wait_mode 0
-fresh
-x copy-pipe-end-of-line 'cat >/dev/null'
-x cancel
-fresh
-x copy-pipe-end-of-line-and-cancel 'cat >/dev/null'
-wait_mode 0
-
-select_text
-x copy-pipe-no-clear 'cat >/dev/null'
-x pipe-no-clear 'cat >/dev/null'
-x copy-pipe 'cat >/dev/null'
-x pipe 'cat >/dev/null'
-x cancel
-select_text
-x copy-pipe-and-cancel 'cat >/dev/null'
-wait_mode 0
-select_text
-x pipe-and-cancel 'cat >/dev/null'
-wait_mode 0
-
-# Commands which cancel on downward movement have separate handlers.
-fresh
-x history-bottom
-x bottom-line
-x cursor-down-and-cancel
-wait_mode 0
-fresh
-x history-bottom
-x halfpage-down-and-cancel
-wait_mode 0
-fresh
-x history-bottom
-x page-down-and-cancel
-wait_mode 0
-fresh
-x history-bottom
-x bottom-line
-x scroll-down-and-cancel
-wait_mode 0
-
-$TMUX has-session -t copy || fail "server died during copy-mode commands"
-exit 0

regress/copy-mode-selection-mode.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Changing an existing character selection to line mode must reset both ends
-# to complete lines, including when the cursor subsequently crosses the fixed
-# end. An invalid regular-expression search must also discard marks left by a
-# previous successful search.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-}
-trap cleanup 0 1 15
-
-$TMUX new-session -d -x30 -y6 \
-	"printf 'alpha\nbeta\ngamma\ndelta\n'; exec sleep 100" || exit 1
-$TMUX set-option -g window-size manual || exit 1
-sleep 1
-
-# A valid regular-expression search creates marks. Replacing it with an
-# invalid expression, growing the mode, and scrolling must not leave an old
-# mark array indexed with the new geometry (the original bug was an ASan heap
-# overflow in this sequence).
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X history-top || exit 1
-$TMUX send-keys -X search-forward beta || exit 1
-[ "$($TMUX display-message -p '#{search_present}')" = 1 ] ||
-	fail "successful search did not create marks"
-$TMUX send-keys -X search-forward '[' || exit 1
-$TMUX resize-window -x40 -y8 || exit 1
-$TMUX send-keys -X scroll-down || exit 1
-[ "$($TMUX display-message -p '#{search_present}')" = 0 ] ||
-	fail "invalid regular expression left stale marks after resize"
-$TMUX send-keys -X cancel || exit 1
-
-# Select part of alpha through part of beta, then change the existing
-# selection to line mode. Both lines, and no partial columns, must be copied.
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X history-top || exit 1
-$TMUX send-keys -N2 -X cursor-right || exit 1
-$TMUX send-keys -X begin-selection || exit 1
-$TMUX send-keys -X cursor-down || exit 1
-$TMUX send-keys -N2 -X cursor-right || exit 1
-$TMUX send-keys -X selection-mode line || exit 1
-[ "$($TMUX display-message -p '#{selection_mode}')" = line ] ||
-	fail "selection did not change to line mode"
-$TMUX send-keys -X copy-selection || exit 1
-expected=$(printf 'alpha\nbeta')
-[ "$($TMUX show-buffer)" = "$expected" ] ||
-	fail "line-mode selection did not expand to complete lines"
-
-# Start with the cursor above the fixed end so selection-mode itself takes the
-# reverse-direction path, then extend it through another line.
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X history-top || exit 1
-$TMUX send-keys -N2 -X cursor-down || exit 1
-$TMUX send-keys -N2 -X cursor-right || exit 1
-$TMUX send-keys -X begin-selection || exit 1
-$TMUX send-keys -X cursor-up || exit 1
-$TMUX send-keys -N2 -X cursor-right || exit 1
-$TMUX send-keys -X selection-mode line || exit 1
-$TMUX send-keys -X cursor-up || exit 1
-$TMUX send-keys -X copy-selection || exit 1
-expected=$(printf 'alpha\nbeta\ngamma')
-[ "$($TMUX show-buffer)" = "$expected" ] ||
-	fail "reversed line-mode selection did not keep complete lines"
-
-exit 0

regress/copy-mode-test-vi.sh

@@ -117,7 +117,6 @@ $TMUX send-keys -X copy-selection
 # Test that vi cursor movement does not stop on the padding cell of a wide
 # character at the end of a line.
 $TMUX kill-server 2>/dev/null
-sleep 1
 $TMUX new -d -x20 -y5 \
       "printf 'abc中\nxyz\n'; exec cat" || exit 1
 $TMUX set-window-option -g mode-keys vi

regress/copy-mode-unicode-whitespace.sh

@@ -1,163 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-
-fail()
-{
-	echo "$1"
-	[ -z "$TMUX" ] || $TMUX kill-server 2>/dev/null
-	exit 1
-}
-
-goto_cell()
-{
-	row=$1
-	column=$2
-
-	$TMUX send-keys -X history-top || fail "$mode: history-top failed"
-	$TMUX send-keys -X start-of-line || fail "$mode: start-of-line failed"
-	[ "$row" -eq 0 ] ||
-	    $TMUX send-keys -X -N "$row" cursor-down ||
-	    fail "$mode: cursor-down failed"
-	[ "$column" -eq 0 ] ||
-	    $TMUX send-keys -X -N "$column" cursor-right ||
-	    fail "$mode: cursor-right failed"
-}
-
-check_cursor()
-{
-	expected=$1
-	actual=$($TMUX display-message -p '#{copy_cursor_x},#{copy_cursor_y}')
-	[ "$actual" = "$expected" ] ||
-	    fail "$mode: expected cursor $expected, got $actual"
-}
-
-check_word()
-{
-	row=$1
-	column=$2
-	expected=$3
-
-	goto_cell "$row" "$column"
-	$TMUX set-buffer sentinel || fail "$mode: set-buffer failed"
-	$TMUX send-keys -X select-word || fail "$mode: select-word failed"
-	$TMUX send-keys -X copy-selection || fail "$mode: copy-selection failed"
-	actual=$($TMUX show-buffer 2>/dev/null)
-	[ "$actual" = "$expected" ] ||
-	    fail "$mode: expected word '$expected', got '$actual'"
-}
-
-check_next_word()
-{
-	row=$1
-	expected=$2
-
-	goto_cell "$row" 0
-	$TMUX send-keys -X next-word || fail "$mode: next-word failed"
-	$TMUX set-buffer sentinel || fail "$mode: set-buffer failed"
-	$TMUX send-keys -X select-word || fail "$mode: select-word failed"
-	$TMUX send-keys -X copy-selection || fail "$mode: copy-selection failed"
-	actual=$($TMUX show-buffer 2>/dev/null)
-	[ "$actual" = "$expected" ] ||
-	    fail "$mode: expected next word '$expected', got '$actual'"
-}
-
-for mode in emacs vi; do
-	TMUX="$TEST_TMUX -Lunicode-whitespace-$mode-$$ -f/dev/null"
-	$TMUX kill-server 2>/dev/null
-	$TMUX new-session -d -x16 -y20 \
-	    "printf 'aa bb\naa\tbb\naa\302\240bb\naa\343\200\200bb\naa:bb\naaaaaaaaaaaaaaa\302\240b\nabcdefghijklmnopq\nhardone\nhardtwo\naa\341\232\200bb\naa\342\200\200bb\naa\342\200\250bb\naa\342\200\251bb\naa\342\200\257bb\naa\342\201\237bb\nxa\302\205b c\n'; exec cat" ||
-	    fail "$mode: new-session failed"
-	$TMUX set-option -g window-size manual || fail "$mode: set size failed"
-	$TMUX set-window-option -g mode-keys "$mode" ||
-	    fail "$mode: set mode-keys failed"
-	$TMUX set-window-option -g word-separators "" ||
-	    fail "$mode: clear word-separators failed"
-	$TMUX copy-mode || fail "$mode: copy-mode failed"
-
-	# ASCII space and TAB retain their existing behaviour.
-	goto_cell 0 0
-	$TMUX send-keys -X next-space || fail "$mode: ASCII next-space failed"
-	check_cursor 3,0
-	goto_cell 1 0
-	$TMUX send-keys -X next-space || fail "$mode: TAB next-space failed"
-	check_cursor 8,1
-	$TMUX send-keys -X previous-space ||
-	    fail "$mode: TAB previous-space failed"
-	check_cursor 0,1
-
-	# NBSP is whitespace for selection and word movement.
-	goto_cell 2 0
-	$TMUX send-keys -X next-word || fail "$mode: NBSP next-word failed"
-	check_cursor 3,2
-	$TMUX send-keys -X previous-word ||
-	    fail "$mode: NBSP previous-word failed"
-	check_cursor 0,2
-	check_word 2 0 aa
-	goto_cell 2 0
-	$TMUX send-keys -X next-word-end ||
-	    fail "$mode: NBSP next-word-end failed"
-	if [ "$mode" = emacs ]; then
-		check_cursor 2,2
-	else
-		check_cursor 1,2
-	fi
-
-	# U+3000 is two columns wide; both its leading and padding cells must be
-	# skipped as one whitespace character in either direction.
-	goto_cell 3 0
-	$TMUX send-keys -X next-word || fail "$mode: U+3000 next-word failed"
-	check_cursor 4,3
-	$TMUX send-keys -X previous-word ||
-	    fail "$mode: U+3000 previous-word failed"
-	check_cursor 0,3
-	goto_cell 3 0
-	$TMUX send-keys -X next-space-end ||
-	    fail "$mode: U+3000 next-space-end failed"
-	if [ "$mode" = emacs ]; then
-		check_cursor 2,3
-	else
-		check_cursor 1,3
-	fi
-
-	# Other characters in word-separators remain literal when space enables
-	# Unicode whitespace matching.
-	$TMUX set-window-option -g word-separators ': ' ||
-	    fail "$mode: set custom word-separators failed"
-	goto_cell 4 0
-	$TMUX send-keys -X next-word || fail "$mode: literal next-word failed"
-	check_cursor 2,4
-	$TMUX set-window-option -g word-separators "" ||
-	    fail "$mode: restore word-separators failed"
-
-	# Whitespace in the last column remains a boundary across a soft wrap.
-	goto_cell 5 0
-	$TMUX send-keys -X next-space ||
-	    fail "$mode: wrapped NBSP next-space failed"
-	check_cursor 0,6
-
-	# A word split only by a soft wrap remains one word, while a hard line
-	# boundary still terminates selection.
-	check_word 7 0 abcdefghijklmnopq
-	check_word 9 0 hardone
-
-	# Check the remaining representative White_Space ranges and U+0085
-	# combined into a cell with another character.
-	check_next_word 11 bb
-	check_next_word 12 bb
-	check_next_word 13 bb
-	check_next_word 14 bb
-	check_next_word 15 bb
-	check_next_word 16 bb
-	goto_cell 17 0
-	$TMUX send-keys -X next-word ||
-	    fail "$mode: combined U+0085 next-word failed"
-	check_cursor 2,17
-
-	$TMUX kill-server 2>/dev/null
-done
-
-exit 0

regress/find-window.sh

@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# Exercise find-window's content, name and title filters in every combination,
-# glob/regex and case-insensitive suffixes, plus zoom restoration.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -p -t outer:0.0 2>/dev/null
-}
-
-wait_mode()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER display-message -p -t find:base.0 '#{pane_mode}' 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "pane mode is '$got', expected '$want'"
-}
-
-run_find()
-{
-	label=$1
-	expected=$2
-	shift 2
-	$INNER find-window -t find:base.0 "$@" || fail "$label failed"
-	wait_mode tree-mode
-	i=0
-	while [ "$i" -lt 50 ]; do
-		captured=$(capture)
-		printf '%s\n' "$captured" | grep -Fq "$expected" && break
-		sleep 0.1
-		i=$((i + 1))
-	done
-	[ "$i" -lt 50 ] || fail "$label did not show '$expected'"
-	$INNER send-keys -t find:base.0 q || exit 1
-	wait_mode ''
-}
-
-$INNER new-session -d -s find -n base -x80 -y24 \
-	"sh -c 'printf \"BaseBody\\n\"; exec sleep 100'" || exit 1
-$INNER split-window -d -h -t find:base \
-	"sh -c 'printf \"OtherBody\\n\"; exec sleep 100'" || exit 1
-$INNER new-window -d -t find: -n NameNeedle 'exec sleep 100' || exit 1
-$INNER new-window -d -t find: -n body \
-	"sh -c 'printf \"BodyNeedle\\n\"; exec sleep 100'" || exit 1
-$INNER new-window -d -t find: -n titled 'exec sleep 100' || exit 1
-$INNER select-pane -t find:titled.0 -T TitleNeedle || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$OUTER new-session -d -s outer -x80 -y24 "$INNER attach -t find:base" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-sleep 1
-
-# Wait until the body text is in the pane history before searching it.
-i=0
-while [ "$i" -lt 50 ]; do
-	$INNER capture-pane -p -t find:body.0 | grep -Fq BodyNeedle && break
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "pane content was not ready"
-
-# No flags means C+N+T. Then cover all three pairs and all three singletons.
-run_find default NameNeedle NameNeedle
-run_find content-name NameNeedle -C -N NameNeedle
-run_find content-title titled -C -T TitleNeedle
-run_find name-title titled -N -T TitleNeedle
-run_find content-only body -C BodyNeedle
-run_find name-only NameNeedle -N NameNeedle
-run_find title-only titled -T TitleNeedle
-
-# Glob case folding and all regular-expression suffix variants.
-run_find insensitive NameNeedle -N -i nameneedle
-run_find regex NameNeedle -N -r '^NameNeedle$'
-run_find regex-insensitive NameNeedle -N -r -i '^nameneedle$'
-
-# -Z temporarily zooms the target window and restores its prior state on exit.
-$INNER find-window -Z -t find:base.0 -N NameNeedle || exit 1
-wait_mode tree-mode
-[ "$($INNER display-message -p -t find:base '#{window_zoomed_flag}')" = 1 ] ||
-	fail "find-window -Z did not zoom"
-$INNER send-keys -t find:base.0 q || exit 1
-wait_mode ''
-[ "$($INNER display-message -p -t find:base '#{window_zoomed_flag}')" = 0 ] ||
-	fail "find-window -Z did not restore zoom"
-
-exit 0

regress/floating-pane-geometry.sh

@@ -199,218 +199,5 @@ must_fail $TMUX resize-pane -t "$id" -x 0
 must_fail $TMUX resize-pane -t "$id" -y 0
 $TMUX kill-pane -t "$id" || exit 1
 
-# --- Tiled pane resize with floating cells in the layout ---
-
-$TMUX set-option -w -u pane-border-lines || exit 1
-base=$($TMUX display-message -p '#{pane_id}')
-
-# A floating cell after the last tiled cell must not become the recipient of a
-# relative or absolute resize. This is the sequence from GitHub issue 5135.
-floating=$($TMUX new-pane -dPF '#{pane_id}' -t "$base" \
-	-x 50% -y 50% -X 50% -Y 50% 'sleep 100') ||
-	fail "new-pane for tiled resize test failed"
-lower=$($TMUX split-window -dPF '#{pane_id}' -t "$base" 'sleep 100') ||
-	fail "split-window for tiled resize test failed"
-
-$TMUX resize-pane -t "$lower" -U 5 || fail "relative tiled resize failed"
-must_equal "$($TMUX display-message -p -t "$base" '#{pane_height}')" 7
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_top}')" 8
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_height}')" 16
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_top}')" 13
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 10
-
-$TMUX resize-pane -t "$lower" -y 11 || fail "absolute tiled reset failed"
-$TMUX resize-pane -t "$lower" -y 16 || fail "absolute tiled resize failed"
-must_equal "$($TMUX display-message -p -t "$base" '#{pane_height}')" 7
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_top}')" 8
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_height}')" 16
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 10
-
-$TMUX kill-pane -t "$floating" || exit 1
-$TMUX kill-pane -t "$lower" || exit 1
-
-# A floating cell between tiled siblings must be skipped when finding the cell
-# which donates space to a resize.
-lower=$($TMUX split-window -dPF '#{pane_id}' -t "$base" 'sleep 100') ||
-	fail "split-window for middle floating cell test failed"
-floating=$($TMUX new-pane -dPF '#{pane_id}' -t "$base" \
-	-x 20 -y 8 -X 30 -Y 8 'sleep 100') ||
-	fail "new-pane for middle floating cell test failed"
-
-$TMUX resize-pane -t "$base" -D 3 || fail "resize past floating cell failed"
-must_equal "$($TMUX display-message -p -t "$base" '#{pane_height}')" 15
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_top}')" 16
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_height}')" 8
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 6
-
-$TMUX kill-pane -t "$floating" || exit 1
-$TMUX kill-pane -t "$lower" || exit 1
-
-# A small floating child must not limit the available tiled space in a nested
-# layout with a different split direction.
-lower=$($TMUX split-window -dPF '#{pane_id}' -t "$base" 'sleep 100') ||
-	fail "split-window for nested floating cell test failed"
-right=$($TMUX split-window -dhPF '#{pane_id}' -t "$lower" 'sleep 100') ||
-	fail "horizontal split for nested floating cell test failed"
-floating=$($TMUX new-pane -dPF '#{pane_id}' -t "$lower" \
-	-x 20 -y 3 -X 30 -Y 10 'sleep 100') ||
-	fail "new-pane for nested floating cell test failed"
-
-$TMUX resize-pane -t "$base" -D 3 || fail "nested tiled resize failed"
-must_equal "$($TMUX display-message -p -t "$base" '#{pane_height}')" 15
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_top}')" 16
-must_equal "$($TMUX display-message -p -t "$lower" '#{pane_height}')" 8
-must_equal "$($TMUX display-message -p -t "$right" '#{pane_top}')" 16
-must_equal "$($TMUX display-message -p -t "$right" '#{pane_height}')" 8
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 1
-
-$TMUX kill-pane -t "$floating" || exit 1
-$TMUX kill-pane -t "$right" || exit 1
-$TMUX kill-pane -t "$lower" || exit 1
-
-# --- Floating panes clamped when the window shrinks (issue #5581, PR #5582) ---
-#
-# layout_resize clamps floating panes back inside the window when it shrinks:
-# move them and, only if they cannot fit, shrink them (never below
-# PANE_MINIMUM). A floating cell is the pane's content, so with the default
-# single-line border the clamp counts 1 cell of border per side, exactly as
-# layout_floating_args_parse does on creation; with no border it counts 0.
-# Each case below gets its own window, since resize-window fixes a window at
-# a manual size for the rest of its life.
-
-# Case 1: a lone floating pane -- break-pane -W on a window's only pane --
-# takes the early-return path in layout_resize, added during PR #5582's
-# review round, since there is no tiled tree to walk.
-win=$($TMUX new-window -dPF '#{window_id}') ||
-	fail "new-window for lone float failed"
-
-# -x 20 -y 6 -> pane 18x4; -X 60 -Y 18 -> pane_left 61, pane_top 19: with the
-# border, the footprint is columns 60-79, rows 18-23, flush with the 80x24
-# window's right and bottom edges, so the float fits before it is shrunk.
-$TMUX break-pane -W -s "$win" -x 20 -y 6 -X 60 -Y 18 ||
-	fail "break-pane -W for lone float failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   61
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    19
-
-# Shrink to 40x16. The float still fits at its own size (18 <= 40-2, 4 <=
-# 16-2) so only its position moves, flush to the new right/bottom edges:
-# xoff = 40 - 18 - 1 = 21; yoff = 16 - 4 - 1 = 11.
-$TMUX resize-window -t "$win" -x 40 -y 16 ||
-	fail "resize-window (lone float) failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   21
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    11
-
-# Case 5: grow the window back. The clamp must not chase the window back
-# outward -- it only ever pulls a float in, never restores where it was.
-$TMUX resize-window -t "$win" -x 80 -y 24 ||
-	fail "resize-window grow (lone float) failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   21
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    11
-$TMUX kill-window -t "$win" || exit 1
-
-# Case 2: the same float, but with a tiled sibling surviving alongside it, so
-# the window's root cell stays tiled and layout_resize takes the normal path
-# (the clamp call after layout_fix_offsets) instead of the early return
-# above. Same geometry as case 1, so the same numbers should come out.
-win=$($TMUX new-window -dPF '#{window_id}') ||
-	fail "new-window for tiled sibling failed"
-$TMUX split-window -t "$win" 'sleep 100' ||
-	fail "split-window for tiled sibling failed"
-$TMUX break-pane -W -s "$win" -x 20 -y 6 -X 60 -Y 18 ||
-	fail "break-pane -W for tiled sibling failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   61
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    19
-
-$TMUX resize-window -t "$win" -x 40 -y 16 ||
-	fail "resize-window (tiled sibling) failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   21
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    11
-$TMUX kill-window -t "$win" || exit 1
-
-# Case 3: new-pane float, the original repro from issue #5581 and the PR
-# body -- also the normal path, via the tiled base pane new-window creates.
-win=$($TMUX new-window -dPF '#{window_id}') ||
-	fail "new-window for new-pane repro failed"
-$TMUX resize-window -t "$win" -x 120 -y 40 ||
-	fail "resize-window to 120x40 failed"
-
-# -x 30 -y 10 -> pane 28x8; -X 85 -Y 25 -> pane_left 86, pane_top 26.
-floating=$($TMUX new-pane -t "$win" -dPF '#{pane_id}' \
-	-x 30 -y 10 -X 85 -Y 25 'sleep 100') ||
-	fail "new-pane for new-pane repro failed"
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_width}')"  28
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 8
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_left}')"   86
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_top}')"    26
-
-# Shrink to 60x20: xoff = 60 - 28 - 1 = 31; yoff = 20 - 8 - 1 = 11.
-$TMUX resize-window -t "$win" -x 60 -y 20 ||
-	fail "resize-window (new-pane repro) failed"
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_width}')"  28
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 8
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_left}')"   31
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_top}')"    11
-$TMUX kill-window -t "$win" || exit 1
-
-# Case 4: a float that already fits inside the shrunk window is left alone --
-# assert position and size are both unchanged, not just one of them.
-win=$($TMUX new-window -dPF '#{window_id}') ||
-	fail "new-window for untouched float failed"
-
-# -x 20 -y 6 -> pane 18x4; -X 8 -Y 3 -> pane_left 9, pane_top 4 (as at the top
-# of this file). Footprint columns 8-27, rows 3-8: well inside 60x20 too.
-floating=$($TMUX new-pane -t "$win" -dPF '#{pane_id}' \
-	-x 20 -y 6 -X 8 -Y 3 'sleep 100') ||
-	fail "new-pane for untouched float failed"
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_left}')"   9
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_top}')"    4
-
-$TMUX resize-window -t "$win" -x 60 -y 20 ||
-	fail "resize-window (untouched float) failed"
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_width}')"  18
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_height}')" 4
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_left}')"   9
-must_equal "$($TMUX display-message -p -t "$floating" '#{pane_top}')"    4
-$TMUX kill-window -t "$win" || exit 1
-
-# Case 6: pad = 0, via the pane-border-lines window option set to none. The
-# border arithmetic differs here (no -2/+1 adjustment either on creation or
-# in the clamp).
-win=$($TMUX new-window -dPF '#{window_id}') ||
-	fail "new-window for pad=0 float failed"
-$TMUX set-option -w -t "$win" pane-border-lines none ||
-	fail "set pane-border-lines none failed"
-
-# No border: -x 20 -y 6 -> pane 20x6 directly; -X 60 -Y 18 -> pane_left 60,
-# pane_top 18 directly. Footprint (== content, no border) is columns 60-79,
-# rows 18-23: flush right/bottom of the 80x24 window, same as case 1.
-$TMUX break-pane -W -s "$win" -x 20 -y 6 -X 60 -Y 18 ||
-	fail "break-pane -W for pad=0 float failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  20
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 6
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   60
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    18
-
-# Shrink to 40x16 with pad=0: xoff = 40 - 20 - 0 = 20; yoff = 16 - 6 - 0 = 10.
-$TMUX resize-window -t "$win" -x 40 -y 16 ||
-	fail "resize-window (pad=0 float) failed"
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_width}')"  20
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_height}')" 6
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_left}')"   20
-must_equal "$($TMUX display-message -p -t "$win" '#{pane_top}')"    10
-$TMUX kill-window -t "$win" || exit 1
-
 $TMUX kill-server 2>/dev/null
 exit 0

regress/format-variables.sh

@@ -71,10 +71,7 @@ cursor_very_visible
 cursor_x
 cursor_y
 history_all_bytes
-history_added
 history_bytes
-history_collected
-history_generation
 history_limit
 history_size
 host
@@ -106,11 +103,6 @@ pane_at_right
 pane_at_top
 pane_bg
 pane_bottom
-pane_command_duration
-pane_command_end_time
-pane_command_running
-pane_command_start_time
-pane_command_status
 pane_current_command
 pane_current_path
 pane_dead
@@ -128,21 +120,16 @@ pane_index
 pane_input_off
 pane_key_mode
 pane_last
-pane_last_output_time
-pane_last_prompt_time
 pane_left
 pane_marked
 pane_marked_set
-pane_modal_flag
 pane_mode
-pane_output_generation
 pane_path
 pane_pb_progress
 pane_pb_state
 pane_pid
 pane_pipe
 pane_pipe_pid
-pane_private_modes
 pane_right
 pane_search_string
 pane_start_command
@@ -154,8 +141,6 @@ pane_title
 pane_top
 pane_tty
 pane_unseen_changes
-pane_unzoomed_height
-pane_unzoomed_width
 pane_width
 pane_x
 pane_y
@@ -221,10 +206,7 @@ window_layout
 window_linked
 window_linked_sessions
 window_linked_sessions_list
-window_manual_height
-window_manual_width
 window_marked_flag
-window_modal_pane
 window_name
 window_offset_x
 window_offset_y

regress/hooks-notify.sh

@@ -218,13 +218,11 @@ $TMUX set-hook -gu pane-mode-changed || fail "unset pane-mode-changed failed"
 
 # pane-exited when a pane's command exits with remain-on-exit off.
 $TMUX set -g @x 0 || fail "set @x failed"
-$TMUX set-hook -g pane-exited \
-	'set -gF @x "#{hook}:#{hook_pane}:#{hook_exit_status}:#{hook_exit_success}"' ||
+$TMUX set-hook -g pane-exited 'set -gF @x "#{hook}:#{hook_pane}"' ||
 	fail "set-hook pane-exited failed"
-pane=$($TMUX splitw -d -t main:0 -P -F '#{pane_id}' \
-	'trap "" HUP; exec </dev/null >/dev/null 2>&1; sleep 1; exit 42') ||
-	fail "split-window exit 42 failed"
-wait_for @x "pane-exited:$pane:42:0"
+pane=$($TMUX splitw -d -t main:0 -P -F '#{pane_id}' 'true') ||
+	fail "split-window true failed"
+wait_for @x "pane-exited:$pane"
 $TMUX set-hook -gu pane-exited || fail "unset pane-exited failed"
 
 # pane-died when a pane's command exits with remain-on-exit on.

regress/image-support.sh

@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Grid-resident SIXEL image markers: history, copy, overwrite and fallback.
+
+PATH=/bin:/usr/bin
+TERM=screen
+
+[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
+TMUX="$TEST_TMUX -Limage$$ -f/dev/null"
+TMUX2="$TEST_TMUX -Limage-client$$ -f/dev/null"
+$TMUX kill-server 2>/dev/null
+$TMUX2 kill-server 2>/dev/null
+
+TMP=$(mktemp)
+trap "$TMUX kill-server 2>/dev/null; $TMUX2 kill-server 2>/dev/null; rm -f $TMP" 0 1 15
+
+$TMUX new-session -d -x 20 -y 8 "
+	printf '\033Pq\"1;1;8;16#0;2;100;100;100#0~~~~~~~~\044-~~~~~~~~\033\\'
+	i=0
+	while [ \$i -lt 10 ]; do printf '\nline-%d' \$i; i=\$((i + 1)); done
+	sleep 10"
+
+sleep 1
+[ "$($TMUX display-message -p '#{image_support}')" = 0 ] && exit 0
+
+# Images scroll as grid cells, while capture output contains ordinary spaces.
+[ "$($TMUX display-message -p '#{history_size}')" -gt 0 ] || exit 1
+$TMUX capture-pane -pS- >$TMP || exit 1
+grep 'Pq' $TMP >/dev/null && exit 1
+
+# Copy mode duplicates the backing grid, including image marker references.
+$TMUX copy-mode || exit 1
+$TMUX send-keys -X history-top || exit 1
+$TMUX capture-pane -p >$TMP || exit 1
+$TMUX send-keys -X cancel || exit 1
+
+# Ordinary text overwrites marker cells through the normal grid write path.
+$TMUX new-window -d "
+	printf '\033Pq\"1;1;8;16#0;2;100;100;100#0~~~~~~~~\044-~~~~~~~~\033\\'
+	printf '\033[HXY'
+	sleep 10"
+sleep 1
+[ "$($TMUX capture-pane -pt:1 -S0 -E0)" = "XY" ] || exit 1
+
+# A 26-pixel raster occupies two default 16-pixel cells, but the final cell
+# remains only partially filled instead of stretching the raster to 32 pixels.
+# A client without an image feature exposes this in the sampled text backend.
+$TMUX kill-server 2>/dev/null
+$TMUX2 new-session -d -x 10 -y 4 "
+	printf '\033Pq\"1;1;26;26#0;2;100;100;100#0!26~-!26~-!26~-!26~-!26B\033\\'
+	sleep 10" || exit 1
+$TMUX2 set -g status off || exit 1
+$TMUX2 set -as terminal-features ',*:sixel' || exit 1
+$TMUX new-session -d -x 10 -y 4 || exit 1
+$TMUX set -g status off || exit 1
+$TMUX pipe-pane -O "cat >$TMP" || exit 1
+$TMUX send-keys -l "$TMUX2 attach-session" || exit 1
+$TMUX send-keys Enter || exit 1
+sleep 1
+$TMUX capture-pane -pS0 -E0 >$TMP || exit 1
+grep -q '^#=' $TMP || exit 1
+
+# Re-emitting the image preserves the 26-pixel raster rather than expanding
+# it to the two complete 16-pixel grid cells occupied by the image.
+$TMUX pipe-pane || exit 1
+$TMUX pipe-pane -O "cat >$TMP" || exit 1
+$TMUX2 refresh-client -R || exit 1
+sleep 1
+grep -a '"1;1;26;26' $TMP >/dev/null || exit 1
+
+# Selection redraws must leave text image cells visible.
+$TMUX2 copy-mode || exit 1
+$TMUX2 send-keys -X history-top || exit 1
+$TMUX2 send-keys -X start-of-line || exit 1
+$TMUX2 send-keys -X begin-selection || exit 1
+sleep 1
+$TMUX capture-pane -pS0 -E0 >$TMP || exit 1
+grep -q '^#=' $TMP || exit 1
+
+# Image marker rows remain cell-aligned when a narrower terminal causes text
+# reflow. The second image cell is clipped, not moved to the following row.
+$TMUX2 send-keys -X cancel || exit 1
+$TMUX2 new-window -d "
+	printf '\033Pq\"1;1;26;26#0;2;100;100;100#0!26~-!26~-!26~-!26~-!26B\033\\'
+	sleep 10" || exit 1
+$TMUX2 select-window -t:1 || exit 1
+sleep 1
+$TMUX resize-window -x 1 -y 4 || exit 1
+sleep 1
+$TMUX capture-pane -pS0 -E3 >$TMP || exit 1
+[ -n "$(sed -n 1p $TMP)" ] || exit 1
+[ -z "$(sed -n 2p $TMP)" ] || exit 1
+$TMUX resize-window -x 10 -y 4 || exit 1
+sleep 1
+$TMUX capture-pane -pS0 -E3 >$TMP || exit 1
+[ "$(sed -n 1p $TMP | wc -c)" = 61 ] || exit 1
+[ -z "$(sed -n 2p $TMP)" ] || exit 1
+
+exit 0

regress/json.sh

@@ -1,137 +0,0 @@
-#!/bin/sh
-
-# Test parsing and printing JSON with display-message -j.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
-
-fail()
-{
-	echo "$1"
-	$TMUX kill-server 2>/dev/null
-	exit 1
-}
-
-check()
-{
-	actual=$($TMUX display-message -plj "$1" 2>&1) ||
-	    fail "JSON was rejected: $1: $actual"
-	[ "$actual" = "$2" ] ||
-	    fail "JSON output mismatch: $1: expected $2, got $actual"
-}
-
-check_fail()
-{
-	if $TMUX display-message -plj "$1" >/dev/null 2>&1; then
-		fail "invalid JSON was accepted: $1"
-	fi
-}
-
-$TMUX new-session -d || exit 1
-
-check '{}' '{}'
-check ' { "z":true, "a":-9223372036854775808, "m":[{}, {"x":false}] } ' \
-    '{"a":-9223372036854775808,"m":[{},{"x":false}],"z":true}'
-check '{"max":9223372036854775807,"min":-9223372036854775808}' \
-    '{"max":9223372036854775807,"min":-9223372036854775808}'
-check '{" key":" value","{key":"[value"}' \
-    '{" key":" value","{key":"[value"}'
-check '{"brace":"{value","bracket":"[value","colon":":value",'\
-'"comma":",value","space":" value"}' \
-    '{"brace":"{value","bracket":"[value","colon":":value",'\
-'"comma":",value","space":" value"}'
-check '{"esc":"\"\\\/\b\f\n\r\t\u0041"}' \
-    '{"esc":"\"\\\/\b\f\n\r\t\u0041"}'
-check '{"unicode":"\u0123\uabcd\uABCD"}' \
-    '{"unicode":"\u0123\uabcd\uABCD"}'
-
-actual=$($TMUX display-message -palj '{}' 2>&1) ||
-    fail "display-message -aj rejected JSON: $actual"
-[ "$actual" = '{}' ] ||
-    fail "display-message -aj did not ignore -a: got $actual"
-actual=$($TMUX display-message -pIlj '{}' 2>&1) ||
-    fail "display-message -Ij rejected JSON: $actual"
-[ "$actual" = '{}' ] ||
-    fail "display-message -Ij did not ignore -I: got $actual"
-
-check_fail ''
-check_fail '   '
-check_fail '[]'
-check_fail 'true'
-check_fail '1'
-check_fail '"string"'
-check_fail '{}{}'
-
-check_fail '{'
-check_fail '{x:1}'
-check_fail '{"":1}'
-check_fail '{"x" 1}'
-check_fail '{"x",1}'
-check_fail '{"x":}'
-check_fail '{"x":,}'
-check_fail '{"x":1'
-check_fail '{"x":1 "y":2}'
-check_fail '{"x":1,,"y":2}'
-check_fail '{"x":1,}'
-check_fail '{"x":1,"x":2}'
-check_fail '{"x":{}}{}'
-check_fail '{"x":{}} trailing'
-check_fail '{"x":{'
-check_fail '{"x":{}'
-
-check_fail '{"x":['
-check_fail '{"x":[}'
-check_fail '{"x":[{}'
-check_fail '{"x":[{},}'
-check_fail '{"x":[{},]}'
-check_fail '{"x":[{}{}]}'
-check_fail '{"x":[{},,{}]}'
-check_fail '{"x":[{"y":}]}'
-check_fail '{"x":""}'
-check_fail '{"x":null}'
-check_fail '{"x":[null]}'
-check_fail '{"x":[true]}'
-check_fail '{"x":["string"]}'
-check_fail '{"x":[[]]}'
-check_fail '{"x":1.0}'
-check_fail '{"x":1e2}'
-check_fail '{"x":+1}'
-check_fail '{"x":-}'
-check_fail '{"x":0x10}'
-check_fail '{"x":01}'
-check_fail '{"x":-01}'
-check_fail '{"x":[1]}'
-check_fail '{"x":9223372036854775808}'
-check_fail '{"x":-9223372036854775809}'
-check_fail '{"x":tru}'
-check_fail '{"x":True}'
-check_fail '{"x":falsee}'
-check_fail '{"x":"bad\q"}'
-check_fail '{"x":"bad\x20"}'
-check_fail '{"x":"bad\u123"}'
-check_fail '{"x":"bad\u12x4"}'
-check_fail '{"x":"unterminated}'
-check_fail '{"x":"escaped quote\"}'
-check_fail '{"x":"line
-break"}'
-
-# The maximum object nesting depth is 200.
-json='{}'
-n=1
-while [ "$n" -lt 200 ]; do
-	json='{"x":'"$json"'}'
-	n=$((n + 1))
-done
-check "$json" "$json"
-check_fail '{"x":'"$json"'}'
-
-if $TMUX display-message -pj >/dev/null 2>&1; then
-	fail "display-message -j accepted a missing message"
-fi
-
-$TMUX kill-server 2>/dev/null
-exit 0

regress/layout-custom.sh

@@ -1,986 +0,0 @@
-#!/bin/sh
-
-# Tests of the custom layout dumper and evaluator in layout-custom.c, and of
-# the JSON tokenizer and parser in json.c that the current layout format is
-# built on.
-#
-# layout_dump is reached through the #{window_layout} and
-# #{window_visible_layout} formats and layout_parse through
-# "select-layout <layout>". json.c has no command of its own either:
-# layout_construct sniffs the first non-blank character and hands anything
-# starting with '{' to json_parse, so select-layout is the only way into it
-# from the shell as well.
-#
-# Both layout formats are covered:
-# - the current (v2) JSON format, which is what every client except an old
-#   control client sees;
-# - the legacy (v1) format, which is still produced for a control client that
-#   has not asked for the "new-layouts" flag, and which is still accepted by
-#   the parser (the version is sniffed from the first character).
-#
-# This exercises:
-# - dumping a single pane, a split, the "a" (active) and "l" (last pane) keys
-#   and the "z" key of a floating pane;
-# - #{window_visible_layout} agreeing with #{window_layout};
-# - the JSON syntax itself: insignificant whitespace, backslash escapes inside
-#   strings, the number and boolean forms, and one failure for each way json.c
-#   can reject an input that a layout string can carry;
-# - a dump being parsed back to exactly the same layout (round trip), after
-#   another layout has been applied in between, and the same for a layout with
-#   two floating panes in it;
-# - parsing a hand-written v2 layout;
-# - "i" deciding which pane goes in which cell, checked with a layout whose
-#   cells are written in a different order from their indexes;
-# - the same layouts with their fields in reversed and scrambled orders,
-#   including "c" before "t" and "V" after "L", neither of which changes the
-#   order the fields are read in;
-# - a layout with more cells than the window has panes having the bottom right
-#   cells dropped, in both formats;
-# - a layout naming no active or last pane leaving the active pane where it was
-#   and emptying the last pane stack, whether it leaves "a" out or gives it as
-#   false;
-# - parsing a v1 layout and dumping it back as v1 through a control client,
-#   with the checksum computed here independently of layout_checksum(), and a
-#   v1 layout leaving the active pane and last pane stack untouched;
-# - the legacy format meeting the floating panes it cannot represent: a v1 dump
-#   dropping the floating cells, both where that leaves the node they were in
-#   with one child so that it collapses, where it does not, and where adjacent
-#   nested floating-only subtrees are dropped, and a v1 layout being applied to
-#   a window that has floating panes without disturbing them, whether the tiled
-#   layout it names is a single cell or a split;
-# - a window whose only tiled pane has been killed, which leaves it with a
-#   floating cell as its layout root or with a root node holding nothing but
-#   floating cells, producing no v1 dump at all, and being parsed as v1;
-# - the %layout-change notification, in both formats at once: two control
-#   clients watching one layout change, only one of which has asked for new
-#   layouts, and the number of notifications a change produces in each format;
-# - failures: a bad v1 header, checksum or body, a wrong version, a missing or
-#   duplicated root cell, missing sizes, sizes out of range, bad cell types, a
-#   pane cell missing "i", leaf cells with children and node cells with fewer
-#   than two, more than one active pane, too few cells for the panes and
-#   inconsistent sizes.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LANG=C.UTF-8
-LC_ALL=C.UTF-8
-export TERM LANG LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
-
-fail()
-{
-	echo "$*" >&2
-	$TMUX kill-server 2>/dev/null
-	exit 1
-}
-
-# must_equal $what $got $expected
-must_equal()
-{
-	if [ "$2" != "$3" ]; then
-		echo "$1 wrong." >&2
-		echo "Expected: '$3'" >&2
-		echo "But got:  '$2'" >&2
-		$TMUX kill-server 2>/dev/null
-		exit 1
-	fi
-}
-
-# must_differ $what $got $unwanted
-must_differ()
-{
-	[ "$2" != "$3" ] || fail "$1 unchanged: '$2'"
-}
-
-# must_contain $what $got $wanted
-must_contain()
-{
-	case "$2" in
-	*"$3"*) ;;
-	*) fail "$1: '$2' does not contain '$3'";;
-	esac
-}
-
-# check_ok $cmd...
-#
-# Run a command and require that it succeeds.
-check_ok()
-{
-	out=$($TMUX "$@" 2>&1) || fail "Command failed (expected success): $* ($out)"
-}
-
-# check_fail $cmd...
-#
-# Run a command and require that it fails. The error text itself is never
-# checked anywhere in this test: the wording of a message is not part of what
-# the layout formats promise, so matching on it only makes the test fail when a
-# message is reworded.
-check_fail()
-{
-	$TMUX "$@" >/dev/null 2>&1 &&
-		fail "Command succeeded (expected failure): $*"
-}
-
-# layout $target
-#
-# The layout of a window with pane ids replaced by %N, so that the expected
-# strings do not depend on which ids the server handed out.
-layout()
-{
-	$TMUX display-message -p -t "$1" '#{window_layout}' |
-		sed 's/%[0-9][0-9]*/%N/g'
-}
-
-# visible_layout $target
-#
-# As layout(), but the visible (zoomed) layout.
-visible_layout()
-{
-	$TMUX display-message -p -t "$1" '#{window_visible_layout}' |
-		sed 's/%[0-9][0-9]*/%N/g'
-}
-
-# raw_layout $target
-#
-# The layout of a window with the real pane ids left in place.
-raw_layout()
-{
-	$TMUX display-message -p -t "$1" '#{window_layout}'
-}
-
-# v1_layout $target
-#
-# The legacy (v1) dump of a window, which is what a control client that has not
-# asked for the "new-layouts" flag is sent. A control client wraps its output in
-# %begin/%end guard lines, which are dropped here.
-v1_layout()
-{
-	$TMUX -C display-message -p -t "$1" '#{window_layout}' | grep -v '^%'
-}
-
-# v1 $body
-#
-# Prefix a legacy (v1) layout body with its checksum. This is a separate
-# implementation of layout_checksum(): a 16 bit rotate right then add, so a
-# mistake in either one shows up as a mismatch.
-v1()
-{
-	awk -v s="$1" 'BEGIN {
-		for (i = 32; i < 127; i++)
-			ord[sprintf("%c", i)] = i
-		csum = 0
-		for (i = 1; i <= length(s); i++) {
-			csum = int(csum / 2) + (csum % 2) * 32768
-			csum = (csum + ord[substr(s, i, 1)]) % 65536
-		}
-		printf "%04x,%s\n", csum, s
-	}'
-}
-
-# A pane cell is dumped as its geometry, then "a" if it is the active pane or
-# "l" with its position on the last pane stack if it is on it, then "i" with
-# its pane index, then "z" if it is floating, then "I" with its pane id.
-ONE='{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"a":true,"i":0,"I":"%N"}}'
-
-check_ok new-session -d -s L -x 80 -y 24 -n one
-
-p0=$($TMUX display-message -p -t L:one.0 '#{pane_id}')
-
-# A single leaf cell filling the window. A pane cell must carry "i", its pane
-# index; "I", its pane id, is written by the dumper and is here so that the cell
-# is the same shape as a dumped one. The JSON checks below care about the syntax
-# around the cell rather than the cell itself.
-LEAF='{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$p0"'"}'
-
-# ---------------------------------------------------------------------------
-# Dumping a single pane.
-
-# The root cell of a new window is the pane itself, and it is the active pane
-# so it has "a" rather than "l".
-must_equal 'Single pane layout' "$(layout L:one)" "$ONE"
-
-# Nothing is zoomed, so the visible layout is the same.
-must_equal 'Single pane visible layout' "$(visible_layout L:one)" "$ONE"
-
-# ---------------------------------------------------------------------------
-# More cells than panes.
-
-# The bottom right cells are closed until as many are left as there are panes,
-# so a two cell layout applied to a one pane window collapses back to the
-# single pane filling the window: the cell that is left takes the space of the
-# one that was closed. The window has one pane to name, so the cell that is
-# closed carries an id belonging to no pane of it.
-check_ok select-layout -t L:one \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"i":0,"I":"'"$p0"'"},{"t":"p","w":80,"h":12,"x":0,"y":12,"i":1,"I":"%999"}]}}'
-must_equal 'Trimmed layout' "$(layout L:one)" "$ONE"
-
-# ---------------------------------------------------------------------------
-# The JSON syntax.
-#
-# These run on the one pane window and are written so that what they prove
-# depends on json.c rather than on the layout evaluation in layout-custom.c:
-# an accepted layout is only required to leave the window as its single pane,
-# and values that are not part of the layout format are carried on keys
-# layout-custom.c never looks at ("n", "b" and so on), which it skips, so
-# numbers, booleans and escapes can be exercised on their own.
-#
-# Objects nested in an array nested in an object are not checked here: every
-# split layout below is one.
-#
-# Two of json.c's rejections cannot be reached from the shell and so are not
-# covered: json_parse_tokens() refusing a top level that is not an object,
-# because layout_construct() only calls json_parse() once the string already
-# starts with '{'; and the maximum object depth, which needs a layout built by a
-# program rather than one written out here.
-
-# check_json_ok $what $layout
-#
-# select-layout must parse $layout and leave the window as its single pane.
-check_json_ok()
-{
-	check_ok select-layout -t L:one "$2"
-	must_equal "Layout after '$1'" "$(layout L:one)" "$ONE"
-}
-
-# check_json_fail $what $layout
-#
-# select-layout must reject $layout.
-check_json_fail()
-{
-	$TMUX select-layout -t L:one "$2" >/dev/null 2>&1 &&
-		fail "$1: select-layout succeeded (expected failure)"
-}
-
-# Whitespace between tokens is skipped. A number is scanned up to the ',', ']',
-# '}' or whitespace that ends it, so a space after a number is fine but one
-# inside it is not.
-check_json_ok 'Spaces between tokens' \
-	'{ "V" : 2 , "L" : { "t" : "p" , "w" : 80 , "h" : 24 , "x" : 0 , "y" : 0 , "i" : 0 , "I" : "'"$p0"'" } }'
-
-check_json_ok 'Newlines and tabs between tokens' "$(printf '{
-\t"V": 2,
-\t"L": {
-\t\t"t": "p",
-\t\t"w": 80,
-\t\t"h": 24,
-\t\t"x": 0,
-\t\t"y": 0,
-\t\t"i": 0,
-\t\t"I": "%s"
-\t}
-}' "$p0")"
-
-check_json_ok 'Carriage returns between tokens' \
-	"$(printf '{\r"V":2,\r"L":%s\r}' "$LEAF")"
-
-# A backslash makes the tokenizer consume the next character whatever it is, so
-# an escaped quote does not end the string. The key is not one that
-# layout-custom.c looks at, so all that is being checked is that the string
-# ended in the right place and the object still parsed.
-check_json_ok 'Escaped quote in a string' \
-	'{"V":2,"a\"b":0,"L":'"$LEAF"'}'
-
-# An escaped backslash immediately before the closing quote: the escape has to
-# be cleared again so that the quote after it does end the string.
-check_json_ok 'Escaped backslash before the closing quote' \
-	'{"V":2,"a\\":0,"L":'"$LEAF"'}'
-
-# Numbers and booleans, again on keys layout-custom.c ignores, so only json.c
-# decides whether they are accepted.
-check_json_ok 'Zero' '{"V":2,"n":0,"L":'"$LEAF"'}'
-check_json_ok 'Several digits' '{"V":2,"n":1234567,"L":'"$LEAF"'}'
-check_json_ok 'Negative number' '{"V":2,"n":-42,"L":'"$LEAF"'}'
-check_json_ok 'Booleans' '{"V":2,"b":true,"d":false,"L":'"$LEAF"'}'
-
-# Tokenizer failures. A value that runs to the end of the input has no
-# terminator, so it is the tokenizer rather than the parser that gives up. Both
-# the number scan and the string scan have to notice this, and with the closing
-# quote escaped there is no terminator left either.
-check_json_fail 'Unterminated number' '{"V":2'
-check_json_fail 'Unterminated string' '{"V":"x'
-check_json_fail 'Escaped closing quote' '{"V":2,"L":{"t":"p\"}}'
-
-# Something that is not a quoted string where a key belongs.
-check_json_fail 'Missing key' '{"V":2,,"L":'"$LEAF"'}'
-
-# A key not followed by ':'.
-check_json_fail 'Missing colon' '{"V","L":2}'
-
-# A bare word that is neither "true", "false" nor a number. This is where
-# "null" ends up.
-check_json_fail 'Unknown literal' '{"V":null,"L":'"$LEAF"'}'
-
-# A ':' with no value after it, so the token where the value belongs is one the
-# object parser has no case for.
-check_json_fail 'Missing value' '{"V":}'
-
-# A ',' with nothing after it, and a value with no ',' before the next key.
-check_json_fail 'Trailing comma in an object' '{"V":2,"L":'"$LEAF"',}'
-check_json_fail 'Missing comma in an object' '{"V":2 "L":'"$LEAF"'}'
-
-# Arrays hold objects and nothing else.
-check_json_fail 'Non-object in an array' \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":["x"]}}'
-check_json_fail 'Trailing comma in an array' \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":['"$LEAF"',]}}'
-
-# An empty string is two adjacent quotes with no value token between them,
-# which the string parser does not accept.
-check_json_fail 'Empty string' '{"V":2,"L":""}'
-
-# A number token that strtoll does not consume all of.
-check_json_fail 'Number with trailing characters' '{"V":8a,"L":'"$LEAF"'}'
-
-# Anything after the top level object.
-check_json_fail 'Data after the top level object' '{"V":2,"L":'"$LEAF"'}{}'
-
-# None of the rejections touched the layout.
-must_equal 'Layout after rejected parses' "$(layout L:one)" "$ONE"
-
-# ---------------------------------------------------------------------------
-# Dumping a split.
-
-check_ok new-window -d -t L:2 -n two
-q0=$($TMUX display-message -p -t L:two.0 '#{pane_id}')
-
-# -l 12 gives the new (bottom) pane 12 lines, leaving 11 for the top pane and
-# one for the border between them. With -d the top pane stays active.
-check_ok split-window -d -v -l 12 -t L:two.0
-q1=$($TMUX display-message -p -t L:two.1 '#{pane_id}')
-
-# Nothing has changed the active pane, so the last pane stack is still empty
-# and the bottom pane has neither "a" nor "l".
-must_equal 'Split layout' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":12,"x":0,"y":12,"i":1,"I":"%N"}]}}'
-
-# ---------------------------------------------------------------------------
-# The active and last pane keys.
-
-# Selecting the bottom pane makes it active and pushes the top pane onto the
-# last pane stack, where it is at index 0.
-check_ok select-pane -t "$q1"
-must_equal 'Layout after select-pane' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"l":0,"i":0,"I":"%N"},{"t":"p","w":80,"h":12,"x":0,"y":12,"a":true,"i":1,"I":"%N"}]}}'
-
-# Selecting the top pane again swaps the two keys over. "i" and "I" do not
-# move: they are the pane's position in the window and its id.
-check_ok select-pane -t "$q0"
-SPLIT='{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":12,"x":0,"y":12,"l":0,"i":1,"I":"%N"}]}}'
-must_equal 'Layout after select-pane back' "$(layout L:two)" "$SPLIT"
-
-# ---------------------------------------------------------------------------
-# The visible layout.
-
-# With nothing zoomed the two layout formats agree.
-#
-# The zoomed case is deliberately not covered here. While a pane is zoomed
-# #{window_layout} dumps the saved (unzoomed) layout and
-# #{window_visible_layout} the zoomed one, but that depends on how zooming
-# stashes the layout root rather than on anything in layout-custom.c.
-must_equal 'Visible layout' "$(visible_layout L:two)" "$SPLIT"
-
-# ---------------------------------------------------------------------------
-# Round trip.
-
-# Make the two panes obviously uneven so that the layout applied in between
-# cannot be mistaken for the saved one. A resize shows up in the dump as the
-# new cell sizes and offsets.
-check_ok resize-pane -t "$q0" -y 5
-saved=$(raw_layout L:two)
-must_equal 'Resized layout' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":5,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":18,"x":0,"y":6,"l":0,"i":1,"I":"%N"}]}}'
-
-check_ok select-layout -t L:two even-vertical
-must_differ 'Layout after even-vertical' "$(raw_layout L:two)" "$saved"
-
-# Parsing a dump gives back exactly the same dump, pane ids included. The panes
-# go back into the cells that named them: the cells are ordered by "i" and then
-# given the window's panes in order, so a cell dumped with "i":k must come back
-# the k'th.
-check_ok select-layout -t L:two "$saved"
-must_equal 'Round tripped layout' "$(raw_layout L:two)" "$saved"
-
-# ---------------------------------------------------------------------------
-# Parsing a hand-written layout.
-
-# Laid out over several lines to keep it readable; that the whitespace is
-# skipped at all is json.c's business, what matters here is that the cells come
-# out of it in the right shape.
-#
-# "a" and "l" are given on the cells so that the active pane and the last pane
-# stack are pinned by the layout rather than left to whatever a layout that
-# names neither happens to produce.
-check_ok select-layout -t L:two "$(printf '{
-	"V": 2,
-	"L": {
-		"t": "h",
-		"w": 80,
-		"h": 24,
-		"x": 0,
-		"y": 0,
-		"c": [
-			{"t": "p", "w": 30, "h": 24, "x": 0, "y": 0, "a": true, "i": 0, "I": "%s"},
-			{"t": "p", "w": 49, "h": 24, "x": 31, "y": 0, "l": 0, "i": 1, "I": "%s"}
-		]
-	}
-}' "$q0" "$q1")"
-must_equal 'Hand-written layout' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"h","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":30,"h":24,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":49,"h":24,"x":31,"y":0,"l":0,"i":1,"I":"%N"}]}}'
-
-# The panes are assigned to the cells in order.
-must_equal 'First pane width' \
-	"$($TMUX display-message -p -t "$q0" '#{pane_width}')" '30'
-must_equal 'Second pane width' \
-	"$($TMUX display-message -p -t "$q1" '#{pane_width}')" '49'
-
-# ---------------------------------------------------------------------------
-# Field order.
-
-# Fields are looked up by key once the object has been parsed, so the order
-# they are written in must give the same layout. Here every object has its keys
-# reversed: "c" comes before "t" and "V" comes after "L", neither of which
-# changes the order they are read in - the cell type is always read before the
-# children and the version before the layout.
-check_ok select-layout -t L:two \
-	'{"L":{"c":[{"I":"'"$q0"'","i":0,"a":true,"y":0,"x":0,"h":8,"w":80,"t":"p"},{"I":"'"$q1"'","i":1,"l":0,"y":9,"x":0,"h":15,"w":80,"t":"p"}],"y":0,"x":0,"h":24,"w":80,"t":"v"},"V":2}'
-must_equal 'Reversed field order' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":8,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":15,"x":0,"y":9,"l":0,"i":1,"I":"%N"}]}}'
-
-# Keys interleaved rather than simply reversed, with "c" in the middle. This
-# time "a" is on the second cell, so the second pane becomes the active one:
-# which pane is active comes from the layout, while "i" and "I" still come from
-# the window. The first cell names neither "a" nor "l", so its pane is neither
-# active nor on the last pane stack and the dump gives it neither key.
-check_ok select-layout -t L:two \
-	'{"V":2,"L":{"h":24,"c":[{"w":40,"t":"p","y":0,"i":0,"h":24,"I":"'"$q0"'","x":0},{"a":true,"h":24,"I":"'"$q1"'","w":39,"y":0,"t":"p","i":1,"x":41}],"w":80,"y":0,"t":"h","x":0}}'
-must_equal 'Scrambled field order' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"h","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":40,"h":24,"x":0,"y":0,"i":0,"I":"%N"},{"t":"p","w":39,"h":24,"x":41,"y":0,"a":true,"i":1,"I":"%N"}]}}'
-
-# ---------------------------------------------------------------------------
-# The legacy (v1) format.
-
-# The layout just applied, in v1: a left/right cell is written with braces and
-# a top/bottom cell with brackets, and each leaf carries its pane id without
-# the leading %.
-v1body="80x24,0,0{40x24,0,0,${q0#%},39x24,41,0,${q1#%}}"
-
-# A control client that has not asked for new layouts is dumped v1.
-must_equal 'v1 dump' "$(v1_layout L:two)" "$(v1 "$v1body")"
-
-# With the new-layouts flag the same client is dumped v2 instead. The flag is
-# set with "attach -f" rather than refresh-client because refresh-client needs
-# a current client, which a control client that has not attached has not got.
-got=$(printf "display-message -p -t L:two '#{window_layout}'\n" |
-	$TMUX -C attach -f new-layouts -t L 2>&1 | grep -v '^%')
-must_contain 'v2 dump for control client' "$got" '{"V":2,"L":'
-
-# A v1 layout with a correct checksum is parsed, and dumping v1 again gives
-# back the same string. That is the whole of what v1 carries: the cells take
-# the sizes and offsets from the body, and the panes are assigned to them in
-# order, which is what puts the same two ids back in the same two places. It is
-# checked in v1 rather than against a v2 dump so that nothing v1 has no opinion
-# on - the active pane, the last pane stack, the pane index - comes into it.
-v1vsplit="80x24,0,0[80x11,0,0,${q0#%},80x12,0,12,${q1#%}]"
-check_ok select-layout -t L:two "$(v1 "$v1vsplit")"
-must_equal 'v1 round trip' "$(v1_layout L:two)" "$(v1 "$v1vsplit")"
-
-# v1 names no active pane, last pane or z-index and must disturb none of them.
-# Applying the v1 form of the layout the window already has therefore leaves
-# even the v2 dump the same byte for byte, last pane stack included.
-check_ok select-pane -t "$q1"
-check_ok select-pane -t "$q0"
-before=$(raw_layout L:two)
-check_ok select-layout -t L:two "$(v1 "$v1vsplit")"
-must_equal 'v1 leaves the active and last panes alone' \
-	"$(raw_layout L:two)" "$before"
-
-# A v1 layout with more cells than the window has panes is trimmed like any
-# other: the bottom right cell is closed and the cell above it takes its eight
-# rows and the border between them, leaving 16. Pane ids in a v1 body are not
-# used to place panes, so the third cell can carry any id.
-v1three="80x24,0,0[80x7,0,0,${q0#%},80x7,0,8,${q1#%},80x8,0,16,999]"
-check_ok select-layout -t L:two "$(v1 "$v1three")"
-must_equal 'v1 layout trimmed' "$(v1_layout L:two)" \
-	"$(v1 "80x24,0,0[80x7,0,0,${q0#%},80x16,0,8,${q1#%}]")"
-
-# ---------------------------------------------------------------------------
-# Pane assignment order.
-
-# "i" is what decides which pane goes into which cell: the cells are ordered by
-# it and then handed the window's panes in order, so the cell with "i":0 takes
-# the first pane of the window wherever that cell sits in the layout. Here the
-# cells are written the other way round from their indexes - the first cell in
-# the string is "i":1 and the second "i":0 - so the first pane of the window
-# has to come out in the second cell.
-#
-# Every other layout above lists its cells in the same order as their indexes,
-# which is the order the tree is walked in, so this is the only check that can
-# tell the two apart.
-check_ok select-layout -t L:two \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":8,"x":0,"y":0,"i":1,"I":"'"$q1"'"},{"t":"p","w":80,"h":15,"x":0,"y":9,"i":0,"I":"'"$q0"'"}]}}'
-must_equal 'First pane height' \
-	"$($TMUX display-message -p -t "$q0" '#{pane_height}')" '15'
-must_equal 'Second pane height' \
-	"$($TMUX display-message -p -t "$q1" '#{pane_height}')" '8'
-
-# So the dump carries the two ids the other way round from every dump above,
-# and with them their indexes, which are the panes' positions in the window and
-# have not moved. Neither cell named an active or last pane, so the pane that
-# was active still is - it is now the one in the second cell.
-swapped='{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":8,"x":0,"y":0,"i":1,"I":"'"$q1"'"},{"t":"p","w":80,"h":15,"x":0,"y":9,"a":true,"i":0,"I":"'"$q0"'"}]}}'
-must_equal 'Layout with the panes swapped' "$(raw_layout L:two)" "$swapped"
-
-# And that dump round trips, indexes out of order and all.
-check_ok select-layout -t L:two "$swapped"
-must_equal 'Round tripped swapped layout' "$(raw_layout L:two)" "$swapped"
-
-# ---------------------------------------------------------------------------
-# Cells that name no active or last pane.
-
-# "a" and "l" are the only things that decide which pane is active and what is
-# on the last pane stack, so a layout naming neither leaves the active pane
-# where it was and empties the stack. Here the first pane of the window is
-# active and the second is at index 0 of the stack beforehand; afterwards the
-# first pane is still active and the stack is empty, so the second pane has no
-# "l".
-check_ok select-pane -t "$q1"
-check_ok select-pane -t "$q0"
-check_ok select-layout -t L:two \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":9,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":14,"x":0,"y":10,"i":1,"I":"'"$q1"'"}]}}'
-must_equal 'Layout naming no active pane' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":9,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":14,"x":0,"y":10,"i":1,"I":"%N"}]}}'
-
-# "a" may be given as false, which says the same as leaving it out: this pane
-# is not the active one. A layout where every cell says so names no active pane
-# at all and so leaves the active pane alone, exactly as the layout above did.
-check_ok select-layout -t L:two \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":10,"x":0,"y":0,"a":false,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":13,"x":0,"y":11,"a":false,"i":1,"I":"'"$q1"'"}]}}'
-must_equal 'Layout with only false active panes' "$(layout L:two)" \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":10,"x":0,"y":0,"a":true,"i":0,"I":"%N"},{"t":"p","w":80,"h":13,"x":0,"y":11,"i":1,"I":"%N"}]}}'
-
-# ---------------------------------------------------------------------------
-# Failures.
-#
-# Each of these is a different reason for a layout to be rejected, but only the
-# rejection itself is checked; the message that comes back with it is not.
-
-# check_layout_fail $layout
-#
-# select-layout must reject $layout.
-check_layout_fail()
-{
-	check_fail select-layout -t L:two "$1"
-}
-
-# A rejected layout must leave the window alone, whatever it was.
-unchanged=$(raw_layout L:two)
-
-# Not JSON and not a checksum.
-check_layout_fail 'garbage'
-
-# A v1 body with its checksum left off, and a string of nothing but hex digits.
-# A v1 header is four hex digits and a comma; neither of these has one, so there
-# is no header and nothing to check a body against.
-check_layout_fail '80x24,0,0'
-check_layout_fail 'ab'
-
-# A v1 header with the checksum of a different body.
-good=$(v1 '80x24,0,0')
-check_layout_fail "${good%%,*},80x24,0,1"
-
-# A correct checksum over a body that is not a layout: a cell with no offsets,
-# and a top to bottom cell closed with '}' instead of ']'. layout_construct_v1
-# returns NULL for both.
-check_layout_fail "$(v1 '80x24')"
-check_layout_fail "$(v1 '80x24,0,0[80x11,0,0,80x12,0,12}')"
-
-# Fewer cells than the window has panes; unlike the other way around this
-# cannot be fixed up.
-check_layout_fail '{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"}}'
-
-# The children of a top to bottom cell must all be the width of their parent.
-check_layout_fail \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":40,"h":12,"x":0,"y":12,"i":1,"I":"'"$q1"'"}]}}'
-
-# The rest are valid JSON, so it is layout_parse_json() and
-# layout_parse_json_layout() doing the rejecting rather than json.c. Each of
-# them is a layout that would be applied but for the one thing being checked.
-
-# Two root cells.
-check_layout_fail \
-	'{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"},"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"}}'
-
-# A missing "y". A cell needs all four of "w", "h", "x" and "y".
-check_layout_fail '{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"i":0,"I":"'"$q0"'"}}'
-
-# Cell sizes are bounded below by one column or row and above by 10000 of
-# either. Both cases are otherwise complete two cell layouts, so the size is
-# the only thing wrong with them.
-check_layout_fail \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":0,"h":12,"x":0,"y":12,"i":1,"I":"'"$q1"'"}]}}'
-check_layout_fail \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":10001,"x":0,"y":12,"i":1,"I":"'"$q1"'"}]}}'
-
-# An unknown cell type: only "h", "v" and "p" exist.
-check_layout_fail '{"V":2,"L":{"t":"q","w":80,"h":24,"x":0,"y":0}}'
-
-# A pane cell needs "i", its pane index. It is "i" that says which pane goes in
-# the cell; "I" is the pane id the cell was dumped with and is not read back.
-check_layout_fail '{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"I":"'"$q0"'"}}'
-
-# A node cell must have more than one child and a leaf cell must have none. A
-# node is written with no "c" at all, with an empty one and with a single child.
-check_layout_fail '{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0}}'
-check_layout_fail '{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[]}}'
-check_layout_fail \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"}]}}'
-check_layout_fail \
-	'{"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'","c":[{"t":"p","w":80,"h":24,"x":0,"y":0,"i":1,"I":"'"$q1"'"}]}}'
-
-# Only one cell may be the active pane.
-check_layout_fail \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"a":true,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":12,"x":0,"y":12,"a":true,"i":1,"I":"'"$q1"'"}]}}'
-
-# The same rejections apply whatever order the fields are written in: a leaf
-# with children when "c" comes first, and a node with no children and a bad cell
-# type when "t" comes last.
-check_layout_fail \
-	'{"V":2,"L":{"c":[{"t":"p","w":80,"h":24,"x":0,"y":0,"i":1,"I":"'"$q1"'"}],"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"}}'
-check_layout_fail '{"V":2,"L":{"w":80,"h":24,"x":0,"y":0,"t":"v"}}'
-check_layout_fail '{"V":2,"L":{"w":80,"h":24,"x":0,"y":0,"t":"q"}}'
-
-# A child that fails after a sibling has already been parsed and added to the
-# parent. This is the case the cleanup at the end of layout_parse_json_layout
-# exists for: the children built so far have to be freed along with the parent
-# that is never returned. The second child has no "y".
-check_layout_fail \
-	'{"V":2,"L":{"c":[{"t":"p","w":80,"h":11,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":12,"x":0,"i":1,"I":"'"$q1"'"}],"t":"v","w":80,"h":24,"x":0,"y":0}}'
-
-# No root cell at all. Every other rejection above comes from a cell that
-# failed to parse; this one is the check for "L" itself.
-check_layout_fail '{"V":2}'
-
-# The wrong version, with "V" before and after "L". Fields are looked up by
-# key, so the version is read before the layout either way and the position of
-# "V" in the string makes no difference.
-check_layout_fail '{"V":1,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"}}'
-check_layout_fail '{"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"i":0,"I":"'"$q0"'"},"V":1}'
-
-# None of that touched the layout.
-must_equal 'Layout after failures' "$(raw_layout L:two)" "$unchanged"
-
-# ---------------------------------------------------------------------------
-# Floating panes.
-
-check_ok new-window -d -t L:3 -n float
-check_ok select-window -t L:float
-check_ok new-pane -d -x 20 -y 6 -X 8 -Y 3 'sleep 100'
-check_ok new-pane -d -x 30 -y 8 -X 30 -Y 10 'sleep 100'
-
-# The tiled pane and the two floating ones. A floating pane goes on the end of
-# the window's pane list, so the pane indexes are in the order the panes were
-# made whatever order their cells end up in.
-f0=$($TMUX display-message -p -t L:float.0 '#{pane_id}')
-fa=$($TMUX display-message -p -t L:float.1 '#{pane_id}')
-fb=$($TMUX display-message -p -t L:float.2 '#{pane_id}')
-
-# A floating cell is dumped with its z-index, which is what marks it as
-# floating when the layout is parsed back. Two of them, so that there is an
-# order between them to get wrong: the newer floating pane is in front, and a
-# cell's "z" is its place in that order counting from the front.
-floating=$(raw_layout L:float)
-must_contain 'Floating layout front z-index' "$floating" '"z":0'
-must_contain 'Floating layout back z-index' "$floating" '"z":1'
-
-# Each floating cell goes in after the cell of the pane that was current when
-# it was made, which is the tiled pane both times, so the newer floating cell
-# is written before the older one while its pane comes after in the window.
-# The dump therefore has its cells in one order and their indexes in another,
-# and only comes back the same if the panes go by index.
-check_ok select-layout -t L:float "$floating"
-must_equal 'Floating layout after round trip' "$(raw_layout L:float)" "$floating"
-
-# ---------------------------------------------------------------------------
-# Floating panes and the legacy (v1) format.
-#
-# v1 has no way to write a floating pane down, so the two formats cannot say the
-# same thing about a window that has one. Dumping v1 takes a copy of the layout,
-# deletes the floating cells from the copy and dumps what is left; parsing v1
-# rearranges the tiled panes and leaves the floating ones where they are. None
-# of this is reached above: every v1 check so far runs on a window that has no
-# floating panes, and every floating pane check so far is in v2.
-
-# float_state $target
-#
-# Everything about a floating pane that a v1 layout has no way to carry, so that
-# applying one can be checked against all of it at once.
-float_state()
-{
-	$TMUX display-message -p -t "$1" \
-		'#{pane_floating_flag} #{pane_width}x#{pane_height} #{pane_left},#{pane_top} #{pane_z}'
-}
-
-# Deleting both floating cells from the copy leaves the root node with a single
-# child, and a node with a single child collapses into it, so the root of the
-# copy is the tiled cell and the dump is that cell on its own filling the
-# window.
-must_equal 'v1 dump with floating panes' "$(v1_layout L:float)" \
-	"$(v1 "80x24,0,0,${f0#%}")"
-
-# The cells are deleted from the copy, so the window itself comes through a v1
-# dump untouched - floating panes, z-indexes and all.
-must_equal 'Layout after a v1 dump' "$(raw_layout L:float)" "$floating"
-
-# The same with a split, where deleting the floating cell still leaves two
-# children behind and the node it was in does not collapse.
-check_ok new-window -d -t L:4 -n mixed
-m0=$($TMUX display-message -p -t L:mixed.0 '#{pane_id}')
-check_ok split-window -d -v -l 12 -t L:mixed.0
-m1=$($TMUX display-message -p -t L:mixed.1 '#{pane_id}')
-check_ok new-pane -d -x 20 -y 6 -X 8 -Y 3 -t L:mixed.0 'sleep 100'
-mf=$($TMUX display-message -p -t L:mixed.2 '#{pane_id}')
-
-# A floating pane takes no space from the tiled layout, so the two tiled cells
-# are the same 11 and 12 rows the split gave them.
-must_equal 'v1 dump with a split and a floating pane' "$(v1_layout L:mixed)" \
-	"$(v1 "80x24,0,0[80x11,0,0,${m0#%},80x12,0,12,${m1#%}]")"
-
-# A v1 layout applied to a window that has a floating pane rearranges the tiled
-# panes and must leave the floating one exactly as it was: v1 names no floating
-# pane, so there is nothing in it for one to be changed by. The top pane goes
-# from 11 rows to 7 and the bottom one from 12 to 16.
-v1mixed="80x24,0,0[80x7,0,0,${m0#%},80x16,0,8,${m1#%}]"
-mfbefore=$(float_state "$mf")
-check_ok select-layout -t L:mixed "$(v1 "$v1mixed")"
-must_equal 'v1 layout with a floating pane' "$(v1_layout L:mixed)" \
-	"$(v1 "$v1mixed")"
-must_equal 'Floating pane after a v1 layout' "$(float_state "$mf")" "$mfbefore"
-must_equal 'Panes after a v1 layout' \
-	"$($TMUX display-message -p -t L:mixed '#{window_panes}')" '3'
-
-# When the tiled layout a v1 string names is a single cell there is no node in
-# the new layout for the floating cells to go back into, so one is made: the
-# root cell is replaced by a top to bottom node holding it and the floating
-# cells go on the end. Nothing else here reaches that.
-fabefore=$(float_state "$fa")
-fbbefore=$(float_state "$fb")
-check_ok select-layout -t L:float "$(v1 "80x24,0,0,${f0#%}")"
-must_equal 'v1 single cell layout with floating panes' "$(v1_layout L:float)" \
-	"$(v1 "80x24,0,0,${f0#%}")"
-must_equal 'Front floating pane after a v1 layout' "$(float_state "$fb")" \
-	"$fbbefore"
-must_equal 'Back floating pane after a v1 layout' "$(float_state "$fa")" \
-	"$fabefore"
-must_equal 'Panes after a v1 single cell layout' \
-	"$($TMUX display-message -p -t L:float '#{window_panes}')" '3'
-
-# Adjacent subtrees containing only floating panes used to be a distinct case:
-# dumping v1 made a copy of the v2 tree and deleted floating cells from the
-# copy, but deleting the last floating cell in the first subtree collapsed the
-# parent and could leave the outer traversal holding a stale pointer to the
-# second subtree.
-check_ok new-window -d -t L:5 -n nested
-n0=$($TMUX display-message -p -t L:nested.0 '#{pane_id}')
-check_ok split-window -d -v -l 12 -t L:nested.0
-n1=$($TMUX display-message -p -t L:nested.1 '#{pane_id}')
-check_ok split-window -d -v -l 6 -t L:nested.1
-n2=$($TMUX display-message -p -t L:nested.2 '#{pane_id}')
-check_ok split-window -d -v -l 3 -t L:nested.2
-n3=$($TMUX display-message -p -t L:nested.3 '#{pane_id}')
-check_ok split-window -d -v -l 2 -t L:nested.3
-n4=$($TMUX display-message -p -t L:nested.4 '#{pane_id}')
-check_ok select-layout -t L:nested \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"h","w":30,"h":10,"x":0,"y":0,"c":[{"t":"p","w":10,"h":5,"x":2,"y":2,"i":0,"z":0},{"t":"p","w":12,"h":6,"x":5,"y":5,"i":1,"z":1}]},{"t":"h","w":30,"h":10,"x":0,"y":0,"c":[{"t":"p","w":14,"h":7,"x":8,"y":8,"i":2,"z":2},{"t":"p","w":16,"h":8,"x":11,"y":11,"i":3,"z":3}]},{"t":"p","w":80,"h":24,"x":0,"y":0,"i":4}]}}'
-must_equal 'v1 dump with nested floating-only subtrees' \
-	"$(v1_layout L:nested)" "$(v1 "80x24,0,0,${n4#%}")"
-check_ok kill-window -t L:nested
-
-# ---------------------------------------------------------------------------
-# A window with no tiled panes.
-#
-# Killing the last tiled pane of a window that has floating panes does not kill
-# the window: that only happens when the pane being killed is the last one
-# counting the floating ones. What is left is a window whose layout root is
-# either a floating cell on its own, or a node holding nothing but floating
-# cells, depending on how many are left. v1 has no way to write either down, so
-# it must not try: a layout with no tiled panes in it produces no v1 dump at
-# all, and #{window_layout} comes back empty for a client being sent v1. What v2
-# makes of such a window is a separate question and is not checked here.
-#
-# A dead server dumps nothing either, so the checks below have to establish that
-# the server is still there before an empty dump is allowed to mean anything.
-
-# no_hang $cmd...
-#
-# Run a command whose result is not being checked, but which has to come back:
-# only the server surviving it is checked afterwards, and a server wedged rather
-# than killed would otherwise show up as the test never finishing.
-no_hang()
-{
-	if command -v timeout >/dev/null 2>&1; then
-		timeout 10 "$@" >/dev/null 2>&1
-	else
-		"$@" >/dev/null 2>&1
-	fi
-	return 0
-}
-
-# One floating pane left. The node it and the tiled cell were in is down to a
-# single child, so it collapses and the floating cell becomes the root.
-check_ok new-window -d -t L:5 -n gone1
-g0=$($TMUX display-message -p -t L:gone1.0 '#{pane_id}')
-check_ok new-pane -d -x 20 -y 6 -X 8 -Y 3 -t L:gone1.0 'sleep 100'
-check_ok kill-pane -t "$g0"
-must_equal 'Panes left with one floating pane' \
-	"$($TMUX display-message -p -t L:gone1 '#{window_panes}')" '1'
-
-# The floating cell is the root and there is nothing tiled under it, so there is
-# no v1 dump to make. In particular the floating cell must not be written out on
-# its own, which would be a layout claiming the window is the size and position
-# of the floating pane with no pane in it at all.
-got=$(v1_layout L:gone1)
-check_ok display-message -p alive
-must_equal 'v1 dump with one floating pane and no tiled panes' "$got" ''
-
-# Two floating panes left, so the node keeps two children, does not collapse,
-# and stays the root with nothing but floating cells in it.
-check_ok new-window -d -t L:6 -n gone2
-h0=$($TMUX display-message -p -t L:gone2.0 '#{pane_id}')
-check_ok new-pane -d -x 20 -y 6 -X 8 -Y 3 -t L:gone2.0 'sleep 100'
-check_ok new-pane -d -x 30 -y 8 -X 30 -Y 10 -t L:gone2.0 'sleep 100'
-check_ok kill-pane -t "$h0"
-must_equal 'Panes left with two floating panes' \
-	"$($TMUX display-message -p -t L:gone2 '#{window_panes}')" '2'
-
-# The node is the root this time rather than the floating cell, but it has no
-# tiled cell anywhere under it either, so there is still no v1 dump to make -
-# and making one must not take the server with it.
-got=$(v1_layout L:gone2)
-check_ok display-message -p alive
-must_equal 'v1 dump with two floating panes and no tiled panes' "$got" ''
-
-# Nor must parsing a v1 layout against it. There is no tiled pane for the
-# layout to name, so whether it is applied or rejected is the format's business;
-# it just has to be one of the two.
-no_hang $TMUX select-layout -t L:gone2 "$(v1 '80x24,0,0,999')"
-check_ok display-message -p alive
-
-check_ok kill-window -t L:gone1
-check_ok kill-window -t L:gone2
-
-# ---------------------------------------------------------------------------
-# Control mode notifications.
-#
-# %layout-change is what a control client actually reads a layout from, and it
-# carries both #{window_layout} and #{window_visible_layout}. Its template is
-# expanded once per client (control-notify.c), so two clients watching the same
-# window must be told about the same change in different formats: v1 for the
-# one that has not asked for new layouts, v2 for the one that has.
-#
-# The dumps above go through "-C display-message", which only ever reaches the
-# format callbacks for the client asking. This needs clients that stay
-# attached while something else changes the layout, so they go on the end of
-# fifos and the change is made from outside.
-
-DIR=$(mktemp -d) || fail 'Could not make a temporary directory'
-OLDIN="$DIR/old-in"
-OLDOUT="$DIR/old-out"
-NEWIN="$DIR/new-in"
-NEWOUT="$DIR/new-out"
-OLDPID=
-NEWPID=
-
-cleanup()
-{
-	[ -n "$OLDPID" ] && kill "$OLDPID" 2>/dev/null
-	[ -n "$NEWPID" ] && kill "$NEWPID" 2>/dev/null
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup EXIT
-
-# wait_for $file $text
-#
-# Wait for $text to appear in a control client's output.
-wait_for()
-{
-	i=0
-	while [ "$i" -lt 6 ]; do
-		grep -F -- "$2" "$1" >/dev/null 2>&1 && return 0
-		sleep 1
-		i=$((i + 1))
-	done
-	echo "missing from $1: $2" >&2
-	cat "$1" >&2
-	return 1
-}
-
-mkfifo "$OLDIN" "$NEWIN" || fail 'Could not make the control client fifos'
-: >"$OLDOUT"
-: >"$NEWOUT"
-
-$TMUX -C attach -t L <"$OLDIN" >"$OLDOUT" 2>&1 &
-OLDPID=$!
-exec 4>"$OLDIN"
-$TMUX -C attach -f new-layouts -t L <"$NEWIN" >"$NEWOUT" 2>&1 &
-NEWPID=$!
-exec 5>"$NEWIN"
-
-# Both clients have to be attached before the layout changes, or they miss the
-# notification entirely.
-printf 'display-message -p ready\n' >&4
-printf 'display-message -p ready\n' >&5
-wait_for "$OLDOUT" ready || fail 'Control client without new-layouts did not attach'
-wait_for "$NEWOUT" ready || fail 'Control client with new-layouts did not attach'
-
-wid=$($TMUX display-message -p -t L:two '#{window_id}')
-
-# One layout change, made by a third client so that neither of the two is the
-# one running the command. 8 lines for the top pane leaves 15 for the bottom
-# and one for the border.
-check_ok resize-pane -t "$q0" -y 8
-
-# Nothing is zoomed, so both fields of the notification carry the same layout.
-# The v2 one is compared against the dump rather than a literal so that it is
-# the two formats being checked and not the geometry again.
-v2now=$(raw_layout L:two)
-v1now=$(v1 "80x24,0,0[80x8,0,0,${q0#%},80x15,0,9,${q1#%}]")
-wait_for "$NEWOUT" "%layout-change $wid $v2now $v2now " ||
-	fail 'No v2 %layout-change for the client with new-layouts'
-wait_for "$OLDOUT" "%layout-change $wid $v1now $v1now " ||
-	fail 'No v1 %layout-change for the client without new-layouts'
-
-# How many notifications one layout change produces, which differs by format
-# on purpose. cmd_select_layout_exec() fires window-layout-changed for any
-# layout it applies, and layout_parse() fires it again for a v1 one, so v1
-# arrives twice - which is what master does for every layout, and what control
-# clients written against it expect. v2 is new and has no such clients, so it
-# gets the single notification. Counting the delta rather than the total, with
-# a settle in between, keeps this independent of what has already been sent.
-n1=$(grep -c "%layout-change $wid " "$OLDOUT")
-check_ok select-layout -t L:two \
-	'{"V":2,"L":{"t":"v","w":80,"h":24,"x":0,"y":0,"c":[{"t":"p","w":80,"h":9,"x":0,"y":0,"i":0,"I":"'"$q0"'"},{"t":"p","w":80,"h":14,"x":0,"y":10,"i":1,"I":"'"$q1"'"}]}}'
-sleep 2
-n2=$(grep -c "%layout-change $wid " "$OLDOUT")
-must_equal 'Notifications for a v2 layout' "$((n2 - n1))" '1'
-
-check_ok select-layout -t L:two "$(v1 "$v1vsplit")"
-sleep 2
-n3=$(grep -c "%layout-change $wid " "$OLDOUT")
-must_equal 'Notifications for a v1 layout' "$((n3 - n2))" '2'
-
-# And the client that did not ask for new layouts must never have been sent
-# one, in that notification or any other.
-grep -F '{"V":2,' "$OLDOUT" >/dev/null 2>&1 &&
-	fail 'Control client without new-layouts was sent a v2 layout'
-
-if [ "$($TMUX display-message -p alive 2>&1)" != "alive" ]; then
-	echo "Server died." >&2
-	exit 1
-fi
-
-$TMUX kill-server 2>/dev/null
-exit 0

regress/layout-nesting-limit.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Version 1 layouts must reject excessive nesting without losing the session or
-# changing its layout. Check both split types and the depth limit boundary.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX="$TEST_TMUX -S$DIR/socket -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0
-trap 'exit 1' 1 2 15
-
-# Generate a checksum-valid v1 layout with one child in every nested group.
-layout()
-{
-	awk -v depth="$1" -v open="$2" 'BEGIN {
-		closing = (open == "{" ? "}" : "]")
-		body = ""
-		for (i = 0; i < depth; i++)
-			body = body "1x1,0,0" open
-		body = body "1x1,0,0"
-		for (i = 0; i < depth; i++)
-			body = body closing
-
-		ord["0"] = 48; ord["1"] = 49; ord["x"] = 120
-		ord[","] = 44; ord["{"] = 123; ord["}"] = 125
-		ord["["] = 91; ord["]"] = 93
-		csum = 0
-		for (i = 1; i <= length(body); i++) {
-			c = substr(body, i, 1)
-			bit = csum % 2
-			csum = int(csum / 2) + bit * 32768
-			csum = (csum + ord[c]) % 65536
-		}
-		printf "%04x,%s", csum, body
-	}'
-}
-
-$TMUX new-session -d -s deep -x80 -y24 'exec sleep 100' || exit 1
-
-for open in '{' '['; do
-	# A valid checksum and nesting up to the limit must still be accepted.
-	value=$(layout 1000 "$open") || fail "could not generate layout"
-	$TMUX select-layout -t deep "$value" ||
-		fail "layout at the depth limit was rejected ($open)"
-	before=$($TMUX display-message -p -t deep \
-	    '#{pane_id} #{pane_width} #{pane_height} #{window_layout}') || exit 1
-
-	for depth in 1001 1500; do
-		value=$(layout "$depth" "$open") || fail "could not generate layout"
-		$TMUX select-layout -t deep "$value" >/dev/null 2>&1 &&
-			fail "excessive nesting was accepted ($open, $depth)"
-		$TMUX has-session -t deep ||
-			fail "server died on excessive nesting ($open, $depth)"
-		after=$($TMUX display-message -p -t deep \
-		    '#{pane_id} #{pane_width} #{pane_height} #{window_layout}') || exit 1
-		[ "$before" = "$after" ] ||
-			fail "pane or layout changed after rejection ($open, $depth)"
-	done
-done
-
-exit 0

regress/layout-set.sh

@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Exercise every predefined layout, next/previous cycling, lookup and restore
-# paths, one-pane early returns, minimum-size handling and floating panes.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
-SEEN="$DIR/layouts"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-layout()
-{
-	$TMUX display-message -p -t layouts:many '#{window_layout}'
-}
-
-check_layout()
-{
-	name=$1
-	$TMUX select-layout -t layouts:many "$name" ||
-		fail "select-layout $name failed"
-	value=$(layout)
-	[ -n "$value" ] || fail "$name produced an empty layout"
-	if grep -Fxq "$value" "$SEEN"; then
-		fail "$name produced the same layout as an earlier preset"
-	fi
-	printf '%s\n' "$value" >>"$SEEN"
-	[ "$($TMUX list-panes -t layouts:many -F x | wc -l)" -eq 5 ] ||
-		fail "$name lost a pane"
-	[ "$($TMUX list-panes -t layouts:many -F '#{pane_floating_flag}' | \
-	    grep -c '^1$')" -eq 1 ] || fail "$name did not preserve the floating pane"
-}
-
-$TMUX new-session -d -s layouts -n many -x100 -y40 'exec sleep 100' || exit 1
-$TMUX set-option -g window-size manual || exit 1
-$TMUX split-window -d -h -t layouts:many 'exec sleep 100' || exit 1
-$TMUX split-window -d -v -t layouts:many 'exec sleep 100' || exit 1
-$TMUX split-window -d -h -t layouts:many 'exec sleep 100' || exit 1
-floating=$($TMUX new-pane -dP -F '#{pane_id}' -t layouts:many \
-    -x20 -y8 -X10 -Y5 'exec sleep 100') || exit 1
-: >"$SEEN"
-
-# Options exercise percentage and explicit secondary-size calculations.
-$TMUX set-option -w -t layouts:many main-pane-height 30% || exit 1
-$TMUX set-option -w -t layouts:many other-pane-height 12 || exit 1
-$TMUX set-option -w -t layouts:many main-pane-width 35% || exit 1
-$TMUX set-option -w -t layouts:many other-pane-width 20 || exit 1
-
-for name in even-horizontal even-vertical main-horizontal \
-    main-horizontal-mirrored main-vertical main-vertical-mirrored tiled; do
-	check_layout "$name"
-done
-
-# Exact and unique-prefix lookup work; ambiguous and invalid names fail.
-$TMUX select-layout -t layouts:many even-h || fail "unique layout prefix failed"
-$TMUX select-layout -t layouts:many main >/dev/null 2>&1 &&
-	fail "ambiguous layout prefix succeeded"
-$TMUX select-layout -t layouts:many no-such-layout >/dev/null 2>&1 &&
-	fail "invalid layout name succeeded"
-
-# Cycle through all layouts in both directions, including wraparound. The
-# aliases and select-layout flags share layout_set_next/previous.
-first=$(layout)
-i=0
-while [ "$i" -lt 7 ]; do
-	$TMUX next-layout -t layouts:many || exit 1
-	i=$((i + 1))
-done
-[ "$(layout)" = "$first" ] || fail "next-layout did not wrap"
-i=0
-while [ "$i" -lt 7 ]; do
-	$TMUX previous-layout -t layouts:many || exit 1
-	i=$((i + 1))
-done
-[ "$(layout)" = "$first" ] || fail "previous-layout did not wrap"
-$TMUX select-layout -t layouts:many -n || exit 1
-$TMUX select-layout -t layouts:many -p || exit 1
-
-# No argument reapplies the last preset; -o restores the previous layout; -E
-# spreads the current cell without changing the pane set.
-$TMUX kill-pane -t "$floating" || exit 1
-$TMUX select-layout -t layouts:many tiled || exit 1
-tiled=$(layout)
-$TMUX select-layout -t layouts:many even-horizontal || exit 1
-$TMUX select-layout -t layouts:many -o || exit 1
-[ "$(layout)" = "$tiled" ] || fail "select-layout -o did not restore layout"
-$TMUX select-layout -t layouts:many || exit 1
-$TMUX select-layout -t layouts:many -E || exit 1
-
-# Each arranger has a deliberate one-pane early return.
-$TMUX new-window -d -t layouts: -n one 'exec sleep 100' || exit 1
-one=$($TMUX display-message -p -t layouts:one '#{window_layout}')
-for name in even-horizontal even-vertical main-horizontal \
-    main-horizontal-mirrored main-vertical main-vertical-mirrored tiled; do
-	$TMUX select-layout -t layouts:one "$name" || exit 1
-	[ "$($TMUX display-message -p -t layouts:one '#{window_layout}')" = "$one" ] ||
-		fail "$name changed a one-pane layout"
-done
-
-# Force the minimum-size paths without requiring a terminal client.
-$TMUX resize-window -t layouts:many -x10 -y6 || exit 1
-for name in even-horizontal even-vertical main-horizontal \
-    main-horizontal-mirrored main-vertical main-vertical-mirrored tiled; do
-	$TMUX select-layout -t layouts:many "$name" || exit 1
-done
-
-$TMUX has-session -t layouts || fail "server died during layout tests"
-exit 0

regress/list-commands.sh

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Exercise list-commands for the full table, a single command, aliases, custom
-# and empty formats, and lookup errors.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-# Keep a server alive across commands. Otherwise a STARTSERVER-only command
-# may exit between invocations and leave a short socket-cleanup race.
-$TMUX new-session -d -s list-commands 'exec sleep 100' || exit 1
-
-all=$($TMUX list-commands) || exit 1
-printf '%s\n' "$all" | grep -q '^attach-session (attach)' || exit 1
-printf '%s\n' "$all" | grep -q '^list-commands (lscm)' || exit 1
-
-one=$($TMUX list-commands -F \
-    '#{command_list_name}|#{command_list_alias}|#{command_list_usage}' \
-    list-commands) || exit 1
-case "$one" in
-'list-commands|lscm|'*) ;;
-*) exit 1 ;;
-esac
-
-# Aliases resolve to their command, while an empty expansion prints no line.
-[ "$($TMUX list-commands -F '#{command_list_name}' lscm)" = list-commands ] ||
-	exit 1
-[ -z "$($TMUX list-commands -F '' list-commands)" ] || exit 1
-
-$TMUX list-commands tmux-no-command-$$ >/dev/null 2>&1 && exit 1
-$TMUX list-commands list >/dev/null 2>&1 && exit 1
-exit 0

regress/modal-pane.sh

@@ -105,24 +105,6 @@ drag()
 	sleep 1
 }
 
-meta_drag()
-{
-	scol="$1"
-	srow="$2"
-	ecol="$3"
-	erow="$4"
-
-	seq=$(printf '\033[<8;%s;%sM' "$scol" "$srow")
-	$TMUX2 send-keys -t "$OUTER" -l "$seq" 2>/dev/null
-	sleep 0.2
-	seq=$(printf '\033[<40;%s;%sM' "$ecol" "$erow")
-	$TMUX2 send-keys -t "$OUTER" -l "$seq" 2>/dev/null
-	sleep 0.2
-	seq=$(printf '\033[<8;%s;%sm' "$ecol" "$erow")
-	$TMUX2 send-keys -t "$OUTER" -l "$seq" 2>/dev/null
-	sleep 1
-}
-
 cleanup
 
 check_ok new-session -d -s modal -x 80 -y 24 'cat'
@@ -145,16 +127,12 @@ case "$(fmt "$modal" '#{pane_flags}')" in
 *O*) ;;
 *) fail "modal pane flags do not include O" ;;
 esac
-case "$(fmt "$modal" '#{pane_flags}')" in
-*A*) ;;
-*) fail "modal pane flags do not include A" ;;
-esac
 case "$(fmt modal:0 '#{window_flags}')" in
 *O*) ;;
 *) fail "modal window flags do not include O" ;;
 esac
 must_equal "$(fmt modal:0 '#{window_modal_pane}')" "$modal"
-must_equal "$(fmt modal:0 '#{window_zoomed_flag}')" 1
+must_equal "$(fmt modal:0 '#{window_zoomed_flag}')" 0
 
 check_fail "window already has a modal pane" \
 	new-pane -O -x 10 -y 4 'cat'
@@ -181,14 +159,12 @@ under=$($TMUX split-window -PF '#{pane_id}' -t "$p0" 'cat') ||
 sleep 1
 must_equal "$(fmt modal:0 '#{pane_id}')" "$modal"
 must_equal "$(fmt "$under" '#{pane_active}')" 0
-must_equal "$(fmt modal:0 '#{window_zoomed_flag}')" 1
 
 float=$($TMUX new-pane -PF '#{pane_id}' -x 10 -y 4 -X 5 -Y 3 'cat') ||
 	fail "new floating pane under modal failed"
 sleep 1
 must_equal "$(fmt modal:0 '#{pane_id}')" "$modal"
 must_equal "$(fmt "$float" '#{pane_active}')" 0
-must_equal "$(fmt modal:0 '#{window_zoomed_flag}')" 1
 
 check_ok new-window -d -t modal: -n other 'cat'
 check_ok select-window -t modal:other
@@ -327,205 +303,6 @@ check_ok kill-pane -t "$modal"
 sleep 1
 must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
 must_equal "$(fmt modal:0 '#{pane_id}')" "$p0"
-must_equal "$(fmt "$p0" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 0:0
-
-ignored=$($TMUX new-pane -KdPF '#{pane_id}' -t "$p0" 'cat') ||
-	fail "new-pane -K without -O failed"
-check_ok kill-pane -t "$ignored"
-
-$TMUX set -g @modal-prefix no
-$TMUX set -g @modal-root no
-$TMUX bind -n z set -g @modal-root yes
-
-modal=$($TMUX new-pane -ODKPF '#{pane_id}' -t "$p0" \
-    -x 20 -y 5 -X 20 -Y 10 'cat') ||
-	fail "new-pane -ODK failed"
-sleep 1
-$TMUX2 send-keys -t "$OUTER" C-b x z Enter
-sleep 1
-must_equal "$($TMUX show -gv @modal-prefix)" no
-must_equal "$($TMUX show -gv @modal-root)" no
-case "$($TMUX capture-pane -pt "$modal")" in
-*xz*) ;;
-*) fail "keys did not reach key-capturing modal pane" ;;
-esac
-left=$(fmt "$modal" '#{pane_left}')
-top=$(fmt "$modal" '#{pane_top}')
-meta_drag $((left + 2)) $((top + 2)) $((left + 7)) $((top + 4))
-new_left=$(fmt "$modal" '#{pane_left}')
-new_top=$(fmt "$modal" '#{pane_top}')
-[ "$new_left" -gt "$left" ] || [ "$new_top" -gt "$top" ] ||
-	fail "key-capturing modal pane did not move"
-$TMUX2 send-keys -t "$OUTER" Escape
-sleep 1
-must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
-
-modal=$($TMUX new-pane -ODKPF '#{pane_id}' -t "$p0" \
-    -x 20 -y 5 -X 20 -Y 10 'trap "" INT; exec cat') ||
-	fail "new-pane -ODK failed"
-sleep 1
-$TMUX2 send-keys -t "$OUTER" C-c
-sleep 1
-must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
-
-# A dead modal does not close on Escape or C-c without -D.
-modal=$($TMUX new-pane -OPF '#{pane_id}' -t "$p0" \
-    -x 20 -y 5 -X 20 -Y 10 'sleep 1') ||
-	fail "new-pane -O failed"
-check_ok set-option -p -t "$modal" remain-on-exit on
-sleep 2
-must_equal "$(fmt "$modal" '#{pane_dead}:#{pane_modal_flag}')" 1:1
-$TMUX2 send-keys -t "$OUTER" Escape
-sleep 1
-must_equal "$(fmt modal:0 '#{window_modal_pane}')" "$modal"
-check_ok kill-pane -t "$modal"
-sleep 1
-
-# failed-key closes successful panes and retains failed panes until a key.
-modal=$($TMUX new-pane -OPF '#{pane_id}' -t "$p0" \
-    -x 20 -y 5 -X 20 -Y 10 'sleep 1') ||
-	fail "new-pane -O failed"
-check_ok set-option -p -t "$modal" remain-on-exit failed-key
-sleep 2
-must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
-
-modal=$($TMUX new-pane -OPF '#{pane_id}' -t "$p0" \
-    -x 20 -y 5 -X 20 -Y 10 'sleep 1; exit 1') ||
-	fail "new-pane -O failed"
-check_ok set-option -p -t "$modal" remain-on-exit failed-key
-sleep 2
-must_equal "$(fmt "$modal" '#{pane_dead}:#{pane_modal_flag}')" 1:1
-must_equal "$($TMUX show-options -pv -t "$modal" remain-on-exit)" failed-key
-$TMUX2 send-keys -t "$OUTER" a
-sleep 1
-must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
-
-# A nonmodal floating pane may remain above zoom, and switching between it and
-# the zoomed tiled pane must not unzoom the window.
-check_ok new-window -d -t modal: -n float-over-zoom 'cat'
-base=$(fmt modal:float-over-zoom '#{pane_id}')
-check_ok split-window -dh -t "$base" 'cat'
-check_ok resize-pane -Z -t "$base"
-over=$($TMUX new-pane -APF '#{pane_id}' -t "$base" \
-    -x 20 -y 5 -X 20 -Y 10 'cat') ||
-	fail "new-pane -A failed"
-must_equal "$(fmt "$over" '#{pane_floating_flag}:#{pane_active}')" 1:1
-case "$(fmt "$over" '#{pane_flags}')" in
-*A*) ;;
-*) fail "float-over-zoom pane flags do not include A" ;;
-esac
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 1:1
-check_ok select-pane -t "$base"
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_active}')" 1:1
-check_ok select-pane -t "$over"
-must_equal "$(fmt "$over" '#{window_zoomed_flag}:#{pane_active}')" 1:1
-client=$($TMUX list-clients -F '#{client_name}' | head -1)
-[ -n "$client" ] || fail "no client for switch-client test"
-check_ok switch-client -c "$client" -t "$base"
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_active}')" 1:1
-check_ok switch-client -c "$client" -t "$over"
-must_equal "$(fmt "$over" '#{window_zoomed_flag}:#{pane_active}')" 1:1
-check_ok kill-pane -t "$over"
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 1:1
-check_ok resize-pane -Z -t "$base"
-
-ignored=$($TMUX new-pane -ALdPF '#{pane_id}' -t "$base" 'cat') ||
-	fail "new-pane -A -L failed"
-case "$(fmt "$ignored" '#{pane_flags}')" in
-*A*) fail "tiled pane flags include A" ;;
-*) ;;
-esac
-
-# Existing floating panes are filtered when zoom begins: -A panes remain in the
-# visible layout and ordinary floating panes do not.
-check_ok new-window -d -t modal: -n existing-over-zoom 'cat'
-base=$(fmt modal:existing-over-zoom '#{pane_id}')
-check_ok split-window -dh -t "$base" 'cat'
-over=$($TMUX new-pane -AdPF '#{pane_id}' -t "$base" \
-    -x 20 -y 5 -X 20 -Y 10 'cat') ||
-	fail "pre-existing new-pane -A failed"
-under=$($TMUX new-pane -dPF '#{pane_id}' -t "$base" \
-    -x 15 -y 4 -X 2 -Y 2 'cat') ||
-	fail "pre-existing ordinary new-pane failed"
-check_ok select-window -t modal:existing-over-zoom
-check_ok select-pane -t "$base"
-check_ok resize-pane -Z -t "$base"
-must_equal "$(fmt "$over" '#{pane_floating_flag}')" 1
-must_equal "$(fmt "$under" '#{pane_floating_flag}')" 0
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 1:1
-
-# Geometry changed in the visible zoom layout is copied back when unzooming.
-check_ok select-pane -t "$over"
-left=$(fmt "$over" '#{pane_left}')
-top=$(fmt "$over" '#{pane_top}')
-meta_drag $((left + 2)) $((top + 2)) $((left + 7)) $((top + 4))
-new_left=$(fmt "$over" '#{pane_left}')
-new_top=$(fmt "$over" '#{pane_top}')
-[ "$new_left" -gt "$left" ] || [ "$new_top" -gt "$top" ] ||
-	fail "float-over-zoom pane did not move"
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 1:1
-check_ok resize-pane -Z -t "$base"
-must_equal "$(fmt "$over" '#{pane_left}:#{pane_top}')" \
-    "$new_left:$new_top"
-must_equal "$(fmt "$under" '#{pane_floating_flag}')" 1
-
-# Resizing with the over-zoom pane active restores the original zoom target.
-check_ok resize-pane -Z -t "$base"
-check_ok select-pane -t "$over"
-check_ok resize-window -t modal:existing-over-zoom -x 90 -y 30
-must_equal "$(fmt "$base" \
-    '#{window_width}x#{window_height}:#{window_zoomed_flag}:#{pane_zoomed_flag}')" \
-    90x30:1:1
-must_equal "$(fmt "$over" '#{pane_floating_flag}:#{pane_active}')" 1:1
-
-# Natural pane exit uses a different removal path from kill-pane and must also
-# preserve zoom.
-dying=$($TMUX new-pane -AdPF '#{pane_id}' -t "$base" \
-    -x 12 -y 4 -X 4 -Y 3 'true') ||
-	fail "short-lived new-pane -A failed"
-i=0
-while $TMUX list-panes -a -F '#{pane_id}' | grep -qx "$dying"; do
-    i=$((i + 1))
-    [ $i -gt 50 ] && fail "short-lived float-over-zoom pane did not exit"
-    sleep 0.1
-done
-must_equal "$(fmt "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}')" 1:1
-
-# A pane with -A is also above a zoom target which was itself floating. The
-# temporary tiled target must sit behind retained floating panes, then return
-# to the normal floating z order when unzoomed.
-check_ok new-window -d -t modal: -n floating-zoom-target 'cat'
-base=$(fmt modal:floating-zoom-target '#{pane_id}')
-check_ok split-window -dh -t "$base" 'cat'
-target=$($TMUX new-pane -dPF '#{pane_id}' -t "$base" \
-    -x 30 -y 10 -X 10 -Y 5 'cat') ||
-	fail "floating zoom target creation failed"
-over=$($TMUX new-pane -AdPF '#{pane_id}' -t "$base" \
-    -x 15 -y 5 -X 15 -Y 8 'cat') ||
-	fail "float-over-zoom pane creation failed"
-check_ok select-window -t modal:floating-zoom-target
-check_ok select-pane -t "$target"
-must_equal "$(fmt "$target" '#{pane_z}')" 0
-must_equal "$(fmt "$over" '#{pane_z}')" 1
-
-check_ok resize-pane -Z -t "$target"
-must_equal "$(fmt "$target" \
-    '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_floating_flag}:#{pane_z}')" \
-    1:1:0:2
-must_equal "$(fmt "$over" '#{pane_floating_flag}:#{pane_z}')" 1:0
-check_ok select-pane -t "$over"
-must_equal "$(fmt "$over" '#{window_zoomed_flag}:#{pane_active}')" 1:1
-check_ok resize-pane -Z -t "$target"
-must_equal "$(fmt "$over" '#{pane_active}:#{pane_z}')" 1:0
-must_equal "$(fmt "$target" '#{pane_floating_flag}:#{pane_z}')" 1:1
-
-# If the target remains active, it returns to the front on unzoom.
-check_ok select-pane -t "$target"
-check_ok resize-pane -Z -t "$target"
-must_equal "$(fmt "$over" '#{pane_floating_flag}:#{pane_z}')" 1:0
-check_ok resize-pane -Z -t "$target"
-must_equal "$(fmt "$target" '#{pane_active}:#{pane_z}')" 1:0
-must_equal "$(fmt "$over" '#{pane_z}')" 1
 
 cleanup
 exit 0

regress/mode-mutation.sh

@@ -269,22 +269,6 @@ test_customize_mode()
 	assert_alive "customize-mode exit"
 }
 
-test_customize_break_pane()
-{
-	start_client option-break
-	side=$($TMUX split-window -d -P -F '#{pane_id}' \
-	    -t option-break:0 'cat') || fail "customize split failed"
-
-	$TMUX customize-mode -t "$side" || fail "customize-mode failed"
-	wait_mode "$side" 1
-	$TMUX break-pane -d -s "$side" || fail "customize break-pane failed"
-
-	assert_alive "customize-mode break-pane"
-	wait_mode "$side" 1
-	$TMUX send-keys -t "$side" q || fail "customize-mode quit failed"
-	wait_mode "$side" 0
-}
-
 test_copy_mode()
 {
 	start_client copy-a 'i=0; while [ $i -lt 200 ]; do echo "copy mutation line $i"; i=$((i + 1)); done; cat'
@@ -318,7 +302,6 @@ test_choose_tree
 test_choose_buffer
 test_choose_client
 test_customize_mode
-test_customize_break_pane
 test_copy_mode
 cleanup
 exit 0

regress/options-values.sh

@@ -86,11 +86,6 @@ check_value "-gv status-keys" "vi"
 check_fail "unknown value: bogus" set -g status-keys bogus
 check_value "-gv status-keys" "vi"
 
-# pane-border-lines accepts rounded as a pane border style.
-check_ok set -gw pane-border-lines rounded
-check_value "-gwv pane-border-lines" "rounded"
-check_ok set -gw pane-border-lines single
-
 # --- flag options ---------------------------------------------------------
 #
 # focus-events is an on/off flag.  Setting with no value toggles it; explicit

regress/output-commands.sh

@@ -1,115 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -L${TEST_SOCKET:-testO$$} -f/dev/null"
-OUT=/tmp/tmux-output-commands-$$
-EXPECTED=$(printf 'one\ntwo')
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -f "$OUT"
-}
-trap cleanup EXIT HUP INT TERM
-
-$TMUX kill-server 2>/dev/null
-$TMUX new-session -d -x80 -y20 "sh -c 'printf \"\\033]133;A\\007p\\$ \\033]133;B\\007echo\\n\\033]133;C\\007one\\ntwo\\n\\033]133;D;0\\007separator\\n\\033]133;A\\007p\\$ \\033]133;B\\007broken\\n\\033]133;C\\007unfinished\"; exec sleep 100'" || exit 1
-sleep 1
-
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = unfinished ] || exit 1
-
-$TMUX send-keys -X pipe-output "wc -c >$OUT" || exit 1
-sleep 1
-[ "$(cat "$OUT")" = 10 ] || exit 1
-
-$TMUX send-keys -X copy-pipe-output "wc -c >$OUT" output || exit 1
-sleep 1
-[ "$(cat "$OUT")" = 10 ] || exit 1
-[ "$($TMUX show-buffer)" = unfinished ] || exit 1
-
-$TMUX send-keys -X select-output || exit 1
-$TMUX send-keys -X copy-selection || exit 1
-[ "$($TMUX show-buffer)" = unfinished ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X select-output || exit 1
-$TMUX send-keys -X pipe-selection "wc -c >$OUT" || exit 1
-sleep 1
-[ "$(cat "$OUT")" = 10 ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X search-backward separator || exit 1
-$TMUX send-keys -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = "$EXPECTED" ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode || exit 1
-$TMUX send-keys -X search-backward one || exit 1
-$TMUX send-keys -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = "$EXPECTED" ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX new-window -d -n plain "printf 'alpha\\nbeta\\n'; exec sleep 100" || exit 1
-sleep 1
-$TMUX copy-mode -t :plain || exit 1
-$TMUX send-keys -t :plain.0 -X copy-output -a || exit 1
-all=$($TMUX show-buffer)
-case "$all" in
-*alpha*beta*) ;;
-*) exit 1 ;;
-esac
-$TMUX send-keys -t :plain.0 -X cancel || exit 1
-
-$TMUX set-buffer -b keep unchanged || exit 1
-$TMUX copy-mode -t :plain || exit 1
-$TMUX send-keys -t :plain.0 -X copy-output || exit 1
-[ "$($TMUX show-buffer -b keep)" = unchanged ] || exit 1
-$TMUX send-keys -t :plain.0 -X cancel || exit 1
-
-$TMUX new-window -d -n empty "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo\\033]133;C\\007one\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007true\\033]133;C\\033]133;D;0\\007'; exec sleep 100" || exit 1
-sleep 1
-$TMUX copy-mode -t :empty || exit 1
-$TMUX send-keys -t :empty.0 -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = one ] || exit 1
-$TMUX send-keys -t :empty.0 -X cancel || exit 1
-
-$TMUX new-window -d -n prompt "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo\\033]133;C\\007one\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
-sleep 1
-$TMUX copy-mode -t :prompt || exit 1
-$TMUX send-keys -t :prompt.0 -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = one ] || exit 1
-$TMUX send-keys -t :prompt.0 -X cancel || exit 1
-
-$TMUX copy-mode -t :prompt || exit 1
-$TMUX send-keys -t :prompt.0 -X -N 100 cursor-down || exit 1
-$TMUX send-keys -t :prompt.0 C-o || exit 1
-[ "$($TMUX display-message -p -t :prompt.0 '#{selection_present}')" = 1 ] || exit 1
-$TMUX send-keys -t :prompt.0 -X copy-selection || exit 1
-[ "$($TMUX show-buffer)" = one ] || exit 1
-$TMUX send-keys -t :prompt.0 -X cancel || exit 1
-
-$TMUX new-window -d -n same "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo\\n\\033]133;C\\007one\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
-sleep 1
-$TMUX copy-mode -t :same || exit 1
-$TMUX send-keys -t :same.0 -X search-backward one || exit 1
-$TMUX send-keys -t :same.0 -X select-output || exit 1
-$TMUX send-keys -t :same.0 -X copy-selection || exit 1
-[ "$($TMUX show-buffer)" = one ] || exit 1
-$TMUX send-keys -t :same.0 -X cancel || exit 1
-
-$TMUX new-window -d -n clear "printf 'old1\\nold2\\nold3\\nold4\\nold5\\nold6\\n\\033]133;A\\007p\\$ \\033]133;B\\007echo 1; clear; ps\\n\\033]133;C\\0071\\n\\033[H\\033[2JPID TTY\\n1 pts/0\\n\\033]133;D;0\\007separator\\n\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
-sleep 1
-$TMUX copy-mode -t :clear || exit 1
-$TMUX send-keys -t :clear.0 C-o || exit 1
-$TMUX send-keys -t :clear.0 -X copy-selection || exit 1
-[ "$($TMUX show-buffer)" = "$(printf 'PID TTY\n1 pts/0')" ] || exit 1
-$TMUX send-keys -t :clear.0 -X cancel || exit 1
-
-exit 0

regress/pane-ops.sh

@@ -19,10 +19,7 @@
 # - respawn-pane/respawn-window refusing a live pane without -k, working on a
 #   dead pane (remain-on-exit) and killing with -k;
 # - resize-pane -x/-y in cells and percent, -L/-R/-U/-D adjustments and -Z
-#   zoom/unzoom, layout round trips, zoom target selection, pane removal,
-#   window resizing and implicit unzoom on layout changes;
-# - swap-pane preserving one or two zoomed windows, including cross-window
-#   swaps of hidden panes and zoom targets.
+#   zoom/unzoom (including implicit unzoom on split).
 #
 # window-ops.sh covers window-level commands and buffers.sh paste buffers.
 
@@ -104,25 +101,6 @@ assert_alive()
 	fi
 }
 
-# Compare layout geometry and pane ordering, ignoring the active pane and
-# last-pane history in the JSON layout. Selection is checked separately.
-pane_layout()
-{
-	$TMUX display-message -p -t "$1" '#{window_layout}' |
-		sed 's/,"a":true//g; s/,"l":[0-9][0-9]*//g'
-}
-
-check_layout()
-{
-	out=$(pane_layout "$1")
-	if [ "$out" != "$2" ]; then
-		echo "Layout for '$1' wrong."
-		echo "Expected: '$2'"
-		echo "But got:  '$out'"
-		exit 1
-	fi
-}
-
 # ---------------------------------------------------------------------------
 # split-window geometry.
 
@@ -166,8 +144,7 @@ check_panes P:0 "0:$p3 1:$p0 2:$p2 3:$p1"
 # break-pane and join-pane.
 
 # break-pane moves a pane to a new window; -P -F prints where it went and -n
-# names the new window. Moving a pane out of a zoomed window unzooms it first.
-check_ok resize-pane -Z -t "$p0"
+# names the new window.
 out=$($TMUX break-pane -d -P -F '#{window_index}:#{pane_id}' -n broken \
 	-s "$p1" -t P:)
 if [ "$out" != "1:$p1" ]; then
@@ -176,14 +153,10 @@ if [ "$out" != "1:$p1" ]; then
 fi
 check_fmt 'P:1' '#{window_name}:#{window_panes}' 'broken:1'
 check_fmt 'P:0' '#{window_panes}' '3'
-check_fmt 'P:0' '#{window_zoomed_flag}' '0'
 
-# join-pane -v moves it back (the source window, left empty, is destroyed) and
-# also unzooms the destination before changing its layout.
-check_ok resize-pane -Z -t "$p0"
+# join-pane -v moves it back (the source window, left empty, is destroyed).
 check_ok join-pane -d -v -s P:broken.0 -t "$p2"
 check_fmt 'P:0' '#{window_panes}' '4'
-check_fmt 'P:0' '#{window_zoomed_flag}' '0'
 if $TMUX has-session -t P:broken 2>/dev/null; then
 	echo "Window 'broken' still exists after join-pane."
 	exit 1
@@ -219,13 +192,13 @@ check_fail "invalid window name: $(printf 'a\377b')" \
 	break-pane -d -n "$(printf 'a\377b')" -s "$p1" -t P:
 
 # join-pane can move a pane from one window to another without destroying
-# the source window if other panes remain. move-pane does the same when no
-# floating-pane movement flags are given.
+# the source window if other panes remain. (On this branch move-pane is
+# reserved for floating panes, covered by floating-pane-geometry.sh.)
 check_ok new-window -d -t P:5 -n other
 check_ok join-pane -d -s "$p1" -t P:5.0
 check_fmt 'P:5' '#{window_panes}' '2'
 check_fmt 'P:0' '#{window_panes}' '3'
-check_ok move-pane -d -v -s "$p1" -t "$p2"
+check_ok join-pane -d -v -s "$p1" -t "$p2"
 check_fmt 'P:0' '#{window_panes}' '4'
 check_fmt 'P:5' '#{window_panes}' '1'
 
@@ -326,122 +299,6 @@ check_fmt 'P:0' '#{window_panes}' '5'
 p6=$($TMUX display-message -p -t P:0.2 '#{pane_id}')
 check_ok kill-pane -t "$p6"
 
-# Zoom and unzoom preserve the exact tiled layout. Selecting another pane
-# without -Z unzooms, while -Z transfers zoom to the selected pane.
-layout=$(pane_layout P:0)
-check_ok select-pane -t "$p0"
-check_ok resize-pane -Z -t "$p0"
-check_ok select-pane -t "$p2"
-check_fmt "$p2" '#{window_zoomed_flag}:#{pane_active}' '0:1'
-check_layout P:0 "$layout"
-
-check_ok select-pane -t "$p0"
-check_ok resize-pane -Z -t "$p0"
-check_ok select-pane -Z -t "$p2"
-check_fmt "$p2" '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_active}' \
-	'1:1:1'
-check_ok resize-pane -Z -t "$p2"
-check_layout P:0 "$layout"
-
-# Directional selection temporarily restores the full layout to find its
-# neighbour, then follows the same unzoom or -Z transfer rules.
-check_ok select-pane -t "$p0"
-check_ok resize-pane -Z -t "$p0"
-check_ok select-pane -t "$p0"
-check_fmt "$p0" '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_active}' \
-	'1:1:1'
-check_ok select-pane -D -t "$p0"
-check_fmt "$p2" '#{window_zoomed_flag}:#{pane_active}' '0:1'
-
-check_ok select-pane -t "$p0"
-check_ok resize-pane -Z -t "$p0"
-check_ok select-pane -D -Z -t "$p0"
-check_fmt "$p2" '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_active}' \
-	'1:1:1'
-check_ok resize-pane -Z -t "$p2"
-check_layout P:0 "$layout"
-
-# The last-pane path has separate zoom handling, both with and without -Z.
-check_ok select-pane -t "$p0"
-check_ok select-pane -t "$p2"
-check_ok resize-pane -Z -t "$p2"
-check_ok select-pane -l -t P:0
-check_fmt "$p0" '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_active}' \
-	'0:0:1'
-
-check_ok select-pane -t "$p0"
-check_ok select-pane -t "$p2"
-check_ok resize-pane -Z -t "$p2"
-check_ok select-pane -l -Z -t P:0
-check_fmt "$p0" '#{window_zoomed_flag}:#{pane_zoomed_flag}:#{pane_active}' \
-	'1:1:1'
-check_ok resize-pane -Z -t "$p0"
-check_layout P:0 "$layout"
-
-# Killing either a hidden ordinary pane or the zoom target unzooms.
-check_ok new-window -d -t P:12 -n zoom-kill 'cat'
-zk0=$($TMUX display-message -p -t P:12.0 '#{pane_id}')
-zk1=$($TMUX split-window -d -P -F '#{pane_id}' -t P:12.0 'cat')
-zk2=$($TMUX split-window -d -P -F '#{pane_id}' -t P:12.0 'cat')
-check_ok resize-pane -Z -t "$zk0"
-check_ok kill-pane -t "$zk1"
-check_fmt "$zk0" '#{window_panes}:#{window_zoomed_flag}:#{pane_zoomed_flag}' \
-	'2:0:0'
-check_ok resize-pane -Z -t "$zk0"
-check_ok kill-pane -t "$zk0"
-check_fmt "$zk2" '#{window_panes}:#{window_zoomed_flag}:#{pane_zoomed_flag}' \
-	'1:0:0'
-check_ok kill-window -t P:12
-
-# The same cases through natural process exit exercise server_destroy_pane.
-check_ok new-window -d -t P:13 -n zoom-exit 'cat'
-ze0=$($TMUX display-message -p -t P:13.0 '#{pane_id}')
-ze1=$($TMUX split-window -d -P -F '#{pane_id}' -t P:13.0 'cat')
-ze2=$($TMUX split-window -d -P -F '#{pane_id}' -t P:13.0 'cat')
-check_ok resize-pane -Z -t "$ze0"
-check_ok send-keys -t "$ze1" C-d
-i=0
-while [ "$($TMUX display-message -p -t P:13 '#{window_panes}')" != 2 ]; do
-	i=$((i + 1))
-	[ $i -gt 50 ] && { echo "Hidden pane did not exit."; exit 1; }
-	sleep 0.1
-done
-check_fmt "$ze0" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '0:0'
-check_ok resize-pane -Z -t "$ze2"
-check_ok send-keys -t "$ze2" C-d
-i=0
-while [ "$($TMUX display-message -p -t P:13 '#{window_panes}')" != 1 ]; do
-	i=$((i + 1))
-	[ $i -gt 50 ] && { echo "Zoomed pane did not exit."; exit 1; }
-	sleep 0.1
-done
-check_fmt "$ze0" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '0:0'
-check_ok kill-window -t P:13
-
-# resize-window restores both tiled and floating zoom targets after rebuilding
-# the layout at the new size.
-check_ok new-window -d -t P:14 -n zoom-resize 'cat'
-zr0=$($TMUX display-message -p -t P:14.0 '#{pane_id}')
-check_ok split-window -d -t P:14.0 'cat'
-check_ok resize-pane -Z -t "$zr0"
-check_ok resize-window -t P:14 -x 90 -y 30
-check_fmt "$zr0" \
-	'#{window_width}x#{window_height}:#{window_zoomed_flag}:#{pane_zoomed_flag}' \
-	'90x30:1:1'
-check_ok resize-pane -Z -t "$zr0"
-zrf=$($TMUX new-pane -dP -F '#{pane_id}' -t P:14 -x 20 -y 6 'cat')
-zrf_size=$($TMUX display-message -p -t "$zrf" \
-	'#{pane_width}x#{pane_height}')
-check_ok resize-pane -Z -t "$zrf"
-check_ok resize-window -t P:14 -x 100 -y 32
-check_fmt "$zrf" \
-	'#{window_width}x#{window_height}:#{window_zoomed_flag}:#{pane_zoomed_flag}' \
-	'100x32:1:1'
-check_ok resize-pane -Z -t "$zrf"
-check_fmt "$zrf" '#{pane_floating_flag}:#{pane_width}x#{pane_height}' \
-	"1:$zrf_size"
-check_ok kill-window -t P:14
-
 # ---------------------------------------------------------------------------
 # kill-pane.
 
@@ -450,10 +307,8 @@ check_ok kill-pane -t "$p3"
 check_panes P:0 "0:$p0 1:$p2 2:$p1"
 
 # -a kills every pane except the target.
-check_ok resize-pane -Z -t "$p0"
 check_ok kill-pane -a -t "$p0"
 check_panes P:0 "0:$p0"
-check_fmt "$p0" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '0:0'
 
 # Killing the last pane in a window kills the window.
 check_ok new-window -d -t P:7 -n goner
@@ -661,10 +516,6 @@ check_panes P:3 "0:$r0 1:$r1 2:$r2"
 # Swapping a pane with itself quietly does nothing.
 check_ok swap-pane -d -s "$r1" -t "$r1"
 check_panes P:3 "0:$r0 1:$r1 2:$r2"
-check_ok resize-pane -Z -t "$r1"
-check_ok swap-pane -d -Z -s "$r1" -t "$r1"
-check_fmt "$r1" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '1:1'
-check_ok resize-pane -Z -t "$r1"
 
 # Panes can be swapped between different windows.
 check_ok swap-pane -d -s "$o0" -t "$r1"
@@ -674,38 +525,10 @@ check_ok swap-pane -d -s "$r1" -t "$o0"
 check_panes P:3 "0:$r0 1:$r1 2:$r2"
 check_panes P:5 "0:$o0"
 
-# With both windows zoomed, -Z preserves each window's zoom when hidden panes
-# are exchanged and when the zoom targets themselves are exchanged.
-o1=$($TMUX split-window -dP -F '#{pane_id}' -t P:5.0)
-check_ok resize-pane -Z -t "$r0"
-check_ok resize-pane -Z -t "$o0"
-check_ok swap-pane -d -Z -s "$r1" -t "$o1"
-check_fmt "$r0" \
-	'#{window_name}:#{window_zoomed_flag}:#{pane_zoomed_flag}' 'swaps:1:1'
-check_fmt "$o0" \
-	'#{window_name}:#{window_zoomed_flag}:#{pane_zoomed_flag}' 'other:1:1'
-check_fmt "$r1" '#{window_name}' 'other'
-check_fmt "$o1" '#{window_name}' 'swaps'
-
-check_ok swap-pane -d -Z -s "$r0" -t "$o0"
-check_fmt "$o0" \
-	'#{window_name}:#{window_zoomed_flag}:#{pane_zoomed_flag}' 'swaps:1:1'
-check_fmt "$r0" \
-	'#{window_name}:#{window_zoomed_flag}:#{pane_zoomed_flag}' 'other:1:1'
-check_ok resize-pane -Z -t "$o0"
-check_ok resize-pane -Z -t "$r0"
-
-# Restore the original panes before the remaining swap tests.
-check_ok swap-pane -d -s "$r0" -t "$o0"
-check_ok swap-pane -d -s "$r1" -t "$o1"
-check_ok kill-pane -t "$o1"
-check_panes P:3 "0:$r0 1:$r1 2:$r2"
-check_panes P:5 "0:$o0"
-
 # -Z keeps the window zoomed across the swap.
 check_ok resize-pane -Z -t "$r0"
 check_ok swap-pane -d -Z -s "$r0" -t "$r1"
-check_fmt "$r0" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '1:1'
+check_fmt 'P:3' '#{window_zoomed_flag}' '1'
 check_ok resize-pane -Z -t P:3
 check_panes P:3 "0:$r1 1:$r0 2:$r2"
 

regress/pipe-pane.sh

@@ -35,9 +35,9 @@ check_alive()
 
 # A pipe-pane -I child may write after the pane process has exited. With
 # remain-on-exit, the pane stays around but its bufferevent has been freed.
-check_ok new-session -d -s pipe -x 80 -y 24 'sleep 1'
+check_ok new-session -d -s pipe -x 80 -y 24 'sleep 0.2'
 check_ok set-option -t pipe:0 remain-on-exit on
-check_ok pipe-pane -t pipe:0.0 -I 'sleep 2; printf x'
+check_ok pipe-pane -t pipe:0.0 -I 'sleep 0.6; printf x'
 
 i=0
 while [ "$($TMUX display-message -p -t pipe:0.0 '#{pane_dead}')" != "1" ]; do
@@ -46,7 +46,7 @@ while [ "$($TMUX display-message -p -t pipe:0.0 '#{pane_dead}')" != "1" ]; do
 	sleep 0.1
 done
 
-sleep 2
+sleep 0.7
 check_alive
 
 $TMUX kill-server 2>/dev/null

regress/prompt-keys.sh

@@ -217,36 +217,7 @@ $OUT send-keys M-r || exit 1
 settle
 status_line | grep -q '>' || fail "status-line prompt not drawn on the status line"
 
-# --- 11. Invalid UTF-8 input must not desynchronize the prompt buffer. ---
-$OUT send-keys -H e6 85 5f || exit 1	# invalid UTF-8, then "_"
-settle
-$IN display-message -p '#{version}' >/dev/null 2>&1 || \
-	fail "invalid UTF-8 append killed inner tmux"
-status_line | grep -qF "> _" || \
-	fail "invalid UTF-8 append did not keep prompt usable (got '$(status_line)')"
-$OUT send-keys Enter || exit 1
-settle
-[ "$($IN show -gv @r)" = "_" ] || \
-	fail "invalid UTF-8 append recovered '$($IN show -gv @r)', wanted '_'"
-
-$IN set -g @r "SENTINEL" || exit 1
-$OUT send-keys M-r || exit 1
-settle
-$OUT send-keys -H e6 85 04 || exit 1	# invalid UTF-8, then C-d
-settle
-$IN display-message -p '#{version}' >/dev/null 2>&1 || \
-	fail "invalid UTF-8 delete killed inner tmux"
-status_line | grep -q '>' || \
-	fail "invalid UTF-8 delete closed the prompt (got '$(status_line)')"
-$OUT send-keys Escape || exit 1
-settle
-[ "$($IN show -gv @r)" = "SENTINEL" ] || \
-	fail "invalid UTF-8 delete accepted the prompt"
-
-# --- 12. emacs cursor-marker edit, accept recovers the exact buffer. ---
-$IN set -g @r "" || exit 1
-$OUT send-keys M-r || exit 1
-settle
+# --- 11. emacs cursor-marker edit, accept recovers the exact buffer. ---
 $OUT send-keys -l "abc" || exit 1
 $OUT send-keys Home || exit 1
 $OUT send-keys -l "X" || exit 1
@@ -258,7 +229,7 @@ settle
 [ "$($IN show -gv @r)" = "Xabc" ] || \
 	fail "status-line accept recovered '$($IN show -gv @r)', wanted 'Xabc'"
 
-# --- 13. Unicode on the status line: insert, move, delete wide char. ---
+# --- 12. Unicode on the status line: insert, move, delete wide char. ---
 $IN set -g @r "" || exit 1
 $OUT send-keys M-r || exit 1
 settle
@@ -278,7 +249,7 @@ settle
 [ "$($IN show -gv @r)" = "Za" ] || \
 	fail "status-line wide edit recovered '$($IN show -gv @r)', wanted 'Za'"
 
-# --- 14. Overflow: more text than fits stays within the line and is kept. ---
+# --- 13. Overflow: more text than fits stays within the line and is kept. ---
 big="0123456789012345678901234567890123456789012345678901234567890123456789ABCDEFGHIJ"
 $IN set -g @r "" || exit 1
 $OUT send-keys M-r || exit 1
@@ -293,7 +264,7 @@ settle
 # The whole buffer was kept despite only part being visible.
 [ "$($IN show -gv @r)" = "$big" ] || fail "overflowing prompt lost buffer content"
 
-# --- 15. Escape closes the status-line prompt cleanly. ---
+# --- 14. Escape closes the status-line prompt cleanly. ---
 $IN set -g @r "SENTINEL" || exit 1
 $OUT send-keys M-r || exit 1
 settle

regress/prompt-words-history.sh

@@ -1,165 +0,0 @@
-#!/bin/sh
-
-# Cover prompt word movement in emacs and vi modes, ambiguous inline command
-# completion, and the show/clear-prompt-history command surface.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -p -t outer:0.0 2>/dev/null
-}
-
-wait_result()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER show-option -gqv @result 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "prompt result is '$got', expected '$want'"
-}
-
-bind_prompt()
-{
-	initial=$1
-	$INNER bind-key -n M-r command-prompt -I "$initial" -p '(word)' \
-		"set-option -g @result '%%'" || exit 1
-}
-
-run_prompt()
-{
-	want=$1
-	shift
-	$INNER set-option -g @result sentinel || exit 1
-	$OUTER send-keys M-r || exit 1
-	sleep 0.2
-	$OUTER send-keys "$@" || exit 1
-	$OUTER send-keys Enter || exit 1
-	wait_result "$want"
-}
-
-run_vi_prompt()
-{
-	want=$1
-	shift
-	$INNER set-option -g @result sentinel || exit 1
-	$OUTER send-keys M-r || exit 1
-	sleep 0.2
-	# Send Escape separately so the terminal's escape-time handling does not
-	# combine it with the first vi command as a Meta key.
-	$OUTER send-keys Escape || exit 1
-	# The inner client must see Escape as a complete key, not the prefix of a
-	# Meta sequence (the default escape-time is 500 milliseconds).
-	sleep 0.7
-	$OUTER send-keys "$@" || exit 1
-	$OUTER send-keys Enter || exit 1
-	wait_result "$want"
-}
-
-$INNER new-session -d -s prompt -x80 -y24 'exec sleep 100' || exit 1
-$INNER set-option -g status on || exit 1
-$INNER set-option -g status-position bottom || exit 1
-$INNER set-option -g window-size manual || exit 1
-$OUTER new-session -d -s outer -x80 -y24 "$INNER attach -t prompt" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-sleep 1
-
-# Emacs Meta-f stops after the first word; Meta-b returns to the start of the
-# previous word. Inserting a marker makes the cursor position observable.
-$INNER set-option -g status-keys emacs || exit 1
-bind_prompt 'one two'
-run_prompt 'oneX two' Home M-f X
-bind_prompt 'one two'
-run_prompt 'one Xtwo' M-b X
-
-# Vi translation and the distinct separator-aware and WORD motions.
-$INNER set-option -g status-keys vi || exit 1
-bind_prompt 'one-two three'
-run_vi_prompt 'one-two Xthree' b i X
-bind_prompt 'one-two three'
-run_vi_prompt 'one-two Xthree' B i X
-bind_prompt 'one-two three'
-run_vi_prompt 'oneX-two three' 0 w i X
-bind_prompt 'one-two three'
-run_vi_prompt 'one-two Xthree' 0 W i X
-bind_prompt 'one-two three'
-run_vi_prompt 'oneX-two three' 0 e a X
-bind_prompt 'one-two three'
-run_vi_prompt 'one-twoX three' 0 E a X
-
-# "show-" has several command matches and no longer common prefix. Tab keeps
-# the input and draws the sorted candidates inline.
-$INNER set-option -g status-keys emacs || exit 1
-bind_prompt ''
-$OUTER send-keys M-r || exit 1
-sleep 0.2
-$OUTER send-keys -l 'show-' || exit 1
-$OUTER send-keys Tab || exit 1
-sleep 0.2
-captured=$(capture)
-printf '%s\n' "$captured" | grep -Fq 'show-buffer' ||
-	fail "ambiguous completion list was not drawn"
-printf '%s\n' "$captured" | grep -Fq 'show-environment' ||
-	fail "ambiguous completion list was incomplete"
-$OUTER send-keys Escape || exit 1
-
-# Add entries to both history rings through real prompts.
-bind_prompt 'history-command'
-run_prompt 'history-command'
-$INNER bind-key -n M-s command-prompt -T search -I history-search \
-	-p '(search-history)' "set-option -g @result '%%'" || exit 1
-$OUTER send-keys M-s || exit 1
-$OUTER send-keys Enter || exit 1
-wait_result history-search
-
-command_history=$($INNER show-prompt-history -T command) || exit 1
-printf '%s\n' "$command_history" | grep -Fq 'history-command' ||
-	fail "command history entry missing"
-search_history=$($INNER show-prompt-history -T search) || exit 1
-printf '%s\n' "$search_history" | grep -Fq 'history-search' ||
-	fail "search history entry missing"
-all_history=$($INNER show-prompt-history) || exit 1
-printf '%s\n' "$all_history" | grep -Fq 'History for command:' || exit 1
-printf '%s\n' "$all_history" | grep -Fq 'History for search:' || exit 1
-
-$INNER show-prompt-history -T invalid >/dev/null 2>&1 &&
-	fail "invalid show history type succeeded"
-$INNER clear-prompt-history -T invalid >/dev/null 2>&1 &&
-	fail "invalid clear history type succeeded"
-$INNER clear-prompt-history -T command || exit 1
-$INNER show-prompt-history -T command | grep -Fq history-command &&
-	fail "type-specific history clear failed"
-$INNER clear-prompt-history || exit 1
-$INNER show-prompt-history | grep -Fq history-search &&
-	fail "all-history clear failed"
-
-exit 0

regress/respawn-pane-control-lag.sh

@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# respawn-pane frees the pane's buffer and creates an empty one. The pane
-# offsets and each control client's offsets used to keep pointing into the old
-# buffer, so if an attached control client had not caught up on the pane's
-# output, the next read from the new process ran off the end of the new buffer
-# and the server crashed in input_parse.
-#
-# Two ways for a client to be behind are tested: a control client whose output
-# goes down a fifo that is never read (a second, healthy control client keeps
-# the pane being read), and a healthy control client viewing a session that
-# the pane's window has been moved out of.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest"
-$TMUX kill-server 2>/dev/null
-
-DIR=$(mktemp -d)
-FIFO=$DIR/fifo
-SERVER=
-
-mkfifo "$FIFO" || exit 1
-
-cleanup() {
-	[ -n "$SERVER" ] && kill -9 "$SERVER" 2>/dev/null
-	$TMUX kill-server 2>/dev/null
-	exec 8<&- 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-alive() {
-	if ! kill -0 "$SERVER" 2>/dev/null; then
-		SERVER=
-		echo "server died after $1"
-		exit 1
-	fi
-	$TMUX has -t rt || exit 1
-}
-
-wait_clients() {
-	n=0
-	while [ $n -lt 50 ]; do
-		[ "$($TMUX lsc 2>/dev/null | wc -l)" -ge $1 ] && return
-		sleep 0.1
-		n=$((n + 1))
-	done
-	echo "control clients did not attach"; exit 1
-}
-
-# A detached session with a pane that writes a line every 10 milliseconds.
-$TMUX -f/dev/null new -d -x 80 -y 24 -s rt \
-	'while :; do echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; sleep 0.01; done' ||
-	exit 1
-SERVER=$($TMUX display -pt rt '#{pid}')
-
-# One control client with output down the unread fifo and one reading
-# normally; stdin of both held open by sleep so they stay attached.
-( sleep 60 ) | $TMUX -f/dev/null -C attach -t rt >"$FIFO" 2>&1 &
-exec 8<"$FIFO"
-( sleep 60 ) | $TMUX -f/dev/null -C attach -t rt >/dev/null 2>&1 &
-wait_clients 2
-
-# Let the first client fall behind, then respawn the pane. The new process
-# writes at once and the server must survive reading it.
-sleep 3
-$TMUX respawn-pane -k -t rt:0 'echo respawned; sleep 60' || exit 1
-sleep 1
-alive "respawn-pane with a lagging control client"
-
-# Now a pane whose window is moved out of the session both clients view: their
-# offsets for it stop advancing, so they fall behind until it is respawned.
-$TMUX neww -d -t rt \
-	'while :; do echo yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy; sleep 0.01; done' ||
-	exit 1
-sleep 1
-$TMUX new -d -s other || exit 1
-$TMUX movew -d -s rt:1 -t other: || exit 1
-sleep 2
-$TMUX respawn-pane -k -t other:1 'echo respawned; sleep 60' || exit 1
-sleep 1
-alive "respawn-pane on a window moved out of the clients' session"
-
-exit 0

regress/screen-redraw-floating.sh

@@ -107,12 +107,6 @@ $TMUX2 new-pane -x28 -y8 -X4 -Y1 -B double \
 	"sh -c 'printf FLOAT; exec sleep 100'" || exit 1
 compare floating-border-double
 
-# Larger floating pane with rounded border lines.
-new_scene 40 12
-$TMUX2 new-pane -x28 -y8 -X4 -Y1 -B rounded \
-	"sh -c 'printf FLOAT; exec sleep 100'" || exit 1
-compare floating-border-rounded
-
 # Floating pane with no border lines: redraw_mark_pane_borders returns early so
 # the float has no border at all, only its (clipped) content over the base pane.
 new_scene 40 12

regress/screen-redraw-outside.sh

@@ -93,15 +93,6 @@ $TMUX2 splitw -v "$C" || exit 1
 $TMUX2 select-layout tiled || exit 1
 compare outside-both-2x2
 
-# Top pane status supplies internal horizontal borders, but there is no pane
-# below the window to supply its bottom edge.
-new_scene 28 9
-$TMUX2 setw pane-border-status top || exit 1
-$TMUX2 setw pane-border-format "" || exit 1
-compare outside-both-status-top-single
-$TMUX2 splitw -v "$C" || exit 1
-compare outside-both-status-top-split
-
 # Window BIGGER than the client: only part of the window is viewed and the view
 # can be panned (refresh-client). This exercises a non-zero scene offset.
 # A 2x2 grid in a 60x20 window viewed through the 40x14 client.

regress/screen-redraw-results/floating-border-rounded.result

@@ -1,12 +0,0 @@
-base
-    ╭──────────────────────────╮
-    │FLOAT                     │
-    │                          │
-    │                          │
-    │                          │
-    │                          │
-    │                          │
-    ╰──────────────────────────╯
-
-
-

regress/screen-redraw-results/outside-both-status-top-single.result

@@ -1,14 +0,0 @@
-────────────────────────────┐···········
-OUT01 abcdefghij            │···········
-OUT02 abcdefghij            │···········
-OUT03 abcdefghij            │···········
-OUT04 abcdefghij            │···········
-OUT05 abcdefghij            │···········
-OUT06 abcdefghij            │···········
-OUT07 abcdefghij            │···········
-                            │···········
-────────────────────────────┘···········
-········································
-········································
-········································
-········································

regress/screen-redraw-results/outside-both-status-top-split.result

@@ -1,14 +0,0 @@
-────────────────────────────┐···········
-OUT06 abcdefghij            │···········
-OUT07 abcdefghij            │···········
-                            │···········
-────────────────────────────┤···········
-PAN05 abcdefghij            │···········
-PAN06 abcdefghij            │···········
-PAN07 abcdefghij            │···········
-                            │···········
-────────────────────────────┘···········
-········································
-········································
-········································
-········································

regress/screen-redraw-scrollbars-auto-hide.sh

@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Auto-hide scrollbars appear on activity or pointer hover, then disappear
-# after pane-scrollbars-timeout. Compare captures of the same copy-mode view so
-# only the overlay scrollbar changes.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUTER="$TEST_TMUX -LtestA$$ -f/dev/null"
-INNER="$TEST_TMUX -LtestB$$ -f/dev/null"
-DIR=$(mktemp -d) || exit 1
-HIDDEN=$DIR/hidden
-VISIBLE=$DIR/visible
-AFTER=$DIR/after
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -pe -t outer:0.0 >"$1" || exit 1
-}
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		$INNER list-clients 2>/dev/null | grep -q . && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "inner client did not attach"
-}
-
-$INNER new-session -d -s inner -x40 -y12 \
-	"sh -c 'seq 50; exec sleep 100'" || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$INNER set-option -g mouse on || exit 1
-$INNER set-window-option pane-scrollbars auto-hide || exit 1
-$INNER set-window-option pane-scrollbars-timeout 3000 || exit 1
-$INNER set-window-option pane-scrollbars-style \
-	'bg=colour196,fg=colour231,width=1,pad=0' || exit 1
-
-$OUTER new-session -d -s outer -x40 -y12 "$INNER attach -t inner" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-wait_for_client
-
-# Enter copy mode and choose a stable view. The initial show timer is allowed
-# to expire before taking the hidden reference capture.
-$INNER copy-mode -H || exit 1
-$INNER send-keys -X history-top || exit 1
-sleep 3.5
-capture "$HIDDEN"
-
-# A copy-mode page movement shows the overlay and starts its timer. Capture
-# that view immediately, then again after the timeout without moving it.
-$INNER send-keys -X page-down || exit 1
-sleep 0.1
-capture "$VISIBLE"
-sleep 3.5
-capture "$AFTER"
-cmp -s "$VISIBLE" "$AFTER" && fail "scrollbar did not hide after timeout"
-
-# Use the post-movement hidden scene as the reference for pointer hover. SGR
-# mouse column 40 is the right-hand scrollbar; moving to column 5 restarts the
-# timer without changing the copy-mode view.
-cp "$AFTER" "$HIDDEN"
-hover=$(printf '\033[<35;40;5M')
-$OUTER send-keys -l "$hover" || exit 1
-sleep 0.1
-capture "$VISIBLE"
-cmp -s "$HIDDEN" "$VISIBLE" && fail "scrollbar did not appear on hover"
-away=$(printf '\033[<35;5;5M')
-$OUTER send-keys -l "$away" || exit 1
-sleep 3.5
-capture "$AFTER"
-cmp -s "$HIDDEN" "$AFTER" || fail "scrollbar did not hide after hover"
-
-exit 0

regress/server-access.sh

@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# Exercise the unprivileged server-access surface: user and group ACL entries,
-# read-only/writable transitions, listing, removal, implied addition, and
-# command errors. Actual connections from another UID require privileges and
-# deliberately do not form part of this test.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-OUT=$(mktemp) || exit 1
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-	rm -f "$OUT"
-}
-trap cleanup 0 1 15
-
-expect_fail()
-{
-	message=$1
-	shift
-	if $TMUX "$@" >"$OUT" 2>&1; then
-		fail "$message: command unexpectedly succeeded"
-	fi
-}
-
-assert_entry()
-{
-	entry=$1
-	$TMUX server-access -l >"$OUT" || exit 1
-	grep -Fxq "$entry" "$OUT" ||
-		fail "missing ACL entry '$entry'"
-}
-
-assert_no_entry()
-{
-	entry=$1
-	$TMUX server-access -l >"$OUT" || exit 1
-	if grep -Fxq "$entry" "$OUT"; then
-		fail "unexpected ACL entry '$entry'"
-	fi
-}
-
-owner_uid=$(id -u)
-owner_name=$(id -un)
-
-# nobody is the non-owner test identity. Derive its primary group rather than
-# assuming whether the system calls it nobody, nogroup, or something else.
-acl_user=nobody
-acl_group=$(id -gn "$acl_user" 2>/dev/null) ||
-	fail "the nobody account is unavailable"
-[ "$owner_name" != "$acl_user" ] || fail "test cannot run as nobody"
-
-$TMUX new-session -d -s access 'exec sleep 100' || exit 1
-
-# The owner is installed as writable at server startup (root is intentionally
-# omitted from display output).
-if [ "$owner_uid" != 0 ]; then
-	assert_entry "$owner_name (U,W)"
-fi
-
-# User ACL lifecycle, including duplicate and missing-entry errors.
-$TMUX server-access -a "$acl_user" || exit 1
-assert_entry "$acl_user (U,W)"
-expect_fail "duplicate user addition" server-access -a "$acl_user"
-$TMUX server-access -r "$acl_user" || exit 1
-assert_entry "$acl_user (U,R)"
-$TMUX server-access -w "$acl_user" || exit 1
-assert_entry "$acl_user (U,W)"
-$TMUX server-access -d "$acl_user" || exit 1
-assert_no_entry "$acl_user (U,W)"
-expect_fail "removing absent user" server-access -d "$acl_user"
-
-# -r and -w imply -a when an entry is absent.
-$TMUX server-access -r "$acl_user" || exit 1
-assert_entry "$acl_user (U,R)"
-$TMUX server-access -d "$acl_user" || exit 1
-
-# The same lifecycle for a group exercises the separate ACL key space.
-$TMUX server-access -g -a -r "$acl_group" || exit 1
-assert_entry "$acl_group (G,R)"
-$TMUX server-access -g -w "$acl_group" || exit 1
-assert_entry "$acl_group (G,W)"
-expect_fail "duplicate group addition" server-access -g -a "$acl_group"
-$TMUX server-access -g -d "$acl_group" || exit 1
-assert_no_entry "$acl_group (G,W)"
-expect_fail "removing absent group" server-access -g -d "$acl_group"
-
-# Parser and lookup errors, plus the immutable owner/root entries.
-expect_fail "missing ACL subject" server-access -a
-expect_fail "unknown user" server-access -a "tmux-no-user-$$"
-expect_fail "unknown group" server-access -g -a "tmux-no-group-$$"
-expect_fail "conflicting add/delete" server-access -a -d "$acl_user"
-expect_fail "conflicting read/write" server-access -r -w "$acl_user"
-expect_fail "changing server owner" server-access -r "$owner_name"
-if [ "$owner_name" != root ]; then
-	expect_fail "changing root access" server-access -a root
-fi
-
-$TMUX has-session -t access || fail "server exited during ACL updates"
-exit 0

regress/server-socket-error.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Server socket creation failures must produce a nonzero client exit status.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-
-# Root bypasses directory mode bits, so it cannot trigger this failure.
-[ "$(id -u)" -eq 0 ] && exit 0
-
-TMP=$(mktemp -d) || exit 1
-SOCKET="$TMP/ro/socket"
-
-cleanup()
-{
-	chmod 700 "$TMP/ro" 2>/dev/null
-	rm -rf "$TMP"
-}
-
-fail()
-{
-	echo "$1" >&2
-	cleanup
-	exit 1
-}
-
-mkdir "$TMP/ro" || exit 1
-chmod 500 "$TMP/ro" || exit 1
-trap cleanup 0 1 15
-
-check_failure()
-{
-	output=$($TEST_TMUX -S "$SOCKET" -f/dev/null "$@" 2>&1)
-	retval=$?
-
-	[ "$retval" -ne 0 ] || fail "tmux $* exited zero: $output"
-	case "$output" in
-	"error creating $SOCKET ("*) ;;
-	*) fail "tmux $* produced unexpected error: $output" ;;
-	esac
-}
-
-check_failure start-server
-check_failure new-session -d
-
-exit 0

regress/switch-mode.sh

@@ -1,203 +0,0 @@
-#!/bin/sh
-
-# Exercise switch-mode's session and window lists with a real attached client:
-# fuzzy filtering, movement and selection, the default and custom commands,
-# no-match cancellation, resize, zoom restoration, and -k mode teardown.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-INNER="$TEST_TMUX -LtestI$$ -f/dev/null"
-OUTER="$TEST_TMUX -LtestO$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-capture()
-{
-	$OUTER capture-pane -p -t outer:0.0 2>/dev/null
-}
-
-wait_capture()
-{
-	marker=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		captured=$(capture)
-		printf '%s\n' "$captured" | grep -Fq "$marker" && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "timed out waiting for '$marker'"
-}
-
-wait_count()
-{
-	marker=$1
-	want=$2
-	i=0
-	while [ "$i" -lt 50 ]; do
-		captured=$(capture)
-		count=$(printf '%s\n' "$captured" | grep -Fc "$marker")
-		[ "$count" -eq "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "found $count '$marker' rows, expected $want"
-}
-
-wait_format()
-{
-	target=$1
-	format=$2
-	want=$3
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER display-message -p -t "$target" "$format" \
-		    2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "$target format $format is '$got', expected '$want'"
-}
-
-wait_client_session()
-{
-	want=$1
-	i=0
-	while [ "$i" -lt 50 ]; do
-		got=$($INNER list-clients -F '#{client_session}' 2>/dev/null)
-		[ "$got" = "$want" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "client session is '$got', expected '$want'"
-}
-
-# Three alphabetically ordered sessions. alpha:main has two panes so -Z can be
-# observed; the two pick-* windows make a deterministic two-row window filter.
-$INNER new-session -d -s alpha -n main -x60 -y15 'exec sleep 100' || exit 1
-$INNER split-window -d -h -t alpha:main 'exec sleep 100' || exit 1
-$INNER new-window -d -t alpha: -n pick-one 'exec sleep 100' || exit 1
-$INNER new-session -d -s bravo -n pick-two -x60 -y15 \
-	'exec sleep 100' || exit 1
-$INNER new-session -d -s charlie -n last -x60 -y15 \
-	'exec sleep 100' || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$INNER select-window -t alpha:main || exit 1
-
-$OUTER new-session -d -s outer -x60 -y15 "$INNER attach -t alpha" || exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-wait_client_session alpha
-
-# Session rows are sorted alpha, bravo, charlie. Up from the first row wraps to
-# charlie; Enter runs a custom command with the selected session target.
-$INNER set-option -g @picked '' || exit 1
-$INNER switch-mode -s -t alpha:main.0 -F 'SESSION #{session_name}' \
-	"set-option -g @picked '%%'" || exit 1
-wait_count 'SESSION ' 3
-$INNER send-keys -t alpha:main.0 Up Enter || exit 1
-wait_format alpha:main.0 '#{@picked}' '=charlie:'
-wait_format alpha:main.0 '#{pane_in_mode}' 0
-
-# Fuzzy filtering keeps only bravo for "brv". The default command switches the
-# real client to that session and closes the mode.
-$INNER switch-mode -s -t alpha:main.0 -F 'SESSION #{session_name}' || exit 1
-wait_count 'SESSION ' 3
-$INNER send-keys -t alpha:main.0 -l brv || exit 1
-wait_count 'SESSION ' 1
-printf '%s\n' "$captured" | grep -Fq 'SESSION bravo' ||
-	fail "fuzzy session filter did not select bravo"
-$INNER send-keys -t alpha:main.0 Enter || exit 1
-wait_client_session bravo
-client=$($INNER list-clients -F '#{client_name}')
-$INNER switch-client -c "$client" -t alpha || exit 1
-wait_client_session alpha
-
-# Window mode sees pick-one then pick-two for the "pick" filter. Down selects
-# the second row, and the custom command receives its window target.
-$INNER set-option -g @picked '' || exit 1
-$INNER switch-mode -w -t alpha:main.0 -F \
-	'WINDOW #{session_name}:#{window_name}' \
-	"set-option -g @picked '%%'" || exit 1
-wait_capture 'WINDOW '
-$INNER send-keys -t alpha:main.0 -l pick || exit 1
-wait_count 'WINDOW ' 2
-$INNER send-keys -t alpha:main.0 Down Enter || exit 1
-picked=$($INNER show-option -gv @picked)
-case "$picked" in
-=bravo:0.) ;;
-*) fail "window selection produced '$picked', expected '=bravo:0.'" ;;
-esac
-
-# Navigation with an empty result set must be harmless, and Escape cancels
-# without running the custom command.
-$INNER set-option -g @picked unchanged || exit 1
-$INNER switch-mode -s -t alpha:main.0 -F 'NONE #{session_name}' \
-	"set-option -g @picked '%%'" || exit 1
-wait_capture 'NONE '
-$INNER send-keys -t alpha:main.0 -l no-such-session || exit 1
-wait_count 'NONE ' 0
-$INNER send-keys -t alpha:main.0 Up Down PPage NPage Home End || exit 1
-wait_format alpha:main.0 '#{pane_mode}' switch-mode
-$INNER send-keys -t alpha:main.0 Escape || exit 1
-wait_format alpha:main.0 '#{pane_in_mode}' 0
-[ "$($INNER show-option -gv @picked)" = unchanged ] ||
-	fail "cancelled switch-mode ran its command"
-
-# -Z temporarily zooms an unzoomed window. Resizing while the mode is open
-# rebuilds and redraws it; exiting restores the original unzoomed state.
-$INNER switch-mode -Zs -t alpha:main.0 -F 'RESIZE #{session_name}' || exit 1
-wait_capture 'RESIZE alpha'
-wait_format alpha:main.0 '#{window_zoomed_flag}' 1
-$INNER resize-window -t alpha:main -x50 -y12 || exit 1
-wait_format alpha:main.0 '#{window_width}x#{window_height}' 50x12
-wait_format alpha:main.0 '#{pane_mode}' switch-mode
-$INNER send-keys -t alpha:main.0 Escape || exit 1
-wait_format alpha:main.0 '#{window_zoomed_flag}' 0
-
-# If the window was already zoomed, leaving -Z mode must keep it zoomed.
-$INNER resize-pane -Z -t alpha:main.0 || exit 1
-$INNER switch-mode -Zs -t alpha:main.0 -F 'ZOOMED #{session_name}' || exit 1
-wait_capture 'ZOOMED alpha'
-$INNER send-keys -t alpha:main.0 Escape || exit 1
-wait_format alpha:main.0 '#{window_zoomed_flag}' 1
-$INNER resize-pane -Z -t alpha:main.0 || exit 1
-
-# -k uses the shared mode teardown flag. Put it on a disposable pane and make
-# sure exiting the mode removes that pane.
-kill_pane=$($INNER split-window -d -P -F '#{pane_id}' -t alpha:main \
-	'exec sleep 100') || exit 1
-$INNER switch-mode -ks -t "$kill_pane" -F 'KILL #{session_name}' || exit 1
-wait_format "$kill_pane" '#{pane_mode}' switch-mode
-$INNER send-keys -t "$kill_pane" Escape || exit 1
-i=0
-while [ "$i" -lt 50 ]; do
-	$INNER list-panes -s -t alpha -F '#{pane_id}' 2>/dev/null | \
-	    grep -q -x "$kill_pane" || break
-	sleep 0.1
-	i=$((i + 1))
-done
-[ "$i" -lt 50 ] || fail "switch-mode -k did not kill its pane"
-
-exit 0

regress/sync-output-atomic.sh

@@ -1,173 +0,0 @@
-#!/bin/sh
-
-# Application synchronized updates must remain one physical client transaction,
-# including when BSU, printable cells and ESU arrive in one pane read.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-
-INNER="$TEST_TMUX -Li$$ -f/dev/null"
-OUTER="$TEST_TMUX -Lo$$ -f/dev/null"
-CLIENT_BYTES=$DIR/client-bytes
-CONTROL=$DIR/control
-EMITTER=$DIR/emitter.pl
-ASSERT=$DIR/assert-sync-output.pl
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		$INNER list-clients -F '#{client_termfeatures}' 2>/dev/null |
-		    grep -q 'sync' && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "sync-capable client did not attach"
-}
-
-wait_for_marker()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		grep -q 'FRAME_000001_ROW_23' "$CLIENT_BYTES" 2>/dev/null && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "client did not receive both synchronized frames"
-}
-
-wait_for_stable_bytes()
-{
-	previous=-1
-	stable=0
-	i=0
-	while [ "$i" -lt 50 ]; do
-		current=$(wc -c <"$CLIENT_BYTES" 2>/dev/null) || current=0
-		if [ "$current" -gt 0 ] && [ "$current" -eq "$previous" ]; then
-			stable=$((stable + 1))
-			[ "$stable" -eq 5 ] && return 0
-		else
-			stable=0
-		fi
-		previous=$current
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "client byte stream did not become stable"
-}
-
-cat >"$EMITTER" <<'PERL'
-use strict;
-use warnings;
-
-my $control = $ENV{CONTROL};
-(my $dir = $control) =~ s{/[^/]+$}{};
-open my $ready, '>', "$dir/ready" or die "$dir/ready: $!\n";
-close $ready;
-while (!-e $control) {
-	select undef, undef, undef, 0.01;
-}
-for my $frame (0 .. 1) {
-	my @rows;
-	for my $row (0 .. 23) {
-		my $marker = sprintf "FRAME_%06d_ROW_%02d_", $frame, $row;
-		push @rows, substr($marker . ('X' x 79), 0, 79);
-	}
-	my $frame = "\e[?2026h\e[H" . join("\r\n", @rows) .
-	    "\e[?2026l";
-	my $written = syswrite STDOUT, $frame;
-	die "short synchronized frame write\n"
-	    unless defined $written && $written == length $frame;
-	select undef, undef, undef, 0.2;
-}
-select undef, undef, undef, 2;
-PERL
-
-$INNER new-session -d -s inner -x 80 -y 24 \
-    "CONTROL='$CONTROL' perl '$EMITTER'" || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$INNER set-option -as terminal-features '*:sync' || exit 1
-
-$OUTER new-session -d -s outer -x 80 -y 24 \
-    "$TEST_TMUX -Li$$ -f/dev/null attach-session -t inner" ||
-    exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-wait_for_client
-
-i=0
-while [ "$i" -lt 50 ] && [ ! -e "$DIR/ready" ]; do
-	sleep 0.1
-	i=$((i + 1))
-done
-[ -e "$DIR/ready" ] || fail "application emitter did not become ready"
-$OUTER pipe-pane -O -t outer:0.0 "cat >'$CLIENT_BYTES'" || exit 1
-: >"$CONTROL"
-wait_for_marker
-wait_for_stable_bytes
-$OUTER pipe-pane -t outer:0.0 || exit 1
-
-cat >"$ASSERT" <<'PERL'
-use strict;
-use warnings;
-
-my $path = shift;
-open my $fh, '<:raw', $path or die "$path: $!\n";
-local $/;
-my $bytes = <$fh>;
-my ($on, $off) = ("\e[?2026h", "\e[?2026l");
-my ($active, %seen);
-
-for (my $i = 0; $i < length($bytes);) {
-	if (substr($bytes, $i, length($on)) eq $on) {
-		die "duplicate synchronized-output start at byte $i\n" if $active;
-		$active = 1;
-		$i += length($on);
-		next;
-	}
-	if (substr($bytes, $i, length($off)) eq $off) {
-		die "unmatched synchronized-output end at byte $i\n" unless $active;
-		$active = 0;
-		$i += length($off);
-		next;
-	}
-	if (substr($bytes, $i) =~ /\AFRAME_(\d{6})_ROW_(\d{2})_/) {
-		my $marker = "$1:$2";
-		die "marker $marker outside synchronized output\n" unless $active;
-		$seen{$marker}++;
-	}
-	$i++;
-}
-die "unterminated synchronized-output transaction\n" if $active;
-for my $frame (0 .. 1) {
-	for my $row (0 .. 23) {
-		my $marker = sprintf "%06d:%02d", $frame, $row;
-		die "missing marker $marker\n" unless $seen{$marker};
-	}
-}
-PERL
-
-perl "$ASSERT" "$CLIENT_BYTES" || exit 1