Minor bits missed (-T show title and popup_* format variables).

# Conflicts:
#	regress/modal-pane.sh
#	server-client.c

CHANGES

@@ -33,9 +33,11 @@ CHANGES FROM 3.7c TO 3.8
     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.
 
-  - floating panes are unzoomed before creation to avoid a crash.
+* 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.
 
 * Add support for themes and improve default colours:
 
@@ -126,6 +128,10 @@ 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.
@@ -172,6 +178,8 @@ 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).
 
@@ -180,7 +188,8 @@ CHANGES FROM 3.7c TO 3.8
   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).
+  is respawned (issue 5498). Bound buffered command replies so a control mode
+  client that stops reading cannot consume unlimited memory (issue 5565).
 
 * Fix grouped sessions sometimes being left as unusable command targets while
   they are being killed (Bryce Miller, issue 5180).

Makefile.am

@@ -174,6 +174,7 @@ dist_tmux_SOURCES = \
 	input-keys.c \
 	input.c \
 	job.c \
+	json.c \
 	key-bindings.c \
 	key-string.c \
 	layout-custom.c \
@@ -187,7 +188,6 @@ dist_tmux_SOURCES = \
 	options-table.c \
 	options.c \
 	paste.c \
-	popup.c \
 	proc.c \
 	prompt-history.c \
 	prompt.c \

cmd-capture-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-capture-pane.c,v 1.68 2026/07/20 11:16:33 nicm Exp $ */
+/* $OpenBSD: cmd-capture-pane.c,v 1.69 2026/09/08 07:31:59 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:FHJLMNpPqRS:Tt:", 0, 0, NULL },
-	.usage = "[-aCeFHJLMNpPqRT] " CMD_BUFFER_USAGE " [-E end-line] "
+	.args = { "ab:CeE:FHIJLMNpPqRS:Tt:", 0, 0, NULL },
+	.usage = "[-aCeFHIJLMNpPqRT] " 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
-				xsnprintf(tmp, sizeof tmp, "\\%03hho", line[i]);
+				snprintf(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, hyperlinks;
+	int				 show_flags, show_time, hyperlinks;
 	u_int				*links = NULL, nlinks = 0;
 	u_int				 i, sx, top, bottom, tmp;
 	char				*cause, *buf = NULL, *line, b[64], *cp;
@@ -342,6 +342,7 @@ 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);
@@ -358,6 +359,7 @@ 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)
@@ -368,11 +370,16 @@ 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)
@@ -393,7 +400,6 @@ 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-copy-mode.c

@@ -30,8 +30,8 @@ const struct cmd_entry cmd_copy_mode_entry = {
 	.name = "copy-mode",
 	.alias = NULL,
 
-	.args = { "UcdekHMqSs:t:u", 0, 0, NULL },
-	.usage = "[-UcdekHMqSu] [-s src-pane] " CMD_TARGET_PANE_USAGE,
+	.args = { "dekHMqSs:t:u", 0, 0, NULL },
+	.usage = "[-dekHMqSu] [-s src-pane] " CMD_TARGET_PANE_USAGE,
 
 	.source =  { 's', CMD_FIND_PANE, 0 },
 	.target = { 't', CMD_FIND_PANE, 0 },

cmd-display-menu.c

@@ -54,8 +54,8 @@ const struct cmd_entry cmd_display_popup_entry = {
 	.name = "display-popup",
 	.alias = "popup",
 
-	.args = { "Bb:Cc:d:e:Eh:kNs:S:t:T:w:x:y:", 0, -1, NULL },
-	.usage = "[-BCEkN] [-b border-lines] [-c target-client] "
+	.args = { "Bb:Cc:d:e:Eh:ks:S:t:T:w:x:y:", 0, -1, NULL },
+	.usage = "[-BCEk] [-b border-lines] [-c target-client] "
 		 "[-d start-directory] [-e environment] [-h height] "
 		 "[-s style] [-S border-style] " CMD_TARGET_PANE_USAGE
 		 " [-T title] [-w width] [-x position] [-y position] "
@@ -91,203 +91,6 @@ cmd_display_menu_args_parse(struct args *args, u_int idx, __unused char **cause)
 	return (type);
 }
 
-static int
-cmd_display_menu_get_popup_pos(struct client *tc, struct cmdq_item *item,
-    struct args *args, u_int *px, u_int *py, u_int w, u_int h)
-{
-	struct tty		*tty = &tc->tty;
-	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct key_event	*event = cmdq_get_event(item);
-	struct session		*s = tc->session;
-	struct winlink		*wl = target->wl;
-	struct window_pane	*wp = target->wp;
-	struct style_ranges	*ranges = NULL;
-	struct style_range	*sr = NULL;
-	const char		*xp, *yp;
-	char			*p;
-	int			 top;
-	u_int			 line, ox, oy, sx, sy, lines, position;
-	long			 n;
-	struct format_tree	*ft;
-
-	/*
-	 * Work out the position from the -x and -y arguments. This is the
-	 * bottom-left position.
-	 */
-
-	/* If the popup is too big, stop now. */
-	if (w > tty->sx || h > tty->sy)
-		return (0);
-
-	/* Create format with mouse position if any. */
-	ft = format_create_from_target(item);
-	if (event->m.valid) {
-		format_add(ft, "popup_mouse_x", "%u", event->m.x);
-		format_add(ft, "popup_mouse_y", "%u", event->m.y);
-	}
-
-	/* Position of the previous menu, for -x/-y L. */
-	format_add(ft, "popup_last_x", "%u", target->w->menu_last_px);
-	format_add(ft, "popup_last_y", "%u", target->w->menu_last_py + h);
-
-	/*
-	 * If there are any status lines, add this window position and the
-	 * status line position.
-	 */
-	top = status_at_line(tc);
-	if (top != -1) {
-		lines = status_line_size(tc);
-		if (top == 0)
-			top = lines;
-		else
-			top = 0;
-		position = options_get_number(s->options, "status-position");
-
-		for (line = 0; line < lines; line++) {
-			ranges = &tc->status.entries[line].ranges;
-			TAILQ_FOREACH(sr, ranges, entry) {
-				if (sr->type != STYLE_RANGE_WINDOW)
-					continue;
-				if (sr->argument == (u_int)wl->idx)
-					break;
-			}
-			if (sr != NULL)
-				break;
-		}
-
-		if (sr != NULL) {
-			format_add(ft, "popup_window_status_line_x", "%u",
-			    sr->start);
-			if (position == 0) {
-				format_add(ft, "popup_window_status_line_y",
-				    "%u", line + 1 + h);
-			} else {
-				format_add(ft, "popup_window_status_line_y",
-				    "%u", tty->sy - lines + line);
-			}
-		}
-
-		if (position == 0)
-			format_add(ft, "popup_status_line_y", "%u", lines + h);
-		else {
-			format_add(ft, "popup_status_line_y", "%u",
-			    tty->sy - lines);
-		}
-	} else
-		top = 0;
-
-	/* Popup width and height. */
-	format_add(ft, "popup_width", "%u", w);
-	format_add(ft, "popup_height", "%u", h);
-
-	/* Position so popup is in the centre. */
-	n = (long)(tty->sx - 1) / 2 - w / 2;
-	if (n < 0)
-		format_add(ft, "popup_centre_x", "%u", 0);
-	else
-		format_add(ft, "popup_centre_x", "%ld", n);
-	n = (tty->sy - 1) / 2 + h / 2;
-	if (n >= tty->sy)
-		format_add(ft, "popup_centre_y", "%u", tty->sy - h);
-	else
-		format_add(ft, "popup_centre_y", "%ld", n);
-
-	/* Position of popup relative to mouse. */
-	if (event->m.valid) {
-		n = (long)event->m.x - w / 2;
-		if (n < 0)
-			format_add(ft, "popup_mouse_centre_x", "%u", 0);
-		else
-			format_add(ft, "popup_mouse_centre_x", "%ld", n);
-		n = event->m.y - h / 2;
-		if (n + h >= tty->sy) {
-			format_add(ft, "popup_mouse_centre_y", "%u",
-			    tty->sy - h);
-		} else
-			format_add(ft, "popup_mouse_centre_y", "%ld", n);
-		n = (long)event->m.y + h;
-		if (n >= tty->sy)
-			format_add(ft, "popup_mouse_top", "%u", tty->sy - 1);
-		else
-			format_add(ft, "popup_mouse_top", "%ld", n);
-		n = event->m.y - h;
-		if (n < 0)
-			format_add(ft, "popup_mouse_bottom", "%u", 0);
-		else
-			format_add(ft, "popup_mouse_bottom", "%ld", n);
-	}
-
-	/* Position in pane. */
-	tty_window_offset(&tc->tty, &ox, &oy, &sx, &sy);
-	n = top + wp->yoff - oy + h;
-	if (n >= tty->sy)
-		format_add(ft, "popup_pane_top", "%u", tty->sy - h);
-	else
-		format_add(ft, "popup_pane_top", "%ld", n);
-	format_add(ft, "popup_pane_bottom", "%u", top + wp->yoff + wp->sy - oy);
-	format_add(ft, "popup_pane_left", "%u", wp->xoff - ox);
-	n = (long)wp->xoff + wp->sx - ox - w;
-	if (n < 0)
-		format_add(ft, "popup_pane_right", "%u", 0);
-	else
-		format_add(ft, "popup_pane_right", "%ld", n);
-
-	/* Expand horizontal position. */
-	xp = args_get(args, 'x');
-	if (xp == NULL || strcmp(xp, "C") == 0)
-		xp = "#{popup_centre_x}";
-	else if (strcmp(xp, "R") == 0)
-		xp = "#{popup_pane_right}";
-	else if (strcmp(xp, "P") == 0)
-		xp = "#{popup_pane_left}";
-	else if (strcmp(xp, "M") == 0)
-		xp = "#{popup_mouse_centre_x}";
-	else if (strcmp(xp, "L") == 0)
-		xp = "#{popup_last_x}";
-	else if (strcmp(xp, "W") == 0)
-		xp = "#{popup_window_status_line_x}";
-	p = format_expand(ft, xp);
-	n = strtol(p, NULL, 10);
-	if (n + w >= tty->sx)
-		n = tty->sx - w;
-	else if (n < 0)
-		n = 0;
-	*px = n;
-	log_debug("%s: -x: %s = %s = %u (-w %u)", __func__, xp, p, *px, w);
-	free(p);
-
-	/* Expand vertical position  */
-	yp = args_get(args, 'y');
-	if (yp == NULL || strcmp(yp, "C") == 0)
-		yp = "#{popup_centre_y}";
-	else if (strcmp(yp, "P") == 0)
-		yp = "#{popup_pane_bottom}";
-	else if (strcmp(yp, "M") == 0)
-		yp = "#{popup_mouse_top}";
-	else if (strcmp(yp, "L") == 0)
-		yp = "#{popup_last_y}";
-	else if (strcmp(yp, "S") == 0)
-		yp = "#{popup_status_line_y}";
-	else if (strcmp(yp, "W") == 0)
-		yp = "#{popup_window_status_line_y}";
-	p = format_expand(ft, yp);
-	n = strtol(p, NULL, 10);
-	if (n < h)
-		n = 0;
-	else
-		n -= h;
-	if (n + h >= tty->sy)
-		n = tty->sy - h;
-	else if (n < 0)
-		n = 0;
-	*py = n;
-	log_debug("%s: -y: %s = %s = %u (-h %u)", __func__, yp, p, *py, h);
-	free(p);
-
-	format_free(ft);
-	return (1);
-}
-
 static int
 cmd_display_menu_get_menu_pos(struct client *tc, struct cmdq_item *item,
     struct args *args, u_int *px, u_int *py, u_int w, u_int h)
@@ -565,6 +368,22 @@ fail:
 	return (CMD_RETURN_ERROR);
 }
 
+static enum pane_lines
+cmd_display_popup_get_lines(const char *value, char **cause)
+{
+	const struct options_table_entry	*oe;
+
+	if (value == NULL)
+		value = "single";
+	else if (strcmp(value, "rounded") == 0)
+		value = "single";
+	else if (strcmp(value, "padded") == 0)
+		value = "spaces";
+
+	oe = options_search("pane-border-lines");
+	return (options_find_choice(oe, value, cause));
+}
+
 static enum cmd_retval
 cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 {
@@ -572,148 +391,199 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct session		*s = target->s;
 	struct client		*tc = cmdq_get_target_client(item);
-	struct tty		*tty = &tc->tty;
-	const char		*value, *shell, *shellcmd = NULL;
-	const char		*style = args_get(args, 's');
+	struct winlink		*wl = target->wl;
+	struct window		*w = wl->window;
+	struct window_pane	*wp = target->wp, *new_wp = NULL;
+	struct spawn_context	 sc = { 0 };
+	struct layout_cell	*lc = NULL;
+	struct layout_geometry	 lg;
+	struct event_payload	*ep;
+	struct cmd_find_state	 fs;
+	const char		*value, *style = args_get(args, 's');
 	const char		*border_style = args_get(args, 'S');
-	char			*cwd = NULL, *cause = NULL, **argv = NULL;
-	char			*title = NULL;
-	int			 modify = popup_present(tc);
-	int			 flags = -1, argc = 0;
-	enum box_lines		 lines = BOX_LINES_DEFAULT;
-	u_int			 px, py, w, h, count = args_count(args);
+	char			*cause = NULL, *title = NULL;
+	enum pane_lines		 lines = PANE_LINES_SINGLE;
+	u_int			 px, py, sx, sy, count = args_count(args);
 	struct args_value	*av;
-	struct environ		*env = NULL;
-	struct options		*o = s->curw->window->options;
-	struct options_entry	*oe;
+	long long		 ll;
 
 	if (args_has(args, 'C')) {
-		server_client_clear_overlay(tc);
+		if (w->modal != NULL)
+			server_kill_pane(w->modal);
 		return (CMD_RETURN_NORMAL);
 	}
 	if (tc->flags & CLIENT_CONTROL)
 		return (CMD_RETURN_NORMAL);
-	if (!modify && tc->overlay_draw != NULL)
+	if (w->modal != NULL)
 		return (CMD_RETURN_NORMAL);
 
-	if (!modify) {
-		h = tty->sy / 2;
-		if (args_has(args, 'h')) {
-			h = args_percentage(args, 'h', 1, tty->sy, tty->sy,
-			    &cause);
-			if (cause != NULL) {
-				cmdq_error(item, "height %s", cause);
-				goto fail;
-			}
-		}
-
-		w = tty->sx / 2;
-		if (args_has(args, 'w')) {
-			w = args_percentage(args, 'w', 1, tty->sx, tty->sx,
-			    &cause);
-			if (cause != NULL) {
-				cmdq_error(item, "width %s", cause);
-				goto fail;
-			}
-		}
-
-		if (w > tty->sx)
-			w = tty->sx;
-		if (h > tty->sy)
-			h = tty->sy;
-		if (!cmd_display_menu_get_popup_pos(tc, item, args, &px, &py,
-		    w, h))
-			goto out;
-
-		value = args_get(args, 'd');
-		if (value != NULL)
-			cwd = format_single_from_target(item, value);
-		else
-			cwd = xstrdup(server_client_get_cwd(tc, s));
-		if (count == 0) {
-			shellcmd = options_get_string(s->options,
-			    "default-command");
-		} else if (count == 1)
-			shellcmd = args_string(args, 0);
-		if (count <= 1 && (shellcmd == NULL || *shellcmd == '\0')) {
-			shellcmd = NULL;
-			shell = options_get_string(s->options, "default-shell");
-			if (!checkshell(shell))
-				shell = _PATH_BSHELL;
-			cmd_append_argv(&argc, &argv, shell);
-		} else
-			args_to_vector(args, &argc, &argv);
-
-		if (args_has(args, 'e') >= 1) {
-			env = environ_create();
-			av = args_first_value(args, 'e');
-			while (av != NULL) {
-				environ_put(env, av->string, 0);
-				av = args_next_value(av);
-			}
-		}
-	}
-
 	value = args_get(args, 'b');
 	if (args_has(args, 'B'))
-		lines = BOX_LINES_NONE;
+		lines = PANE_LINES_NONE;
 	else if (value != NULL) {
-		oe = options_get(o, "popup-border-lines");
-		lines = options_find_choice(options_table_entry(oe), value,
-		    &cause);
+		lines = cmd_display_popup_get_lines(value, &cause);
 		if (cause != NULL) {
-			cmdq_error(item, "popup-border-lines %s", cause);
+			cmdq_error(item, "pane-border-lines %s", cause);
 			goto fail;
 		}
 	}
 
+	sy = w->sy / 2;
+	if (args_has(args, 'h')) {
+		ll = args_percentage(args, 'h', 1, w->sy, w->sy, &cause);
+		if (cause != NULL) {
+			cmdq_error(item, "height %s", cause);
+			goto fail;
+		}
+		sy = ll;
+	}
+
+	sx = w->sx / 2;
+	if (args_has(args, 'w')) {
+		ll = args_percentage(args, 'w', 1, w->sx, w->sx, &cause);
+		if (cause != NULL) {
+			cmdq_error(item, "width %s", cause);
+			goto fail;
+		}
+		sx = ll;
+	}
+
+	if (sx > w->sx)
+		sx = w->sx;
+	if (sy > w->sy)
+		sy = w->sy;
+	if ((lines == PANE_LINES_NONE && (sx < 1 || sy < 1)) ||
+	    (lines != PANE_LINES_NONE && (sx < 3 || sy < 3)))
+		goto out;
+	if (!cmd_display_menu_get_menu_pos(tc, item, args, &px, &py, sx, sy))
+		goto out;
+
+	lg.sx = sx;
+	lg.sy = sy;
+	lg.xoff = px;
+	lg.yoff = py;
+	if (lines != PANE_LINES_NONE) {
+		lg.sx -= 2;
+		lg.sy -= 2;
+		lg.xoff++;
+		lg.yoff++;
+	}
+
+	window_push_zoom(w, 0, 1);
+	lc = layout_floating_pane(w, wp, &lg);
+	if (lc == NULL) {
+		window_pop_zoom(w);
+		goto out;
+	}
+
+	sc.item = item;
+	sc.s = s;
+	sc.wl = wl;
+	sc.tc = tc;
+	sc.wp0 = wp;
+	sc.lc = lc;
+	sc.idx = -1;
+	sc.cwd = args_get(args, 'd');
+	sc.flags = (SPAWN_FLOATING|SPAWN_MODAL|SPAWN_FLOATOVERZOOM);
+
+	if (count != 1 || *args_string(args, 0) != '\0')
+		args_to_vector(args, &sc.argc, &sc.argv);
+	sc.environ = environ_create();
+	av = args_first_value(args, 'e');
+	while (av != NULL) {
+		environ_put(sc.environ, av->string, 0);
+		av = args_next_value(av);
+	}
+
+	new_wp = spawn_pane(&sc, &cause);
+	if (new_wp == NULL) {
+		cmdq_error(item, "create pane failed: %s", cause);
+		free(cause);
+		cause = NULL;
+		window_pop_zoom(w);
+		goto fail;
+	}
+	window_pop_zoom(w);
+	new_wp->flags |= PANE_CAPTUREALLKEYS;
+	if (!args_has(args, 'E'))
+		new_wp->flags |= PANE_CLOSEONCANCEL;
+
+	options_set_number(new_wp->options, "pane-border-lines", lines);
+	if (args_has(args, 'E') > 1) {
+		if (args_has(args, 'k'))
+			options_set_number(new_wp->options, "remain-on-exit", 4);
+		else
+			options_set_number(new_wp->options, "remain-on-exit", 2);
+	} else if (args_has(args, 'E'))
+		options_set_number(new_wp->options, "remain-on-exit", 0);
+	else if (args_has(args, 'k'))
+		options_set_number(new_wp->options, "remain-on-exit", 3);
+	else
+		options_set_number(new_wp->options, "remain-on-exit", 1);
+	options_set_string(new_wp->options, "remain-on-exit-format", 0, "%s", "");
+
+	if (style != NULL) {
+		if (options_set_string(new_wp->options, "window-style", 0,
+		    "%s", style) == NULL) {
+			cmdq_error(item, "bad style: %s", style);
+			goto fail;
+		}
+		options_set_string(new_wp->options, "window-active-style", 0,
+		    "%s", style);
+		new_wp->flags |= (PANE_REDRAW|PANE_STYLECHANGED|
+		    PANE_THEMECHANGED);
+	}
+	if (border_style != NULL) {
+		if (options_set_string(new_wp->options, "pane-border-style", 0,
+		    "%s", border_style) == NULL) {
+			cmdq_error(item, "bad border style: %s", border_style);
+			goto fail;
+		}
+		options_set_string(new_wp->options, "pane-active-border-style",
+		    0, "%s", border_style);
+	}
 	if (args_has(args, 'T'))
 		title = format_single_from_target(item, args_get(args, 'T'));
-	else
-		title = xstrdup("");
-
-	if (args_has(args, 'N') || !modify)
-		flags = 0;
-	if (args_has(args, 'E') > 1) {
-		if (flags == -1)
-			flags = 0;
-		flags |= POPUP_CLOSEEXITZERO;
-	} else if (args_has(args, 'E')) {
-		if (flags == -1)
-			flags = 0;
-		flags |= POPUP_CLOSEEXIT;
-	}
-	if (args_has(args, 'k')) {
-		if (flags == -1)
-			flags = 0;
-		flags |= POPUP_CLOSEANYKEY;
+	if (title != NULL) {
+		options_set_number(new_wp->options, "pane-border-status",
+		    PANE_STATUS_TOP);
+		options_set_string(new_wp->options, "pane-border-format", 0,
+		    "%s", "#{pane_title}");
+		screen_set_title(&new_wp->base, title, 0);
+		ep = event_payload_create();
+		cmd_find_from_pane(&fs, new_wp, 0);
+		event_payload_set_target(ep, &fs);
+		event_payload_set_pane(ep, "pane", new_wp);
+		event_payload_set_window(ep, "window", new_wp->window);
+		event_payload_set_string(ep, "new_title", "%s", title);
+		events_fire("pane-title-changed", ep);
 	}
 
-	if (modify) {
-		popup_modify(tc, title, style, border_style, lines, flags);
-		goto out;
-	}
-	if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
-	    argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0)
-		goto out;
-	environ_free(env);
-	free(cwd);
+	new_wp->wait_item = item;
+	server_redraw_session(s);
+	if (sc.argv != NULL)
+		cmd_free_argv(sc.argc, sc.argv);
+	environ_free(sc.environ);
 	free(title);
-	cmd_free_argv(argc, argv);
 	return (CMD_RETURN_WAIT);
 
 out:
-	cmd_free_argv(argc, argv);
-	environ_free(env);
-	free(cwd);
+	if (sc.argv != NULL)
+		cmd_free_argv(sc.argc, sc.argv);
+	environ_free(sc.environ);
 	free(title);
 	return (CMD_RETURN_NORMAL);
 
 fail:
 	free(cause);
-	cmd_free_argv(argc, argv);
-	environ_free(env);
-	free(cwd);
+	if (new_wp != NULL) {
+		server_client_remove_pane(new_wp);
+		layout_close_pane(new_wp);
+		window_remove_pane(new_wp->window, new_wp);
+	}
+	if (sc.argv != NULL)
+		cmd_free_argv(sc.argc, sc.argv);
+	environ_free(sc.environ);
 	free(title);
 	return (CMD_RETURN_ERROR);
 }

cmd-display-message.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-message.c,v 1.65 2026/02/23 08:46:57 nicm Exp $ */
+/* $OpenBSD: cmd-display-message.c,v 1.66 2026/09/08 08:33:10 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:lINpt:F:v", 0, 1, NULL },
-	.usage = "[-aCIlNpv] [-c target-client] [-d delay] [-F format] "
+	.args = { "aCc:d:jlINpt:F:v", 0, 1, NULL },
+	.usage = "[-aCIjlNpv] [-c target-client] [-d delay] [-F format] "
 		 CMD_TARGET_PANE_USAGE " [message]",
 
 	.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
@@ -67,14 +67,15 @@ 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;
+	char			*msg, *cause = NULL;
 	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')) {
+	if (args_has(args, 'I') && !args_has(args, 'j')) {
 		if (wp == NULL)
 			return (CMD_RETURN_NORMAL);
 		switch (window_pane_start_input(wp, item, &cause)) {
@@ -107,7 +108,9 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 		template = args_string(args, 0);
 	else
 		template = args_get(args, 'F');
-	if (template == NULL)
+	if (args_has(args, 'j') && template == NULL)
+		template = "";
+	else if (template == NULL)
 		template = DISPLAY_MESSAGE_TEMPLATE;
 
 	/*
@@ -129,7 +132,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')) {
+	if (args_has(args, 'a') && !args_has(args, 'j')) {
 		format_each(ft, cmd_display_message_each, item);
 		format_free(ft);
 		return (CMD_RETURN_NORMAL);
@@ -139,6 +142,19 @@ 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.87 2026/07/17 12:42:51 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.88 2026/09/07 12:05:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -388,9 +388,11 @@ 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, NULL);
-		else
+		if (window[1] != '\0') {
+			n = strtonum(window + 1, 1, INT_MAX, &errstr);
+			if (errstr != NULL)
+				return (-1);
+		} else
 			n = 1;
 		s = fs->s;
 		if (fs->flags & CMD_FIND_WINDOW_INDEX) {
@@ -626,9 +628,11 @@ 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, NULL);
-		else
+		if (pane[1] != '\0') {
+			n = strtonum(pane + 1, 1, INT_MAX, &errstr);
+			if (errstr != NULL)
+				return (-1);
+		} else
 			n = 1;
 		wp = fs->w->active;
 		if (pane[0] == '+')

cmd-list-panes.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-panes.c,v 1.40 2026/06/01 14:01:09 nicm Exp $ */
+/* $OpenBSD: cmd-list-panes.c,v 1.41 2026/09/08 10:20:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -97,6 +97,7 @@ 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;
@@ -147,7 +148,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, NULL, s, wl, wp);
+		format_defaults(ft, c, 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.36 2026/02/27 08:25:12 nicm Exp $ */
+/* $OpenBSD: cmd-list-sessions.c,v 1.37 2026/09/08 10:20:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,6 +53,7 @@ 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;
@@ -76,7 +77,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, NULL, l[i], NULL, NULL);
+		format_defaults(ft, c, 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.50 2026/02/27 08:25:12 nicm Exp $ */
+/* $OpenBSD: cmd-list-windows.c,v 1.51 2026/09/08 10:20:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -60,6 +60,7 @@ 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;
@@ -94,7 +95,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, NULL, s, wl, NULL);
+		format_defaults(ft, c, s, wl, NULL);
 
 		if (filter != NULL) {
 			expanded = format_expand(ft, filter);

cmd-parse.y

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-parse.y,v 1.59 2026/08/31 07:51:56 nicm Exp $ */
+/* $OpenBSD: cmd-parse.y,v 1.60 2026/09/08 10:20:08 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(NULL, pi->item, FORMAT_NONE, flags);
+			ft = format_create(c, pi->item, FORMAT_NONE, flags);
 			format_defaults(ft, c, fsp->s, fsp->wl, fsp->wp);
 
 			$$ = format_expand(ft, $1);

cmd-select-layout.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-layout.c,v 1.43 2026/07/10 13:38:45 nicm Exp $ */
+/* $OpenBSD: cmd-select-layout.c,v 1.45 2026/09/09 07:03:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -73,12 +73,13 @@ 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;
-	int			 next, previous, layout;
+	char			*oldlayout, *cause = NULL;
+	int			 next, previous, layout, flags = 0;
 
 	server_unzoom_window(w);
 
@@ -89,8 +90,12 @@ 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);
+	w->old_layout = layout_dump(w, w->layout_root, flags);
 
 	if (next || previous) {
 		if (next)

cmd-split-window.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.150 2026/08/20 09:19:24 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.151 2026/09/10 11:02:18 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:de:EfF:hIkl:KLMm:Op:PR:s:S:t:T:vWx:X:y:Y:Z", 0, -1, NULL },
-	.usage = "[-AbCdefhIkKLMOPvWZ] [-B border-lines] "
+	.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] "
 		 "[-c start-directory] [-e environment] "
 		 "[-F format] [-l size] [-m message] [-p percentage] "
 		 "[-s style] [-S active-border-style] "
@@ -219,6 +219,8 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 		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) {

configure.ac

@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], next-3.8)
+AC_INIT([tmux], next-3.9)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)

control-notify.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: control-notify.c,v 1.38 2026/08/03 13:38:42 nicm Exp $ */
+/* $OpenBSD: control-notify.c,v 1.39 2026/09/08 10:20:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -70,6 +70,7 @@ 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;
 
@@ -84,19 +85,25 @@ 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.
 	 */
-	wl = TAILQ_FIRST(&w->winlinks);
-	if (wl == NULL || w->layout_root == NULL)
+	if (TAILQ_FIRST(&w->winlinks) == 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;
-		if (winlink_find_by_window_id(&s->windows, w->id) != NULL)
-			control_notify_write(c, "%s", cp);
+		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);
 	}
-	free(cp);
 }
 
 /* Notify control clients that window pane changed. */

control.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.67 2026/09/03 21:35:38 nicm Exp $ */
+/* $OpenBSD: control.c,v 1.68 2026/09/09 08:30:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -108,6 +108,7 @@ 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;
@@ -132,6 +133,9 @@ 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| \
@@ -165,6 +169,15 @@ 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);
@@ -407,16 +420,52 @@ control_reset_pane(struct client *c, struct window_pane *wp)
 	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)
+{
+	struct control_state	*cs = c->control_state;
+	size_t			 size;
+
+	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);
+
+	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);
+}
+
 /* 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, strlen(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);
@@ -426,6 +475,7 @@ control_write_line(struct client *c, char *line)
 	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);
@@ -1007,6 +1057,7 @@ control_discard_all(struct client *c)
 	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);
 }
 

format.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.415 2026/08/31 19:34:09 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.417 2026/09/08 15:42:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -855,26 +855,42 @@ format_cb_window_active_clients_list(struct format_tree *ft)
 static void *
 format_cb_window_layout(struct format_tree *ft)
 {
-	struct window	*w = ft->w;
+	struct client		*c = ft->client;
+	struct window		*w = ft->w;
+	struct layout_cell	*lcroot;
+	int			 flags = 0;
 
 	if (w == NULL)
 		return (NULL);
 
 	if (w->saved_layout_root != NULL)
-		return (layout_dump(w, w->saved_layout_root));
-	return (layout_dump(w, w->layout_root));
+		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));
 }
 
 /* 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);
 
-	return (layout_dump(w, w->layout_root));
+	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));
 }
 
 /* Callback for pane_start_command. */
@@ -5234,6 +5250,7 @@ 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

fuzz/input-fuzzer.c

@@ -44,7 +44,7 @@ LLVMFuzzerTestOneInput(const u_char *data, size_t size)
 	w = window_create(PANE_WIDTH, PANE_HEIGHT, 0, 0);
 	wp = window_add_pane(w, NULL, 0, 0);
 	bufferevent_pair_new(libevent, BEV_OPT_CLOSE_ON_FREE, vpty);
-	wp->ictx = input_init(wp, vpty[0], NULL, NULL);
+	wp->ictx = input_init(wp, vpty[0], NULL);
 	window_add_ref(w, __func__);
 
 	wp->fd = open("/dev/null", O_WRONLY);

grid.c

@@ -1760,8 +1760,6 @@ grid_line_flags_string(int flags)
 		strlcat(s, "START_OUTPUT,", sizeof s);
 	if (flags & GRID_LINE_END_OUTPUT)
 		strlcat(s, "END_OUTPUT,", sizeof s);
-	if (flags & GRID_LINE_END_OUTPUT_STATUS)
-		strlcat(s, "END_OUTPUT_STATUS,", sizeof s);
 	if (flags & GRID_LINE_HYPERLINK)
 		strlcat(s, "HYPERLINK,", sizeof s);
 	if (*s == '\0')

input.c

@@ -101,7 +101,6 @@ struct input_ctx {
 	struct bufferevent	       *event;
 	struct screen_write_ctx		ctx;
 	struct colour_palette	       *palette;
-	struct client		       *c;
 
 	struct input_cell		cell;
 	struct input_cell		old_cell;
@@ -874,7 +873,7 @@ input_restore_state(struct input_ctx *ictx)
 /* Initialise input parser. */
 struct input_ctx *
 input_init(struct window_pane *wp, struct bufferevent *bev,
-    struct colour_palette *palette, struct client *c)
+    struct colour_palette *palette)
 {
 	struct input_ctx	*ictx;
 
@@ -882,7 +881,6 @@ input_init(struct window_pane *wp, struct bufferevent *bev,
 	ictx->wp = wp;
 	ictx->event = bev;
 	ictx->palette = palette;
-	ictx->c = c;
 
 	ictx->input_space = INPUT_BUF_START;
 	ictx->input_buf = xmalloc(INPUT_BUF_START);
@@ -3194,14 +3192,13 @@ input_osc_112(struct input_ctx *ictx, const char *p)
 
 /* Parse the OSC 133 D exit status. */
 static int
-input_osc_133_exit_status(const char *p, int *present)
+input_osc_133_exit_status(const char *p)
 {
 	const char	*end;
 	char		*copy;
-	char		*endptr;
+	const char	*errstr;
 	long long	 status;
 
-	*present = 0;
 	if (p[1] != ';' || p[2] == '\0' || strchr(p + 2, '=') == p + 2)
 		return (0);
 	end = strchr(p + 2, ';');
@@ -3215,11 +3212,9 @@ input_osc_133_exit_status(const char *p, int *present)
 		free(copy);
 		return (0);
 	}
-	*present = 1;
-	errno = 0;
-	status = (int)strtol(copy, &endptr, 10);
+	status = strtonum(copy, 0, 255, &errstr);
 	free(copy);
-	if (errno != 0 || endptr == copy || status < 0 || status > 255)
+	if (errstr != NULL)
 		return (255);
 	return (status);
 }
@@ -3264,22 +3259,6 @@ input_fire_command_event(struct window_pane *wp, const char *name)
 	events_fire(name, ep);
 }
 
-/* Check if an OSC 133 prompt is secondary or a continuation. */
-static int
-input_osc_133_secondary_prompt(const char *p)
-{
-	const char	*cp;
-
-	while ((cp = strstr(p, ";k=")) != NULL) {
-		cp += 3;
-		if ((*cp == 's' || *cp == 'c') &&
-		    (cp[1] == '\0' || cp[1] == ';'))
-			return (1);
-		p = cp;
-	}
-	return (0);
-}
-
 /* Handle the OSC 133 sequence. */
 static void
 input_osc_133(struct input_ctx *ictx, const char *p)
@@ -3289,7 +3268,8 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 	struct grid		*gd = s->grid;
 	u_int			 line = s->cy + gd->hsize;
 	struct grid_line	*gl = NULL;
-	int			 status, status_present;
+	const char		*cp;
+	int			 status;
 
 	if (line < gd->hsize + gd->sy)
 		gl = grid_get_line(gd, line);
@@ -3298,17 +3278,9 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 	case 'A':
 	case 'N':
 		if (gl != NULL) {
-			if (!(gl->flags & (GRID_LINE_START_PROMPT|
-			    GRID_LINE_SECOND_PROMPT))) {
-				gl->osc133_data.prompt_col = s->cx;
-				if (input_osc_133_secondary_prompt(p))
-					gl->flags |= GRID_LINE_SECOND_PROMPT;
-				else
-					gl->flags |= GRID_LINE_START_PROMPT;
-				log_debug("%s: osc133 %s at %u,%u", __func__,
-				    input_osc_133_secondary_prompt(p) ? "secondary prompt" :
-				    "prompt", s->cx, line);
-			}
+			memset(&gl->osc133_data, 0, sizeof gl->osc133_data);
+			gl->osc133_data.prompt_col = s->cx;
+			gl->flags |= GRID_LINE_START_PROMPT;
 		}
 		if (wp != NULL) {
 			wp->last_prompt_time = time(NULL);
@@ -3317,33 +3289,25 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 		break;
 	case 'P':
 		if (gl != NULL) {
-			if (!(gl->flags & (GRID_LINE_START_PROMPT|
-			    GRID_LINE_SECOND_PROMPT))) {
-				gl->osc133_data.prompt_col = s->cx;
-				if (input_osc_133_secondary_prompt(p))
-					gl->flags |= GRID_LINE_SECOND_PROMPT;
-				else
-					gl->flags |= GRID_LINE_START_PROMPT;
-				log_debug("%s: osc133 prompt at %u,%u", __func__, s->cx,
-				    line);
-			}
+			cp = strstr(p, ";k=s");
+			if (cp != NULL && (cp[4] == ';' || cp[4] == '\0'))
+				gl->flags |= GRID_LINE_SECOND_PROMPT;
+			else
+				gl->flags |= GRID_LINE_START_PROMPT;
+			gl->osc133_data.prompt_col = s->cx;
 		}
 		break;
 	case 'B':
 	case 'I':
-		if (gl != NULL && !(gl->flags & GRID_LINE_START_COMMAND)) {
+		if (gl != NULL) {
 			gl->flags |= GRID_LINE_START_COMMAND;
 			gl->osc133_data.cmd_col = s->cx;
-			log_debug("%s: osc133 command at %u,%u", __func__, s->cx,
-			    line);
 		}
 		break;
 	case 'C':
-		if (gl != NULL && !(gl->flags & GRID_LINE_START_OUTPUT)) {
+		if (gl != NULL) {
 			gl->flags |= GRID_LINE_START_OUTPUT;
 			gl->osc133_data.out_start_col = s->cx;
-			log_debug("%s: osc133 output start at %u,%u", __func__, s->cx,
-			    line);
 		}
 		if (wp != NULL) {
 			wp->cmd_start_time = time(NULL);
@@ -3354,7 +3318,7 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 		}
 		break;
 	case 'D':
-		status = input_osc_133_exit_status(p, &status_present);
+		status = input_osc_133_exit_status(p);
 		if (wp != NULL) {
 			wp->cmd_end_time = time(NULL);
 			wp->flags &= ~PANE_CMDRUNNING;
@@ -3363,12 +3327,8 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 		}
 		if (gl != NULL) {
 			gl->flags |= GRID_LINE_END_OUTPUT;
-			if (status_present)
-				gl->flags |= GRID_LINE_END_OUTPUT_STATUS;
 			gl->osc133_data.out_end_col = s->cx;
 			gl->osc133_data.exit_status = status;
-			log_debug("%s: osc133 output end at %u,%u (status %d)",
-			    __func__, s->cx, line, status);
 		}
 		break;
 	}
@@ -3463,15 +3423,9 @@ input_osc_52(struct input_ctx *ictx, const char *p)
 		return;
 
 	if (wp == NULL) {
-		/* Popup window. */
-		if (ictx->c == NULL) {
-			free(out);
-			return;
-		}
-		tty_set_selection(&ictx->c->tty, clip, out, outlen);
-		paste_add(NULL, out, outlen);
+		free(out);
+		return;
 	} else {
-		/* Normal window. */
 		screen_write_start_pane(&ctx, wp, NULL);
 		screen_write_setselection(&ctx, clip, out, outlen);
 		screen_write_stop(&ctx);

key-bindings.c

@@ -52,9 +52,7 @@
 	" '#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}' '<' {send -X history-top}" \
 	" '#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}' '>' {send -X history-bottom}" \
 	" ''" \
-	" '#{?#{==:#{pane_mode},copy-mode},#{?copy_line_numbers,Line Numbers Off,Line Numbers On},}' 'L' {send -X line-numbers-toggle}" \
-	" '#{?#{==:#{pane_mode},copy-mode},#{?copy_fold_view,Fold View Off,Fold View On},}' 'O' {send -X fold-view-toggle}" \
-	" '#{?#{==:#{pane_mode},copy-mode},Edit,}' 'e' {if -F '#{selection_present}' {send -X open-selection} {send -X open-output}}" \
+	" '#{?#{==:#{pane_mode},copy-mode},#{?copy_line_numbers,Hide Line Numbers,Show Line Numbers},}' 'L' {send -X line-numbers-toggle}" \
 	" '#{?#{==:#{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}" \
@@ -577,7 +575,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 -- '%%' } }",
@@ -586,19 +583,15 @@ key_bindings_init(void)
 		"bind -Tcopy-mode Escape { send -X cancel }",
 		"bind -Tcopy-mode C-[ { send -X cancel }",
 		"bind -Tcopy-mode Space { send -X page-down }",
-		"bind -Tcopy-mode Tab { send -X toggle-output }",
-"bind -Tcopy-mode BTab { send -X toggle-output -a }",
 		"bind -Tcopy-mode , { send -X jump-reverse }",
 		"bind -Tcopy-mode \\; { send -X jump-again }",
 		"bind -Tcopy-mode F { command-prompt -P -1p'(jump backward)' { send -X jump-backward -- '%%' } }",
 		"bind -Tcopy-mode L { send -X line-numbers-toggle }",
 		"bind -Tcopy-mode N { send -X search-reverse }",
-		"bind -Tcopy-mode O { send -X fold-view-toggle }",
 		"bind -Tcopy-mode P { send -X toggle-position }",
 		"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 }",
@@ -607,7 +600,7 @@ key_bindings_init(void)
 		"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 }",
-		"bind -Tcopy-mode MouseDown1Pane { select-pane; send -X toggle-output -m }",
+		"bind -Tcopy-mode MouseDown1Pane select-pane",
 		"bind -Tcopy-mode MouseDrag1Pane { select-pane; send -X begin-selection }",
 		"bind -Tcopy-mode MouseDragEnd1Pane { send -X copy-pipe-and-cancel }",
 		"bind -Tcopy-mode WheelUpPane { select-pane; send -N5 -X scroll-up }",
@@ -667,8 +660,6 @@ key_bindings_init(void)
 		"bind -Tcopy-mode-vi Escape { send -X clear-selection }",
 		"bind -Tcopy-mode-vi C-[ { send -X clear-selection }",
 		"bind -Tcopy-mode-vi Space { send -X begin-selection }",
-		"bind -Tcopy-mode-vi Tab { send -X toggle-output }",
-"bind -Tcopy-mode-vi BTab { send -X toggle-output -a }",
 		"bind -Tcopy-mode-vi '$' { send -X end-of-line }",
 		"bind -Tcopy-mode-vi , { send -X jump-reverse }",
 		"bind -Tcopy-mode-vi / { command-prompt -P -T search -p'(search down)' { send -X search-forward -- '%%' } }",
@@ -696,10 +687,7 @@ 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 O { send -X fold-view-toggle }",
 		"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 -- '%%' } }",
 		"bind -Tcopy-mode-vi V { send -X select-line }",
@@ -727,7 +715,7 @@ key_bindings_init(void)
 		"bind -Tcopy-mode-vi % { send -X next-matching-bracket }",
 		"bind -Tcopy-mode-vi Home { send -X start-of-line }",
 		"bind -Tcopy-mode-vi End { send -X end-of-line }",
-		"bind -Tcopy-mode-vi MouseDown1Pane { select-pane; send -X toggle-output -m }",
+		"bind -Tcopy-mode-vi MouseDown1Pane { select-pane }",
 		"bind -Tcopy-mode-vi MouseDrag1Pane { select-pane; send -X begin-selection }",
 		"bind -Tcopy-mode-vi MouseDragEnd1Pane { send -X copy-pipe-and-cancel }",
 		"bind -Tcopy-mode-vi WheelUpPane { select-pane; send -N5 -X scroll-up }",

layout.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: layout.c,v 1.98 2026/08/25 18:38:05 nicm Exp $ */
+/* $OpenBSD: layout.c,v 1.99 2026/09/09 07:03:39 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) {
+		if (lc->wp != NULL && lc->wp->layout_cell != NULL) {
 			lc->wp->layout_cell->parent = NULL;
 			lc->wp->layout_cell = NULL;
 		}
@@ -233,29 +233,6 @@ 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)
 {
@@ -265,7 +242,7 @@ layout_cell_is_tiled(struct layout_cell *lc)
 	return is_leaf && !is_floating;
 }
 
-static int
+int
 layout_cell_has_tiled_child(struct layout_cell *lc)
 {
 	struct layout_cell      *lcchild;
@@ -509,18 +486,20 @@ 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)
+layout_count_cells(struct layout_cell *lc, int with_floating)
 {
 	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);
+			count += layout_count_cells(lcchild, with_floating);
 		return (count);
 	default:
 		fatalx("bad layout type");
@@ -721,7 +700,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 (lc->wp != NULL)
+		if (*lcroot == lc)
 			*lcroot = NULL;
 		layout_free_cell(lc, 0);
 		return;

monitor.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.7 2026/07/27 19:15:58 nicm Exp $ */
+/* $OpenBSD: monitor.c,v 1.8 2026/09/07 10:15:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -614,8 +614,10 @@ 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
+	else if (*what == '\0')
 		*type = MONITOR_SESSION;
+	else
+		goto fail;
 	*name = xstrdup(copy);
 	*format = xstrdup(split);
 

options-table.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.244 2026/09/01 12:49:49 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.245 2026/09/10 11:02:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -78,7 +78,7 @@ static const char *options_table_pane_border_indicators_list[] = {
 static const char *options_table_pane_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "number", "spaces", "none", NULL
 };
-static const char *options_table_popup_border_lines_list[] = {
+static const char *options_table_box_lines_list[] = {
 	"single", "double", "heavy", "simple", "rounded", "padded", "none", NULL
 };
 static const char *options_table_set_clipboard_list[] = {
@@ -91,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", NULL
+	"off", "on", "failed", "key", "failed-key", NULL
 };
 static const char *options_table_destroy_unattached_list[] = {
 	"off", "on", "keep-last", "keep-group", NULL
@@ -114,6 +114,7 @@ static const char *options_table_theme_list[] = {
 static const char *options_table_copy_mode_line_numbers_list[] = {
 	"off", "default", "absolute", "relative", "hybrid", NULL
 };
+
 /* Status line format. */
 #define OPTIONS_TABLE_STATUS_FORMAT1 \
 	"#[align=left range=left #{E:status-left-style}]" \
@@ -491,7 +492,7 @@ const struct options_table_entry options_table[] = {
 	{ .name = "menu-border-lines",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_WINDOW,
-	  .choices = options_table_popup_border_lines_list,
+	  .choices = options_table_box_lines_list,
 	  .default_num = BOX_LINES_SINGLE,
 	  .text = "Type of characters used to draw menu border lines. Some of "
 		  "these are only supported on terminals with UTF-8 support."
@@ -1383,13 +1384,6 @@ const struct options_table_entry options_table[] = {
 	  .text = "Style of search matches in copy mode."
 	},
 
-	{ .name = "copy-mode-exit-status-format",
-	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
-	  .default_str = "#{?exit_status,#[fg=themered]!, }",
-	  .text = "Format of OSC 133 exit status indicator in copy mode."
-	},
-
 	{ .name = "copy-mode-current-match-style",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW,
@@ -1671,40 +1665,14 @@ const struct options_table_entry options_table[] = {
 	  .text = "Pane scrollbar position."
 	},
 
-	{ .name = "popup-style",
-	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "bg=themedarkgrey,fg=themewhite",
-	  .flags = OPTIONS_TABLE_IS_STYLE,
-	  .separator = ",",
-	  .text = "Default style of popups."
-	},
-
-	{ .name = "popup-border-style",
-	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "bg=themedarkgrey,fg=themelightgrey",
-	  .flags = OPTIONS_TABLE_IS_STYLE,
-	  .separator = ",",
-	  .text = "Default style of popup borders."
-	},
-
-	{ .name = "popup-border-lines",
-	  .type = OPTIONS_TABLE_CHOICE,
-	  .scope = OPTIONS_TABLE_WINDOW,
-	  .choices = options_table_popup_border_lines_list,
-	  .default_num = BOX_LINES_SINGLE,
-	  .text = "Type of characters used to draw popup border lines. Some of "
-		  "these are only supported on terminals with UTF-8 support."
-	},
-
 	{ .name = "remain-on-exit",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
 	  .choices = options_table_remain_on_exit_list,
 	  .default_num = 0,
 	  .text = "Whether panes should remain ('on'), remain until a key is "
-		  "pressed ('key') or be automatically killed ('off' or "
+		  "pressed after any exit ('key') or after a failure "
+		  "('failed-key'), or be automatically killed ('off' or "
 		  "'failed') when the program inside exits."
 	},
 

popup.c

@@ -1,661 +0,0 @@
-/* $OpenBSD: popup.c,v 1.77 2026/08/28 08:02:16 nicm Exp $ */
-
-/*
- * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "tmux.h"
-
-struct popup_data {
-	struct client		 *c;
-	struct cmdq_item	 *item;
-	int			  flags;
-	char			 *title;
-
-	char			 *style;
-	char			 *border_style;
-	struct grid_cell	  border_cell;
-	enum box_lines		  border_lines;
-
-	struct screen		  s;
-	struct grid_cell	  defaults;
-	struct colour_palette	  palette;
-
-	struct visible_ranges	  r;
-
-	struct job		 *job;
-	struct input_ctx	 *ictx;
-	int			  status;
-	popup_close_cb		  cb;
-	void			 *arg;
-
-	int			  close;
-
-	/* Current position and size. */
-	u_int			  px;
-	u_int			  py;
-	u_int			  sx;
-	u_int			  sy;
-
-	/* Preferred position and size. */
-	u_int			  ppx;
-	u_int			  ppy;
-	u_int			  psx;
-	u_int			  psy;
-
-	enum { OFF, MOVE, SIZE }  dragging;
-	u_int			  dx;
-	u_int			  dy;
-
-	u_int			  lx;
-	u_int			  ly;
-	u_int			  lb;
-};
-
-static void
-popup_free(struct popup_data *pd)
-{
-	server_client_unref(pd->c);
-
-	if (pd->job != NULL)
-		job_free(pd->job);
-	if (pd->ictx != NULL)
-		input_free(pd->ictx);
-
-	free(pd->r.ranges);
-	screen_free(&pd->s);
-	colour_palette_free(&pd->palette);
-
-	free(pd->title);
-	free(pd->style);
-	free(pd->border_style);
-	free(pd);
-}
-
-static void
-popup_reapply_styles(struct popup_data *pd)
-{
-	struct client		*c = pd->c;
-	struct session		*s = c->session;
-	struct options		*o;
-	struct format_tree	*ft;
-	struct style		 sytmp;
-
-	if (s == NULL)
-		return;
-	o = s->curw->window->options;
-
-	ft = format_create_defaults(NULL, c, s, s->curw, NULL);
-
-	/* Reapply popup style from options. */
-	memcpy(&pd->defaults, &grid_default_cell, sizeof pd->defaults);
-	style_apply(&pd->defaults, o, "popup-style", ft);
-	if (pd->style != NULL) {
-		style_set(&sytmp, &grid_default_cell);
-		if (style_parse(&sytmp, &pd->defaults, pd->style) == 0) {
-			pd->defaults.fg = sytmp.gc.fg;
-			pd->defaults.bg = sytmp.gc.bg;
-		}
-	}
-	pd->defaults.attr = 0;
-
-	/* Reapply border style from options. */
-	memcpy(&pd->border_cell, &grid_default_cell, sizeof pd->border_cell);
-	style_apply(&pd->border_cell, o, "popup-border-style", ft);
-	if (pd->border_style != NULL) {
-		style_set(&sytmp, &grid_default_cell);
-		if (style_parse(&sytmp, &pd->border_cell,
-		    pd->border_style) == 0) {
-			pd->border_cell.fg = sytmp.gc.fg;
-			pd->border_cell.bg = sytmp.gc.bg;
-		}
-	}
-	pd->border_cell.attr = 0;
-
-	format_free(ft);
-}
-
-static void
-popup_redraw_cb(const struct tty_ctx *ttyctx)
-{
-	struct popup_data	*pd = ttyctx->arg;
-
-	pd->c->flags |= CLIENT_REDRAWOVERLAY;
-}
-
-static int
-popup_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
-{
-	struct popup_data	*pd = ttyctx->arg;
-
-	if (c != pd->c)
-		return (0);
-	if (pd->c->flags & CLIENT_REDRAWOVERLAY)
-		return (0);
-
-	ttyctx->wox = 0;
-	ttyctx->woy = 0;
-	ttyctx->wsx = c->tty.sx;
-	ttyctx->wsy = c->tty.sy;
-
-	if (pd->border_lines == BOX_LINES_NONE) {
-		ttyctx->xoff = ttyctx->rxoff = pd->px;
-		ttyctx->yoff = ttyctx->ryoff = pd->py;
-	} else {
-		ttyctx->xoff = ttyctx->rxoff = pd->px + 1;
-		ttyctx->yoff = ttyctx->ryoff = pd->py + 1;
-	}
-
-	return (1);
-}
-
-static void
-popup_init_ctx_cb(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx)
-{
-	struct popup_data	*pd = ctx->arg;
-
-	memcpy(&ttyctx->defaults, &pd->defaults, sizeof ttyctx->defaults);
-	ttyctx->flags &= ~TTY_CTX_WINDOW_BIGGER;
-	ttyctx->style_ctx.defaults = &ttyctx->defaults;
-	ttyctx->style_ctx.palette = &pd->palette;
-	ttyctx->redraw_cb = popup_redraw_cb;
-	ttyctx->set_client_cb = popup_set_client_cb;
-	ttyctx->arg = pd;
-}
-
-static struct screen *
-popup_mode_cb(__unused struct client *c, void *data, u_int *cx, u_int *cy)
-{
-	struct popup_data	*pd = data;
-
-	if (pd->border_lines == BOX_LINES_NONE) {
-		*cx = pd->px + pd->s.cx;
-		*cy = pd->py + pd->s.cy;
-	} else {
-		*cx = pd->px + 1 + pd->s.cx;
-		*cy = pd->py + 1 + pd->s.cy;
-	}
-	return (&pd->s);
-}
-
-/* Return parts of the input range which are not obstructed by the popup. */
-static struct visible_ranges *
-popup_check_cb(__unused struct client* c, void *data, u_int px, u_int py,
-    u_int nx)
-{
-	struct popup_data	*pd = data;
-	struct visible_ranges	*r = &pd->r;
-
-	server_client_overlay_range(pd->px, pd->py, pd->sx, pd->sy, px, py, nx,
-	    r);
-	return (r);
-}
-
-static void
-popup_draw_cb(struct client *c, void *data)
-{
-	struct popup_data	*pd = data;
-	struct tty		*tty = &c->tty;
-	struct screen		 s;
-	struct screen_write_ctx	 ctx;
-	u_int			 i, px = pd->px, py = pd->py;
-	struct grid_cell	 defaults;
-	struct tty_style_ctx	 style_ctx;
-
-	popup_reapply_styles(pd);
-
-	screen_init(&s, pd->sx, pd->sy, 0);
-	if (pd->s.hyperlinks != NULL) {
-		hyperlinks_free(s.hyperlinks);
-		s.hyperlinks = hyperlinks_copy(pd->s.hyperlinks);
-	}
-	screen_write_start(&ctx, &s);
-	screen_write_clearscreen(&ctx, 8);
-
-	if (pd->border_lines == BOX_LINES_NONE) {
-		screen_write_cursormove(&ctx, 0, 0, 0);
-		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx, pd->sy);
-	} else if (pd->sx > 2 && pd->sy > 2) {
-		screen_write_box(&ctx, pd->sx, pd->sy, pd->border_lines,
-		    &pd->border_cell, pd->title);
-		screen_write_cursormove(&ctx, 1, 1, 0);
-		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2,
-		    pd->sy - 2);
-	}
-	screen_write_stop(&ctx);
-
-	memcpy(&defaults, &pd->defaults, sizeof defaults);
-	if (defaults.fg == 8)
-		defaults.fg = pd->palette.fg;
-	if (defaults.bg == 8)
-		defaults.bg = pd->palette.bg;
-	style_ctx.defaults = &defaults;
-	style_ctx.palette = &pd->palette;
-	style_ctx.dim = 0;
-	style_ctx.hyperlinks = s.hyperlinks;
-
-	c->overlay_check = NULL;
-	c->overlay_data = NULL;
-	for (i = 0; i < pd->sy; i++)
-		tty_draw_line(tty, &s, 0, i, pd->sx, px, py + i, &style_ctx);
-	screen_free(&s);
-	c->overlay_check = popup_check_cb;
-	c->overlay_data = pd;
-}
-
-static void
-popup_free_cb(__unused struct client *c, void *data)
-{
-	struct popup_data	*pd = data;
-	struct cmdq_item	*item = pd->item;
-
-	if (pd->cb != NULL)
-		pd->cb(pd->status, pd->arg);
-
-	if (item != NULL) {
-		if (cmdq_get_client(item) != NULL &&
-		    cmdq_get_client(item)->session == NULL)
-			cmdq_get_client(item)->retval = pd->status;
-		cmdq_continue(item);
-	}
-
-	popup_free(pd);
-}
-
-static void
-popup_resize_cb(__unused struct client *c, void *data)
-{
-	struct popup_data	*pd = data;
-	struct tty		*tty = &c->tty;
-
-	if (pd == NULL)
-		return;
-
-	/* Adjust position and size. */
-	if (pd->psy > tty->sy)
-		pd->sy = tty->sy;
-	else
-		pd->sy = pd->psy;
-	if (pd->psx > tty->sx)
-		pd->sx = tty->sx;
-	else
-		pd->sx = pd->psx;
-	if (pd->ppy + pd->sy > tty->sy)
-		pd->py = tty->sy - pd->sy;
-	else
-		pd->py = pd->ppy;
-	if (pd->ppx + pd->sx > tty->sx)
-		pd->px = tty->sx - pd->sx;
-	else
-		pd->px = pd->ppx;
-
-	/* Avoid zero size screens. */
-	if (pd->border_lines == BOX_LINES_NONE) {
-		screen_resize(&pd->s, pd->sx, pd->sy, 0);
-		if (pd->job != NULL)
-			job_resize(pd->job, pd->sx, pd->sy );
-	} else if (pd->sx > 2 && pd->sy > 2) {
-		screen_resize(&pd->s, pd->sx - 2, pd->sy - 2, 0);
-		if (pd->job != NULL)
-			job_resize(pd->job, pd->sx - 2, pd->sy - 2);
-	}
-}
-
-static void
-popup_handle_drag(struct client *c, struct popup_data *pd,
-    struct mouse_event *m)
-{
-	u_int	px, py;
-
-	if (!MOUSE_DRAG(m->b))
-		pd->dragging = OFF;
-	else if (pd->dragging == MOVE) {
-		if (m->x < pd->dx)
-			px = 0;
-		else if (m->x - pd->dx + pd->sx > c->tty.sx)
-			px = c->tty.sx - pd->sx;
-		else
-			px = m->x - pd->dx;
-		if (m->y < pd->dy)
-			py = 0;
-		else if (m->y - pd->dy + pd->sy > c->tty.sy)
-			py = c->tty.sy - pd->sy;
-		else
-			py = m->y - pd->dy;
-		pd->px = px;
-		pd->py = py;
-		pd->dx = m->x - pd->px;
-		pd->dy = m->y - pd->py;
-		pd->ppx = px;
-		pd->ppy = py;
-		server_redraw_client(c);
-	} else if (pd->dragging == SIZE) {
-		if (pd->border_lines == BOX_LINES_NONE) {
-			if (m->x < pd->px + 1)
-				return;
-			if (m->y < pd->py + 1)
-				return;
-		} else {
-			if (m->x < pd->px + 3)
-				return;
-			if (m->y < pd->py + 3)
-				return;
-		}
-		pd->sx = m->x - pd->px;
-		pd->sy = m->y - pd->py;
-		pd->psx = pd->sx;
-		pd->psy = pd->sy;
-
-		if (pd->border_lines == BOX_LINES_NONE) {
-			screen_resize(&pd->s, pd->sx, pd->sy, 0);
-			if (pd->job != NULL)
-				job_resize(pd->job, pd->sx, pd->sy);
-		} else {
-			screen_resize(&pd->s, pd->sx - 2, pd->sy - 2, 0);
-			if (pd->job != NULL)
-				job_resize(pd->job, pd->sx - 2, pd->sy - 2);
-		}
-		server_redraw_client(c);
-	}
-}
-
-static int
-popup_key_cb(struct client *c, void *data, struct key_event *event)
-{
-	struct popup_data	*pd = data;
-	struct mouse_event	*m = &event->m;
-	const char		*buf;
-	size_t			 len;
-	u_int			 px, py;
-	enum { NONE, LEFT, RIGHT, TOP, BOTTOM } border = NONE;
-
-	if (KEYC_IS_MOUSE(event->key)) {
-		if (pd->dragging != OFF) {
-			popup_handle_drag(c, pd, m);
-			goto out;
-		}
-		if (m->x < pd->px ||
-		    m->x > pd->px + pd->sx - 1 ||
-		    m->y < pd->py ||
-		    m->y > pd->py + pd->sy - 1) {
-			return (0);
-		}
-		if (pd->border_lines != BOX_LINES_NONE) {
-			if (m->x == pd->px)
-				border = LEFT;
-			else if (m->x == pd->px + pd->sx - 1)
-				border = RIGHT;
-			else if (m->y == pd->py)
-				border = TOP;
-			else if (m->y == pd->py + pd->sy - 1)
-				border = BOTTOM;
-		}
-		if ((m->b & MOUSE_MASK_MODIFIERS) == 0 &&
-		    MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3 &&
-		    (border == LEFT || border == TOP))
-			goto out;
-		if (((m->b & MOUSE_MASK_MODIFIERS) == MOUSE_MASK_META) ||
-		    (border != NONE && !MOUSE_DRAG(m->lb))) {
-			if (!MOUSE_DRAG(m->b))
-				goto out;
-			if (MOUSE_BUTTONS(m->lb) == MOUSE_BUTTON_1)
-				pd->dragging = MOVE;
-			else if (MOUSE_BUTTONS(m->lb) == MOUSE_BUTTON_3)
-				pd->dragging = SIZE;
-			pd->dx = m->lx - pd->px;
-			pd->dy = m->ly - pd->py;
-			goto out;
-		}
-	}
-	if ((((pd->flags & (POPUP_CLOSEEXIT|POPUP_CLOSEEXITZERO)) == 0) ||
-	    pd->job == NULL) &&
-	    (event->key == '\033' || event->key == ('c'|KEYC_CTRL)))
-		return (1);
-	if (pd->job == NULL && (pd->flags & POPUP_CLOSEANYKEY) &&
-	    !KEYC_IS_MOUSE(event->key) && !KEYC_IS_PASTE(event->key))
-		return (1);
-	if (pd->job != NULL) {
-		if (KEYC_IS_MOUSE(event->key)) {
-			/* Must be inside, checked already. */
-			if (pd->border_lines == BOX_LINES_NONE) {
-				px = m->x - pd->px;
-				py = m->y - pd->py;
-			} else {
-				px = m->x - pd->px - 1;
-				py = m->y - pd->py - 1;
-			}
-			if (!input_key_get_mouse(&pd->s, m, px, py, &buf, &len))
-				return (0);
-			bufferevent_write(job_get_event(pd->job), buf, len);
-			return (0);
-		}
-		input_key(&pd->s, job_get_event(pd->job), event->key);
-	}
-	return (0);
-
-out:
-	pd->lx = m->x;
-	pd->ly = m->y;
-	pd->lb = m->b;
-	return (0);
-}
-
-static void
-popup_job_update_cb(struct job *job)
-{
-	struct popup_data	*pd = job_get_data(job);
-	struct evbuffer		*evb = job_get_event(job)->input;
-	struct client		*c = pd->c;
-	struct screen		*s = &pd->s;
-	void			*data = EVBUFFER_DATA(evb);
-	size_t			 size = EVBUFFER_LENGTH(evb);
-
-	if (size == 0)
-		return;
-
-	c->overlay_check = NULL;
-	c->overlay_data = NULL;
-	input_parse_screen(pd->ictx, s, popup_init_ctx_cb, pd, data, size);
-	c->overlay_check = popup_check_cb;
-	c->overlay_data = pd;
-
-	evbuffer_drain(evb, size);
-}
-
-static void
-popup_job_complete_cb(struct job *job)
-{
-	struct popup_data	*pd = job_get_data(job);
-	int			 status;
-
-	status = job_get_status(pd->job);
-	if (WIFEXITED(status))
-		pd->status = WEXITSTATUS(status);
-	else if (WIFSIGNALED(status))
-		pd->status = WTERMSIG(status);
-	else
-		pd->status = 0;
-	pd->job = NULL;
-
-	if ((pd->flags & POPUP_CLOSEEXIT) ||
-	    ((pd->flags & POPUP_CLOSEEXITZERO) && pd->status == 0))
-		server_client_clear_overlay(pd->c);
-}
-
-int
-popup_present(struct client *c)
-{
-	return (c->overlay_draw == popup_draw_cb);
-}
-
-int
-popup_modify(struct client *c, const char *title, const char *style,
-	const char *border_style, enum box_lines lines, int flags)
-{
-	struct popup_data		*pd = c->overlay_data;
-	struct style		sytmp;
-
-	if (title != NULL) {
-		if (pd->title != NULL)
-			free(pd->title);
-		pd->title = xstrdup(title);
-	}
-	if (border_style != NULL) {
-		free(pd->border_style);
-		pd->border_style = xstrdup(border_style);
-		style_set(&sytmp, &pd->border_cell);
-		if (style_parse(&sytmp, &pd->border_cell, border_style) == 0) {
-			pd->border_cell.fg = sytmp.gc.fg;
-			pd->border_cell.bg = sytmp.gc.bg;
-		}
-	}
-	if (style != NULL) {
-		free(pd->style);
-		pd->style = xstrdup(style);
-		style_set(&sytmp, &pd->defaults);
-		if (style_parse(&sytmp, &pd->defaults, style) == 0) {
-			pd->defaults.fg = sytmp.gc.fg;
-			pd->defaults.bg = sytmp.gc.bg;
-		}
-	}
-	if (lines != BOX_LINES_DEFAULT) {
-		if (lines == BOX_LINES_NONE && pd->border_lines != lines) {
-			screen_resize(&pd->s, pd->sx, pd->sy, 1);
-			job_resize(pd->job, pd->sx, pd->sy);
-		} else if (pd->border_lines == BOX_LINES_NONE &&
-		    pd->border_lines != lines) {
-			screen_resize(&pd->s, pd->sx - 2, pd->sy - 2, 1);
-			job_resize(pd->job, pd->sx - 2, pd->sy - 2);
-		}
-		pd->border_lines = lines;
-		tty_resize(&c->tty);
-	}
-	if (flags != -1)
-		pd->flags = flags;
-
-	server_redraw_client(c);
-	return (0);
-}
-
-int
-popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
-    u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
-    int argc, char **argv, const char *cwd, const char *title, struct client *c,
-    struct session *s, const char *style, const char *border_style,
-    popup_close_cb cb, void *arg)
-{
-	struct popup_data	*pd;
-	u_int			 jx, jy;
-	struct options		*o;
-	struct style		 sytmp;
-
-	if (s != NULL)
-		o = s->curw->window->options;
-	else
-		o = c->session->curw->window->options;
-
-	if (lines == BOX_LINES_DEFAULT)
-		lines = options_get_number(o, "popup-border-lines");
-	if (lines == BOX_LINES_NONE) {
-		if (sx < 1 || sy < 1)
-			return (-1);
-		jx = sx;
-		jy = sy;
-	} else {
-		if (sx < 3 || sy < 3)
-			return (-1);
-		jx = sx - 2;
-		jy = sy - 2;
-	}
-	if (c->tty.sx < sx || c->tty.sy < sy)
-		return (-1);
-
-	pd = xcalloc(1, sizeof *pd);
-	pd->item = item;
-	pd->flags = flags;
-
-	if (title != NULL)
-		pd->title = xstrdup(title);
-	if (style != NULL)
-		pd->style = xstrdup(style);
-	if (border_style != NULL)
-		pd->border_style = xstrdup(border_style);
-
-	pd->c = c;
-	pd->c->references++;
-
-	pd->cb = cb;
-	pd->arg = arg;
-	pd->status = 128 + SIGHUP;
-
-	pd->border_lines = lines;
-	memcpy(&pd->border_cell, &grid_default_cell, sizeof pd->border_cell);
-	style_apply(&pd->border_cell, o, "popup-border-style", NULL);
-	if (border_style != NULL) {
-		style_set(&sytmp, &grid_default_cell);
-		if (style_parse(&sytmp, &pd->border_cell, border_style) == 0) {
-			pd->border_cell.fg = sytmp.gc.fg;
-			pd->border_cell.bg = sytmp.gc.bg;
-		}
-	}
-	pd->border_cell.attr = 0;
-
-	screen_init(&pd->s, jx, jy, 0);
-	screen_set_default_cursor(&pd->s, global_w_options);
-	colour_palette_init(&pd->palette);
-	colour_palette_from_option(&pd->palette, global_w_options);
-
-	memcpy(&pd->defaults, &grid_default_cell, sizeof pd->defaults);
-	style_apply(&pd->defaults, o, "popup-style", NULL);
-	if (style != NULL) {
-		style_set(&sytmp, &grid_default_cell);
-		if (style_parse(&sytmp, &pd->defaults, style) == 0) {
-			pd->defaults.fg = sytmp.gc.fg;
-			pd->defaults.bg = sytmp.gc.bg;
-		}
-	}
-	pd->defaults.attr = 0;
-
-	pd->px = px;
-	pd->py = py;
-	pd->sx = sx;
-	pd->sy = sy;
-
-	pd->ppx = px;
-	pd->ppy = py;
-	pd->psx = sx;
-	pd->psy = sy;
-
-	pd->job = job_run(shellcmd, argc, argv, env, s, cwd,
-	    popup_job_update_cb, popup_job_complete_cb, NULL, pd,
-	    JOB_NOWAIT|JOB_PTY|JOB_KEEPWRITE|JOB_DEFAULTSHELL, jx, jy);
-	if (pd->job == NULL) {
-		popup_free(pd);
-		return (-1);
-	}
-	pd->ictx = input_init(NULL, job_get_event(pd->job), &pd->palette, c);
-
-	server_client_set_overlay(c, 0, popup_check_cb, popup_mode_cb,
-	    popup_draw_cb, popup_key_cb, popup_free_cb, popup_resize_cb, pd);
-	return (0);
-}

prompt.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: prompt.c,v 1.6 2026/08/17 06:45:16 nicm Exp $ */
+/* $OpenBSD: prompt.c,v 1.7 2026/09/09 07:53:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1493,9 +1493,11 @@ 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);
-	else
+		if (tmp.size == 0)
+			return (PROMPT_KEY_HANDLED);
+	} else
 		return (PROMPT_KEY_HANDLED);
 
 	pr->buffer = xreallocarray(pr->buffer, size + 2,

regress/capture-pane-time.sh

@@ -0,0 +1,38 @@
+#!/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/collapse-output.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-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
-$TMUX new-session -d -x80 -y20 "sh -c 'printf \"\\033]133;A\\007p\\$ \\033]133;B\\007echo hi\\n\\033]133;C\\007hello\\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 -c || exit 1
-$TMUX send-keys -X search-backward hello || exit 1
-hidden=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$hidden" != hello ] || exit 1
-$TMUX send-keys -X search-backward separator || exit 1
-hidden=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$hidden" != separator ] || exit 1
-
-$TMUX send-keys BTab || exit 1
-$TMUX send-keys -X search-backward hello || exit 1
-shown=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$shown" = hello ] || exit 1
-$TMUX send-keys -X select-line || exit 1
-$TMUX send-keys -X copy-selection || exit 1
-selected=$($TMUX show-buffer)
-[ "$selected" = hello ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX kill-server
-$TMUX new-session -d -x80 -y20 "sh -c 'printf \"first\\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 -c || exit 1
-$TMUX send-keys -X search-backward separator || exit 1
-hidden=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$hidden" != separator ] || exit 1
-$TMUX send-keys BTab || exit 1
-$TMUX send-keys -X search-backward separator || exit 1
-shown=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$shown" = separator ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX kill-server
-$TMUX new-session -d -x80 -y20 "sh -c 'printf \"\\033]133;A\\007P> \\033]133;B\\007for i in 1 2 3; do\\n\\033]133;A;k=s\\007> \\033]133;B\\007echo \\$i\\n\\033]133;P;k=s\\007> \\033]133;B\\007done\\033]133;C\\007\\nRESULT\\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 -c || exit 1
-$TMUX send-keys -X search-backward RESULT || exit 1
-hidden=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$hidden" != RESULT ] || exit 1
-$TMUX send-keys -X search-backward 'echo $i' || exit 1
-shown=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$shown" = 'echo $i' ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode -U || exit 1
-$TMUX send-keys -X search-backward RESULT || exit 1
-$TMUX send-keys Tab || exit 1
-cursor=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$cursor" = done ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX kill-server
-$TMUX new-session -d -x80 -y20 "sh -c 'printf \"\\033]133;A\\007P0> \\033]133;B\\007\\r\\n\\033]133;D;0\\007empty-separator\\n\\033]133;A\\007P1> \\033]133;B\\007\"; exec sleep 100'" || exit 1
-sleep 1
-
-$TMUX copy-mode -c || exit 1
-collapsed=$($TMUX capture-pane -p)
-case "$collapsed" in
-*"+ P0>"*) ;;
-*) exit 1 ;;
-esac
-$TMUX send-keys -X search-backward empty-separator || exit 1
-hidden=$($TMUX display-message -p '#{copy_cursor_line}')
-[ "$hidden" != empty-separator ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX kill-server 2>/dev/null
-exit 0

regress/control-client-new-layouts.sh

@@ -0,0 +1,123 @@
+#!/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,6 +1,7 @@
 #!/bin/sh
 
-# Popups require a tty overlay and cannot be displayed by a control client.
+# Popups require an attached terminal 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.
 

regress/control-client-sanity.sh

@@ -30,8 +30,11 @@ killw
 EOF
 sleep 1
 $TMUX has || exit 1
-$TMUX lsp -aF '#{pane_id} #{window_layout}' >$TMP || exit 1
-cat <<EOF|cmp -s $TMP - || 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
 %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/copy-mode-exit-status.sh

@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Check OSC 133 exit status indicators in copy mode using a real client.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
-
-fail() {
-	echo "$*" >&2
-	exit 1
-}
-
-capture() {
-	$TMUX capture-pane -pS0 -E- >$TMP || exit 1
-}
-
-check_grep() {
-	grep -Fq "$1" $TMP || fail "missing pattern: $1"
-}
-
-check_no_grep() {
-	grep -Fq "$1" $TMP && fail "unexpected pattern: $1"
-}
-
-$TMUX kill-server 2>/dev/null
-$TMUX2 kill-server 2>/dev/null
-
-TMP=$(mktemp)
-trap "rm -f $TMP; $TMUX kill-server 2>/dev/null; $TMUX2 kill-server 2>/dev/null" 0 1 15
-
-$TMUX2 new-session -d -x80 -y10 \
-	"printf '\033]133;A\007p\$ \033]133;B\007one\n\033]133;C\007out1\n\033]133;D;0\007\033]133;A\007p\$ \033]133;B\007two\n\033]133;C\007out2\n\033]133;D;123\007\033]133;A\007p\$ \033]133;B\007silent\n\033]133;C\007\033]133;D;7\007\033]133;A\007p\$ \033]133;B\007three\n\033]133;C\007out3\n\033]133;D\007\033]133;A\007p\$ \033]133;B\007'; exec sleep 100" || \
-	exit 1
-$TMUX2 set -g status off || exit 1
-$TMUX2 set -g copy-mode-position-format '#[align=left]POS' || exit 1
-$TMUX2 list-keys -Tcopy-mode O | grep -Fq 'fold-view-toggle' || exit 1
-$TMUX2 list-keys -Tcopy-mode-vi O | grep -Fq 'fold-view-toggle' || exit 1
-
-$TMUX new-session -d -x80 -y10 || exit 1
-$TMUX set -g status off || exit 1
-$TMUX send -l "$TMUX2 attach" || exit 1
-$TMUX send Enter || exit 1
-sleep 1
-
-$TMUX2 copy-mode -U || exit 1
-$TMUX2 send -X history-top || exit 1
-sleep 1
-capture
-check_grep "!- p\$ two"
-check_grep "!  p\$ silent"
-check_no_grep "!+ p\$ silent"
-check_grep "POS"
-
-# Rebuilding with collapsed output must not expand copy-mode formats before
-# the viewport has been restored for the shorter backing grid.
-$TMUX2 send -X collapse-output -a || exit 1
-sleep 1
-capture
-check_grep "!+ p\$ two"
-check_grep "!  p\$ silent"
-check_no_grep "!+ p\$ silent"
-$TMUX2 send -X line-numbers-on || exit 1
-sleep 1
-capture
-check_grep "  3 !+ p\$ two"
-$TMUX2 send -X fold-view-toggle || exit 1
-[ "$($TMUX2 display -p '#{copy_fold_view}')" = 0 ] || exit 1
-sleep 1
-capture
-check_grep "out2"
-check_no_grep "!+ p\$ two"
-check_grep "  3 p\$ two"
-$TMUX2 send -X fold-view-toggle || exit 1
-[ "$($TMUX2 display -p '#{copy_fold_view}')" = 1 ] || exit 1
-sleep 1
-capture
-check_grep "  3 !- p\$ two"
-
-# A format wider than the standard three-column gutter is not truncated.
-$TMUX2 send -X cancel || exit 1
-$TMUX2 set -g copy-mode-exit-status-format \
-	'#[align=right]#{?exit_status,!#{exit_status}, }' || exit 1
-$TMUX2 copy-mode -c || exit 1
-$TMUX2 send -X history-top || exit 1
-sleep 1
-capture
-check_grep "!123+ p\$ two"
-
-$TMUX2 send -X select-line || exit 1
-$TMUX2 send -X copy-selection || exit 1
-selection=$($TMUX2 show-buffer)
-case $selection in
-*RC=*) fail "exit status was copied" ;;
-esac
-
-exit 0

regress/input-modes.sh

@@ -5,12 +5,9 @@
 start_pane alternate 10 3 'MAIN\033[?1049hALT\033[?1049lZ\n'
 check_capture alternate 'MAINZ'
 
-start_pane osc133 20 12 'xx\033]133;A\007p>\033]133;B\007cmd\nxy\033]133;P;k=s\007more\nxz\033]133;A;k=s\007more\nxw\033]133;P;k=c\007more\nxv\033]133;A;k=c\007more\nzz\033]133;C\007out\033]133;D;7\007\nq\033]133;C\007bad\033]133;D;-1\007\nqq\033]133;C\007big\033]133;D;300\007\nzzz\033]133;C\007ok\033]133;D\007\n'
+start_pane osc133 20 8 'xx\033]133;A\007p>\033]133;B\007cmd\nxy\033]133;P;k=s\007more\nzz\033]133;C\007out\033]133;D;7\007\nq\033]133;C\007bad\033]133;D;-1\007\nqq\033]133;C\007big\033]133;D;300\007\nzzz\033]133;C\007ok\033]133;D\007\n'
 check_capture osc133 'xxp>cmd
 xymore
-xzmore
-xwmore
-xvmore
 zzout
 qbad
 qqbig
@@ -18,13 +15,10 @@ zzzok'
 check_raw_matches osc133 \
 	'L 0 \(0\) flags=START_PROMPT,START_COMMAND\[[0-9a-f]+\].* osc133=2,4,0,0,0' \
 	'L 1 \(1\) flags=SECOND_PROMPT\[[0-9a-f]+\].* osc133=2,0,0,0,0' \
-	'L 2 \(2\) flags=SECOND_PROMPT\[[0-9a-f]+\].* osc133=2,0,0,0,0' \
-	'L 3 \(3\) flags=SECOND_PROMPT\[[0-9a-f]+\].* osc133=2,0,0,0,0' \
-	'L 4 \(4\) flags=SECOND_PROMPT\[[0-9a-f]+\].* osc133=2,0,0,0,0' \
-	'L 5 \(5\) flags=START_OUTPUT,END_OUTPUT,END_OUTPUT_STATUS\[[0-9a-f]+\].* osc133=0,0,2,5,7' \
-	'L 6 \(6\) flags=START_OUTPUT,END_OUTPUT,END_OUTPUT_STATUS\[[0-9a-f]+\].* osc133=0,0,1,4,255' \
-	'L 7 \(7\) flags=START_OUTPUT,END_OUTPUT,END_OUTPUT_STATUS\[[0-9a-f]+\].* osc133=0,0,2,5,255' \
-	'L 8 \(8\) flags=START_OUTPUT,END_OUTPUT\[[0-9a-f]+\].* osc133=0,0,3,5,0'
+	'L 2 \(2\) flags=START_OUTPUT,END_OUTPUT\[[0-9a-f]+\].* osc133=0,0,2,5,7' \
+	'L 3 \(3\) flags=START_OUTPUT,END_OUTPUT\[[0-9a-f]+\].* osc133=0,0,1,4,255' \
+	'L 4 \(4\) flags=START_OUTPUT,END_OUTPUT\[[0-9a-f]+\].* osc133=0,0,2,5,255' \
+	'L 5 \(5\) flags=START_OUTPUT,END_OUTPUT\[[0-9a-f]+\].* osc133=0,0,3,5,0'
 
 $TMUX kill-server 2>/dev/null
 exit $exit_status

regress/json.sh

@@ -0,0 +1,137 @@
+#!/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

@@ -0,0 +1,986 @@
+#!/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

@@ -0,0 +1,77 @@
+#!/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/modal-pane.sh

@@ -337,9 +337,9 @@ $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 -OKPF '#{pane_id}' -t "$p0" \
+modal=$($TMUX new-pane -ODKPF '#{pane_id}' -t "$p0" \
     -x 20 -y 5 -X 20 -Y 10 'cat') ||
-	fail "new-pane -OK failed"
+	fail "new-pane -ODK failed"
 sleep 1
 $TMUX2 send-keys -t "$OUTER" C-b x z Enter
 sleep 1
@@ -356,9 +356,151 @@ 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}')" ''
+
+$TMUX bind P display-popup -E -t "$p0" -w 20 -h 5 -T popup-title 'cat'
+$TMUX2 send-keys -t "$OUTER" C-b P
+sleep 1
+modal=$(fmt modal:0 '#{window_modal_pane}')
+[ -n "$modal" ] || fail "display-popup did not create a modal pane"
+must_equal "$(fmt "$modal" '#{pane_title}')" popup-title
+must_equal "$($TMUX show-options -pv -t "$modal" pane-border-status)" top
+must_equal "$($TMUX show-options -pv -t "$modal" pane-border-format)" \
+	'#{pane_title}'
+$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 display-popup pane" ;;
+esac
+$TMUX2 send-keys -t "$OUTER" Escape
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" "$modal"
+$TMUX2 send-keys -t "$OUTER" C-c
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
+
+# Creating a popup pane must not fire the split-window hook.
+check_ok set-hook -t modal after-split-window \
+	"set-option -g @popup-after-split yes"
+check_ok set-option -g @popup-after-split no
+check_ok display-popup -E -t "$p0" true
+must_equal "$($TMUX show-option -gv @popup-after-split)" no
+check_ok set-hook -u -t modal after-split-window
+
+# A borderless popup must not create a zero-sized pane in a tiny window.
+check_ok new-window -d -t modal: -n popup-small 'cat'
+check_ok set-option -w -t modal:popup-small window-size manual
+check_ok resize-window -t modal:popup-small -x 1 -y 1
+small=$(fmt modal:popup-small '#{pane_id}')
+check_ok bind Z display-popup -B -t "$small" 'cat'
+$TMUX2 send-keys -t "$OUTER" C-b Z
+sleep 1
+must_equal "$(fmt modal:popup-small '#{window_panes}')" 1
+must_equal "$(fmt modal:popup-small '#{window_modal_pane}')" ''
+
+$TMUX bind D display-popup -t "$p0" -w 20 -h 5 'printf done'
+$TMUX2 send-keys -t "$OUTER" C-b D
+sleep 2
+modal=$(fmt modal:0 '#{window_modal_pane}')
+[ -n "$modal" ] || fail "retained display-popup was not created"
+must_equal "$(fmt "$modal" '#{pane_dead}')" 1
+case "$($TMUX capture-pane -pt "$modal")" in
+*'Pane is dead'*) fail "display-popup showed remain-on-exit message" ;;
+esac
+$TMUX2 send-keys -t "$OUTER" a
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" "$modal"
+$TMUX2 send-keys -t "$OUTER" Escape
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
+
+$TMUX bind K display-popup -k -t "$p0" -w 20 -h 5 'printf done'
+$TMUX2 send-keys -t "$OUTER" C-b K
+sleep 2
+modal=$(fmt modal:0 '#{window_modal_pane}')
+[ -n "$modal" ] || fail "display-popup -k was not created"
+must_equal "$(fmt "$modal" '#{pane_dead}')" 1
+$TMUX2 send-keys -t "$OUTER" a
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
+
+$TMUX bind F display-popup -EE -t "$p0" -w 20 -h 5 'exit 1'
+$TMUX2 send-keys -t "$OUTER" C-b F
+sleep 2
+modal=$(fmt modal:0 '#{window_modal_pane}')
+[ -n "$modal" ] || fail "failed display-popup -EE did not remain"
+must_equal "$(fmt "$modal" '#{pane_dead}')" 1
+$TMUX2 send-keys -t "$OUTER" a
+sleep 1
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" "$modal"
+$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
+
+check_ok display-popup -EE -t "$p0" true
+must_equal "$(fmt modal:0 '#{window_modal_pane}')" ''
+
+$TMUX bind G display-popup -EE -k -t "$p0" -w 20 -h 5 'exit 1'
+$TMUX2 send-keys -t "$OUTER" C-b G
+sleep 2
+modal=$(fmt modal:0 '#{window_modal_pane}')
+[ -n "$modal" ] || fail "failed display-popup -EE -k did not remain"
+must_equal "$(fmt "$modal" '#{pane_dead}')" 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}')" ''
+
+check_ok display-popup -EE -k -t "$p0" true
+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'

regress/output-commands.sh

@@ -1,168 +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 -U || 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 -U || exit 1
-$TMUX send-keys -X search-backward separator || exit 1
-$TMUX send-keys -X copy-output || exit 1
-copied=$($TMUX show-buffer)
-[ "$copied" = "$EXPECTED" ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode -U || exit 1
-$TMUX send-keys -X search-backward one || exit 1
-$TMUX send-keys -X copy-output || exit 1
-copied=$($TMUX show-buffer)
-[ "$copied" = "$EXPECTED" ] || exit 1
-
-$TMUX send-keys -X pipe-output "wc -l >$OUT" || exit 1
-sleep 1
-[ "$(cat "$OUT")" = 2 ] || exit 1
-
-$TMUX send-keys -X copy-pipe-output "wc -l >$OUT" output || exit 1
-sleep 1
-[ "$(cat "$OUT")" = 2 ] || exit 1
-copied=$($TMUX show-buffer)
-[ "$copied" = "$EXPECTED" ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX copy-mode -c || exit 1
-$TMUX send-keys -X search-backward echo || exit 1
-$TMUX send-keys -X select-output || exit 1
-$TMUX send-keys -X copy-selection || exit 1
-selected=$($TMUX show-buffer)
-[ "$selected" = "$EXPECTED" ] || exit 1
-$TMUX send-keys -X cancel || exit 1
-
-$TMUX set-buffer -b keep unchanged || exit 1
-$TMUX copy-mode -U || exit 1
-$TMUX send-keys -X search-backward unfinished || exit 1
-$TMUX send-keys -X copy-output || exit 1
-[ "$($TMUX show-buffer)" = unfinished ] || 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 copy-mode -t :plain || exit 1
-$TMUX send-keys -t :plain.0 -X select-output || exit 1
-$TMUX send-keys -t :plain.0 -X select-output -a || exit 1
-$TMUX send-keys -t :plain.0 -X copy-selection || 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 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 -U -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 -c -t :prompt || exit 1
-$TMUX send-keys -t :prompt.0 -X expand-output || exit 1
-$TMUX send-keys -t :prompt.0 -X -N 10 cursor-down || exit 1
-$TMUX send-keys -t :prompt.0 -X select-output || 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 below "printf '\\033]133;A\\007p\\$ \\033]133;B\\007old\\n\\033]133;C\\007old1\\nold2\\nold3\\nold4\\nold5\\n\\033]133;D;0\\007separator\\n\\033]133;A\\007p\\$ \\033]133;B\\007ps\\n\\033]133;C\\007PID 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 -c -t :below || exit 1
-$TMUX send-keys -t :below.0 -X search-backward ps || exit 1
-$TMUX send-keys -t :below.0 -X expand-output || exit 1
-$TMUX send-keys -t :below.0 -X -N 100 cursor-down || exit 1
-$TMUX send-keys -t :below.0 C-o || exit 1
-[ "$($TMUX display-message -p -t :below.0 '#{selection_present}')" = 1 ] || exit 1
-$TMUX send-keys -t :below.0 -X copy-selection || exit 1
-[ "$($TMUX show-buffer)" = "$(printf 'PID TTY\\n1 pts/0')" ] || exit 1
-$TMUX send-keys -t :below.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
-
-$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 -U -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 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
-
-exit 0

regress/pane-ops.sh

@@ -104,6 +104,25 @@ 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.
 
@@ -309,12 +328,12 @@ 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=$($TMUX display-message -p -t P:0 '#{window_layout}')
+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_fmt P:0 '#{window_layout}' "$layout"
+check_layout P:0 "$layout"
 
 check_ok select-pane -t "$p0"
 check_ok resize-pane -Z -t "$p0"
@@ -322,7 +341,7 @@ 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_fmt P:0 '#{window_layout}' "$layout"
+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.
@@ -340,7 +359,7 @@ 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_fmt P:0 '#{window_layout}' "$layout"
+check_layout P:0 "$layout"
 
 # The last-pane path has separate zoom handling, both with and without -Z.
 check_ok select-pane -t "$p0"
@@ -357,7 +376,7 @@ 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_fmt P:0 '#{window_layout}' "$layout"
+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'

regress/prompt-keys.sh

@@ -217,7 +217,36 @@ $OUT send-keys M-r || exit 1
 settle
 status_line | grep -q '>' || fail "status-line prompt not drawn on the status line"
 
-# --- 11. emacs cursor-marker edit, accept recovers the exact buffer. ---
+# --- 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
 $OUT send-keys -l "abc" || exit 1
 $OUT send-keys Home || exit 1
 $OUT send-keys -l "X" || exit 1
@@ -229,7 +258,7 @@ settle
 [ "$($IN show -gv @r)" = "Xabc" ] || \
 	fail "status-line accept recovered '$($IN show -gv @r)', wanted 'Xabc'"
 
-# --- 12. Unicode on the status line: insert, move, delete wide char. ---
+# --- 13. Unicode on the status line: insert, move, delete wide char. ---
 $IN set -g @r "" || exit 1
 $OUT send-keys M-r || exit 1
 settle
@@ -249,7 +278,7 @@ settle
 [ "$($IN show -gv @r)" = "Za" ] || \
 	fail "status-line wide edit recovered '$($IN show -gv @r)', wanted 'Za'"
 
-# --- 13. Overflow: more text than fits stays within the line and is kept. ---
+# --- 14. 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
@@ -264,7 +293,7 @@ settle
 # The whole buffer was kept despite only part being visible.
 [ "$($IN show -gv @r)" = "$big" ] || fail "overflowing prompt lost buffer content"
 
-# --- 14. Escape closes the status-line prompt cleanly. ---
+# --- 15. Escape closes the status-line prompt cleanly. ---
 $IN set -g @r "SENTINEL" || exit 1
 $OUT send-keys M-r || exit 1
 settle

regress/screen-redraw-outside.sh

@@ -93,6 +93,15 @@ $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-popups.sh

@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Exercise drawing of popups (display-popup) over the window scene. A popup is an
-# overlay drawn on top of the redraw scene (the overlay_draw path in
-# screen-redraw.c), so this guards against regressions in how popups appear.
-#
-# A popup is modal and stays open until its command exits, so each scene fully
-# re-creates the servers and re-attaches; the popup is opened in the background
-# (display-popup blocks the client that runs it) and the outer pane is captured
-# while it is open.
-#
-# Run with GENERATE=1 to (re)create the golden files.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX=
-TMUX2=
-SETUP=0
-RESULTS=screen-redraw-results
-
-TMP=$(mktemp)
-
-cleanup() {
-	rm -f "$TMP"
-	[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null
-	[ -n "$TMUX2" ] && $TMUX2 kill-server 2>/dev/null
-}
-trap cleanup 0 1 15
-
-fail() {
-	echo "$*" >&2
-	exit 1
-}
-
-compare() {
-	sleep 1
-	$TMUX capturep -p >$TMP || exit 1
-	if [ -n "$GENERATE" ]; then
-		cp $TMP "$RESULTS/$1.result" || exit 1
-		echo "generated $1"
-	else
-		cmp -s $TMP "$RESULTS/$1.result" || \
-			fail "scene $1 differs from $RESULTS/$1.result"
-	fi
-}
-
-C="sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"POP%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'"
-
-# setup: fresh inner window attached inside a fresh outer pane, 40x14.
-setup() {
-	[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null
-	[ -n "$TMUX2" ] && $TMUX2 kill-server 2>/dev/null
-	SETUP=$((SETUP + 1))
-	TMUX="$TEST_TMUX -LtestA$$-$SETUP -f/dev/null"
-	TMUX2="$TEST_TMUX -LtestB$$-$SETUP -f/dev/null"
-	$TMUX2 new -d -x40 -y14 "$C" || exit 1
-	$TMUX2 set -g status off || exit 1
-	$TMUX2 set -g window-size manual || exit 1
-	$TMUX2 resizew -x40 -y14 || exit 1
-	$TMUX new -d -x40 -y14 || exit 1
-	$TMUX set -g status off || exit 1
-	$TMUX set -g window-size manual || exit 1
-	$TMUX set -g default-terminal "tmux-256color" || exit 1
-	$TMUX send -l "$TMUX2 attach" || exit 1
-	$TMUX send Enter || exit 1
-	sleep 1
-}
-
-# popup <args>: open a popup running a fixed command, in the background (it stays
-# open because the command sleeps; the servers are killed at the next setup).
-popup() {
-	$TMUX2 display-popup "$@" -E "sh -c 'printf POPUP; exec sleep 100'" &
-	sleep 1
-}
-
-# Basic popup over a single pane.
-setup
-popup -w20 -h6 -x6 -y3
-compare popup-basic
-
-# Popup over a split: drawn on top of the pane border.
-setup
-$TMUX2 splitw -h "$C" || exit 1
-popup -w24 -h8 -x8 -y3
-compare popup-over-split
-
-# Popup with no border lines (-B).
-setup
-popup -B -w20 -h6 -x6 -y3
-compare popup-noborder
-
-# Popup with double border lines.
-setup
-popup -b double -w20 -h6 -x6 -y3
-compare popup-double
-
-exit 0

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

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

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

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

regress/screen-redraw-results/popup-basic.result

@@ -1,14 +0,0 @@
-POP00 ┌──────────────────┐
-POP01 │POPUP             │
-POP02 │                  │
-POP03 │                  │
-POP04 │                  │
-POP05 └──────────────────┘
-POP06 abcdefghij
-POP07 abcdefghij
-POP08 abcdefghij
-POP09 abcdefghij
-POP10 abcdefghij
-POP11 abcdefghij
-POP12 abcdefghij
-

regress/screen-redraw-results/popup-double.result

@@ -1,14 +0,0 @@
-POP00 ╔══════════════════╗
-POP01 ║POPUP             ║
-POP02 ║                  ║
-POP03 ║                  ║
-POP04 ║                  ║
-POP05 ╚══════════════════╝
-POP06 abcdefghij
-POP07 abcdefghij
-POP08 abcdefghij
-POP09 abcdefghij
-POP10 abcdefghij
-POP11 abcdefghij
-POP12 abcdefghij
-

regress/screen-redraw-results/popup-noborder.result

@@ -1,14 +0,0 @@
-POP00 POPUP
-POP01
-POP02
-POP03
-POP04
-POP05
-POP06 abcdefghij
-POP07 abcdefghij
-POP08 abcdefghij
-POP09 abcdefghij
-POP10 abcdefghij
-POP11 abcdefghij
-POP12 abcdefghij
-

regress/screen-redraw-results/popup-over-split.result

@@ -1,14 +0,0 @@
-POP00 ab┌──────────────────────┐fghij
-POP01 ab│POPUP                 │fghij
-POP02 ab│                      │fghij
-POP03 ab│                      │fghij
-POP04 ab│                      │fghij
-POP05 ab│                      │fghij
-POP06 ab│                      │fghij
-POP07 ab└──────────────────────┘fghij
-POP08 abcdefghij    │POP08 abcdefghij
-POP09 abcdefghij    │POP09 abcdefghij
-POP10 abcdefghij    │POP10 abcdefghij
-POP11 abcdefghij    │POP11 abcdefghij
-POP12 abcdefghij    │POP12 abcdefghij
-                    │

regress/targets-panes.sh

@@ -97,6 +97,10 @@ check "p:.{top-left}" "%0"
 check_ok select-pane -t p:0.%0
 check "p:0.+" "1" '#{pane_index}'	# next pane
 check "p:0.-" "3" '#{pane_index}'	# previous pane (wraps)
+check_fail "can't find pane: +0" "p:0.+0"
+check_fail "can't find pane: +foo" "p:0.+foo"
+check_fail "can't find pane: -0" "p:0.-0"
+check_fail "can't find pane: -foo" "p:0.-foo"
 
 # --- last pane (!) --------------------------------------------------------
 check_ok select-pane -t p:0.%2

regress/targets.sh

@@ -154,6 +154,13 @@ check "alpha:{previous}" "3"
 check "alpha:!" "2"		# last window
 check "alpha:{last}" "2"
 
+# Malformed relative offsets must fail rather than silently selecting the
+# current window.
+check_fail "can't find window: +0" "alpha:+0"
+check_fail "can't find window: +foo" "alpha:+foo"
+check_fail "can't find window: -0" "alpha:-0"
+check_fail "can't find window: -foo" "alpha:-foo"
+
 # --- combined and empty forms ---------------------------------------------
 #
 # Empty targets use the current pane from TMUX_PANE when there is no client.

screen-redraw.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-redraw.c,v 1.158 2026/09/01 19:50:58 nicm Exp $ */
+/* $OpenBSD: screen-redraw.c,v 1.159 2026/09/09 08:31:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -33,7 +33,7 @@
  * this is done at various points, such as when a pane is moved or resized. The
  * scene only includes the part of the client used for the window: panes, pane
  * status lines, borders, scrollbars, and any area outside the window. The
- * client status line and overlay are not included.
+ * client status line is not included.
  *
  * A scene is made from spans. A span is a horizontal run of cells on one
  * visible line that can be drawn in the same way. Each span has a type, for
@@ -93,7 +93,6 @@ enum redraw_span_type {
 #define REDRAW_PANE_SCROLLBAR 0x20
 #define REDRAW_STATUS 0x40
 #define REDRAW_MENU 0x80
-#define REDRAW_OVERLAY 0x100
 
 /* Draw everything. */
 #define REDRAW_ALL 0x7fffffff
@@ -264,8 +263,6 @@ redraw_flags_to_string(int flags)
 		strlcat(s, "scrollbar ", sizeof s);
 	if (flags & REDRAW_MENU)
 		strlcat(s, "menu ", sizeof s);
-	if (flags & REDRAW_OVERLAY)
-		strlcat(s, "overlay ", sizeof s);
 	if (REDRAW_IS_ALL(flags))
 		strlcat(s, "all ", sizeof s);
 	if (*s != '\0')
@@ -713,7 +710,7 @@ redraw_mark_pane_borders(struct redraw_build_ctx *bctx, struct window_pane *wp,
 	} else {
 		mark_right = (right <= (int)bctx->w->sx);
 		mark_bottom = (bottom <= (int)bctx->w->sy);
-		if (pane_status == PANE_STATUS_TOP)
+		if (pane_status == PANE_STATUS_TOP && bottom < (int)bctx->w->sy)
 			mark_bottom = 0;
 		else if (pane_status == PANE_STATUS_BOTTOM)
 			mark_top = 0;
@@ -1381,45 +1378,30 @@ static void
 redraw_draw_span(struct redraw_draw_ctx *dctx, struct redraw_span *span,
     u_int y)
 {
-	struct redraw_scene	*scene = dctx->scene;
 	struct redraw_span_data	*data = &span->data;
 	enum redraw_span_type	 type = data->type;
-	struct client		*c = scene->c;
-	struct tty		*tty = &c->tty;
-	struct visible_ranges	*r;
-	struct visible_range	*rr;
-	u_int			 i, x, n;
 
 	if (type == REDRAW_SPAN_STATUS && ~data->st.wp->flags & PANE_NEWSTATUS)
 		return;
 
-	r = tty_check_overlay_range(tty, span->x, y, span->width);
-	for (i = 0; i < r->used; i++) {
-		rr = &r->ranges[i];
-		if (rr->nx == 0)
-			continue;
-		x = rr->px;
-		n = rr->nx;
-
-		switch (span->data.type) {
-		case REDRAW_SPAN_PANE:
-			redraw_draw_pane_span(dctx, span, x, y, n);
-			break;
-		case REDRAW_SPAN_BORDER:
-		case REDRAW_SPAN_EMPTY:
-		case REDRAW_SPAN_OUTSIDE:
-			redraw_draw_border_span(dctx, span, x, y, n);
-			break;
-		case REDRAW_SPAN_STATUS:
-			redraw_draw_status_span(dctx, span, x, y, n);
-			break;
-		case REDRAW_SPAN_SCROLLBAR:
-			redraw_draw_scrollbar_span(dctx, span, x, y, n);
-			break;
-		case REDRAW_SPAN_MENU:
-			redraw_draw_menu_span(dctx, span, x, y, n);
-			break;
-		}
+	switch (span->data.type) {
+	case REDRAW_SPAN_PANE:
+		redraw_draw_pane_span(dctx, span, span->x, y, span->width);
+		break;
+	case REDRAW_SPAN_BORDER:
+	case REDRAW_SPAN_EMPTY:
+	case REDRAW_SPAN_OUTSIDE:
+		redraw_draw_border_span(dctx, span, span->x, y, span->width);
+		break;
+	case REDRAW_SPAN_STATUS:
+		redraw_draw_status_span(dctx, span, span->x, y, span->width);
+		break;
+	case REDRAW_SPAN_SCROLLBAR:
+		redraw_draw_scrollbar_span(dctx, span, span->x, y, span->width);
+		break;
+	case REDRAW_SPAN_MENU:
+		redraw_draw_menu_span(dctx, span, span->x, y, span->width);
+		break;
 	}
 }
 
@@ -1688,10 +1670,8 @@ redraw_draw(struct client *c, struct window_pane *wp, int flags)
 	struct screen		*sl;
 	struct redraw_scene	*scene;
 	struct window_pane	*loop;
-	u_int			 width, i, y, lines, j;
+	u_int			 width, i, y, lines;
 	struct redraw_span	*first;
-	struct visible_ranges	*r;
-	struct visible_range	*rr;
 	int			 redraw;
 
 	if (c->flags & CLIENT_SUSPENDED)
@@ -1799,19 +1779,9 @@ redraw_draw(struct client *c, struct window_pane *wp, int flags)
 		else
 			y = c->tty.sy - lines;
 		sl = c->status.active;
-		for (i = 0; i < lines; i++) {
-			r = tty_check_overlay_range(tty, 0, y + i, tty->sx);
-			for (j = 0; j < r->used; j++) {
-				rr = &r->ranges[j];
-				if (rr->nx == 0)
-					continue;
-				tty_draw_line(tty, sl, rr->px, i, rr->nx,
-				    rr->px, y + i, NULL);
-			}
-		}
+		for (i = 0; i < lines; i++)
+			tty_draw_line(tty, sl, 0, i, tty->sx, 0, y + i, NULL);
 	}
-	if (c->overlay_draw != NULL && (flags & REDRAW_OVERLAY))
-		c->overlay_draw(c, c->overlay_data);
 
 	tty_reset(tty);
 
@@ -1867,18 +1837,13 @@ redraw_screen(struct client *c)
 {
 	int	flags = 0;
 
-	if (c->flags & CLIENT_REDRAWWINDOW) {
-		if (c->flags & CLIENT_REDRAWOVERLAY)
-			redraw_draw(c, NULL, REDRAW_ALL);
-		else
-			redraw_draw(c, NULL, REDRAW_ALL & ~REDRAW_OVERLAY);
-	} else {
+	if (c->flags & CLIENT_REDRAWWINDOW)
+		redraw_draw(c, NULL, REDRAW_ALL);
+	else {
 		if (c->flags & CLIENT_REDRAWBORDERS)
 			flags |= (REDRAW_PANE_BORDER|REDRAW_PANE_STATUS);
 		if (c->flags & CLIENT_REDRAWSTATUS)
 			flags |= (REDRAW_STATUS|REDRAW_PANE_STATUS);
-		if (c->flags & CLIENT_REDRAWOVERLAY)
-			flags |= REDRAW_OVERLAY;
 		if (c->flags & CLIENT_REDRAWMENU)
 			flags |= REDRAW_MENU;
 		if (c->session->curw->window->menu != NULL)

screen-write.c

@@ -305,21 +305,16 @@ screen_write_initctx(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
 
 	if (~ctx->flags & SCREEN_WRITE_SYNC) {
 		/*
-		 * For the active pane showing its base screen or for an
-		 * overlay (no pane), only use synchronized updates if
-		 * requested (commands that move the cursor); for other panes
-		 * or a pane in a mode, always use it, since the cursor will
-		 * have to move.
+		 * For the active pane showing its base screen, only use
+		 * synchronized updates if requested (commands that move the
+		 * cursor); for other panes or a pane in a mode, always use it,
+		 * since the cursor will have to move.
 		 */
 		if (ctx->wp != NULL && (ctx->wp != ctx->wp->window->active ||
 		    ctx->wp->screen != &ctx->wp->base))
 			ttyctx->flags |= TTY_CTX_SYNC;
-		else {
-			if (ctx->wp == NULL)
-				ttyctx->flags |= TTY_CTX_OVERLAY_SYNC;
-			if (is_sync)
-				ttyctx->flags |= TTY_CTX_SYNC;
-		}
+		else if (is_sync)
+			ttyctx->flags |= TTY_CTX_SYNC;
 		tty_write(tty_cmd_syncstart, ttyctx);
 		ctx->flags |= SCREEN_WRITE_SYNC;
 	}
@@ -714,7 +709,7 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
 			if (!window_position_is_visible(r, xoff + s->cx))
 				break;
 			ttyctx.cell = &gc;
-			ttyctx.flags &= (TTY_CTX_OVERLAY_SYNC|TTY_CTX_SYNC);
+			ttyctx.flags &= TTY_CTX_SYNC;
 			tty_write(tty_cmd_cell, &ttyctx);
 			ttyctx.ocx++;
 

server-client.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.510 2026/09/01 19:50:58 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.512 2026/09/10 11:02:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -67,77 +67,6 @@ server_client_how_many(void)
 	return (n);
 }
 
-/* Overlay timer callback. */
-static void
-server_client_overlay_timer(__unused int fd, __unused short events, void *data)
-{
-	server_client_clear_overlay(data);
-}
-
-/* Set an overlay on client. */
-void
-server_client_set_overlay(struct client *c, u_int delay,
-    overlay_check_cb checkcb, overlay_mode_cb modecb,
-    overlay_draw_cb drawcb, overlay_key_cb keycb, overlay_free_cb freecb,
-    overlay_resize_cb resizecb, void *data)
-{
-	struct timeval	tv;
-
-	if (c->overlay_draw != NULL)
-		server_client_clear_overlay(c);
-
-	tv.tv_sec = delay / 1000;
-	tv.tv_usec = (delay % 1000) * 1000L;
-
-	if (event_initialized(&c->overlay_timer))
-		evtimer_del(&c->overlay_timer);
-	evtimer_set(&c->overlay_timer, server_client_overlay_timer, c);
-	if (delay != 0)
-		evtimer_add(&c->overlay_timer, &tv);
-
-	c->overlay_check = checkcb;
-	c->overlay_mode = modecb;
-	c->overlay_draw = drawcb;
-	c->overlay_key = keycb;
-	c->overlay_free = freecb;
-	c->overlay_resize = resizecb;
-	c->overlay_data = data;
-
-	if (c->overlay_check == NULL)
-		c->tty.flags |= TTY_FREEZE;
-	if (c->overlay_mode == NULL)
-		c->tty.flags |= TTY_NOCURSOR;
-	window_update_focus(c->session->curw->window);
-	server_redraw_client(c);
-}
-
-/* Clear overlay mode on client. */
-void
-server_client_clear_overlay(struct client *c)
-{
-	if (c->overlay_draw == NULL)
-		return;
-
-	if (event_initialized(&c->overlay_timer))
-		evtimer_del(&c->overlay_timer);
-
-	if (c->overlay_free != NULL)
-		c->overlay_free(c, c->overlay_data);
-
-	c->overlay_check = NULL;
-	c->overlay_mode = NULL;
-	c->overlay_draw = NULL;
-	c->overlay_key = NULL;
-	c->overlay_free = NULL;
-	c->overlay_resize = NULL;
-	c->overlay_data = NULL;
-
-	c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR);
-	if (c->session != NULL)
-		window_update_focus(c->session->curw->window);
-	server_redraw_client(c);
-}
-
 /* Are these ranges empty? That is, nothing is visible. */
 int
 server_client_ranges_is_empty(struct visible_ranges *r)
@@ -161,52 +90,6 @@ server_client_ensure_ranges(struct visible_ranges *r, u_int n)
 	r->size = n;
 }
 
-/*
- * Given overlay position and dimensions, return parts of the input range which
- * are visible.
- */
-void
-server_client_overlay_range(u_int x, u_int y, u_int sx, u_int sy, u_int px,
-    u_int py, u_int nx, struct visible_ranges *r)
-{
-	u_int	ox, onx;
-
-	/* Trivial case of no overlap in the y direction. */
-	if (py < y || py > y + sy - 1) {
-		server_client_ensure_ranges(r, 1);
-		r->ranges[0].px = px;
-		r->ranges[0].nx = nx;
-		r->used = 1;
-		return;
-	}
-	server_client_ensure_ranges(r, 2);
-
-	/* Visible bit to the left of the popup. */
-	if (px < x) {
-		r->ranges[0].px = px;
-		r->ranges[0].nx = x - px;
-		if (r->ranges[0].nx > nx)
-			r->ranges[0].nx = nx;
-	} else {
-		r->ranges[0].px = 0;
-		r->ranges[0].nx = 0;
-	}
-
-	/* Visible bit to the right of the popup. */
-	ox = x + sx;
-	if (px > ox)
-		ox = px;
-	onx = px + nx;
-	if (onx > ox) {
-		r->ranges[1].px = ox;
-		r->ranges[1].nx = onx - ox;
-	} else {
-		r->ranges[1].px = 0;
-		r->ranges[1].nx = 0;
-	}
-	r->used = 2;
-}
-
 /* Check if this client is inside this server. */
 int
 server_client_check_nested(struct client *c)
@@ -490,7 +373,6 @@ server_client_lost(struct client *c)
 		cfg_client = NULL;
 	c->flags |= CLIENT_DEAD;
 
-	server_client_clear_overlay(c);
 	status_prompt_clear(c);
 	status_message_clear(c);
 
@@ -1391,15 +1273,19 @@ server_client_repeat_time(struct client *c, struct key_binding *bd)
 	return (repeat);
 }
 
-/* Handle a key press on a dead pane waiting for a key. */
+/* Handle a key press which closes a dead pane. */
 static int
 server_client_handle_dead_key(struct window_pane *wp, key_code key)
 {
+	int	remain_on_exit;
+
 	if (wp == NULL ||
 	    (~wp->flags & PANE_EXITED) ||
 	    KEYC_IS_MOUSE(key) ||
-	    KEYC_IS_PASTE(key) ||
-	    options_get_number(wp->options, "remain-on-exit") != 3)
+	    KEYC_IS_PASTE(key))
+		return (0);
+	remain_on_exit = options_get_number(wp->options, "remain-on-exit");
+	if (remain_on_exit != 3 && remain_on_exit != 4)
 		return (0);
 	options_set_number(wp->options, "remain-on-exit", 0);
 	server_destroy_pane(wp, 0);
@@ -1742,10 +1628,6 @@ server_client_handle_key0(struct client *c, struct key_event *event,
 	if (s == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS))
 		return (0);
 
-	/*
-	 * Handle theme reporting keys before overlays so they work even when a
-	 * popup is open.
-	 */
 	if (event->key == KEYC_REPORT_LIGHT_THEME) {
 		server_client_report_theme(c, THEME_LIGHT);
 		return (0);
@@ -1756,9 +1638,9 @@ server_client_handle_key0(struct client *c, struct key_event *event,
 	}
 
 	/*
-	 * Key presses in overlay mode, for panes capturing all keys and in the
-	 * command prompt are a special case. The queue might be blocked so they
-	 * need to be processed immediately rather than queued.
+	 * Dead panes waiting for a key, modal cancel keys, panes capturing all keys
+	 * and the command prompt are special cases. The queue might be blocked so
+	 * they need to be processed immediately rather than queued.
 	 */
 	if (~c->flags & CLIENT_READONLY) {
 		if (c->message_string != NULL) {
@@ -1767,25 +1649,20 @@ server_client_handle_key0(struct client *c, struct key_event *event,
 			status_message_clear(c);
 		}
 
-		if (c->overlay_key != NULL) {
-			switch (c->overlay_key(c, c->overlay_data, event)) {
-			case 0:
-				return (0);
-			case 1:
-				server_client_clear_overlay(c);
-				return (0);
-			}
-		}
-
-		server_client_clear_overlay(c);
-
 		wp = s->curw->window->active;
+		if (server_client_handle_dead_key(wp, event->key))
+			return (0);
+		if (wp != NULL &&
+		    wp == wp->window->modal &&
+		    (wp->flags & PANE_CLOSEONCANCEL) &&
+		    (event->key == '\033' || event->key == ('c'|KEYC_CTRL))) {
+			server_kill_pane(wp);
+			return (0);
+		}
 		if (wp != NULL &&
 		    (wp->flags & PANE_CAPTUREALLKEYS) &&
 		    TAILQ_EMPTY(&wp->modes) &&
 		    !KEYC_IS_MOUSE(event->key)) {
-			if (server_client_handle_dead_key(wp, event->key))
-				return (0);
 			if (~wp->flags & PANE_EXITED) {
 				window_pane_key(wp, c, s, s->curw, event->key,
 				    &event->m);
@@ -2166,11 +2043,8 @@ server_client_reset_state(struct client *c)
 	flags = (tty->flags & TTY_BLOCK);
 	tty->flags &= ~TTY_BLOCK;
 
-	/* Get mode from overlay if any, else from screen. */
-	if (c->overlay_draw != NULL) {
-		if (c->overlay_mode != NULL)
-			s = c->overlay_mode(c, c->overlay_data, &cx, &cy);
-	} else if (w->menu != NULL) {
+	/* Get mode from the menu if any, else from the screen. */
+	if (w->menu != NULL) {
 		menu_get_cursor(w->menu, &cx, &cy);
 		s = menu_screen(w->menu);
 	} else if (wp != NULL && c->prompt == NULL)
@@ -2192,7 +2066,7 @@ server_client_reset_state(struct client *c)
 	if (c->prompt != NULL) {
 		prompt = 1;
 		status_prompt_cursor(c, &cx, &cy);
-	} else if (wp != NULL && c->overlay_draw == NULL) {
+	} else if (wp != NULL) {
 		if (w->menu != NULL) {
 			tty_window_offset(tty, &ox, &oy, &sx, &sy);
 			if (cx < ox || cx >= ox + sx ||
@@ -2247,7 +2121,7 @@ server_client_reset_state(struct client *c)
 			if (!cursor)
 				mode &= ~MODE_CURSOR;
 		}
-	} else if (c->overlay_mode == NULL || s == NULL)
+	} else if (s == NULL)
 		mode &= ~MODE_CURSOR;
 	if (~pane_mode & MODE_SYNC) {
 		log_debug("%s: cursor to %u,%u", __func__, cx, cy);
@@ -2264,7 +2138,7 @@ server_client_reset_state(struct client *c)
 	 * movement events.
 	 */
 	if (options_get_number(oo, "mouse")) {
-		if (c->overlay_draw == NULL && w->menu == NULL) {
+		if (w->menu == NULL) {
 			mode &= ~ALL_MOUSE_MODES;
 			TAILQ_FOREACH(loop, &w->panes, entry) {
 				if (loop->screen->mode & MODE_MOUSE_ALL)
@@ -2280,7 +2154,7 @@ server_client_reset_state(struct client *c)
 	}
 
 	/* Clear bracketed paste mode if at the prompt. */
-	if (c->overlay_draw == NULL && prompt)
+	if (prompt)
 		mode &= ~MODE_BRACKETPASTE;
 
 	/* Set the terminal mode and reset attributes. */
@@ -2482,11 +2356,10 @@ server_client_check_redraw(struct client *c)
 	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
 		return;
 	if (c->flags & CLIENT_ALLREDRAWFLAGS) {
-		log_debug("%s: redraw%s%s%s%s%s", c->name,
+		log_debug("%s: redraw%s%s%s%s", c->name,
 		    (c->flags & CLIENT_REDRAWWINDOW) ? " window" : "",
 		    (c->flags & CLIENT_REDRAWSTATUS) ? " status" : "",
 		    (c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "",
-		    (c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : "",
 		    (c->flags & CLIENT_REDRAWMENU) ? " menu" : "");
 	}
 
@@ -2694,10 +2567,6 @@ server_client_dispatch(struct imsg *imsg, void *arg)
 		tty_resize(&c->tty);
 		tty_repeat_requests(&c->tty, 0);
 		recalculate_sizes();
-		if (c->overlay_resize == NULL)
-			server_client_clear_overlay(c);
-		else
-			c->overlay_resize(c, c->overlay_data);
 		server_redraw_client(c);
 		if (c->session != NULL)
 			server_client_fire_resized(c, old_sx, old_sy);
@@ -3084,6 +2953,8 @@ server_client_control_flags(struct client *c, const char *next)
 		return (CLIENT_CONTROL_NOOUTPUT);
 	if (strcmp(next, "wait-exit") == 0)
 		return (CLIENT_CONTROL_WAITEXIT);
+	if (strcmp(next, "new-layouts") == 0)
+		return (CLIENT_CONTROL_NEWLAYOUTS);
 	return (0);
 }
 
@@ -3150,6 +3021,8 @@ server_client_get_flags(struct client *c)
 		strlcat(s, "no-output,", sizeof s);
 	if (c->flags & CLIENT_CONTROL_WAITEXIT)
 		strlcat(s, "wait-exit,", sizeof s);
+	if (c->flags & CLIENT_CONTROL_NEWLAYOUTS)
+		strlcat(s, "new-layouts,", sizeof s);
 	if (c->flags & CLIENT_CONTROL_PAUSEAFTER) {
 		xsnprintf(tmp, sizeof tmp, "pause-after=%u,",
 		    c->pause_age / 1000);

server-fn.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.152 2026/09/03 19:12:36 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.153 2026/09/10 11:02:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -386,6 +386,7 @@ server_destroy_pane(struct window_pane *wp, int notify)
 	case 0:
 		break;
 	case 2:
+	case 4:
 		if (WIFEXITED(wp->status) && WEXITSTATUS(wp->status) == 0)
 			break;
 		/* FALLTHROUGH */

spawn.c

@@ -701,7 +701,7 @@ spawn_editor_finish(struct window_pane *wp)
 
 struct spawn_editor_state *
 spawn_editor(struct client *c, const char *buf, size_t len,
-    const char *editor, spawn_finish_edit_cb cb, void *arg)
+    spawn_finish_edit_cb cb, void *arg)
 {
 	struct spawn_editor_state	*es;
 	struct spawn_context		 sc = { 0 };
@@ -715,13 +715,13 @@ spawn_editor(struct client *c, const char *buf, size_t len,
 	FILE				*f;
 	char				*cmd, *cause = NULL;
 	char				 path[] = _PATH_TMP "tmux.XXXXXXXX";
+	const char			*editor;
 	int				 fd;
 
 	if (w->modal != NULL)
 		return (NULL);
 
-	if (editor == NULL)
-		editor = options_get_string(global_options, "editor");
+	editor = options_get_string(global_options, "editor");
 	fd = mkstemp(path);
 	if (fd == -1)
 		return (NULL);

status.c

@@ -577,8 +577,6 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
 	struct prompt_create_data	pd;
 	struct status_prompt_data	*spd;
 
-	server_client_clear_overlay(c);
-
 	status_message_clear(c);
 	status_prompt_clear(c);
 	status_push_screen(c);

tmux.1

@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.1164 2026/09/03 21:04:11 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.1169 2026/09/10 11:02:18 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 3 2026 $
+.Dd $Mdocdate: September 10 2026 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1116,6 +1116,8 @@ The flags are:
 .Bl -tag -width Ds
 .It ignore\-size
 the client does not affect the size of other clients
+.It new\-layouts
+use the new layout string format
 .It no\-detach\-on\-destroy
 do not detach the client when the session it is attached to is destroyed if
 there are any other sessions
@@ -2004,25 +2006,6 @@ Same as
 .Ic copy\-pipe
 but also exit copy mode.
 .It Xo
-.Ic copy\-pipe\-output
-.Op Fl aCP
-.Op Ar command
-.Op Ar prefix
-.Xc
-Copy the current OSC 133 command output, pipe it to
-.Ar command ,
-and clear the selection.
-.Ar prefix
-is used to name the new paste buffer.
-.It Xo
-.Ic copy\-output
-.Op Fl aCP
-.Op Ar prefix
-.Xc
-Copy the current OSC 133 command output and clear the selection.
-.Ar prefix
-is used to name the new paste buffer.
-.It Xo
 .Ic copy\-selection
 .Op Fl CP
 .Op Ar prefix
@@ -2188,27 +2171,6 @@ Hide line numbers in copy mode.
 .Xc
 Toggle line numbers in copy mode.
 .It Xo
-.Ic collapse\-output
-.Op Fl a
-.Xc
-Collapse the output for the command on the cursor line.
-With
-.Fl a ,
-collapse all command output in the copy-mode buffer.
-Text before the first OSC 133 prompt is treated as an initial command output
-region.
-.It Xo
-.Ic expand\-output
-.Op Fl a
-.Xc
-Expand the output for the command on the cursor line.
-With
-.Fl a ,
-expand all command output in the copy-mode buffer.
-.Pp
-The Tab key toggles output for the command on the cursor line and S-Tab
-toggles all command output.
-.It Xo
 .Ic middle\-line
 (vi: M)
 (emacs: M\-r)
@@ -2262,32 +2224,6 @@ but treat all non-whitespace characters as part of a word.
 .Xc
 Switch at which end of the selection the cursor sits.
 .It Xo
-.Ic open\-output
-.Op Fl a
-.Op Ar command
-.Xc
-Open the current OSC 133 command output in an editor.
-If
-.Ar command
-is given, it is used as the editor command; otherwise, the
-.Ic editor
-option is used.
-.It Xo
-.Ic open\-selection
-.Op Ar command
-.Xc
-Open the current selection in an editor.
-If
-.Ar command
-is given, it is used as the editor command; otherwise, the
-.Ic editor
-option is used.
-In emacs mode,
-.Ql e ,
-and in vi mode,
-.Ql M\-e ,
-opens the selection if one is present, otherwise the command output.
-.It Xo
 .Ic page\-down
 (vi: C\-f)
 (emacs: PageDown)
@@ -2328,14 +2264,6 @@ Same as
 .Ic pipe
 but also exit copy mode.
 .It Xo
-.Ic pipe\-output
-.Op Fl a
-.Op Ar command
-.Xc
-Pipe the current OSC 133 command output to
-.Ar command
-and clear the selection.
-.It Xo
 .Ic previous\-matching\-bracket
 (emacs: M\-C\-b)
 .Xc
@@ -2530,16 +2458,6 @@ backward becomes forward).
 .Xc
 Select the current line.
 .It Xo
-.Ic select\-output
-.Op Fl a
-.Xc
-Select the current OSC 133 command output.
-If it is collapsed, it is expanded first.
-The default emacs binding is
-.Ql C\-o
-and the default vi binding is
-.Ql M\-o .
-.It Xo
 .Ic select\-word
 .Xc
 Select the current word.
@@ -2578,12 +2496,6 @@ Toggle the visibility of the position indicator in the top right.
 Move to the top line.
 .El
 .Pp
-The output commands use OSC 133 output text from the C marker to the D marker.
-If there is no D marker, the output ends at the end of the copy-mode buffer.
-With
-.Fl a ,
-they use the entire copy-mode buffer instead.
-.Pp
 The search commands come in several varieties:
 .Ql search\-forward
 and
@@ -2629,15 +2541,6 @@ Finding the beginning of command output requires the shell to emit an escape
 sequence (\e033]133;C\e033\e\e) to tell tmux where the output begins.
 If the shell does not send these escape sequences, these commands do nothing.
 .Pp
-The output commands operate on text from an OSC 133
-.Ql C
-marker up to its matching
-.Ql D
-marker, or the current end of the buffer if there is no
-.Ql D
-marker.
-They do nothing if the cursor is not associated with an output range.
-.Pp
 Copy commands may take an optional buffer prefix argument which is used
 to generate the buffer name (the default is
 .Ql buffer
@@ -2700,19 +2603,12 @@ The synopsis for the
 command is:
 .Bl -tag -width Ds
 .It Xo Ic copy\-mode
-.Op Fl UcdekHMqSu
+.Op Fl dekHMqSu
 .Op Fl s Ar src\-pane
 .Op Fl t Ar target\-pane
 .Xc
 Enter copy mode.
 .Pp
-.Fl c
-enters copy mode with OSC 133 command output collapsed.
-.Fl U
-enters copy mode with OSC 133 output controls shown and all output expanded.
-When output is collapsed, the prompt and entered command are shown and text
-from the output start marker to the next primary prompt marker is hidden.
-.Pp
 .Fl u
 enters copy mode and scrolls one page up and
 .Fl d
@@ -2753,60 +2649,6 @@ bind PageDown copy\-mode \-ed
 kills the pane when the mode is exited.
 .El
 .Pp
-The following commands operate on OSC 133 command output. In copy mode, they
-use the output on the cursor line; otherwise, they use the most recent output
-in the target pane. If an output has a C marker but no D marker, it ends at the
-end of the pane buffer. If there is no OSC 133 output, they do nothing unless
-.Fl a
-is given, which uses the entire buffer.
-.Bl -tag -width Ds
-.It Xo Ic select\-output
-.Op Fl a
-.Op Fl t Ar target\-pane
-.Xc
-Enter copy mode if necessary and select the output.
-.It Xo Ic copy\-output
-.Op Fl aCP
-.Op Fl t Ar target\-pane
-.Op Ar prefix
-.Xc
-Copy the output to a paste buffer.
-.It Xo Ic copy\-pipe\-output
-.Op Fl aCP
-.Op Fl t Ar target\-pane
-.Op Ar command
-.Op Ar prefix
-.Xc
-Copy the output to a paste buffer and pipe it to
-.Ar command .
-.It Xo Ic pipe\-output
-.Op Fl a
-.Op Fl t Ar target\-pane
-.Op Ar command
-.Xc
-Pipe the output to
-.Ar command .
-.It Xo Ic open\-output
-.Op Fl a
-.Op Fl t Ar target\-pane
-.Op Ar command
-.Xc
-Open the output in an editor. If
-.Ar command
-is given, it is used as the editor command; otherwise the
-.Ic editor
-option is used.
-.It Xo Ic open\-selection
-.Op Fl t Ar target\-pane
-.Op Ar command
-.Xc
-Open the current copy-mode selection in an editor. If
-.Ar command
-is given, it is used as the editor command; otherwise the
-.Ic editor
-option is used.
-.El
-.Pp
 A number of preset arrangements of panes are available, these are called
 layouts.
 These may be selected with the
@@ -2859,8 +2701,8 @@ For example:
 .Bd -literal -offset indent
 $ tmux list\-windows
 0: ksh [159x48]
-    layout: bb62,159x48,0,0{79x48,0,0,79x48,80,0}
-$ tmux select\-layout \[aq]bb62,159x48,0,0{79x48,0,0,79x48,80,0}\[aq]
+    layout: {"V":2,"L":{"t":"h","w":159,"h":48,"x":0,"y":0,"c":[{"t":"p","w":79,"h":48,"x":0,"y":0,"l":0,"i":0,"I":"%0"},{"t":"p","w":79,"h":48,"x":80,"y":0,"a":true,"i":1,"I":"%2"}]}}
+$ tmux select\-layout \[aq]{"V":2,"L":{"t":"h","w":159,"h":48,"x":0,"y":0,"c":[{"t":"p","w":79,"h":48,"x":0,"y":0,"l":0,"i":0,"I":"%0"},{"t":"p","w":79,"h":48,"x":80,"y":0,"a":true,"i":1,"I":"%2"}]}}\[aq]
 .Ed
 .Pp
 .Nm
@@ -2948,7 +2790,7 @@ The pane must not already be floating or hidden, and the window must not
 be zoomed.
 .Tg capturep
 .It Xo Ic capture\-pane
-.Op Fl aeFHLpPRqCJMN
+.Op Fl aeFHILpPRqCJMN
 .Op Fl b Ar buffer\-name
 .Op Fl E Ar end\-line
 .Op Fl S Ar start\-line
@@ -2990,6 +2832,8 @@ captures only any output that the pane has received that is the beginning of an
 as-yet incomplete escape sequence.
 .Fl L
 includes the line number at the start of each line and
+.Fl I
+includes the time each line entered the history, or zero if not available.
 .Fl F
 includes the flags (where
 .Ql -
@@ -3811,7 +3655,7 @@ but a different format may be specified with
 .Fl F .
 .Tg newp
 .It Xo Ic new\-pane
-.Op Fl AbCdefhIkKLMOPvWZ
+.Op Fl AbCDefhIkKLMOPvWZ
 .Op Fl B Ar border\-lines
 .Op Fl c Ar start\-directory
 .Op Fl e Ar environment
@@ -3873,6 +3717,13 @@ all keys, including the prefix key, are passed directly to the modal pane.
 With
 .Fl C ,
 the modal pane is closed when the mouse is clicked outside it.
+With
+.Fl D ,
+the modal pane is closed when
+.Ql Escape
+or
+.Ql C-c
+is pressed.
 .Pp
 The
 .Fl L
@@ -5502,10 +5353,16 @@ section on how to specify
 .Ar style .
 .It Ic menu\-border\-lines Ar type
 Set the type of characters used for drawing menu borders.
-See
-.Ic popup\-border\-lines
-for possible values for
-.Ar border\-lines .
+.Ar type
+may be one of
+.Ic single ,
+.Ic rounded ,
+.Ic double ,
+.Ic heavy ,
+.Ic simple ,
+.Ic padded ,
+or
+.Ic none .
 .It Ic message\-command\-style Ar style
 Set status line message command style.
 This is used for the command prompt with
@@ -5958,20 +5815,6 @@ section.
 .It Ic copy\-mode\-position\-format Ar format
 Format of the position indicator in copy mode.
 .Pp
-.It Ic copy\-mode\-exit\-status\-format Ar format
-Format of the OSC 133 exit status indicator in the copy-mode gutter.
-The default displays a theme red
-.Ql !
-for a nonzero status and a space otherwise.
-The gutter grows to fit the expanded format.
-The format is drawn to the left of the collapse control, and its alignment
-applies within that area.
-The format is expanded with
-.Ql exit_status
-and
-.Ql exit_status_present ,
-which is set only when the OSC 133 end-of-output marker includes a status.
-.Pp
 .It Ic copy\-mode\-position\-style Ar style
 Set the style of the position indicator in copy mode.
 For how to specify
@@ -6177,48 +6020,6 @@ see the
 section.
 Attributes are ignored.
 .Pp
-.It Ic popup\-style Ar style
-Set the popup style.
-See the
-.Sx STYLES
-section on how to specify
-.Ar style .
-Attributes are ignored.
-.Pp
-.It Ic popup\-border\-style Ar style
-Set the popup border style.
-See the
-.Sx STYLES
-section on how to specify
-.Ar style .
-Attributes are ignored.
-.Pp
-.It Ic popup\-border\-lines Ar type
-Set the type of characters used for drawing popup borders.
-.Ar type
-may be one of:
-.Bl -tag -width Ds
-.It single
-single lines using ACS or UTF\-8 characters (default)
-.It rounded
-variation of single with rounded corners using UTF\-8 characters
-.It double
-double lines using UTF\-8 characters
-.It heavy
-heavy lines using UTF\-8 characters
-.It simple
-simple ASCII characters
-.It padded
-simple ASCII space character
-.It none
-no border
-.El
-.Pp
-.Ql double
-and
-.Ql heavy
-will fall back to standard ACS line drawing when UTF\-8 is not supported.
-.Pp
 .It Xo Ic pane\-scrollbars
 .Op Ic off | modal | on | auto\-hide
 .Xc
@@ -6498,7 +6299,7 @@ uses when the colour with that index is requested.
 The index may be from zero to 255.
 .Pp
 .It Xo Ic remain\-on\-exit
-.Op Ic on | off | failed | key
+.Op Ic on | off | failed | key | failed\-key
 .Xc
 A pane with this flag set is not destroyed when the program running in it
 exits.
@@ -6508,6 +6309,10 @@ then only when the program exit status is not zero.
 If set to
 .Ic key ,
 the pane stays open and closes when a key is pressed.
+If set to
+.Ic failed\-key ,
+the pane stays open and closes when a key is pressed only if the program exit
+status is not zero.
 The pane may be reactivated with the
 .Ic respawn\-pane
 command.
@@ -8361,10 +8166,16 @@ command should be omitted.
 .Pp
 .Fl b
 sets the type of characters used for drawing menu borders.
-See
-.Ic popup\-border\-lines
-for possible values for
-.Ar border\-lines .
+.Ar border\-lines
+may be one of
+.Ic single ,
+.Ic rounded ,
+.Ic double ,
+.Ic heavy ,
+.Ic simple ,
+.Ic padded ,
+or
+.Ic none .
 .Pp
 .Fl H
 sets the style for the selected menu item (see
@@ -8400,15 +8211,18 @@ Both may be a row or column number, or one of the following special values:
 .It Li "S" Ta Fl y Ta "The line above or below the status line"
 .El
 .Pp
-Or a format, which is expanded including the following additional variables:
+Or a format, which is expanded with the following additional variables.
+The
+.Ql popup_
+prefix is retained for compatibility:
 .Bl -column "XXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
 .It Sy "Variable name" Ta Sy "Replaced with"
-.It Li "popup_centre_x" Ta "Centered in the client"
-.It Li "popup_centre_y" Ta "Centered in the client"
-.It Li "popup_height" Ta "Height of menu or popup"
+.It Li "popup_centre_x" Ta "Centered in the window"
+.It Li "popup_centre_y" Ta "Centered in the window"
+.It Li "popup_height" Ta "Height of the menu"
 .It Li "popup_last_x" Ta "Left of the last menu"
 .It Li "popup_last_y" Ta "Bottom of the last menu"
-.It Li "popup_mouse_bottom" Ta "Bottom of at the mouse"
+.It Li "popup_mouse_bottom" Ta "Bottom at the mouse"
 .It Li "popup_mouse_centre_x" Ta "Horizontal centre at the mouse"
 .It Li "popup_mouse_centre_y" Ta "Vertical centre at the mouse"
 .It Li "popup_mouse_top" Ta "Top at the mouse"
@@ -8419,7 +8233,7 @@ Or a format, which is expanded including the following additional variables:
 .It Li "popup_pane_right" Ta "Right of the pane"
 .It Li "popup_pane_top" Ta "Top of the pane"
 .It Li "popup_status_line_y" Ta "Above or below the status line"
-.It Li "popup_width" Ta "Width of menu or popup"
+.It Li "popup_width" Ta "Width of the menu"
 .It Li "popup_window_status_line_x" Ta "At the window position in status line"
 .It Li "popup_window_status_line_y" Ta "At the status line showing the window"
 .El
@@ -8451,7 +8265,7 @@ The following keys are available in menus:
 .El
 .Tg display
 .It Xo Ic display\-message
-.Op Fl aCIlNpv
+.Op Fl aCIjlNpv
 .Op Fl c Ar target\-client
 .Op Fl d Ar delay
 .Op Fl t Ar target\-pane
@@ -8491,6 +8305,12 @@ if
 .Fl t
 is given, otherwise the active pane.
 .Pp
+If
+.Fl j
+is given,
+.Ar message
+is parsed as JSON and printed.
+.Pp
 .Fl v
 prints verbose logging as the format is parsed and
 .Fl a
@@ -8499,116 +8319,6 @@ lists the format variables and their values.
 .Fl I
 forwards any input read from stdin to the empty pane given by
 .Ar target\-pane .
-.Tg popup
-.It Xo Ic display\-popup
-.Op Fl BCEkN
-.Op Fl b Ar border\-lines
-.Op Fl c Ar target\-client
-.Op Fl d Ar start\-directory
-.Op Fl e Ar environment
-.Op Fl h Ar height
-.Op Fl s Ar style
-.Op Fl S Ar border\-style
-.Op Fl t Ar target\-pane
-.Op Fl T Ar title
-.Op Fl w Ar width
-.Op Fl x Ar position
-.Op Fl y Ar position
-.Op Ar shell\-command Op Ar argument ...
-.Xc
-.D1 Pq alias: Ic popup
-Display a popup running
-.Ar shell\-command
-(or
-.Ar default\-command
-when omitted) on
-.Ar target\-client .
-A popup is a rectangular box drawn over the top of any panes.
-If the command is run inside an existing popup, that popup is modified.
-Only the
-.Fl b ,
-.Fl B ,
-.Fl C ,
-.Fl E ,
-.Fl EE ,
-.Fl K ,
-.Fl N ,
-.Fl s ,
-and
-.Fl S
-options are accepted in this case;
-all others are ignored.
-.Pp
-.Fl E
-closes the popup automatically when
-.Ar shell\-command
-exits.
-Two
-.Fl E
-closes the popup only if
-.Ar shell\-command
-exited with success.
-.Fl k
-allows any key to dismiss the popup instead of only
-.Ql Escape
-or
-.Ql C\-c .
-.Pp
-.Fl x
-and
-.Fl y
-give the position of the popup, they have the same meaning as for the
-.Ic display\-menu
-command.
-.Fl w
-and
-.Fl h
-give the width and height - both may be a percentage (followed by
-.Ql % ) .
-If omitted, half of the terminal size is used.
-.Pp
-.Fl B
-does not surround the popup by a border.
-.Pp
-.Fl b
-sets the type of characters used for drawing popup borders.
-When
-.Fl B
-is specified, the
-.Fl b
-option is ignored.
-See
-.Ic popup\-border\-lines
-for possible values for
-.Ar border\-lines .
-.Pp
-.Fl s
-sets the style for the popup and
-.Fl S
-sets the style for the popup border (see
-.Sx STYLES ) .
-.Pp
-.Fl e
-takes the form
-.Ql VARIABLE=value
-and sets an environment variable for the popup; it may be specified multiple
-times.
-.Pp
-.Fl T
-is a format for the popup title (see
-.Sx FORMATS ) .
-.Pp
-The
-.Fl C
-flag closes any popup on the client.
-.Pp
-.Fl N
-disables any previously specified
-.Fl E ,
-.Fl EE ,
-or
-.Fl k
-option.
 .Tg showphist
 .It Xo Ic show\-prompt\-history
 .Op Fl T Ar prompt\-type
@@ -9236,7 +8946,7 @@ and flags (currently not used).
 For example:
 .Bd -literal -offset indent
 %begin 1363006971 2 1
-0: ksh* (1 panes) [80x24] [layout b25f,80x24,0,0,2] @2 (active)
+0: ksh* (1 panes) [80x24] [layout {"V":2,"L":{"t":"p","w":80,"h":24,"x":0,"y":0,"a":true,"i":0,"I":"%2"}}] @2 (active)
 %end 1363006971 2 1
 .Ed
 .Pp
@@ -9297,10 +9007,15 @@ The layout of a window with ID
 .Ar window\-id
 changed.
 The new layout is
-.Ar window\-layout .
-The window's visible layout is
-.Ar window\-visible\-layout
-and the window flags are
+.Ar window\-layout
+and the window's visible layout is
+.Ar window\-visible\-layout .
+If the
+.Ar new\-layouts
+flag is set, both layout fields use the new format string; see
+.Ic refresh\-client
+.Fl f .
+The window flags are
 .Ar window\-flags .
 .It Ic %message Ar message
 A message sent with the

tmux.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1433 2026/09/01 12:49:49 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1439 2026/09/10 11:02:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -60,6 +60,7 @@ struct input_ctx;
 struct input_request;
 struct input_requests;
 struct job;
+struct json_node;
 struct menu_data;
 struct mode_tree_data;
 struct mouse_event;
@@ -815,7 +816,6 @@ struct colour_palette {
 #define GRID_LINE_START_OUTPUT 0x40
 #define GRID_LINE_END_OUTPUT 0x80
 #define GRID_LINE_HYPERLINK 0x100
-#define GRID_LINE_END_OUTPUT_STATUS 0x200
 
 /* All OSC 133 flags. */
 #define GRID_LINE_OSC133_FLAGS \
@@ -823,8 +823,7 @@ struct colour_palette {
 	 GRID_LINE_SECOND_PROMPT| \
 	 GRID_LINE_START_COMMAND| \
 	 GRID_LINE_START_OUTPUT| \
-	 GRID_LINE_END_OUTPUT| \
-	 GRID_LINE_END_OUTPUT_STATUS)
+	 GRID_LINE_END_OUTPUT)
 
 /* Grid string flags. */
 #define GRID_STRING_WITH_SEQUENCES 0x1
@@ -1340,6 +1339,7 @@ struct window_pane {
 #define PANE_CLOSEONCLICK 0x80000
 #define PANE_CAPTUREALLKEYS 0x100000
 #define PANE_FLOATOVERZOOM 0x200000
+#define PANE_CLOSEONCANCEL 0x400000
 
 	bitstr_t	*sync_dirty;
 	u_int		 sync_dirty_size;
@@ -1796,7 +1796,6 @@ struct tty {
 	size_t		 discarded;
 
 	struct termios	 tio;
-	struct visible_ranges r;
 
 	struct grid_cell cell;
 	struct grid_cell last_cell;
@@ -1858,7 +1857,6 @@ struct tty_ctx {
 #define TTY_CTX_INVISIBLE_PANES 0x2
 #define TTY_CTX_WINDOW_BIGGER 0x4
 #define TTY_CTX_SYNC 0x8
-#define TTY_CTX_OVERLAY_SYNC 0x10
 #define TTY_CTX_CELL_INVALIDATE 0x20
 #define TTY_CTX_PANE_OBSCURED 0x40
 
@@ -2193,16 +2191,6 @@ struct prompt_draw_data {
 	u_int			 prompt_line;
 };
 
-/* Overlay callbacks */
-typedef struct visible_ranges *(*overlay_check_cb)(struct client *, void *,
-    u_int, u_int, u_int);
-typedef struct screen *(*overlay_mode_cb)(struct client *, void *, u_int *,
-    u_int *);
-typedef void (*overlay_draw_cb)(struct client *, void *);
-typedef int (*overlay_key_cb)(struct client *, void *, struct key_event *);
-typedef void (*overlay_free_cb)(struct client *, void *);
-typedef void (*overlay_resize_cb)(struct client *, void *);
-
 /* Client connection. */
 struct client {
 	const char		*name;
@@ -2288,7 +2276,7 @@ struct client {
 #define CLIENT_SIZECHANGED 0x400000
 #define CLIENT_STATUSOFF 0x800000
 #define CLIENT_REDRAWSTATUSALWAYS 0x1000000
-#define CLIENT_REDRAWOVERLAY 0x2000000
+/* 0x2000000 unused */
 #define CLIENT_CONTROL_NOOUTPUT 0x4000000
 #define CLIENT_DEFAULTSOCKET 0x8000000
 #define CLIENT_STARTSERVER 0x10000000
@@ -2298,17 +2286,17 @@ struct client {
 #define CLIENT_CONTROL_PAUSEAFTER 0x100000000ULL
 #define CLIENT_CONTROL_WAITEXIT 0x200000000ULL
 #define CLIENT_WINDOWSIZECHANGED 0x400000000ULL
-/* 0x800000000ULL unused */
+#define CLIENT_CONTROL_NEWLAYOUTS 0x800000000ULL
 #define CLIENT_BRACKETPASTING 0x1000000000ULL
 #define CLIENT_ASSUMEPASTING 0x2000000000ULL
 #define CLIENT_WRITE_ACK 0x4000000000ULL
 #define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL
+#define CLIENT_CONTROL_DISCARD 0x1000000000ULL
 #define CLIENT_ALLREDRAWFLAGS		\
 	(CLIENT_REDRAWWINDOW|		\
 	 CLIENT_REDRAWSTATUS|		\
 	 CLIENT_REDRAWSTATUSALWAYS|	\
 	 CLIENT_REDRAWBORDERS|		\
-	 CLIENT_REDRAWOVERLAY|		\
 	 CLIENT_REDRAWMENU)
 #define CLIENT_UNATTACHEDFLAGS	\
 	(CLIENT_DEAD|		\
@@ -2354,15 +2342,6 @@ struct client {
 	u_int			 pan_ox;
 	u_int			 pan_oy;
 
-	overlay_check_cb	 overlay_check;
-	overlay_mode_cb		 overlay_mode;
-	overlay_draw_cb		 overlay_draw;
-	overlay_key_cb		 overlay_key;
-	overlay_free_cb		 overlay_free;
-	overlay_resize_cb	 overlay_resize;
-	void			*overlay_data;
-	struct event		 overlay_timer;
-
 	struct client_files	 files;
 	u_int			 source_file_depth;
 
@@ -2964,8 +2943,6 @@ void	tty_default_attributes(struct tty *, u_int,
 void	tty_update_mode(struct tty *, int, struct screen *);
 const struct grid_cell *tty_check_codeset(struct tty *,
 	    const struct grid_cell *);
-struct visible_ranges *tty_check_overlay_range(struct tty *, u_int, u_int,
-	    u_int);
 void	tty_sync_start(struct tty *);
 void	tty_sync_end(struct tty *);
 int	tty_open(struct tty *, char **);
@@ -3316,14 +3293,8 @@ int	 server_create_socket(uint64_t, char **);
 
 /* server-client.c */
 u_int	 server_client_how_many(void);
-void	 server_client_set_overlay(struct client *, u_int, overlay_check_cb,
-	     overlay_mode_cb, overlay_draw_cb, overlay_key_cb,
-	     overlay_free_cb, overlay_resize_cb, void *);
-void	 server_client_clear_overlay(struct client *);
 void	 server_client_ensure_ranges(struct visible_ranges *, u_int);
 int	 server_client_ranges_is_empty(struct visible_ranges *);
-void	 server_client_overlay_range(u_int, u_int, u_int, u_int, u_int, u_int,
-	     u_int, struct visible_ranges *);
 void	 server_client_set_key_table(struct client *, const char *);
 const char *server_client_get_key_table(struct client *);
 int	 server_client_check_nested(struct client *);
@@ -3432,7 +3403,7 @@ void	 recalculate_sizes_now(int);
 /* input.c */
 #define INPUT_BUF_DEFAULT_SIZE 1048576
 struct input_ctx *input_init(struct window_pane *, struct bufferevent *,
-	     struct colour_palette *, struct client *);
+	     struct colour_palette *);
 void	 input_free(struct input_ctx *);
 void	 input_reset(struct input_ctx *, int);
 struct evbuffer *input_pending(struct input_ctx *);
@@ -3751,6 +3722,7 @@ struct window_pane *window_pane_previous_by_number(struct window *,
 			struct window_pane *, u_int);
 int		 window_pane_index(struct window_pane *, u_int *);
 int		 window_pane_zindex(struct window_pane *, u_int *);
+int		 window_pane_last_index(struct window_pane *, u_int *);
 u_int		 window_count_panes(struct window *, int);
 void		 window_destroy_panes(struct window *);
 struct window_pane *window_pane_find_by_id_str(const char *);
@@ -3850,7 +3822,7 @@ struct visible_ranges *window_visible_ranges(struct window_pane *, int, int,
 		     u_int, struct visible_ranges *);
 
 /* layout.c */
-u_int		 layout_count_cells(struct layout_cell *);
+u_int		 layout_count_cells(struct layout_cell *, int);
 struct layout_cell *layout_create_cell(struct layout_cell *);
 void		 layout_free_cell(struct layout_cell *, int);
 void		 layout_print_cell(struct layout_cell *, const char *, u_int);
@@ -3862,8 +3834,8 @@ struct layout_cell *layout_search_by_border(struct layout_cell *, u_int, u_int);
 void		 layout_set_size(struct layout_cell *, u_int, u_int, int, int);
 void		 layout_make_leaf(struct layout_cell *, struct window_pane *);
 void		 layout_make_node(struct layout_cell *, enum layout_type);
-void		 layout_fix_zindexes(struct window *, struct layout_cell *);
 int		 layout_cell_is_tiled(struct layout_cell *);
+int		 layout_cell_has_tiled_child(struct layout_cell *);
 int		 layout_add_horizontal_border(struct layout_cell *,
 		     struct layout_cell *, int);
 void		 layout_fix_offsets(struct window *);
@@ -3914,7 +3886,8 @@ int		 layout_remove_tile(struct window *, struct layout_cell *);
 int		 layout_insert_tile(struct window *, struct layout_cell *);
 
 /* layout-custom.c */
-char		*layout_dump(struct window *, struct layout_cell *);
+#define LAYOUT_CUSTOM_OLD_FORMAT 0x1
+char		*layout_dump(struct window *, struct layout_cell *, int);
 int		 layout_parse(struct window *, const char *, char **);
 
 /* layout-set.c */
@@ -4185,20 +4158,6 @@ void		 menu_get_cursor(struct menu_data *, u_int *, u_int *);
 void		 menu_resize(struct menu_data *, struct window *);
 int		 menu_key(struct client *, struct menu_data *, struct key_event *);
 
-/* popup.c */
-#define POPUP_CLOSEEXIT 0x1
-#define POPUP_CLOSEEXITZERO 0x2
-#define POPUP_CLOSEANYKEY 0x4
-typedef void (*popup_close_cb)(int, void *);
-int		 popup_display(int, enum box_lines, struct cmdq_item *, u_int,
-                    u_int, u_int, u_int, struct environ *, const char *, int,
-                    char **, const char *, const char *, struct client *,
-                    struct session *, const char *, const char *,
-                    popup_close_cb, void *);
-int		 popup_present(struct client *);
-int		 popup_modify(struct client *, const char *, const char *,
-		    const char *, enum box_lines, int);
-
 /* style.c */
 int		 style_parse(struct style *,const struct grid_cell *,
 		     const char *);
@@ -4223,7 +4182,7 @@ struct winlink	*spawn_window(struct spawn_context *, char **);
 struct window_pane *spawn_pane(struct spawn_context *, char **);
 typedef void (*spawn_finish_edit_cb)(char *, size_t, void *);
 struct spawn_editor_state *spawn_editor(struct client *, const char *, size_t,
-		     const char *, spawn_finish_edit_cb, void *);
+		     spawn_finish_edit_cb, void *);
 void		 spawn_cancel_editor(struct spawn_editor_state *);
 pid_t		 spawn_get_editor_pid(struct spawn_editor_state *);
 void		 spawn_editor_finish(struct window_pane *);
@@ -4274,4 +4233,29 @@ struct hyperlinks	*hyperlinks_copy(struct hyperlinks *);
 void			 hyperlinks_reset(struct hyperlinks *);
 void			 hyperlinks_free(struct hyperlinks *);
 
+/* json.c */
+struct json_node	*json_parse(const char *, char **);
+void			 json_destroy_node(struct json_node *);
+char			*json_to_string(struct json_node *);
+struct json_node	*json_find(struct json_node *, const char *);
+struct json_node	*json_array_first(struct json_node *);
+struct json_node	*json_array_next(struct json_node *);
+int			 json_get_string(struct json_node *, const char **);
+int			 json_get_number(struct json_node *, int64_t *);
+int			 json_get_boolean(struct json_node *, int *);
+int			 json_get_object(struct json_node *,
+			     struct json_node **);
+int			 json_get_array(struct json_node *,
+			     struct json_node **);
+int			 json_find_string(struct json_node *, const char *,
+			     const char **, char **);
+int			 json_find_number(struct json_node *, const char *,
+			     int64_t *, char **);
+int			 json_find_boolean(struct json_node *, const char *,
+			     int *, char **);
+int			 json_find_object(struct json_node *, const char *,
+			     struct json_node **, char **);
+int			 json_find_array(struct json_node *, const char *,
+			     struct json_node **, char **);
+
 #endif /* TMUX_H */

tty-draw.c

@@ -52,8 +52,7 @@ tty_draw_line_clear(struct tty *tty, u_int px, u_int py, u_int nx,
 		return;
 
 	/* If genuine BCE is available, can try escape sequences. */
-	if (tty->client->overlay_check == NULL &&
-	    !wrapped &&
+	if (!wrapped &&
 	    nx >= 10 &&
 	    !tty_fake_bce(tty, defaults, bg)) {
 		/* Off the end of the line, use EL if available. */

tty.c

@@ -66,7 +66,6 @@ static void	tty_redraw_region(struct tty *, const struct tty_ctx *);
 static void	tty_emulate_repeat(struct tty *, enum tty_code_code,
 		    enum tty_code_code, u_int);
 static void	tty_draw_pane(struct tty *, const struct tty_ctx *, u_int);
-static int	tty_check_overlay(struct tty *, u_int, u_int);
 
 #ifdef ENABLE_SIXEL
 static void	tty_write_one(void (*)(struct tty *, const struct tty_ctx *),
@@ -545,8 +544,6 @@ void
 tty_free(struct tty *tty)
 {
 	tty_close(tty);
-
-	free(tty->r.ranges);
 }
 
 void
@@ -1201,9 +1198,6 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py,
     u_int px, u_int nx, u_int bg)
 {
 	struct client		*c = tty->client;
-	struct visible_ranges	*r;
-	struct visible_range	*rr;
-	u_int			 i;
 
 	log_debug("%s: %s, %u at %u,%u", __func__, c->name, nx, px, py);
 
@@ -1212,7 +1206,7 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py,
 		return;
 
 	/* If genuine BCE is available, can try escape sequences. */
-	if (c->overlay_check == NULL && !tty_fake_bce(tty, defaults, bg)) {
+	if (!tty_fake_bce(tty, defaults, bg)) {
 		/* Off the end of the line, use EL if available. */
 		if (px + nx >= tty->sx && tty_term_has(tty->term, TTYC_EL)) {
 			tty_cursor(tty, px, py);
@@ -1235,18 +1229,9 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py,
 		}
 	}
 
-	/*
-	 * Couldn't use an escape sequence, use spaces. Clear only the visible
-	 * bit if there is an overlay.
-	 */
-	r = tty_check_overlay_range(tty, px, py, nx);
-	for (i = 0; i < r->used; i++) {
-		rr = &r->ranges[i];
-		if (rr->nx != 0) {
-			tty_cursor(tty, rr->px, py);
-			tty_repeat_space(tty, rr->nx);
-		}
-	}
+	/* Couldn't use an escape sequence, use spaces. */
+	tty_cursor(tty, px, py);
+	tty_repeat_space(tty, nx);
 }
 
 /* Clear a line, adjusting to visible part of pane. */
@@ -1255,22 +1240,12 @@ tty_clear_pane_line(struct tty *tty, const struct tty_ctx *ctx, u_int py,
     u_int px, u_int nx, u_int bg)
 {
 	struct client		*c = tty->client;
-	struct visible_ranges	*r;
-	struct visible_range	*ri;
-	u_int			 i, l, x, rx, ry;
+	u_int			 l, x, rx, ry;
 
 	log_debug("%s: %s, %u at %u,%u", __func__, c->name, nx, px, py);
 
-	if (tty_clamp_line(tty, ctx, px, py, nx, &l, &x, &rx, &ry)) {
-		r = tty_check_overlay_range(tty, x, ry, rx);
-		for (i = 0; i < r->used; i++) {
-			ri = &r->ranges[i];
-			if (ri->nx == 0)
-				continue;
-			tty_clear_line(tty, &ctx->defaults, ry, ri->px, ri->nx,
-			    bg);
-		}
-	}
+	if (tty_clamp_line(tty, ctx, px, py, nx, &l, &x, &rx, &ry))
+		tty_clear_line(tty, &ctx->defaults, ry, x, rx, bg);
 }
 
 /* Clamp area position to visible part of pane. */
@@ -1351,11 +1326,8 @@ tty_clear_area(struct tty *tty, const struct tty_ctx *ctx, u_int py,
 	if (nx == 0 || ny == 0)
 		return;
 
-	/*
-	 * If there is an overlay or BCE is not available, cannot clear as a
-	 * region.
-	 */
-	if (c->overlay_check == NULL && !tty_fake_bce(tty, defaults, bg)) {
+	/* If BCE is available, can try to clear as a region. */
+	if (!tty_fake_bce(tty, defaults, bg)) {
 		/* Use ED if clearing off the bottom of the terminal. */
 		if (px == 0 &&
 		    px + nx >= tty->sx &&
@@ -1427,53 +1399,28 @@ static void
 tty_draw_pane(struct tty *tty, const struct tty_ctx *ctx, u_int py)
 {
 	struct screen		*s = ctx->s;
-	u_int			 nx = ctx->sx, i, x, rx, ry, j;
-	struct visible_ranges	*r;
-	struct visible_range	*rr;
+	u_int			 nx = ctx->sx, i, x, rx, ry;
 
 	log_debug("%s: %s %u", __func__, tty->client->name, py);
 
 	if (~ctx->flags & TTY_CTX_WINDOW_BIGGER) {
-		r = tty_check_overlay_range(tty, ctx->xoff, ctx->yoff + py, nx);
-		for (j = 0; j < r->used; j++) {
-			rr = &r->ranges[j];
-			if (rr->nx == 0)
-				continue;
-			tty_draw_line(tty, s, rr->px - ctx->xoff, py, rr->nx,
-			    rr->px, ctx->yoff + py, &ctx->style_ctx);
-		}
+		tty_draw_line(tty, s, 0, py, nx, ctx->xoff, ctx->yoff + py,
+		    &ctx->style_ctx);
 		return;
 	}
-	if (tty_clamp_line(tty, ctx, 0, py, nx, &i, &x, &rx, &ry)) {
-		r = tty_check_overlay_range(tty, x, ry, rx);
-		for (j = 0; j < r->used; j++) {
-			rr = &r->ranges[j];
-			if (rr->nx == 0)
-				continue;
-			tty_draw_line(tty, s, i + rr->px - x, py, rr->nx,
-			    rr->px, ry, &ctx->style_ctx);
-		}
-	}
+	if (tty_clamp_line(tty, ctx, 0, py, nx, &i, &x, &rx, &ry))
+		tty_draw_line(tty, s, i, py, rx, x, ry, &ctx->style_ctx);
 }
 
 void
 tty_cmd_redrawline(struct tty *tty, const struct tty_ctx *ctx)
 {
-	u_int			 i, x, rx, ry, j;
-	struct visible_ranges	*r;
-	struct visible_range	*rr;
+	u_int			 i, x, rx, ry;
 
 	if (tty_clamp_line(tty, ctx, ctx->ocx, ctx->ocy, ctx->n,
-	    &i, &x, &rx, &ry)) {
-		r = tty_check_overlay_range(tty, x, ry, rx);
-		for (j = 0; j < r->used; j++) {
-			rr = &r->ranges[j];
-			if (rr->nx == 0)
-				continue;
-			tty_draw_line(tty, ctx->s, ctx->ocx + i + rr->px - x,
-			    ctx->ocy, rr->nx, rr->px, ry, &ctx->style_ctx);
-		}
-	}
+	    &i, &x, &rx, &ry))
+		tty_draw_line(tty, ctx->s, ctx->ocx + i, ctx->ocy, rx, x, ry,
+		    &ctx->style_ctx);
 }
 
 /* Check if character needs to be mapped for codeset. */
@@ -1510,36 +1457,6 @@ tty_check_codeset(struct tty *tty, const struct grid_cell *gc)
 	return (&new);
 }
 
-/* Check if a single character is covered by the overlay. */
-static int
-tty_check_overlay(struct tty *tty, u_int px, u_int py)
-{
-	struct visible_ranges	*r;
-
-	/*
-	 * With a single character, if there is anything visible (that is, the
-	 * range is not empty), it must be that character.
-	 */
-	r = tty_check_overlay_range(tty, px, py, 1);
-	return (!server_client_ranges_is_empty(r));
-}
-
-/* Return parts of the input range which are visible. */
-struct visible_ranges *
-tty_check_overlay_range(struct tty *tty, u_int px, u_int py, u_int nx)
-{
-	struct client	*c = tty->client;
-
-	if (c->overlay_check == NULL) {
-		server_client_ensure_ranges(&tty->r, 1);
-		tty->r.ranges[0].px = px;
-		tty->r.ranges[0].nx = nx;
-		tty->r.used = 1;
-		return (&tty->r);
-	}
-	return (c->overlay_check(c, c->overlay_data, px, py, nx));
-}
-
 #ifdef ENABLE_SIXEL
 /* Update context for client. */
 static int
@@ -1683,14 +1600,11 @@ tty_write_one(void (*cmdfn)(struct tty *, const struct tty_ctx *),
 void
 tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
 	    !tty_full_width(tty, ctx) ||
 	    tty_fake_bce(tty, &ctx->defaults, ctx->bg) ||
 	    (!tty_term_has(tty->term, TTYC_ICH) &&
-	    !tty_term_has(tty->term, TTYC_ICH1)) ||
-	    c->overlay_check != NULL) {
+	    !tty_term_has(tty->term, TTYC_ICH1))) {
 		tty_draw_pane(tty, ctx, ctx->ocy);
 		return;
 	}
@@ -1705,14 +1619,11 @@ tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
 	    !tty_full_width(tty, ctx) ||
 	    tty_fake_bce(tty, &ctx->defaults, ctx->bg) ||
 	    (!tty_term_has(tty->term, TTYC_DCH) &&
-	    !tty_term_has(tty->term, TTYC_DCH1)) ||
-	    c->overlay_check != NULL) {
+	    !tty_term_has(tty->term, TTYC_DCH1))) {
 		tty_draw_pane(tty, ctx, ctx->ocy);
 		return;
 	}
@@ -1735,16 +1646,13 @@ tty_cmd_clearcharacter(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
 	    !tty_full_width(tty, ctx) ||
 	    tty_fake_bce(tty, &ctx->defaults, ctx->bg) ||
 	    !tty_term_has(tty->term, TTYC_CSR) ||
 	    !tty_term_has(tty->term, TTYC_IL1) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1762,16 +1670,13 @@ tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_deleteline(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
 	    !tty_full_width(tty, ctx) ||
 	    tty_fake_bce(tty, &ctx->defaults, ctx->bg) ||
 	    !tty_term_has(tty->term, TTYC_CSR) ||
 	    !tty_term_has(tty->term, TTYC_DL1) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1815,8 +1720,6 @@ tty_cmd_clearstartofline(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if (ctx->ocy != ctx->orupper)
 		return;
 
@@ -1827,8 +1730,7 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
 	    (!tty_term_has(tty->term, TTYC_RI) &&
 	    !tty_term_has(tty->term, TTYC_RIN)) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1848,8 +1750,6 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
 	if (ctx->ocy != ctx->orlower)
 		return;
 
@@ -1858,8 +1758,7 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
 	    tty_fake_bce(tty, &ctx->defaults, 8) ||
 	    !tty_term_has(tty->term, TTYC_CSR) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1890,7 +1789,6 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client		*c = tty->client;
 	u_int			 i;
 
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
@@ -1898,8 +1796,7 @@ tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
 	    tty_fake_bce(tty, &ctx->defaults, 8) ||
 	    !tty_term_has(tty->term, TTYC_CSR) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1929,7 +1826,6 @@ void
 tty_cmd_scrolldown(struct tty *tty, const struct tty_ctx *ctx)
 {
 	u_int		 i;
-	struct client	*c = tty->client;
 
 	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
 	    (!tty_full_width(tty, ctx) && !tty_use_margin(tty)) ||
@@ -1938,8 +1834,7 @@ tty_cmd_scrolldown(struct tty *tty, const struct tty_ctx *ctx)
 	    (!tty_term_has(tty->term, TTYC_RI) &&
 	    !tty_term_has(tty->term, TTYC_RIN)) ||
 	    ctx->sx == 1 ||
-	    ctx->sy == 1 ||
-	    c->overlay_check != NULL) {
+	    ctx->sy == 1) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -2027,11 +1922,9 @@ tty_cmd_clearscreen(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_alignmenttest(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
 	u_int		 i, j;
 
-	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
-	    c->overlay_check != NULL) {
+	if (ctx->flags & TTY_CTX_WINDOW_BIGGER) {
 		ctx->redraw_cb(ctx);
 		return;
 	}
@@ -2051,29 +1944,9 @@ tty_cmd_alignmenttest(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
 {
-	const struct grid_cell	*gcp = ctx->cell;
-	struct screen		*s = ctx->s;
-	struct visible_ranges	*r;
-	u_int			 px, py, i, vis = 0;
-
-	px = ctx->xoff + ctx->ocx - ctx->wox;
-	py = ctx->yoff + ctx->ocy - ctx->woy;
 	if (!tty_is_visible(tty, ctx, ctx->ocx, ctx->ocy, 1, 1))
 		return;
 
-	if (gcp->data.width == 1 && !tty_check_overlay(tty, px, py))
-		return;
-	if (gcp->data.width > 1) { /* could be partially obscured */
-		r = tty_check_overlay_range(tty, px, py, gcp->data.width);
-		for (i = 0; i < r->used; i++)
-			vis += r->ranges[i].nx;
-		if (vis < gcp->data.width) {
-			tty_draw_line(tty, s, s->cx, s->cy, gcp->data.width,
-			    px, py, &ctx->style_ctx);
-			return;
-		}
-	}
-
 	if (ctx->xoff + ctx->ocx - ctx->wox > tty->sx - 1 &&
 	    ctx->ocy == ctx->orlower &&
 	    tty_full_width(tty, ctx))
@@ -2093,9 +1966,6 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_cells(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct visible_ranges	*r;
-	struct visible_range	*ri;
-	u_int			 i, px, py, cx;
 	const char		*cp = ctx->data.data;
 	size_t			 n = ctx->data.size;
 
@@ -2121,20 +1991,7 @@ tty_cmd_cells(struct tty *tty, const struct tty_ctx *ctx)
 	tty_margin_off(tty);
 	tty_cursor_pane_unless_wrap(tty, ctx, ctx->ocx, ctx->ocy);
 	tty_attributes(tty, ctx->cell, &ctx->style_ctx);
-
-	/* Get tty position from pane position for overlay check. */
-	px = ctx->xoff + ctx->ocx - ctx->wox;
-	py = ctx->yoff + ctx->ocy - ctx->woy;
-
-	r = tty_check_overlay_range(tty, px, py, n);
-	for (i = 0; i < r->used; i++) {
-		ri = &r->ranges[i];
-		if (ri->nx != 0) {
-			cx = ri->px - ctx->xoff + ctx->wox;
-			tty_cursor_pane_unless_wrap(tty, ctx, cx, ctx->ocy);
-			tty_putn(tty, cp + ri->px - px, ri->nx, ri->nx);
-		}
-	}
+	tty_putn(tty, cp, n, n);
 }
 
 void
@@ -2228,23 +2085,8 @@ tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_syncstart(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct client	*c = tty->client;
-
-	if ((ctx->flags & TTY_CTX_OVERLAY_SYNC) &&
-	    (ctx->flags & TTY_CTX_SYNC)) {
-		/*
-		 * This is an overlay and a command that moves the cursor so
-		 * start synchronized updates.
-		 */
+	if (ctx->flags & TTY_CTX_SYNC)
 		tty_sync_start(tty);
-	} else if (~ctx->flags & TTY_CTX_OVERLAY_SYNC) {
-		/*
-		 * This is a pane. If there is an overlay, always start;
-		 * otherwise, only if requested.
-		 */
-		if ((ctx->flags & TTY_CTX_SYNC) || c->overlay_draw != NULL)
-			tty_sync_start(tty);
-	}
 }
 
 void
@@ -2263,10 +2105,6 @@ tty_cell(struct tty *tty, const struct grid_cell *gc,
 	if (gc->flags & GRID_FLAG_PADDING)
 		return;
 
-	/* Check if character is covered by overlay or floating pane. */
-	if (!tty_check_overlay(tty, tty->cx, tty->cy))
-		return;
-
 	/* Check the output codeset and apply attributes. */
 	gcp = tty_check_codeset(tty, gc);
 	tty_attributes(tty, gcp, style_ctx);

window-buffer.c

@@ -606,8 +606,7 @@ window_buffer_start_edit(struct window_buffer_modedata *data,
 	ed->name = xstrdup(paste_buffer_name(pb));
 	ed->pb = pb;
 
-	ed->editor = spawn_editor(c, buf, len, NULL,
-	    window_buffer_edit_close_cb, ed);
+	ed->editor = spawn_editor(c, buf, len, window_buffer_edit_close_cb, ed);
 	if (ed->editor == NULL)
 		window_buffer_finish_edit(ed);
 	else {

window-customize.c

@@ -2104,8 +2104,8 @@ window_customize_start_edit(struct window_customize_modedata *data,
 		buf = "\n";
 		len = 1;
 	}
-	ed->editor = spawn_editor(c, buf, len, NULL,
-	    window_customize_edit_close_cb, ed);
+	ed->editor = spawn_editor(c, buf, len, window_customize_edit_close_cb,
+	    ed);
 	free(value);
 	if (ed->editor == NULL)
 		window_customize_finish_edit(ed);

window.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.373 2026/08/24 21:17:19 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.374 2026/09/08 08:37:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -683,7 +683,6 @@ window_pane_update_focus(struct window_pane *wp)
 				    c->session->attached != 0 &&
 				    (c->flags & CLIENT_FOCUSED) &&
 				    c->session->curw->window == wp->window &&
-				    c->overlay_draw == NULL &&
 				    wp->window->menu == NULL) {
 					focused = 1;
 					break;
@@ -1255,6 +1254,21 @@ window_pane_zindex(struct window_pane *wp, u_int *i)
 	return (-1);
 }
 
+int
+window_pane_last_index(struct window_pane *wp, u_int *i)
+{
+	struct window		*w = wp->window;
+	struct window_pane	*wq;
+
+	*i = 0;
+	TAILQ_FOREACH(wq, &w->last_panes, sentry) {
+		if (wq == wp)
+			return (0);
+		(*i)++;
+	}
+	return (-1);
+}
+
 u_int
 window_count_panes(struct window *w, int with_floating)
 {
@@ -1610,7 +1624,7 @@ window_pane_set_event(struct window_pane *wp)
 	    NULL, window_pane_error_callback, wp);
 	if (wp->event == NULL)
 		fatalx("out of memory");
-	wp->ictx = input_init(wp, wp->event, &wp->palette, NULL);
+	wp->ictx = input_init(wp, wp->event, &wp->palette);
 
 	bufferevent_enable(wp->event, EV_READ|EV_WRITE);
 }