Fix select-output losing a prior non-empty output to a later empty one

The output-commands.sh ":empty" test packed two full OSC133 C/D
cycles onto a single grid row with no newlines around them, which
does not reflect how real shell integrations behave (Enter always
echoes a newline). Give it the newline a real terminal would emit so
"echo" and the following no-output "true" land on separate rows,
matching realistic OSC133 usage (same idea as the earlier
scroll-on-clear fix for the ":clear" case).

With that in place, window_copy_find_previous_output_range still
failed: once cursor sits at/after a command with genuinely empty
output (e.g. "true"), the loop's cursor-row candidate unconditionally
overwrote an already-found earlier non-empty output ("echo" -> "one")
with the later, empty one. Keep the previously-found non-empty match
instead of downgrading it, so select-output/copy-output correctly
reach back to the last output that actually had content.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.github/workflows/regress.yml

@@ -27,10 +27,10 @@ jobs:
             runner: ubuntu-24.04
             make: make
             configure: --enable-utf8proc --enable-asan
-          - name: ubuntu-24.04-arm64
-            runner: ubuntu-24.04-arm
-            make: make
-            configure: --enable-utf8proc --enable-asan
+          #- name: ubuntu-24.04-arm64
+          #  runner: ubuntu-24.04-arm
+          #  make: make
+          #  configure: --enable-utf8proc --enable-asan
           - name: macos-26-arm64
             runner: macos-26
             make: gmake
@@ -72,14 +72,14 @@ jobs:
 
       - name: build
         run: |
-          sh autogen.sh
+         sh autogen.sh
           ./configure ${{ matrix.configure }}
           ${{ matrix.make }} -j"$(getconf _NPROCESSORS_ONLN)"
 
       - name: test
         run: |
           cd regress
-          ${{ matrix.make }} -j"$(getconf _NPROCESSORS_ONLN)"
+          ${{ matrix.make }}
 
       - name: logs
         if: failure()

Makefile.am

@@ -188,6 +188,7 @@ dist_tmux_SOURCES = \
 	options-table.c \
 	options.c \
 	paste.c \
+	popup.c \
 	proc.c \
 	prompt-history.c \
 	prompt.c \

SYNCING.md

@@ -35,7 +35,7 @@ The usual local layout is:
 ```sh
 cd /some/where/useful
 git clone https://github.com/tmux/tmux.git tmux-portable
-git clone https://github.com/tmux/tmux-openbsd-cutover.git tmux-openbsd-cutover
+git clone https://github.com/ThomasAdam/tmux-obsd.git tmux-openbsd-cutover
 ```
 
 The exact directory names do not matter, but the examples below use:
@@ -56,19 +56,18 @@ The cutover repository has three important branches:
 
 # Adding the OpenBSD remote to portable
 
-In the portable repository, add the published cutover repository as a remote.
-This works regardless of which branch is checked out in a local cutover clone:
+In the portable repository, add the cutover repository as a remote:
 
 ```sh
 cd /path/to/tmux-portable
-git remote add tmux-openbsd https://github.com/tmux/tmux-openbsd-cutover.git
+git remote add tmux-openbsd /path/to/tmux-openbsd-cutover
 git config remote.tmux-openbsd.tagOpt --no-tags
 ```
 
 If the remote already exists, update it instead:
 
 ```sh
-git remote set-url tmux-openbsd https://github.com/tmux/tmux-openbsd-cutover.git
+git remote set-url tmux-openbsd /path/to/tmux-openbsd-cutover
 git config remote.tmux-openbsd.tagOpt --no-tags
 ```
 
@@ -78,32 +77,6 @@ Fetch the cutover master branch explicitly:
 git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
 ```
 
-To merge unpublished changes from a local cutover clone instead, first ensure
-it has an up-to-date local `master` branch. A normal clone may check out
-`automation` and have only `origin/master`; fetching `master` from that clone
-will then fail with `couldn't find remote ref master`.
-
-With a clean cutover working tree:
-
-```sh
-cd /path/to/tmux-openbsd-cutover
-git fetch --no-tags origin
-git switch master
-git merge --ff-only origin/master
-```
-
-`git switch master` creates a tracking branch from `origin/master` if there is
-no local `master` yet. If the fast-forward fails, reconcile the local cutover
-changes before continuing; do not reset them away.
-
-Then, in portable, point the remote at that clone and fetch its local `master`:
-
-```sh
-cd /path/to/tmux-portable
-git remote set-url tmux-openbsd /path/to/tmux-openbsd-cutover
-git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
-```
-
 # Automated syncing
 
 The normal sync is performed by the GitHub Actions workflow in the
@@ -126,9 +99,7 @@ OpenBSD changes.
 If the workflow fails while merging into portable, do the merge locally and
 push the result.
 
-Start with a clean working tree and an up-to-date portable master. If a merge
-is already in progress, skip to resolving conflicts, or abort it before
-starting again:
+Start from an up-to-date portable master:
 
 ```sh
 cd /path/to/tmux-portable
@@ -137,15 +108,10 @@ git checkout master
 git pull --ff-only origin master
 ```
 
-Fetch the published cutover branch. Update an existing remote as well, since
-it may point at a local clone without a `master` branch or with a stale one:
+Fetch the cutover branch:
 
 ```sh
-if git remote get-url tmux-openbsd >/dev/null 2>&1; then
-    git remote set-url tmux-openbsd https://github.com/tmux/tmux-openbsd-cutover.git
-else
-    git remote add tmux-openbsd https://github.com/tmux/tmux-openbsd-cutover.git
-fi
+git remote add tmux-openbsd /path/to/tmux-openbsd-cutover 2>/dev/null || true
 git config remote.tmux-openbsd.tagOpt --no-tags
 git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
 ```
@@ -156,22 +122,7 @@ Merge it:
 git merge --no-ff --log refs/remotes/tmux-openbsd/master
 ```
 
-If merging a local cutover branch instead, use the local-clone preparation
-and fetch commands above in place of this fetch block.
-
-When the merge reports conflicts, it leaves the merge in progress. List the
-unresolved files, edit the conflict markers to combine the required portable
-and OpenBSD changes, then stage each resolved file:
-
-```sh
-git diff --name-only --diff-filter=U
-git diff -- path/to/file
-git add path/to/file
-```
-
-For files that should come entirely from one side, decide whether portable or
-OpenBSD owns the file before using the commands below. They replace the whole
-file, including changes outside the conflicting hunks.
+Resolve conflicts by deciding whether portable or OpenBSD owns the file.
 
 Useful commands:
 
@@ -189,25 +140,11 @@ git add path/to/file
 
 This takes the OpenBSD/cutover version of a conflicted file.
 
-For a modify/delete conflict, the side that deleted the file has no version
-to check out. For example, portable generates `Makefile` using autotools and
-does not track OpenBSD's `Makefile`. If Git reports that `Makefile` was deleted
-in HEAD and modified in cutover, keep the portable deletion with:
-
-```sh
-git rm -- Makefile
-```
-
-This removes the OpenBSD file left by the merge; regenerate the portable
-`Makefile` with your usual configure command before building. Use this only
-for the unmerged OpenBSD file, not an existing generated build file.
-
 Before committing, inspect the result:
 
 ```sh
 git status
 git diff --check
-git diff --cached --check
 git diff --cached --stat
 ```
 

cmd-copy-mode.c

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

cmd-display-menu.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-menu.c,v 1.55 2026/09/21 12:14:32 nicm Exp $ */
+/* $OpenBSD: cmd-display-menu.c,v 1.53 2026/08/31 07:46:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -54,8 +54,8 @@ const struct cmd_entry cmd_display_popup_entry = {
 	.name = "display-popup",
 	.alias = "popup",
 
-	.args = { "Bb:Cc:d:e:Eh:ks:S:t:T:w:x:y:", 0, -1, NULL },
-	.usage = "[-BCEk] [-b border-lines] [-c target-client] "
+	.args = { "Bb:Cc:d:e:Eh:kNs:S:t:T:w:x:y:", 0, -1, NULL },
+	.usage = "[-BCEkN] [-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,6 +91,203 @@ 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)
@@ -285,8 +482,8 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	enum box_lines		 lines = BOX_LINES_DEFAULT;
 	char			*title, *cause = NULL;
 	int			 flags = 0, starting_choice = 0;
-	u_int			 px, py, sx, sy, i, count = args_count(args);
-	struct options		*o = target->w->options;
+	u_int			 px, py, i, count = args_count(args);
+	struct options		*o = target->s->curw->window->options;
 	struct options_entry	*oe;
 
 	if (args_has(args, 'C')) {
@@ -334,6 +531,9 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	}
 	if (menu->count == 0)
 		goto out;
+	if (!cmd_display_menu_get_menu_pos(tc, item, args, &px, &py,
+	    menu->width + 4, menu->count + 2))
+		goto out;
 
 	value = args_get(args, 'b');
 	if (value != NULL) {
@@ -344,11 +544,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 			cmdq_error(item, "menu-border-lines %s", cause);
 			goto fail;
 		}
-	} else
-		lines = options_get_number(o, "menu-border-lines");
-	menu_get_size(menu, lines, &sx, &sy);
-	if (!cmd_display_menu_get_menu_pos(tc, item, args, &px, &py, sx, sy))
-		goto out;
+	}
 
 	if (args_has(args, 'O'))
 		flags |= MENU_STAYOPEN;
@@ -369,22 +565,6 @@ 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)
 {
@@ -392,199 +572,148 @@ 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 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');
+	struct tty		*tty = &tc->tty;
+	const char		*value, *shell, *shellcmd = NULL;
+	const char		*style = args_get(args, 's');
 	const char		*border_style = args_get(args, 'S');
-	char			*cause = NULL, *title = NULL;
-	enum pane_lines		 lines = PANE_LINES_SINGLE;
-	u_int			 px, py, sx, sy, count = args_count(args);
+	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);
 	struct args_value	*av;
-	long long		 ll;
+	struct environ		*env = NULL;
+	struct options		*o = s->curw->window->options;
+	struct options_entry	*oe;
 
 	if (args_has(args, 'C')) {
-		if (w->modal != NULL)
-			server_kill_pane(w->modal);
+		server_client_clear_overlay(tc);
 		return (CMD_RETURN_NORMAL);
 	}
 	if (tc->flags & CLIENT_CONTROL)
 		return (CMD_RETURN_NORMAL);
-	if (w->modal != NULL)
+	if (!modify && tc->overlay_draw != 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 = PANE_LINES_NONE;
+		lines = BOX_LINES_NONE;
 	else if (value != NULL) {
-		lines = cmd_display_popup_get_lines(value, &cause);
+		oe = options_get(o, "popup-border-lines");
+		lines = options_find_choice(options_table_entry(oe), value,
+		    &cause);
 		if (cause != NULL) {
-			cmdq_error(item, "pane-border-lines %s", cause);
+			cmdq_error(item, "popup-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'));
-	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);
+	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;
 	}
 
-	new_wp->wait_item = item;
-	server_redraw_session(s);
-	if (sc.argv != NULL)
-		cmd_free_argv(sc.argc, sc.argv);
-	environ_free(sc.environ);
+	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);
 	free(title);
+	cmd_free_argv(argc, argv);
 	return (CMD_RETURN_WAIT);
 
 out:
-	if (sc.argv != NULL)
-		cmd_free_argv(sc.argc, sc.argv);
-	environ_free(sc.environ);
+	cmd_free_argv(argc, argv);
+	environ_free(env);
+	free(cwd);
 	free(title);
 	return (CMD_RETURN_NORMAL);
 
 fail:
 	free(cause);
-	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);
+	cmd_free_argv(argc, argv);
+	environ_free(env);
+	free(cwd);
 	free(title);
 	return (CMD_RETURN_ERROR);
 }

cmd-join-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-join-pane.c,v 1.75 2026/09/21 10:33:16 nicm Exp $ */
+/* $OpenBSD: cmd-join-pane.c,v 1.74 2026/08/03 20:29:52 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 George Nachman <tmux@georgester.com>
@@ -133,7 +133,7 @@ cmd_join_pane_place(struct cmdq_item *item, struct winlink *wl,
 	} else if (strcmp(position, "back") == 0) {
 		TAILQ_REMOVE(&w->z_index, wp, zentry);
 		TAILQ_FOREACH(owp, &w->z_index, zentry) {
-			if (!window_pane_is_floating_with_hidden(owp))
+			if (!window_pane_is_floating(owp))
 				break;
 		}
 		if (owp != NULL)
@@ -142,30 +142,24 @@ cmd_join_pane_place(struct cmdq_item *item, struct winlink *wl,
 			TAILQ_INSERT_TAIL(&w->z_index, wp, zentry);
 	} else if (strcmp(position, "forward") == 0) {
 		owp = TAILQ_PREV(wp, window_panes_zindex, zentry);
-		while (owp != NULL && owp->layout_cell == NULL)
-			owp = TAILQ_PREV(owp, window_panes_zindex, zentry);
 		if (owp != NULL) {
 			TAILQ_REMOVE(&w->z_index, wp, zentry);
 			TAILQ_INSERT_BEFORE(owp, wp, zentry);
 		}
 	} else if (strcmp(position, "backward") == 0) {
 		owp = TAILQ_NEXT(wp, zentry);
-		while (owp != NULL && owp->layout_cell == NULL)
-			owp = TAILQ_NEXT(owp, zentry);
 		if (owp != NULL && window_pane_is_floating(owp)) {
 			TAILQ_REMOVE(&w->z_index, wp, zentry);
 			TAILQ_INSERT_AFTER(&w->z_index, owp, wp, zentry);
 		}
 	} else if (strcmp(position, "forward-loop") == 0) {
 		owp = TAILQ_PREV(wp, window_panes_zindex, zentry);
-		while (owp != NULL && owp->layout_cell == NULL)
-			owp = TAILQ_PREV(owp, window_panes_zindex, zentry);
 		TAILQ_REMOVE(&w->z_index, wp, zentry);
 		if (owp != NULL)
 			TAILQ_INSERT_BEFORE(owp, wp, zentry);
 		else {
 			TAILQ_FOREACH(owp, &w->z_index, zentry) {
-				if (!window_pane_is_floating_with_hidden(owp))
+				if (!window_pane_is_floating(owp))
 					break;
 			}
 			if (owp != NULL)
@@ -175,8 +169,6 @@ cmd_join_pane_place(struct cmdq_item *item, struct winlink *wl,
 		}
 	} else if (strcmp(position, "backward-loop") == 0) {
 		owp = TAILQ_NEXT(wp, zentry);
-		while (owp != NULL && owp->layout_cell == NULL)
-			owp = TAILQ_NEXT(owp, zentry);
 		if (owp != NULL && window_pane_is_floating(owp)) {
 			TAILQ_REMOVE(&w->z_index, wp, zentry);
 			TAILQ_INSERT_AFTER(&w->z_index, owp, wp, zentry);
@@ -355,10 +347,8 @@ cmd_join_pane_zindex(struct cmdq_item *item, struct winlink *wl,
 
 	n = 0;
 	TAILQ_FOREACH(owp, &w->z_index, zentry) {
-		if (!window_pane_is_floating_with_hidden(owp))
+		if (!window_pane_is_floating(owp))
 			break;
-		if (owp->layout_cell == NULL)
-			continue;
 		if (n >= z)
 			break;
 		n++;
@@ -453,6 +443,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
 				cmdq_error(item, "pane is not floating");
 				return (CMD_RETURN_ERROR);
 			}
+			server_unzoom_window(dst_w);
 			if ((s = args_get(args, 'P')) != NULL)
 				return (cmd_join_pane_place(item, dst_wl, dst_wp, s));
 			if ((s = args_get(args, 'z')) != NULL)

cmd-queue.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.124 2026/09/22 06:46:50 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.123 2026/08/24 20:34:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -580,9 +580,6 @@ cmdq_fire_command(struct cmdq_item *item)
 	int			 flags, quiet = 0;
 	char			*tmp;
 
-	if (item->client != NULL && (item->client->flags & CLIENT_DEAD))
-		return (CMD_RETURN_ERROR);
-
 	if (cfg_finished)
 		cmdq_add_message(item);
 	if (log_get_level() > 1) {

cmd-resize-pane.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-resize-pane.c,v 1.69 2026/09/21 10:33:16 nicm Exp $ */
+/* $OpenBSD: cmd-resize-pane.c,v 1.68 2026/08/31 07:44:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -91,8 +91,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
 		server_redraw_window(w);
 		return (CMD_RETURN_NORMAL);
 	}
-	if (!window_pane_is_floating(wp))
-		server_unzoom_window(w);
+	server_unzoom_window(w);
 	lc = wp->layout_cell; /* may have been replaced by unzoom */
 
 	if (args_has(args, 'x')) {

cmd-run-shell.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.95 2026/09/20 07:59:55 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.94 2026/08/25 06:04:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -164,7 +164,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
 	if (cdata->client != NULL)
 		cdata->client->references++;
 	if (args_has(args, 'c'))
-		cdata->cwd = format_single_from_target(item, args_get(args, 'c'));
+		cdata->cwd = xstrdup(args_get(args, 'c'));
 	else
 		cdata->cwd = xstrdup(server_client_get_cwd(c, s));
 

cmd-wait-for.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-wait-for.c,v 1.24 2026/09/22 06:46:50 nicm Exp $ */
+/* $OpenBSD: cmd-wait-for.c,v 1.23 2026/07/10 13:38:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -480,40 +480,6 @@ cmd_wait_for_unlock(struct cmdq_item *item, const char *name,
 	return (CMD_RETURN_NORMAL);
 }
 
-void
-cmd_wait_for_client_lost(struct client *c)
-{
-	struct wait_channel	*wc, *wc1;
-	struct wait_item	*wi, *wi1;
-	struct wait_event_item	*wei, *wei1;
-
-	TAILQ_FOREACH_SAFE(wei, &wait_event_items, entry, wei1) {
-		if (cmdq_get_client(wei->item) == c) {
-			TAILQ_REMOVE(&wait_event_items, wei, entry);
-			cmdq_continue(wei->item);
-			cmd_wait_for_event_free(wei);
-		}
-	}
-
-	RB_FOREACH_SAFE(wc, wait_channels, &wait_channels, wc1) {
-		TAILQ_FOREACH_SAFE(wi, &wc->waiters, entry, wi1) {
-			if (cmdq_get_client(wi->item) == c) {
-				cmdq_continue(wi->item);
-				TAILQ_REMOVE(&wc->waiters, wi, entry);
-				free(wi);
-			}
-		}
-		TAILQ_FOREACH_SAFE(wi, &wc->lockers, entry, wi1) {
-			if (cmdq_get_client(wi->item) == c) {
-				cmdq_continue(wi->item);
-				TAILQ_REMOVE(&wc->lockers, wi, entry);
-				free(wi);
-			}
-		}
-		cmd_wait_for_remove_empty(wc);
-	}
-}
-
 void
 cmd_wait_for_flush(void)
 {

format.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.418 2026/09/20 08:19:31 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>
@@ -2876,10 +2876,10 @@ format_cb_session_activity_flag(struct format_tree *ft)
 
 	if (ft->s != NULL) {
 		RB_FOREACH(wl, winlinks, &ft->s->windows) {
-			if (wl->flags & WINLINK_ACTIVITY)
+			if (ft->wl->flags & WINLINK_ACTIVITY)
 				return (xstrdup("1"));
+			return (xstrdup("0"));
 		}
-		return (xstrdup("0"));
 	}
 	return (NULL);
 }
@@ -2894,8 +2894,8 @@ format_cb_session_bell_flag(struct format_tree *ft)
 		RB_FOREACH(wl, winlinks, &ft->s->windows) {
 			if (wl->flags & WINLINK_BELL)
 				return (xstrdup("1"));
+			return (xstrdup("0"));
 		}
-		return (xstrdup("0"));
 	}
 	return (NULL);
 }
@@ -2908,10 +2908,10 @@ format_cb_session_silence_flag(struct format_tree *ft)
 
 	if (ft->s != NULL) {
 		RB_FOREACH(wl, winlinks, &ft->s->windows) {
-			if (wl->flags & WINLINK_SILENCE)
+			if (ft->wl->flags & WINLINK_SILENCE)
 				return (xstrdup("1"));
+			return (xstrdup("0"));
 		}
-		return (xstrdup("0"));
 	}
 	return (NULL);
 }

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);
+	wp->ictx = input_init(wp, vpty[0], NULL, NULL);
 	window_add_ref(w, __func__);
 
 	wp->fd = open("/dev/null", O_WRONLY);

grid.c

@@ -1760,6 +1760,8 @@ 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

@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.272 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.271 2026/08/31 19:34:09 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -101,6 +101,7 @@ 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;
@@ -873,7 +874,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 colour_palette *palette, struct client *c)
 {
 	struct input_ctx	*ictx;
 
@@ -881,6 +882,7 @@ 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);
@@ -3192,13 +3194,14 @@ 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)
+input_osc_133_exit_status(const char *p, int *present)
 {
 	const char	*end;
 	char		*copy;
-	const char	*errstr;
+	char		*endptr;
 	long long	 status;
 
+	*present = 0;
 	if (p[1] != ';' || p[2] == '\0' || strchr(p + 2, '=') == p + 2)
 		return (0);
 	end = strchr(p + 2, ';');
@@ -3212,9 +3215,11 @@ input_osc_133_exit_status(const char *p)
 		free(copy);
 		return (0);
 	}
-	status = strtonum(copy, 0, 255, &errstr);
+	*present = 1;
+	errno = 0;
+	status = (int)strtol(copy, &endptr, 10);
 	free(copy);
-	if (errstr != NULL)
+	if (errno != 0 || endptr == copy || status < 0 || status > 255)
 		return (255);
 	return (status);
 }
@@ -3259,6 +3264,22 @@ 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)
@@ -3268,8 +3289,7 @@ 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;
-	const char		*cp;
-	int			 status;
+	int			 status, status_present;
 
 	if (line < gd->hsize + gd->sy)
 		gl = grid_get_line(gd, line);
@@ -3278,9 +3298,14 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 	case 'A':
 	case 'N':
 		if (gl != NULL) {
-			memset(&gl->osc133_data, 0, sizeof gl->osc133_data);
-			gl->osc133_data.prompt_col = s->cx;
-			gl->flags |= GRID_LINE_START_PROMPT;
+			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;
+			}
 		}
 		if (wp != NULL) {
 			wp->last_prompt_time = time(NULL);
@@ -3289,23 +3314,25 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 		break;
 	case 'P':
 		if (gl != NULL) {
-			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;
+			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;
+			}
 		}
 		break;
 	case 'B':
 	case 'I':
-		if (gl != NULL) {
+		if (gl != NULL && !(gl->flags & GRID_LINE_START_COMMAND)) {
 			gl->flags |= GRID_LINE_START_COMMAND;
 			gl->osc133_data.cmd_col = s->cx;
 		}
 		break;
 	case 'C':
-		if (gl != NULL) {
+		if (gl != NULL && !(gl->flags & GRID_LINE_START_OUTPUT)) {
 			gl->flags |= GRID_LINE_START_OUTPUT;
 			gl->osc133_data.out_start_col = s->cx;
 		}
@@ -3318,7 +3345,7 @@ input_osc_133(struct input_ctx *ictx, const char *p)
 		}
 		break;
 	case 'D':
-		status = input_osc_133_exit_status(p);
+		status = input_osc_133_exit_status(p, &status_present);
 		if (wp != NULL) {
 			wp->cmd_end_time = time(NULL);
 			wp->flags &= ~PANE_CMDRUNNING;
@@ -3327,6 +3354,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;
 		}
@@ -3423,9 +3452,15 @@ input_osc_52(struct input_ctx *ictx, const char *p)
 		return;
 
 	if (wp == NULL) {
-		free(out);
-		return;
+		/* Popup window. */
+		if (ictx->c == NULL) {
+			free(out);
+			return;
+		}
+		tty_set_selection(&ictx->c->tty, clip, out, outlen);
+		paste_add(NULL, out, outlen);
 	} else {
+		/* Normal window. */
 		screen_write_start_pane(&ctx, wp, NULL);
 		screen_write_setselection(&ctx, clip, out, outlen);
 		screen_write_stop(&ctx);

key-bindings.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: key-bindings.c,v 1.193 2026/09/21 20:45:48 nicm Exp $ */
+/* $OpenBSD: key-bindings.c,v 1.192 2026/08/06 09:05:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -52,7 +52,9 @@
 	" '#{?#{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,Hide Line Numbers,Show Line Numbers},}' 'L' {send -X line-numbers-toggle}" \
+	" '#{?#{==:#{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},#{?refresh_active,Refresh Off,Refresh On},}' 'r' {send -X refresh-toggle}" \
 	" ''" \
 	" '#{?#{&&:#{buffer_size},#{!:#{pane_in_mode}}},Paste #[underscore]#{=/9/...:buffer_sample},}' 'p' {paste-buffer}" \
@@ -523,7 +525,7 @@ key_bindings_init(void)
 		"bind -n TripleClick1Pane { select-pane -t=; if -F '#{||:#{pane_in_mode},#{mouse_any_flag}}' { send -M } { copy-mode -H; send -X select-line; run -d0.3; send -X copy-pipe-and-cancel } }",
 
 		/* Mouse button 1 on border. */
-		"bind -n MouseDown1Border { select-pane -t= }",
+		"bind -n MouseDown1Border { select-pane -M }",
 
 		/* Mouse button 1 drag on border. */
 		"bind -n MouseDrag1Border { resize-pane -M }",
@@ -575,6 +577,7 @@ 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 -- '%%' } }",
@@ -583,15 +586,19 @@ 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 }",
@@ -600,7 +607,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",
+		"bind -Tcopy-mode MouseDown1Pane { select-pane; send -X toggle-output -m }",
 		"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 }",
@@ -660,6 +667,8 @@ 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 -- '%%' } }",
@@ -687,7 +696,10 @@ 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 }",
@@ -715,7 +727,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 }",
+		"bind -Tcopy-mode-vi MouseDown1Pane { select-pane; send -X toggle-output -m }",
 		"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-custom.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: layout-custom.c,v 1.43 2026/09/22 06:48:01 nicm Exp $ */
+/* $OpenBSD: layout-custom.c,v 1.41 2026/09/09 09:01:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -283,59 +283,26 @@ layout_checksum(const char *layout)
 char *
 layout_dump(__unused struct window *w, struct layout_cell *lcroot, int flags)
 {
-	struct layout_string	 layout_string = { 0 };
-	char			*out;
+	struct layout_string	 layout_string;
+	char			*out = NULL;
 
 	if (lcroot == NULL)
-		goto bad;
+		return NULL;
+
 	layout_string_init(&layout_string);
-	if (layout_append(lcroot, &layout_string, flags) != 0)
-		goto bad;
-	if (~flags & LAYOUT_CUSTOM_OLD_FORMAT)
-		xasprintf(&out, "{\"V\":2,\"L\":%s}", layout_string.dat);
-	else {
-		xasprintf(&out, "%04hx,%s", layout_checksum(layout_string.dat),
-		    layout_string.dat);
-	}
-	layout_string_free(&layout_string);
-	return (out);
 
-bad:
-	layout_string_free(&layout_string);
-	if (~flags & LAYOUT_CUSTOM_OLD_FORMAT)
-		return (NULL);
-	return (xstrdup("0000,"));
-}
-
-/* Get a floating pane cell's z-index in the layout being dumped. */
-static u_int
-layout_cell_zindex(struct layout_cell *lc)
-{
-	struct window_pane	*wp = lc->wp, *wq;
-	struct window		*w = wp->window;
-	struct layout_cell	*other;
-	int			 saved = (lc == wp->saved_layout_cell);
-	u_int			 i = 0;
-
-	if (saved &&
-	    w->active != NULL &&
-	    (w->active->flags & PANE_ZOOMED) &&
-	    (w->active->saved_layout_cell->flags & LAYOUT_CELL_FLOATING)) {
-		if (wp == w->active)
-			return (0);
-		i++;
-	}
-	TAILQ_FOREACH(wq, &w->z_index, zentry) {
-		if (wq == wp)
-			break;
-		if (saved)
-			other = wq->saved_layout_cell;
+	if (layout_append(lcroot, &layout_string, flags) == 0) {
+		if (flags & LAYOUT_CUSTOM_OLD_FORMAT)
+			xasprintf(&out, "%04hx,%s",
+			    layout_checksum(layout_string.dat),
+			    layout_string.dat);
 		else
-			other = wq->layout_cell;
-		if (other != NULL && (other->flags & LAYOUT_CELL_FLOATING))
-			i++;
+			xasprintf(&out, "{\"V\":2,\"L\":%s}",
+			    layout_string.dat);
 	}
-	return (i);
+	layout_string_free(&layout_string);
+
+	return (out);
 }
 
 /* Append information for a single cell in a JSON (v2) format. */
@@ -346,7 +313,7 @@ layout_append_v2(struct layout_cell *lc, struct layout_string *ls)
 	struct window_pane	*wp;
 	enum layout_type	 type;
 	char			 c;
-	u_int			 i, n, z;
+	u_int			 i, n;
 
 	if (lc == NULL)
 		return (-1);
@@ -387,10 +354,9 @@ layout_append_v2(struct layout_cell *lc, struct layout_string *ls)
 		if (window_pane_index(wp, &i) != 0)
 			return (-1);
 		layout_string_write(ls, ",\"i\":%u", i);
-		if (lc->flags & LAYOUT_CELL_FLOATING) {
-			z = layout_cell_zindex(lc);
-			layout_string_write(ls, ",\"z\":%u", z);
-		}
+		if ((lc->flags & LAYOUT_CELL_FLOATING) &&
+		    window_pane_zindex(wp, &i) == 0)
+			layout_string_write(ls, ",\"z\":%u", i);
 		layout_string_write(ls, ",\"I\":\"%%%u\"", wp->id);
 	}
 

layout.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: layout.c,v 1.101 2026/09/20 08:42:46 nicm Exp $ */
+/* $OpenBSD: layout.c,v 1.100 2026/09/11 08:16:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1728,7 +1728,7 @@ layout_floating_args_parse(struct cmdq_item *item, struct args *args,
     enum pane_lines lines, struct window *w, struct layout_geometry *lg,
     char **cause)
 {
-	int	 sx, sy, ox, oy, pad;
+	int	 sx, sy, ox, oy;
 	char	*error = NULL;
 
 	sx = lg->sx == UINT_MAX ? w->sx / 2 : lg->sx;
@@ -1777,20 +1777,12 @@ layout_floating_args_parse(struct cmdq_item *item, struct args *args,
 		}
 	}
 
-	if (!window_has_floating_panes(w)) {
-		w->last_new_pane_x = 0;
-		w->last_new_pane_y = 0;
-	}
 	if (ox == INT_MAX) {
 		if (w->last_new_pane_x == 0)
 			ox = 4;
 		else {
-			if (lines != PANE_LINES_NONE)
-				pad = 1;
-			else
-				pad = 0;
 			ox = w->last_new_pane_x + 4;
-			if (ox + sx + pad > (int)w->sx)
+			if (w->last_new_pane_x > w->sx)
 				ox = 4;
 		}
 		w->last_new_pane_x = ox;
@@ -1801,12 +1793,8 @@ layout_floating_args_parse(struct cmdq_item *item, struct args *args,
 		if (w->last_new_pane_y == 0)
 			oy = 2;
 		else {
-			if (lines != PANE_LINES_NONE)
-				pad = 1;
-			else
-				pad = 0;
 			oy = w->last_new_pane_y + 2;
-			if (oy + sy + pad > (int)w->sy)
+			if (w->last_new_pane_y > w->sy)
 				oy = 2;
 		}
 		w->last_new_pane_y = oy;

menu.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: menu.c,v 1.71 2026/09/21 12:14:32 nicm Exp $ */
+/* $OpenBSD: menu.c,v 1.70 2026/08/17 07:33:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -51,18 +51,6 @@ struct menu_data {
 	void			*data;
 };
 
-void
-menu_get_size(struct menu *menu, enum box_lines lines, u_int *sx, u_int *sy)
-{
-	if (lines == BOX_LINES_NONE) {
-		*sx = menu->item_width + 2;
-		*sy = menu->count;
-	} else {
-		*sx = menu->width + 4;
-		*sy = menu->count + 2;
-	}
-}
-
 void
 menu_add_items(struct menu *menu, const struct menu_item *items,
     struct cmdq_item *qitem, struct client *c, struct cmd_find_state *fs)
@@ -154,8 +142,6 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
 	width = format_width(new_item->name);
 	if (*new_item->name == '-')
 		width--;
-	if (width > menu->item_width)
-		menu->item_width = width;
 	if (width > menu->width)
 		menu->width = width;
 }
@@ -252,7 +238,7 @@ menu_update(struct menu_data *md)
 	screen_write_clearscreen(&ctx, 8);
 
 	if (md->border_lines != BOX_LINES_NONE) {
-		screen_write_box(&ctx, menu_width(md), menu_height(md),
+		screen_write_box(&ctx, menu->width + 4, menu->count + 2,
 		    md->border_lines, &md->border_style_gc, menu->title);
 	}
 
@@ -300,13 +286,11 @@ menu_destroy(struct window *w)
 void
 menu_get_cursor(struct menu_data *md, u_int *cx, u_int *cy)
 {
-	u_int	border = (md->border_lines != BOX_LINES_NONE);
-
-	*cx = md->px + 1 + border;
+	*cx = md->px + 2;
 	if (md->choice == -1)
 		*cy = md->py;
 	else
-		*cy = md->py + border + md->choice;
+		*cy = md->py + 1 + md->choice;
 }
 
 struct screen *
@@ -318,19 +302,13 @@ menu_screen(struct menu_data *md)
 u_int
 menu_width(struct menu_data *md)
 {
-	u_int	sx, sy;
-
-	menu_get_size(md->menu, md->border_lines, &sx, &sy);
-	return (sx);
+	return (md->menu->width + 4);
 }
 
 u_int
 menu_height(struct menu_data *md)
 {
-	u_int	sx, sy;
-
-	menu_get_size(md->menu, md->border_lines, &sx, &sy);
-	return (sy);
+	return (md->menu->count + 2);
 }
 
 u_int
@@ -360,7 +338,6 @@ menu_key(struct client *c, struct menu_data *md, struct key_event *event)
 	enum cmd_parse_status		 status;
 	char				*error;
 	key_code			 key;
-	u_int				 border;
 
 	if (KEYC_IS_MOUSE(event->key)) {
 		/*
@@ -376,10 +353,10 @@ menu_key(struct client *c, struct menu_data *md, struct key_event *event)
 				return (1);
 			return (0);
 		}
-		border = (md->border_lines != BOX_LINES_NONE);
-		if (m->x < md->px || m->x >= md->px + menu_width(md) ||
-		    m->y < md->py + border ||
-		    m->y >= md->py + border + n) {
+		if (m->x < md->px ||
+		    m->x > md->px + 4 + menu->width ||
+		    m->y < md->py + 1 ||
+		    m->y > md->py + 1 + n - 1) {
 			if (~md->flags & MENU_STAYOPEN) {
 				if (!move && MOUSE_RELEASE(m->b))
 					return (1);
@@ -402,7 +379,7 @@ menu_key(struct client *c, struct menu_data *md, struct key_event *event)
 			if (!MOUSE_WHEEL(m->b) && !MOUSE_DRAG(m->b))
 				goto chosen;
 		}
-		md->choice = m->y - (md->py + border);
+		md->choice = m->y - (md->py + 1);
 		if (md->choice != old)
 			server_redraw_window_menu(md->w);
 		return (0);
@@ -569,16 +546,20 @@ menu_resize(struct menu_data *md, struct window *w)
 
 	if (md == NULL)
 		return;
+
 	nx = md->px;
 	ny = md->py;
 
-	menu_get_size(md->menu, md->border_lines, &sx, &sy);
+	sx = md->menu->width + 4;
+	sy = md->menu->count + 2;
+
 	if (nx + sx > w->sx) {
 		if (w->sx <= sx)
 			nx = 0;
 		else
 			nx = w->sx - sx;
 	}
+
 	if (ny + sy > w->sy) {
 		if (w->sy <= sy)
 			ny = 0;
@@ -610,9 +591,8 @@ menu_display(struct menu *menu, int flags, int starting_choice,
 		w = fs->w;
 	o = w->options;
 
-	if (lines == BOX_LINES_DEFAULT)
-		lines = options_get_number(o, "menu-border-lines");
-	menu_get_size(menu, lines, &sx, &sy);
+	sx = menu->width + 4;
+	sy = menu->count + 2;
 	if (sx >= w->sx)
 		px = 0;
 	else if (px + sx > w->sx)
@@ -624,6 +604,9 @@ menu_display(struct menu *menu, int flags, int starting_choice,
 	w->menu_last_px = px;
 	w->menu_last_py = py;
 
+	if (lines == BOX_LINES_DEFAULT)
+		lines = options_get_number(o, "menu-border-lines");
+
 	md = xcalloc(1, sizeof *md);
 	md->w = w;
 	md->flags = flags;

mode-tree.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-tree.c,v 1.102 2026/09/21 12:14:32 nicm Exp $ */
+/* $OpenBSD: mode-tree.c,v 1.101 2026/08/05 07:50:21 nicm Exp $ */
 
 /*
  * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1375,14 +1375,12 @@ static void
 mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x,
     u_int y, int outside)
 {
-	struct window		*w = mtd->wp->window;
 	struct mode_tree_item	*mti;
 	struct menu		*menu;
 	const struct menu_item	*items;
 	struct mode_tree_menu	*mtm;
 	char			*title;
-	enum box_lines		 lines;
-	u_int			 line, sx, sy;
+	u_int			 line;
 
 	if (mtd->offset + y > mtd->line_size - 1)
 		line = mtd->current;
@@ -1407,17 +1405,14 @@ mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x,
 	mtm->line = line;
 	mtd->references++;
 
-	lines = options_get_number(w->options, "menu-border-lines");
-	menu_get_size(menu, lines, &sx, &sy);
-	if (x >= sx / 2)
-		x -= sx / 2;
+	if (x >= (menu->width + 4) / 2)
+		x -= (menu->width + 4) / 2;
 	else
 		x = 0;
 	x += mtd->wp->xoff;
 	y += mtd->wp->yoff;
-
-	if (menu_display(menu, 0, 0, NULL, x, y, c, lines, NULL, NULL, NULL,
-	    NULL, mode_tree_menu_callback, mtm) != 0) {
+	if (menu_display(menu, 0, 0, NULL, x, y, c, BOX_LINES_DEFAULT, NULL,
+	    NULL, NULL, NULL, mode_tree_menu_callback, mtm) != 0) {
 		mode_tree_remove_ref(mtd);
 		free(mtm);
 		menu_free(menu);

options-table.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.247 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.246 2026/09/11 10:17:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -79,7 +79,7 @@ static const char *options_table_pane_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "number", "spaces", "none",
 	"rounded", NULL
 };
-static const char *options_table_menu_border_lines_list[] = {
+static const char *options_table_popup_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "rounded", "padded", "none", NULL
 };
 static const char *options_table_set_clipboard_list[] = {
@@ -115,7 +115,6 @@ 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}]" \
@@ -493,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_menu_border_lines_list,
+	  .choices = options_table_popup_border_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."
@@ -1385,6 +1384,13 @@ 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,
@@ -1666,6 +1672,33 @@ 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,

popup.c

@@ -0,0 +1,661 @@
+/* $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);
+}

regress/Makefile

@@ -1,17 +1,33 @@
 TESTS!= echo *.sh
 LOGDIR=logs
 
-.PHONY: all prepare $(TESTS)
+.PHONY: all
+.NOTPARALLEL: all
 
-all: prepare $(TESTS)
-	@failed=0; failures=; \
+all:
+	@mkdir -p "$(LOGDIR)"; \
+	rm -f "$(LOGDIR)"/*.log; \
+	failed=0; failures=; \
 	for test in $(TESTS); do \
 		base=$${test##*/}; \
 		log="$(LOGDIR)/$${base%.sh}.log"; \
-		if [ -f "$$log" ]; then \
+		rm -f "$$log"; \
+		printf '%-40s ' "$$test"; \
+		start=$$(date +%s); \
+		env -i LC_CTYPE=C.UTF-8 MallocNanoZone=0 \
+		    sh -x "$$test" >"$$log" 2>&1; \
+		if [ $$? -eq 0 ]; then \
+			end=$$(date +%s); \
+			rm -f "$$log"; \
+			echo "PASS ($$((end - start))s)"; \
+		else \
+			end=$$(date +%s); \
+			echo "FAIL ($$((end - start))s)"; \
+			echo " log: $$log"; \
 			failed=1; \
 			failures="$$failures $$test"; \
 		fi; \
+		sleep 1; \
 	done; \
 	if [ "$$failed" -ne 0 ]; then \
 		echo; \
@@ -23,22 +39,3 @@ all: prepare $(TESTS)
 		rmdir "$(LOGDIR)" 2>/dev/null || true; \
 	fi; \
 	exit $$failed
-
-prepare:
-	@mkdir -p "$(LOGDIR)"
-	@rm -f "$(LOGDIR)"/*.log
-
-$(TESTS): prepare
-	@base="$@"; base=$${base##*/}; \
-	log="$(LOGDIR)/$${base%.sh}.log"; \
-	start=$$(date +%s); \
-	if env -i LC_CTYPE=C.UTF-8 MallocNanoZone=0 \
-	    sh -x "$@" >"$$log" 2>&1; then \
-		end=$$(date +%s); \
-		rm -f "$$log"; \
-		printf '%-40s PASS (%ss)\n' "$@" "$$((end - start))"; \
-	else \
-		end=$$(date +%s); \
-		printf '%-40s FAIL (%ss)\n log: %s\n' \
-		    "$@" "$$((end - start))" "$$log"; \
-	fi

regress/alerts.sh

@@ -2,9 +2,8 @@
 
 # monitor-activity, monitor-bell and monitor-silence: both the
 # alert-activity, alert-bell and alert-silence hooks and the winlink alert
-# flags (window_activity_flag, window_bell_flag, window_silence_flag,
-# their session equivalents and the #, !, ~ characters in window_flags).
-# The sessions are detached so
+# flags (window_activity_flag, window_bell_flag, window_silence_flag and
+# the #, !, ~ characters in window_flags). The sessions are detached so
 # alert flags are set even on the current window; the *-action options
 # still decide whether the hooks fire. Panes run cat: activity is
 # generated by the tty echo of send-keys and a bell by sending a BEL and
@@ -112,24 +111,6 @@ flags_have()
 	esac
 }
 
-assert_session_flag()
-{
-	flag="#{session_${1}_flag}"
-	expected=$2
-
-	# Only mon exists here. Check both window contexts and list-sessions.
-	for target in mon:w0 "mon:$3"; do
-		value=$($TMUX display -pt "$target" "$flag") ||
-			fail "display $flag failed"
-		[ "$value" = "$expected" ] ||
-			fail "expected $flag for $target to be '$expected' but got '$value'"
-	done
-	value=$($TMUX list-sessions -F "$flag") ||
-		fail "list-sessions $flag failed"
-	[ "$value" = "$expected" ] ||
-		fail "expected list-sessions $flag to be '$expected' but got '$value'"
-}
-
 flags_lack()
 {
 	target=$1
@@ -169,12 +150,10 @@ $TMUX set-hook -g alert-silence \
 # alert-bell and sets the bell flag, shown as ! in window_flags.
 $TMUX neww -d -t mon: -n bellw cat || fail "new-window bellw failed"
 assert_fmt_unchanged mon:bellw '#{window_bell_flag}' 0
-assert_session_flag bell 0 bellw
 flags_lack mon:bellw '!'
 bell mon:bellw
 wait_for @log '|alert-bell:mon:bellw'
 wait_for_fmt mon:bellw '#{window_bell_flag}' 1
-assert_session_flag bell 1 bellw
 flags_have mon:bellw '!'
 
 # Bells are not deduplicated: a second bell fires the hook again even
@@ -185,7 +164,6 @@ wait_for @log '|alert-bell:mon:bellw|alert-bell:mon:bellw'
 # Selecting the window clears the alert flags.
 $TMUX selectw -t mon:bellw || fail "select-window bellw failed"
 wait_for_fmt mon:bellw '#{window_bell_flag}' 0
-assert_session_flag bell 0 bellw
 flags_lack mon:bellw '!'
 $TMUX selectw -t mon:w0 || fail "select-window w0 failed"
 
@@ -195,7 +173,6 @@ $TMUX set -g @log '' || fail "reset @log failed"
 bell mon:w0
 wait_for @log '|alert-bell:mon:w0'
 wait_for_fmt mon:w0 '#{window_bell_flag}' 1
-assert_session_flag bell 1 bellw
 $TMUX selectw -t mon:bellw || fail "select-window bellw failed"
 $TMUX selectw -t mon:w0 || fail "select-window w0 failed"
 wait_for_fmt mon:w0 '#{window_bell_flag}' 0
@@ -222,7 +199,6 @@ $TMUX neww -d -t mon: -n actw cat || fail "new-window actw failed"
 $TMUX set -g @log '' || fail "reset @log failed"
 activity mon:actw
 assert_fmt_unchanged mon:actw '#{window_activity_flag}' 0
-assert_session_flag activity 0 actw
 assert_unchanged @log ''
 
 # With monitor-activity on, output fires alert-activity and sets the
@@ -232,7 +208,6 @@ $TMUX set -wt mon:actw monitor-activity on ||
 activity mon:actw
 wait_for @log '|alert-activity:mon:actw'
 wait_for_fmt mon:actw '#{window_activity_flag}' 1
-assert_session_flag activity 1 actw
 flags_have mon:actw '#'
 
 # While the flag is set further activity does not fire the hook again.
@@ -259,7 +234,6 @@ exec 3>"$OUT/fifo"
 wait_for_fmt mon: '#{session_attached}' 1
 $TMUX selectw -t mon:actw || fail "select-window actw failed"
 wait_for_fmt mon:actw '#{window_activity_flag}' 0
-assert_session_flag activity 0 actw
 flags_lack mon:actw '#'
 $TMUX selectw -t mon:w0 || fail "select-window w0 failed"
 exec 3>&-
@@ -276,7 +250,6 @@ $TMUX set -wt mon:w0 monitor-activity on ||
 $TMUX set -g @log '' || fail "reset @log failed"
 activity mon:w0
 wait_for_fmt mon:w0 '#{window_activity_flag}' 1
-assert_session_flag activity 1 actw
 assert_unchanged @log ''
 $TMUX set -wut mon:w0 monitor-activity ||
 	fail "unset monitor-activity w0 failed"
@@ -300,19 +273,16 @@ $TMUX selectw -t mon:w0 || fail "select-window w0 failed"
 # running.
 $TMUX neww -d -t mon: -n silw cat || fail "new-window silw failed"
 assert_fmt_unchanged mon:silw '#{window_silence_flag}' 0
-assert_session_flag silence 0 silw
 $TMUX set -g @log '' || fail "reset @log failed"
 $TMUX set -wt mon:silw monitor-silence 1 || fail "set monitor-silence failed"
 wait_for @log '|alert-silence:mon:silw'
 wait_for_fmt mon:silw '#{window_silence_flag}' 1
-assert_session_flag silence 1 silw
 flags_have mon:silw '~'
 assert_unchanged @log '|alert-silence:mon:silw'
 $TMUX set -wt mon:silw monitor-silence 0 ||
 	fail "reset monitor-silence failed"
 $TMUX selectw -t mon:silw || fail "select-window silw failed"
 wait_for_fmt mon:silw '#{window_silence_flag}' 0
-assert_session_flag silence 0 silw
 flags_lack mon:silw '~'
 $TMUX selectw -t mon:w0 || fail "select-window w0 failed"
 

regress/codepoint-widths.sh

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Width cache ranges must include their endpoint without overflowing wchar_t.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-SERVER=
-WATCHDOG=
-
-cleanup()
-{
-	if [ -n "$WATCHDOG" ]; then
-		kill "$WATCHDOG" 2>/dev/null
-		wait "$WATCHDOG" 2>/dev/null
-	fi
-	[ -n "$SERVER" ] && kill -9 "$SERVER" 2>/dev/null
-}
-trap cleanup 0
-trap 'exit 1' 1 2 15
-
-$TMUX new-session -d 'exec sleep 60' || exit 1
-SERVER=$($TMUX display-message -p '#{pid}') || exit 1
-
-# kill-server cannot stop a server stuck rebuilding the width cache.
-(
-	sleep 5
-	kill -9 "$SERVER" 2>/dev/null
-) &
-WATCHDOG=$!
-
-$TMUX set -g codepoint-widths 'U+1F600=2' || exit 1
-
-# Cover both signed and unsigned 32-bit wchar_t. Values above WCHAR_MAX
-# are ignored by the parser on platforms where they cannot be represented.
-for value in U+7FFFFFFF=1 U+7FFFFFFE-U+7FFFFFFF=2 \
-    U+FFFFFFFF=1 U+FFFFFFFE-U+FFFFFFFF=2; do
-	$TMUX set -g codepoint-widths "$value" || exit 1
-	[ "$($TMUX display-message -p alive)" = alive ] || exit 1
-done
-
-# Check that an ordinary range still includes both endpoints and stops there.
-$TMUX set -g codepoint-widths 'U+03B1-U+03B3=2' || exit 1
-$TMUX set -g @text 'αβγδ' || exit 1
-[ "$($TMUX display-message -p '#{w:@text}')" = 7 ] || exit 1
-$TMUX set -gu codepoint-widths || exit 1
-[ "$($TMUX display-message -p '#{w:@text}')" = 4 ] || exit 1
-
-$TMUX kill-server || exit 1
-SERVER=
-exit 0

regress/collapse-output.sh

@@ -0,0 +1,81 @@
+#!/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-exit-stalled.sh

@@ -17,7 +17,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$"
+TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 DIR=$(mktemp -d)

regress/control-client-exit.sh

@@ -19,7 +19,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$"
+TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 DIR=$(mktemp -d)

regress/control-client-popup.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Popups require an attached terminal and cannot be displayed by a control
-# client.
+# Popups require a tty overlay and cannot be displayed by a control client.
 # A popup command from control mode must be ignored cleanly, leaving the
 # client command queue and server usable.
 

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

@@ -10,7 +10,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$"
+TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 OUT=$(mktemp)

regress/control-client-wait-exit.sh

@@ -10,7 +10,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$"
+TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 FIFO=$(mktemp -u)

regress/copy-mode-exit-status.sh

@@ -0,0 +1,102 @@
+#!/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/copy-mode-source-blank.sh

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Trimming a blank source must leave a visible line for cursor reflow.
-
-PATH=/bin:/usr/bin
-TERM=screen
-export PATH TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$TMUX kill-server 2>/dev/null
-}
-trap cleanup 0
-trap 'exit 1' 1 2 3 15
-
-$TMUX new-session -d -x80 -y24 -s test 'sleep 100' || exit 1
-$TMUX set-option -g window-size manual || exit 1
-$TMUX new-window -t test:1 'sleep 100' || exit 1
-$TMUX resize-window -t test:0 -x20 -y24 || exit 1
-
-# Exercise widening, narrowing, and equal widths with no source history.
-for pair in '0 1' '1 0' '1 2'; do
-	set -- $pair
-	if [ "$2" = 2 ]; then
-		$TMUX new-window -t test:2 'sleep 100' || exit 1
-		$TMUX resize-window -t test:2 -x80 -y24 || exit 1
-	fi
-	source=test:$1.0
-	target=test:$2.0
-	[ "$($TMUX display-message -p -t "$source" '#{history_size}')" = 0 ] ||
-		fail "source has unexpected history"
-	$TMUX copy-mode -s "$source" -t "$target" || exit 1
-	$TMUX has-session -t test || fail "server died copying blank source"
-	[ "$($TMUX display-message -p -t "$target" \
-	    '#{pane_in_mode} #{copy_cursor_x} #{copy_cursor_y}')" = '1 0 0' ] ||
-		fail "blank source did not enter copy mode at the first cell"
-	$TMUX send-keys -t "$target" -X cancel || exit 1
-done
-
-# Real content still trims trailing empty lines, clamping the cursor to beta.
-$TMUX respawn-pane -k -t test:0.0 \
-	"printf 'alpha\r\nbeta\r\n\r\n\r\n'; exec sleep 100" || exit 1
-i=0
-while [ "$($TMUX display-message -p -t test:0.0 '#{cursor_y}')" != 4 ]; do
-	i=$((i + 1))
-	[ "$i" -lt 10 ] || fail "source output did not arrive"
-	sleep 1
-done
-$TMUX copy-mode -s test:0.0 -t test:1.0 || exit 1
-[ "$($TMUX display-message -p -t test:1.0 \
-    '#{pane_in_mode} #{copy_cursor_y} #{copy_cursor_line}')" = '1 1 beta' ] ||
-	fail "nonblank source content or trailing-line trimming changed"
-
-exit 0

regress/floating-pane-zoom.sh

@@ -1,158 +0,0 @@
-#!/bin/sh
-
-# Moving, resizing and reordering an over-zoom float must leave the tiled
-# pane zoomed, and the changes must survive an explicit unzoom.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-trap '$TMUX kill-server 2>/dev/null' 0
-trap 'exit 1' 1 2 15
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-run()
-{
-	$TMUX "$@" || fail "failed: $*"
-}
-
-check()
-{
-	got=$(run display-message -p -t "$1" "$2") || exit 1
-	[ "$got" = "$3" ] || fail "$1 $2: got '$got', expected '$3'"
-}
-
-check_zoom()
-{
-	check "$base" '#{window_zoomed_flag}:#{pane_zoomed_flag}' '1:1'
-	check "$float" '#{pane_floating_flag}:#{pane_active}' "1:$active"
-	check "$base" '#{@unzoomed}' ''
-}
-
-run new-session -d -x 80 -y 24
-base=$(run display-message -p '#{pane_id}') || exit 1
-other=$(run split-window -dPF '#{pane_id}') || exit 1
-layout=$(run display-message -p '#{window_layout}') || exit 1
-run set-hook -g window-unzoomed 'set -g @unzoomed 1'
-
-# Cover creation before and after zoom, with both the float and the tiled
-# pane active. Modal panes use the same over-zoom flag.
-for mode in before after detached modal; do
-	if [ "$mode" != before ]; then
-		run resize-pane -Z -t "$base"
-	fi
-	case "$mode" in
-	detached) flags=-Ad; active=0 ;;
-	modal) flags=-O; active=1 ;;
-	*) flags=-A; active=1 ;;
-	esac
-	float=$(run new-pane "$flags" -PF '#{pane_id}' -t "$base" \
-	    -x 20 -y 8 -X 8 -Y 3 '') || exit 1
-	if [ "$mode" = before ]; then
-		run resize-pane -Z -t "$base"
-	fi
-	run set -gu @unzoomed
-	check_zoom
-
-	run move-pane -t "$float" -D
-	check "$float" '#{pane_top}' 5
-	check_zoom
-	run move-pane -t "$float" -U 2 -R 3 -L 1
-	check "$float" '#{pane_left}:#{pane_top}' '11:3'
-	check_zoom
-	run move-pane -t "$float" -X 25% -Y 25%
-	check "$float" '#{pane_left}:#{pane_top}' '21:7'
-	check_zoom
-	run move-pane -t "$float" -P bottom-right
-	check "$float" '#{pane_left}:#{pane_top}' '61:17'
-	check_zoom
-	run resize-pane -t "$float" -x 30 -y 10
-	check "$float" '#{pane_width}:#{pane_height}' '28:8'
-	check_zoom
-	run resize-pane -t "$float" -U 1 -L 2
-	check "$float" '#{pane_left}:#{pane_top}:#{pane_width}:#{pane_height}' \
-	    '59:16:30:9'
-	check_zoom
-	run move-pane -t "$float" -P centre
-	check "$float" '#{pane_left}:#{pane_top}' '25:7'
-	check_zoom
-
-	# Failed commands must not change zoom either.
-	for command in 'move-pane -D invalid' 'move-pane -P invalid' \
-	    'move-pane -z invalid' 'resize-pane -x invalid' \
-	    'resize-pane -D invalid'; do
-		$TMUX $command -t "$float" 2>/dev/null &&
-		    fail "unexpected success: $command"
-		check_zoom
-	done
-
-	run resize-pane -Z -t "$base"
-	check "$float" '#{pane_left}:#{pane_top}:#{pane_width}:#{pane_height}' \
-	    '25:7:30:9'
-	run kill-pane -t "$float"
-	check "$base" '#{window_layout}' "$layout"
-done
-
-# Put an ordinary (hidden while zoomed) float between two over-zoom floats
-# in the stacking order. Reordering must skip it when counting visible
-# positions, but keep all floats ahead of the tiled panes after unzoom.
-back=$(run new-pane -AdPF '#{pane_id}' -t "$base" '') || exit 1
-hidden=$(run new-pane -dPF '#{pane_id}' -t "$base" '') || exit 1
-float=$(run new-pane -AdPF '#{pane_id}' -t "$base" '') || exit 1
-active=0
-run resize-pane -Z -t "$base"
-run set -gu @unzoomed
-
-for position in backward back forward-loop; do
-	run move-pane -t "$float" -P front
-	run move-pane -t "$float" -P "$position"
-	check "$float" '#{pane_z}' 1
-	check "$back" '#{pane_z}' 0
-	check_zoom
-done
-for position in forward front backward-loop; do
-	run move-pane -t "$float" -P back
-	run move-pane -t "$float" -P "$position"
-	check "$float" '#{pane_z}' 0
-	check "$back" '#{pane_z}' 1
-	check_zoom
-done
-for z in 1 0 99; do
-	run move-pane -t "$float" -z "$z"
-	want=$z
-	[ "$z" = 99 ] && want=1
-	check "$float" '#{pane_z}' "$want"
-	check_zoom
-done
-run resize-pane -Z -t "$base"
-check "$float" '#{pane_z}' 2
-check "$base" '#{pane_z}' 4
-run kill-pane -t "$hidden"
-run kill-pane -t "$back"
-
-# Explicit zoom toggling and operations on tiled panes retain their
-# existing behaviour. The over-zoom flag alone does not make a pane a float:
-# zooming the float itself gives it a tiled cell until unzoom.
-run resize-pane -Z -t "$float"
-check "$float" '#{pane_zoomed_flag}:#{pane_floating_flag}' '1:0'
-run resize-pane -t "$float" -x 25
-check "$float" '#{window_zoomed_flag}:#{pane_floating_flag}:#{pane_width}' \
-    '0:1:23'
-run resize-pane -Z -t "$base"
-run resize-pane -t "$other" -D 1
-check "$base" '#{window_zoomed_flag}' 0
-
-# A hidden ordinary float must still be unzoomed before resizing it.
-hidden=$(run new-pane -dPF '#{pane_id}' -t "$base" '') || exit 1
-run resize-pane -Z -t "$base"
-run resize-pane -t "$hidden" -x 25
-check "$hidden" '#{window_zoomed_flag}:#{pane_floating_flag}:#{pane_width}' \
-    '0:1:23'
-
-exit 0

regress/format-fuzzy.sh

@@ -7,8 +7,6 @@ TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-trap '$TMUX kill-server 2>/dev/null' 0
-trap 'exit 1' 1 2 15
 
 # test_format $format $expected_result
 test_format()

regress/format-modifiers.sh

@@ -18,24 +18,6 @@ export TZ LANG LC_ALL
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-FIFO1="${TMPDIR:-/tmp}/fmt-l-$$-1"
-FIFO2="${TMPDIR:-/tmp}/fmt-l-$$-2"
-HOLD1=
-HOLD2=
-CC1=
-CC2=
-
-cleanup()
-{
-	for pid in $HOLD1 $HOLD2 $CC1 $CC2; do
-		kill "$pid" 2>/dev/null
-		wait "$pid" 2>/dev/null
-	done
-	$TMUX kill-server 2>/dev/null
-	rm -f "$FIFO1" "$FIFO2"
-}
-trap cleanup 0
-trap 'exit 1' 1 2 15
 
 ESC=$(printf '\033')
 
@@ -597,6 +579,8 @@ assert_alive "verbose loop expansion"
 
 # L loops over attached clients.  Attach two control-mode clients, each held
 # open by a background process keeping a FIFO's write end open.
+FIFO1="${TMPDIR:-/tmp}/fmt-l-$$-1"
+FIFO2="${TMPDIR:-/tmp}/fmt-l-$$-2"
 rm -f "$FIFO1" "$FIFO2"
 mkfifo "$FIFO1" "$FIFO2" || exit 1
 # Hold the write ends open so the control clients stay attached.
@@ -621,9 +605,9 @@ test_format "#{L/nr:x}" "xx"
 test_format "#{L/r:x}" "xx"
 # Now detach one and confirm the count drops to one.
 kill $HOLD2 2>/dev/null
-wait $HOLD2 2>/dev/null
-HOLD2=
 sleep 1
 test_format "#{L:x}" "x"
+kill $HOLD1 $CC1 $CC2 2>/dev/null
+rm -f "$FIFO1" "$FIFO2"
 
 exit 0

regress/format-strings.sh

@@ -7,8 +7,6 @@ TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-trap '$TMUX kill-server 2>/dev/null' 0
-trap 'exit 1' 1 2 15
 
 # test_format $format $expected_result
 test_format()

regress/hooks-lifecycle.sh

@@ -76,14 +76,14 @@ $TMUX set-hook -g session-closed \
 	fail "set-hook session-closed failed"
 
 # The only pane of the only window of a session exits: pane-exited, then
-# session-closed, then window-unlinked, each seeing the dead object in the
+# window-unlinked, then session-closed, each seeing the dead object in the
 # hook formats.
 pane=$($TMUX new -d -s doomed -n dwin -P -F '#{pane_id}' 'true') ||
 	fail "new-session doomed failed"
 wait_for @log \
-	"|pane-exited:$pane|session-closed:doomed|window-unlinked:doomed:dwin"
+	"|pane-exited:$pane|window-unlinked:doomed:dwin|session-closed:doomed"
 assert_unchanged @log \
-	"|pane-exited:$pane|session-closed:doomed|window-unlinked:doomed:dwin"
+	"|pane-exited:$pane|window-unlinked:doomed:dwin|session-closed:doomed"
 
 # The dead pane, window and session cannot be used as targets but the
 # server survives.
@@ -110,14 +110,14 @@ $TMUX set-hook -g pane-exited \
 	'set -gF @log "#{@log}|pane-exited:#{hook_pane}"' ||
 	fail "restore pane-exited hook failed"
 
-# kill-window on the last window: session-closed then window-unlinked but
+# kill-window on the last window: window-unlinked then session-closed but
 # no pane-exited for the panes in the killed window.
 $TMUX set -g @log '' || fail "reset @log failed"
 $TMUX new -d -s doomed2 -n dwin2 || fail "new-session doomed2 failed"
 $TMUX splitw -d -t doomed2:0 || fail "split-window doomed2 failed"
 $TMUX kill-window -t doomed2:0 || fail "kill-window failed"
-wait_for @log '|session-closed:doomed2|window-unlinked:doomed2:dwin2'
-assert_unchanged @log '|session-closed:doomed2|window-unlinked:doomed2:dwin2'
+wait_for @log '|window-unlinked:doomed2:dwin2|session-closed:doomed2'
+assert_unchanged @log '|window-unlinked:doomed2:dwin2|session-closed:doomed2'
 $TMUX has -t main || fail "server died after kill-window chain"
 
 # kill-session: session-closed fires first, then window-unlinked for its

regress/if-shell-error.sh

@@ -12,8 +12,7 @@ $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
 OUT=$(mktemp)
-trap 'rm -f "$TMP" "$OUT"; $TMUX kill-server 2>/dev/null' 0
-trap 'exit 1' 1 2 15
+trap "rm -f $TMP $OUT" 0 1 15
 
 cat <<EOF >$TMP
 if 'true' 'wibble wobble'

regress/input-common.inc

@@ -4,9 +4,6 @@ TERM=screen
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 
-# Keep panes alive until the next case or cleanup, without reading replies.
-INPUT_HOLD='while :; do sleep 3600; done'
-
 TMP=$(mktemp)
 EXP=$(mktemp)
 trap 'rm -f "$TMP" "$EXP"; $TMUX kill-server 2>/dev/null' 0 1 15
@@ -40,10 +37,10 @@ start_pane_hlimit()
 
 	$TMUX kill-server 2>/dev/null
 	sleep 0.1
-	$TMUX new-session -d -x 1 -y 1 -s test-setup "$INPUT_HOLD" || exit 1
+	$TMUX new-session -d -x 1 -y 1 -s test-setup "sleep 2" || exit 1
 	$TMUX set-option -g history-limit "$hlimit" || exit 1
 	$TMUX new-session -d -x "$sx" -y "$sy" -s "$name" \
-	    "printf '$seq'; $INPUT_HOLD" || exit 1
+	    "printf '$seq'; sleep 2" || exit 1
 	$TMUX kill-session -t test-setup
 	sleep 0.3
 }

regress/input-keys.sh

@@ -22,19 +22,7 @@ assert_key () {
 	      clear-history -t$W \; \
 	      send-keys -t$W "$key" 'EOL' || exit 1
 
-	# cat echoes the keys back asynchronously, so wait for the EOL marker
-	# to reach the pane instead of capturing straight away.
-	i=0
-	while [ $i -lt 50 ]; do
-		screen=$($TMUX capturep -pt$W)
-		case "$screen" in
-		*EOL*) break ;;
-		esac
-		i=$((i + 1))
-		sleep 0.1
-	done
-
-	actual_code=$(printf '%s\n' "$screen" | \
+	actual_code=$($TMUX capturep -pt$W | \
 			      head -1 | \
 			      sed -e 's/EOL.*$//')
 

regress/input-malformed.sh

@@ -2,38 +2,6 @@
 
 . ./input-common.inc
 
-# Wait for the terminator and following text to reach the parser.
-check_discard()
-{
-	name=$1
-	printf 'OK\n' >"$EXP"
-	i=0
-	while [ "$i" -lt 300 ]; do
-		capture_grid "$name" >"$TMP"
-		cmp -s "$TMP" "$EXP" && return 0
-		sleep 0.05
-		i=$((i + 1))
-	done
-	fail "$name (timed out waiting for discard)"
-}
-
-# The missing-terminator timer may expire before the string limit is reached
-# on a slow build. Clear any payload printed after the timeout, then check
-# that the string did not change the title and normal output has resumed.
-test_discard()
-{
-	name=$1
-	prefix=$2
-	start_cmd "$name" 8 3 "$INPUT_HOLD"
-	$TMUX select-pane -T discard-test || exit 1
-	$TMUX respawn-pane -k \
-	    "perl -e 'print qq{$prefix}, q{x} x 1100000, qq{\e\\\\\e[H\e[2JOK}'; $INPUT_HOLD" || exit 1
-	check_discard "$name"
-	$TMUX display-message -p -t "$name:" '#{pane_title}' >"$TMP" || exit 1
-	printf 'discard-test\n' >"$EXP"
-	cmp "$TMP" "$EXP" || fail "$name title"
-}
-
 start_cmd csi-param-discard 8 3 \
     "perl -e 'print qq{\e[}, q{1} x 80, qq{\030OK}'; sleep 2"
 check_capture csi-param-discard 'OK'
@@ -42,8 +10,13 @@ start_cmd csi-interm-discard 8 3 \
     "perl -e 'print qq{\e[    \030OK}'; sleep 2"
 check_capture csi-interm-discard 'OK'
 
-test_discard osc-discard '\e]2;'
-test_discard apc-discard '\e_'
+start_cmd osc-discard 8 3 \
+    "perl -e 'print qq{\e]2;}, q{x} x 1100000, qq{\e\\\\OK}'; sleep 2"
+check_capture osc-discard 'OK'
+
+start_cmd apc-discard 8 3 \
+    "perl -e 'print qq{\e_}, q{x} x 1100000, qq{\e\\\\OK}'; sleep 2"
+check_capture apc-discard 'OK'
 
 start_pane unknown-csi 8 3 '\033[?9999zOK'
 check_capture unknown-csi 'OK'

regress/input-modes.sh

@@ -5,9 +5,12 @@
 start_pane alternate 10 3 'MAIN\033[?1049hALT\033[?1049lZ\n'
 check_capture alternate 'MAINZ'
 
-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'
+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'
 check_capture osc133 'xxp>cmd
 xymore
+xzmore
+xwmore
+xvmore
 zzout
 qbad
 qqbig
@@ -15,10 +18,13 @@ 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=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'
+	'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'
 
 $TMUX kill-server 2>/dev/null
 exit $exit_status

regress/input-scroll.sh

@@ -51,7 +51,7 @@ $TMUX kill-server 2>/dev/null
 sleep 0.1
 $TMUX new-session -d -x 5 -y 3 -s history \; \
     set-option -g history-limit 3 \; \
-    respawn-pane -k "printf '01\n02\n03\n04\n05\n06'; $INPUT_HOLD" || exit 1
+    respawn-pane -k "printf '01\n02\n03\n04\n05\n06'; sleep 2" || exit 1
 sleep 0.3
 $TMUX capture-pane -pN -t history: -S - -E - | normalize_capture >"$TMP"
 printf "%s\n" '01

regress/kill-session-zoomed.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Killing a session whose window is zoomed must not crash the server:
-# window_destroy used to unzoom the window, which resized the panes and
-# fired pane-resized with the window in the payload, and releasing that
-# reference destroyed the window a second time.
-
-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 -f/dev/null new -d -sfoo || exit 1
-$TMUX split-window -d -h -tfoo:0 || exit 1
-$TMUX resize-pane -Z -tfoo:0 || exit 1
-$TMUX new -d -sbar || exit 1
-$TMUX kill-session -tfoo || exit 1
-$TMUX has-session -tbar || exit 1
-
-# The same with the zoomed window in a session killed by kill-server.
-$TMUX new -d -sbaz || exit 1
-$TMUX split-window -d -v -tbaz:0 || exit 1
-$TMUX resize-pane -Z -tbaz:0 || exit 1
-$TMUX kill-server || exit 1
-
-exit 0

regress/layout-custom.sh

@@ -50,8 +50,7 @@
 #   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 an empty v1 body with a checksum, and being
-#   parsed as v1;
+#   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;
@@ -377,7 +376,10 @@ must_equal 'Layout after select-pane back' "$(layout L:two)" "$SPLIT"
 
 # With nothing zoomed the two layout formats agree.
 #
-# Zoomed layouts are checked below with floating panes.
+# 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"
 
 # ---------------------------------------------------------------------------
@@ -701,42 +703,6 @@ must_contain 'Floating layout back z-index' "$floating" '"z":1'
 check_ok select-layout -t L:float "$floating"
 must_equal 'Floating layout after round trip' "$(raw_layout L:float)" "$floating"
 
-# A dump taken while zoomed must retain the unzoomed floating z-indexes.
-# Check hidden floats, floats above zoom, and a mixture of the two.
-for flags in '' A mixed; do
-	check_ok new-window -d -t L: -n zoom
-	zt=$($TMUX display-message -p -t L:zoom '#{pane_id}')
-	check_ok split-window -d -h -t "$zt"
-	case "$flags" in
-	A|mixed) first=-Ad ;;
-	*) first=-d ;;
-	esac
-	case "$flags" in
-	A) second=-Ad ;;
-	*) second=-d ;;
-	esac
-	check_ok new-pane "$first" -t "$zt" -x 20 -y 6 ''
-	check_ok new-pane "$second" -t "$zt" -x 30 -y 8 ''
-	for pane in 0 2 3; do
-		check_ok select-pane -t "L:zoom.$pane"
-		before=$(raw_layout L:zoom)
-		legacy=$(v1_layout L:zoom)
-		check_ok resize-pane -Z -t "L:zoom.$pane"
-		during=$(raw_layout L:zoom)
-		must_equal 'Layout while zoomed' "$during" "$before"
-		must_equal 'Legacy layout while zoomed' \
-		    "$(v1_layout L:zoom)" "$legacy"
-		must_equal 'Zoom after dumping layout' \
-		    "$($TMUX display-message -p -t L:zoom '#{window_zoomed_flag}')" 1
-		must_differ 'Visible layout while zoomed' \
-		    "$(visible_layout L:zoom)" "$(layout L:zoom)"
-		check_ok select-layout -t L:zoom "$during"
-		must_equal 'Round trip from zoomed layout' \
-		    "$(raw_layout L:zoom)" "$before"
-	done
-	check_ok kill-window -t L:zoom
-done
-
 # ---------------------------------------------------------------------------
 # Floating panes and the legacy (v1) format.
 #
@@ -872,12 +838,12 @@ 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
-# only an empty v1 body to dump. The floating cell must not be written out on
+# 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" '0000,'
+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.
@@ -890,11 +856,11 @@ 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 the v1 body is still empty -
+# 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" '0000,'
+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;

regress/modal-pane.sh

@@ -400,107 +400,6 @@ $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/mode-tree-menu-position.sh

@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# Chooser menus are centred on the mouse using their displayed width. A
-# hidden title must not move a borderless menu away from the mouse.
-
-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"
-
-cleanup()
-{
-	$TMUX kill-server >/dev/null 2>&1
-	$TMUX2 kill-server >/dev/null 2>&1
-}
-trap cleanup 0 1 15
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-$TMUX new-session -d -s short -x 100 -y 30 'sleep 100' || exit 1
-$TMUX set -g mouse on || exit 1
-$TMUX set -g status off || exit 1
-$TMUX2 new-session -d -x 100 -y 30 "$TMUX attach" || exit 1
-sleep 1
-
-for name in short aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; do
-	$TMUX rename-session "$name" || exit 1
-	for lines in none single padded; do
-		$TMUX set -g menu-border-lines "$lines" || exit 1
-		$TMUX choose-tree -s || exit 1
-		sleep 1
-
-		# Right-button press at window (60, 0), away from either edge.
-		seq=$(printf '\033[<2;61;1M')
-		$TMUX2 send-keys -l "$seq" || exit 1
-		sleep 1
-
-		row=2
-		column=54
-		if [ "$lines" = none ]; then
-			row=1
-		elif [ "$name" != short ]; then
-			column=31
-		fi
-		text=$($TMUX2 capture-pane -p | awk -v row="$row" \
-		    -v column="$column" 'NR == row {
-			# Keep byte offsets equal to columns with non-Unicode awk.
-			gsub(/│/, "|")
-			print substr($0, column, 7)
-		    }')
-		[ "$text" = 'Select ' ] || \
-		    fail "$lines menu for $name: expected Select at ($column, $row), got '$text'"
-
-		# Close the menu, release the button, then leave the chooser.
-		$TMUX2 send-keys Escape || exit 1
-		seq=$(printf '\033[<2;61;1m')
-		$TMUX2 send-keys -l "$seq" || exit 1
-		$TMUX2 send-keys q || exit 1
-		sleep 1
-	done
-done
-
-exit 0

regress/output-commands.sh

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

regress/respawn-pane-control-lag.sh

@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$"
+TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 DIR=$(mktemp -d)

regress/run-shell-cwd.sh

@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# run-shell -c should expand formats using the target pane.
-
-PATH=/bin:/usr/bin
-TERM=screen
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-
-TMP=$(mktemp -d)
-trap '$TMUX kill-server 2>/dev/null; rm -rf "$TMP"' 0 1 15
-TMP=$(cd "$TMP" && pwd -P)
-mkdir "$TMP/first" "$TMP/second dir" || exit 1
-
-check_directory()
-{
-	actual=$(cat "$TMP/out")
-	if [ "$actual" != "$1" ]; then
-		echo "Expected directory '$1', got '$actual'"
-		exit 1
-	fi
-}
-
-# The start path is available immediately, before the child is scheduled.
-# Use it to test the format context in the same command queue as creation.
-$TMUX new-session -d -s test -c "$TMP/first" 'sleep 60' \; \
-	 run-shell -c '#{pane_start_path}' "pwd >'$TMP/out'" || exit 1
-check_directory "$TMP/first"
-
-# An explicit target must supply the format context, including with a delay.
-pane=$($TMUX new-window -d -P -F '#{pane_id}' -t test \
-	-c "$TMP/second dir" 'sleep 60') || exit 1
-# The current path depends on the operating system finding the child process.
-i=0
-while [ "$($TMUX display-message -p -t "$pane" '#{pane_current_path}')" != \
-    "$TMP/second dir" ]; do
-	if [ "$i" -ge 100 ]; then
-		echo "Timed out waiting for pane current directory"
-		exit 1
-	fi
-	sleep 0.05
-	i=$((i + 1))
-done
-$TMUX run-shell -t "$pane" -d 0.1 -c '#{pane_current_path}' \
-	"pwd >'$TMP/out'" || exit 1
-check_directory "$TMP/second dir"
-
-# Literal directories and the default client directory still work.
-$TMUX run-shell -c "$TMP/second dir" "pwd >'$TMP/out'" || exit 1
-check_directory "$TMP/second dir"
-(cd "$TMP/first" && $TMUX run-shell "pwd >'$TMP/out'") || exit 1
-check_directory "$TMP/first"
-
-exit 0

regress/screen-redraw-menus.sh

@@ -106,28 +106,9 @@ compare menu-over-split
 
 # Menu with no border lines.
 setup 40 14
-$TMUX2 display-menu -T "This title must not reserve width" -C 1 \
-    -b none -x6 -y8 \
-    "Alpha item" a "" \
-    "Beta item" b "" \
-    "" "" "" \
-    "Gamma item" g "" || exit 1
-sleep 1
+menu -b none -x6 -y8
 compare menu-noborder
 
-# Menu border style follows the explicitly targeted window, not the current
-# window when a different pane is selected.
-setup 40 14
-$TMUX2 set menu-border-lines none || exit 1
-$TMUX2 neww || exit 1
-$TMUX2 display-menu -t%0 -T "Menu" -C 1 \
-    "Alpha item" a "" \
-    "Beta item" b "" \
-    "" "" "" \
-    "Gamma item" g "" || exit 1
-$TMUX2 selectw -t%0 || exit 1
-compare menu-target-window-noborder
-
 # Menu with double border lines.
 setup 40 14
 menu -b double -x6 -y8

regress/screen-redraw-popups.sh

@@ -0,0 +1,101 @@
+#!/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/menu-noborder.result

@@ -1,11 +1,11 @@
 MENU00 abcdefghij
 MENU01 abcdefghij
-MENU02 abcdefghij
-MENU03 abcdefghij
-MENU04 Alpha item (a) 
-MENU05 Beta item  (b) 
-MENU06                
-MENU07 Gamma item (g) 
+MENU02  Menu            
+MENU03  Alpha item (a)  
+MENU04  Beta item  (b)  
+MENU05                  
+MENU06  Gamma item (g)  
+MENU07                  
 MENU08 abcdefghij
 MENU09 abcdefghij
 MENU10 abcdefghij

regress/screen-redraw-results/menu-target-window-noborder.result

@@ -1,13 +0,0 @@
-MENU00 abcdefghij
-MENU01 abcdefghij
-MENU02 abcdefghij
-MENU03 abcdefghij
-MENU04 abcd Alpha item (a) 
-MENU05 abcd Beta item  (b) 
-MENU06 abcd                
-MENU07 abcd Gamma item (g) 
-MENU08 abcdefghij
-MENU09 abcdefghij
-MENU10 abcdefghij
-MENU11 abcdefghij
-MENU12 abcdefghij

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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/screen-redraw-tiled.sh

@@ -95,8 +95,7 @@ layout_tee_down() {		# top/bottom, bottom split: a top tee
 $TMUX kill-server 2>/dev/null
 $TMUX2 kill-server 2>/dev/null
 
-# Keep the anchor window alive until cleanup, even on slow test runs.
-$TMUX2 new -d -x40 -y14 'exec cat' || exit 1
+$TMUX2 new -d -x40 -y14 "sh -c 'exec sleep 100'" || exit 1
 $TMUX2 set -g status off || exit 1
 $TMUX2 set -g window-size manual || exit 1
 $TMUX2 set -g pane-border-format " #{pane_index} " || exit 1

regress/sync-output-wrapped.sh

@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# When only some lines are redrawn after a synchronized update, a line
-# following a wrapped line must be drawn at its own position, not where the
-# cursor happens to be.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-
-DIR=$(mktemp -d) || exit 1
-TMUX_TMPDIR=$DIR
-export TMUX_TMPDIR
-
-INNER="$TEST_TMUX -Li$$ -f/dev/null"
-OUTER="$TEST_TMUX -Lo$$ -f/dev/null"
-CONTROL=$DIR/control
-EMITTER=$DIR/emitter.pl
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-wait_for_file()
-{
-	i=0
-	while [ "$i" -lt 50 ] && [ ! -e "$1" ]; do
-		sleep 0.1
-		i=$((i + 1))
-	done
-	[ -e "$1" ] || fail "$2"
-}
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		$INNER list-clients -F '#{client_termfeatures}' 2>/dev/null |
-		    grep -q 'sync' && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "sync-capable client did not attach"
-}
-
-cat >"$EMITTER" <<'PERL'
-use strict;
-use warnings;
-
-my $control = $ENV{CONTROL};
-(my $dir = $control) =~ s{/[^/]+$}{};
-
-# Fill the screen with 80 column lines and no newlines so every line wraps.
-my $out = "\e[H\e[2J";
-for my $row (1 .. 24) {
-	$out .= substr(sprintf("ROW%02d_", $row) . ('x' x 80), 0, 80);
-}
-syswrite STDOUT, $out . "\e[1;1H";
-
-open my $painted, '>', "$dir/painted" or die "$dir/painted: $!\n";
-close $painted;
-while (!-e $control) {
-	select undef, undef, undef, 0.01;
-}
-
-# Change rows 2 and 6 in one synchronized update.
-my $frame = "\e[?2026h" .
-    "\e[2;1H" . substr("NEW02_" . ('#' x 80), 0, 80) .
-    "\e[6;1H" . substr("NEW06_" . ('%' x 80), 0, 80) .
-    "\e[24;1H" .
-    "\e[?2026l";
-my $written = syswrite STDOUT, $frame;
-die "short synchronized frame write\n"
-    unless defined $written && $written == length $frame;
-open my $done, '>', "$dir/done" or die "$dir/done: $!\n";
-close $done;
-select undef, undef, undef, 3;
-PERL
-
-$INNER new-session -d -s inner -x 80 -y 24 \
-    "CONTROL='$CONTROL' perl '$EMITTER'" || exit 1
-$INNER set-option -g status off || exit 1
-$INNER set-option -g window-size manual || exit 1
-$INNER set-option -as terminal-features '*:sync' || exit 1
-
-$OUTER new-session -d -s outer -x 80 -y 24 \
-    "$TEST_TMUX -Li$$ -f/dev/null attach-session -t inner" ||
-    exit 1
-$OUTER set-option -g status off || exit 1
-$OUTER set-option -g window-size manual || exit 1
-wait_for_client
-
-wait_for_file "$DIR/painted" "application did not paint"
-sleep 1
-: >"$CONTROL"
-wait_for_file "$DIR/done" "application did not finish"
-sleep 1
-
-$OUTER capture-pane -p -t outer:0.0 >"$DIR/screen" || exit 1
-sed -n 2p "$DIR/screen" | grep -q '^NEW02_#' || fail "row 2 not redrawn"
-sed -n 3p "$DIR/screen" | grep -q '^ROW03_x' || fail "row 3 overwritten"
-sed -n 6p "$DIR/screen" | grep -q '^NEW06_%' || fail "row 6 not redrawn"
-exit 0

regress/tty-keys.sh

@@ -9,37 +9,14 @@ $TMUX kill-server 2>/dev/null
 TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX2 kill-server 2>/dev/null
 
-TMP=$(mktemp) || exit 1
-prompt_pid=
-
-cleanup () {
-	if [ -n "$prompt_pid" ]; then
-		kill "$prompt_pid" 2>/dev/null
-		wait "$prompt_pid" 2>/dev/null
-	fi
-	$TMUX kill-server 2>/dev/null
-	$TMUX2 kill-server 2>/dev/null
-	rm -f "$TMP"
-}
-trap cleanup 0
-trap 'exit 1' 1 2 15
-
-fail () {
-	echo "[FAIL] $*" >&2
-	exit 1
-}
+TMP=$(mktemp)
+trap "rm -f $TMP" 0 1 15
 
 $TMUX2 -f/dev/null new -d || exit 1
 $TMUX -f/dev/null new -d "$TMUX2 attach" || exit 1
-i=0
-while [ -z "$($TMUX2 list-clients -F '#{client_name}')" ]; do
-	[ "$i" -lt 100 ] || fail "inner client did not attach"
-	sleep 0.05
-	i=$((i + 1))
-done
+sleep 1
 
 exit_status=0
-assertion=0
 
 format_string () {
 	case $1 in
@@ -57,33 +34,12 @@ assert_key () {
 	expected_name=$2
 	format_string=$(format_string "$expected_name")
 
-	# Use a different prompt each time so a stale redraw cannot look ready.
-	assertion=$((assertion + 1))
-	prompt="tty-keys-$assertion:"
-	$TMUX2 command-prompt -k -p "$prompt" \
-	    'display-message -pl '"$format_string" > "$TMP" &
-	prompt_pid=$!
-	i=0
-	while ! $TMUX capture-pane -p | grep -Fq "$prompt"; do
-		kill -0 "$prompt_pid" 2>/dev/null || \
-		    fail "$keys -> $expected_name: prompt exited before becoming ready"
-		[ "$i" -lt 100 ] || \
-		    fail "$keys -> $expected_name: timed out waiting for prompt"
-		sleep 0.05
-		i=$((i + 1))
-	done
+	$TMUX2 command-prompt -k 'display-message -pl '"$format_string" > "$TMP" &
+	sleep 0.05
 
-	$TMUX send-keys $keys || fail "could not send $keys"
+	$TMUX send-keys $keys
 
-	i=0
-	while kill -0 "$prompt_pid" 2>/dev/null; do
-		[ "$i" -lt 100 ] || \
-		    fail "$keys -> $expected_name: timed out waiting for key"
-		sleep 0.05
-		i=$((i + 1))
-	done
-	wait "$prompt_pid" || fail "$keys -> $expected_name: prompt failed"
-	prompt_pid=
+	wait
 
 	keys=$(printf '%s' "$keys" | sed -e 's/Escape/\\\\033/g' | tr -d '[:space:]')
 	actual_name=$(tr -d '[:space:]' < "$TMP")
@@ -337,16 +293,6 @@ assert_key 'Escape [24@' 'C-S-F12'
 assert_key 'Escape [I' 'FocusIn'
 assert_key 'Escape [O' 'FocusOut'
 
-# Focus events do not leave the prefix table.
-$TMUX2 bind C-c set -g @focus-prefix yes
-$TMUX2 set -g focus-events on
-$TMUX send-keys C-b Escape '[O' Escape '[I' C-c
-sleep 0.05
-if [ "$($TMUX2 show -gv @focus-prefix)" != yes ]; then
-	echo "[FAIL] FocusIn and FocusOut left the prefix table"
-	exit_status=1
-fi
-
 # Paste keys
 assert_key 'Escape [200~' 'PasteStart'
 assert_key 'Escape [201~' 'PasteEnd'
@@ -409,4 +355,7 @@ assert_key 'Escape [32;2u' 'S-Space'
 assert_key 'Escape [9;5u' 'C-Tab'
 assert_key 'Escape [1;5Z' 'C-S-Tab'
 
+$TMUX kill-server 2>/dev/null
+$TMUX2 kill-server 2>/dev/null
+
 exit $exit_status

regress/tty-margins-scrollbar.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# A pane that doesn't span the terminal's full width - because
-# pane-scrollbars is on (the scrollbar occupies a column) or the pane is
-# one of a side-by-side split - needs DECSLRM (left/right margin) support
-# to use the fast native-scroll path (tty_cmd_linefeed()/scrollup()/
-# scrolldown()/reverseindex(), tty.c:
-# "(!tty_full_width(tty, ctx) && !tty_use_margin(tty))"). Without it, every
-# single scroll falls back to tty_redraw_region()'s full manual repaint of
-# the whole region - a real, confirmed source of flicker (and, separately,
-# of image content not surviving a scroll in branches with image support).
-#
-# tty_default_features() (tty-features.c) grants the "margins" feature to
-# several terminals it can positively identify via XTVERSION/DA2 (mintty,
-# iTerm2, WezTerm, ghostty, XTerm-as-VT420) - this checks the actual
-# server-side scroll decision via the -vv log for the underlying mechanism
-# those table entries all rely on, using the terminal-features option
-# directly (which any of them - or a user's own terminal-overrides -
-# ultimately feed into) rather than simulating any one terminal's
-# identification handshake.
-
-PATH=/bin:/usr/bin
-TERM=screen
-LC_ALL=C.UTF-8
-export PATH TERM LC_ALL
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-
-DIR=$(mktemp -d) || exit 1
-cd "$DIR" || exit 1
-INNER="$TEST_TMUX -vv -Lmarginsscrollbar-inner-$$ -f/dev/null"
-OUTER="$TEST_TMUX -Lmarginsscrollbar-outer-$$ -f/dev/null"
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-cleanup()
-{
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-	cd /
-	rm -rf "$DIR"
-}
-trap cleanup 0 1 15
-
-wait_for_client()
-{
-	i=0
-	while [ "$i" -lt 50 ]; do
-		CLIENT=$($INNER list-clients -F '#{client_name}' 2>/dev/null)
-		[ -n "$CLIENT" ] && return 0
-		sleep 0.1
-		i=$((i + 1))
-	done
-	fail "inner client did not attach"
-}
-
-run_scroll_phase()
-{
-	label=$1
-	margins=$2
-
-	rm -f tmux-server*.log
-
-	$INNER new-session -d -s inner -x 40 -y 6 'exec sh' || exit 1
-	$INNER set -g status off || exit 1
-	$INNER set -g window-size manual || exit 1
-	$INNER set -g pane-scrollbars on || exit 1
-	if [ "$margins" = "on" ]; then
-		$INNER set -as terminal-features ',*:margins' || exit 1
-	fi
-
-	$OUTER new-session -d -x 40 -y 6 || exit 1
-	OUTERPANE=$($OUTER list-panes -F '#{pane_id}') || exit 1
-	$OUTER set -g status off || exit 1
-	$OUTER set -g window-size manual || exit 1
-	$OUTER set -g default-terminal screen-256color || exit 1
-	$OUTER send-keys -t "$OUTERPANE" -l "$INNER attach -t inner" || exit 1
-	$OUTER send-keys -t "$OUTERPANE" Enter || exit 1
-	sleep 1
-
-	wait_for_client
-
-	i=0
-	while [ "$i" -lt 8 ]; do
-		$INNER send-keys -t inner Enter || exit 1
-		sleep 0.2
-		i=$((i + 1))
-	done
-	sleep 0.3
-
-	LOG=$(ls tmux-server*.log 2>/dev/null | head -1)
-	[ -n "$LOG" ] || fail "$label: sanity: no server -vv log was produced"
-
-	n=$(grep -c "tty_redraw_region.*large region redraw" "$LOG")
-
-	$OUTER kill-server 2>/dev/null
-	$INNER kill-server 2>/dev/null
-
-	echo "$n"
-}
-
-# Phase 1: margins granted - must never fall back to a full region redraw.
-n_with=$(run_scroll_phase "with margins" "on")
-[ "$n_with" -eq 0 ] ||
-	fail "with margins granted, scrolling a scrollbar-enabled pane still fell back to a full region redraw ($n_with times)"
-
-# Phase 2: sanity check - without margins, the same scenario must actually
-# hit the fallback, proving phase 1 wasn't accidentally trivial.
-n_without=$(run_scroll_phase "without margins" "off")
-[ "$n_without" -gt 0 ] ||
-	fail "sanity: without margins, scrolling a scrollbar-enabled pane never fell back to a full region redraw - this scenario no longer exercises the bug this test checks for"
-
-exit 0

regress/wait-for-client-lost.sh

@@ -1,164 +0,0 @@
-#!/bin/sh
-
-# A disconnected waiter must release both its wait and its command queue.
-PATH=/bin:/usr/bin
-TERM=screen
-export TERM
-
-[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUT=$(mktemp -d)
-TMUX="$TEST_TMUX -S$OUT/socket -f/dev/null"
-pids=
-
-cleanup()
-{
-	for pid in $pids; do
-		kill "$pid" 2>/dev/null || true
-	done
-	$TMUX kill-server 2>/dev/null || true
-	rm -rf "$OUT"
-}
-trap cleanup EXIT
-
-fail()
-{
-	echo "$*" >&2
-	exit 1
-}
-
-wait_list()
-{
-	expected=$1
-	shift
-	i=0
-	while [ $i -lt 100 ]; do
-		value=$($TMUX wait-for -l "$@") || fail "list waiters failed"
-		[ "$value" = "$expected" ] && return
-		i=$((i + 1))
-		sleep 0.05
-	done
-	fail "expected waiters '$expected', got '$value'"
-}
-
-wait_free()
-{
-	client_pid=$1
-	i=0
-	while [ $i -lt 100 ]; do
-		awk -v pid="$client_pid" '
-		    $4 == "IDENTIFY_CLIENTPID" && $5 == pid { address = $3 }
-		    address != "" && $2 == "free" && $3 == "client" &&
-		    $4 == address && $5 == "(0" { freed = 1 }
-		    END { exit !freed }
-		' "$OUT"/tmux-server-*.log && return
-		i=$((i + 1))
-		sleep 0.05
-	done
-	fail "client $client_pid was not freed"
-}
-
-cd "$OUT" || exit 1
-$TMUX -vv new-session -d -s test || fail "new-session failed"
-$TMUX set -g @continued 0 || fail "set option failed"
-
-for signal in TERM KILL; do
-	for kind in channel lock event; do
-		name="$kind-$signal"
-		case $kind in
-		channel) args="$name"; list_args="$name" ;;
-		lock)
-			$TMUX wait-for -L "$name" || fail "lock failed"
-			args="-L $name"; list_args="$name"
-			;;
-		event) args="-E @$name"; list_args="-E @$name" ;;
-		esac
-
-		$TMUX wait-for $args \; set -g @continued 1 &
-		dead=$!
-		pids="$dead"
-		wait_list "client-$dead" $list_args
-
-		$TMUX wait-for $args &
-		live=$!
-		pids="$dead $live"
-		wait_list "$(printf 'client-%s\nclient-%s' "$dead" "$live")" \
-		    $list_args
-
-		kill -"$signal" "$dead" || fail "kill failed"
-		wait "$dead" 2>/dev/null || true
-		pids="$live"
-		wait_list "client-$live" $list_args
-		wait_free "$dead"
-		[ "$($TMUX show -gqv @continued)" = 0 ] ||
-			fail "disconnected client's next command ran"
-
-		case $kind in
-		channel) $TMUX wait-for -S "$name" || fail "signal failed" ;;
-		lock) $TMUX wait-for -U "$name" || fail "unlock failed" ;;
-		event)
-			$TMUX wait-for -E -w "client-$live" "@$name" ||
-				fail "wake event waiter failed"
-			;;
-		esac
-		wait_list "" $list_args
-		wait_free "$live"
-		wait "$live" || fail "surviving waiter failed"
-		pids=
-		if [ "$kind" = lock ]; then
-			$TMUX wait-for -U "$name" || fail "final unlock failed"
-		fi
-	done
-done
-
-# Removing the last waiter must remove its otherwise unused channel, and must
-# not create a pending signal. Unrelated pending signals must be preserved.
-$TMUX wait-for -S saved || fail "save signal failed"
-$TMUX wait-for last &
-dead=$!
-pids="$dead"
-wait_list "client-$dead" last
-kill -KILL "$dead" || fail "kill last waiter failed"
-wait "$dead" 2>/dev/null || true
-pids=
-wait_list "" last
-wait_free "$dead"
-grep -F 'remove empty wait channel last' "$OUT"/tmux-server-*.log \
-    >/dev/null || fail "empty channel was not removed"
-
-$TMUX wait-for saved \; wait-for last &
-live=$!
-pids="$live"
-wait_list "client-$live" last
-$TMUX wait-for -S last || fail "signal last failed"
-wait_free "$live"
-wait "$live" || fail "pending signal was not preserved"
-pids=
-
-# Source-file leaves a cleanup callback behind the blocked command.
-printf 'wait-for sourced\nset -g @continued 1\n' >"$OUT/source.conf"
-$TMUX source-file "$OUT/source.conf" &
-dead=$!
-pids="$dead"
-wait_list "client-$dead" sourced
-kill -KILL "$dead" || fail "kill source-file waiter failed"
-wait "$dead" 2>/dev/null || true
-pids=
-wait_list "" sourced
-wait_free "$dead"
-[ "$($TMUX show -gqv @continued)" = 0 ] ||
-	fail "disconnected source-file client's next command ran"
-
-# Firing an event after cancellation must not call the removed event sink.
-$TMUX wait-for -E window-renamed &
-dead=$!
-pids="$dead"
-wait_list "client-$dead" -E window-renamed
-kill -KILL "$dead" || fail "kill event waiter failed"
-wait "$dead" 2>/dev/null || true
-pids=
-wait_list "" -E window-renamed
-wait_free "$dead"
-$TMUX rename-window -t test:0 renamed || fail "rename-window failed"
-$TMUX display-message -p '#{pid}' >/dev/null || fail "server exited"
-
-exit 0

screen-redraw.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-redraw.c,v 1.161 2026/09/22 16:56:07 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 is not included.
+ * client status line and overlay are 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,6 +93,7 @@ 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
@@ -263,6 +264,8 @@ 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')
@@ -1378,30 +1381,45 @@ 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;
 
-	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;
+	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;
+		}
 	}
 }
 
@@ -1655,7 +1673,7 @@ redraw_draw_pane_prompt(struct redraw_draw_ctx *dctx, struct window_pane *wp)
 	prompt_draw(wp->prompt, &pdd);
 	screen_write_stop(&ctx);
 
-	tty_draw_line(tty, &screen, offset, 0, width, px, cy, NULL);
+	tty_draw_line(tty, &screen, 0, offset, width, px, cy, NULL);
 	screen_free(&screen);
 }
 
@@ -1670,8 +1688,10 @@ 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;
+	u_int			 width, i, y, lines, j;
 	struct redraw_span	*first;
+	struct visible_ranges	*r;
+	struct visible_range	*rr;
 	int			 redraw;
 
 	if (c->flags & CLIENT_SUSPENDED)
@@ -1779,9 +1799,19 @@ 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++)
-			tty_draw_line(tty, sl, 0, i, tty->sx, 0, y + i, NULL);
+		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);
+			}
+		}
 	}
+	if (c->overlay_draw != NULL && (flags & REDRAW_OVERLAY))
+		c->overlay_draw(c, c->overlay_data);
 
 	tty_reset(tty);
 
@@ -1837,13 +1867,18 @@ redraw_screen(struct client *c)
 {
 	int	flags = 0;
 
-	if (c->flags & CLIENT_REDRAWWINDOW)
-		redraw_draw(c, NULL, REDRAW_ALL);
-	else {
+	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_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

@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.292 2026/09/21 12:14:32 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.290 2026/08/24 15:05:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -305,16 +305,21 @@ 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, 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 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.
 		 */
 		if (ctx->wp != NULL && (ctx->wp != ctx->wp->window->active ||
 		    ctx->wp->screen != &ctx->wp->base))
 			ttyctx->flags |= TTY_CTX_SYNC;
-		else if (is_sync)
-			ttyctx->flags |= TTY_CTX_SYNC;
+		else {
+			if (ctx->wp == NULL)
+				ttyctx->flags |= TTY_CTX_OVERLAY_SYNC;
+			if (is_sync)
+				ttyctx->flags |= TTY_CTX_SYNC;
+		}
 		tty_write(tty_cmd_syncstart, ttyctx);
 		ctx->flags |= SCREEN_WRITE_SYNC;
 	}
@@ -709,7 +714,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_SYNC;
+			ttyctx.flags &= (TTY_CTX_OVERLAY_SYNC|TTY_CTX_SYNC);
 			tty_write(tty_cmd_cell, &ttyctx);
 			ttyctx.ocx++;
 
@@ -833,39 +838,34 @@ screen_write_menu(struct screen_write_ctx *ctx, struct menu *menu, int choice,
 	struct screen		*s = ctx->s;
 	struct grid_cell	 default_gc;
 	const struct grid_cell	*gc = &default_gc;
-	u_int			 border, cx = s->cx, cy = s->cy, i, j, width;
+	u_int			 cx, cy, i, j, width = menu->width;
 	const char		*name;
 
+	cx = s->cx;
+	cy = s->cy;
+
 	memcpy(&default_gc, menu_gc, sizeof default_gc);
 
-	if (lines == BOX_LINES_NONE) {
-		border = 0;
-		width = menu->item_width;
-	} else {
-		border = 1;
-		width = menu->width;
-		screen_write_box(ctx, width + 4, menu->count + 2, lines,
-		    border_gc, menu->title);
-	}
+	screen_write_box(ctx, menu->width + 4, menu->count + 2, lines,
+	    border_gc, menu->title);
 
 	for (i = 0; i < menu->count; i++) {
 		name = menu->items[i].name;
 		if (name == NULL) {
-			screen_write_cursormove(ctx, cx, cy + border + i, 0);
-			screen_write_hline(ctx, width + 2 + (2 * border), 1, 1,
-			    lines, border_gc);
+			screen_write_cursormove(ctx, cx, cy + 1 + i, 0);
+			screen_write_hline(ctx, width + 4, 1, 1, lines,
+			    border_gc);
 			continue;
 		}
 
 		if (choice >= 0 && i == (u_int)choice && *name != '-')
 			gc = choice_gc;
 
-		screen_write_cursormove(ctx, cx + border, cy + border + i, 0);
+		screen_write_cursormove(ctx, cx + 1, cy + 1 + i, 0);
 		for (j = 0; j < width + 2; j++)
 			screen_write_putc(ctx, gc, ' ');
 
-		screen_write_cursormove(ctx, cx + border + 1, cy + border + i,
-		    0);
+		screen_write_cursormove(ctx, cx + 2, cy + 1 + i, 0);
 		if (*name == '-') {
 			default_gc.attr |= GRID_ATTR_DIM;
 			format_draw(ctx, gc, width, name + 1, NULL, 0);

server-client.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.514 2026/09/22 06:46:50 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,6 +67,77 @@ 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)
@@ -90,6 +161,52 @@ 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)
@@ -373,6 +490,7 @@ 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);
 
@@ -384,9 +502,6 @@ server_client_lost(struct client *c)
 	TAILQ_REMOVE(&clients, c, entry);
 	log_debug("lost client %p", c);
 
-	cmd_wait_for_client_lost(c);
-	cmdq_next(c);
-
 	if (c->flags & CLIENT_ATTACHED) {
 		server_client_attached_lost(c);
 		events_fire_client("client-detached", c);
@@ -1631,6 +1746,10 @@ 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);
@@ -1641,9 +1760,10 @@ server_client_handle_key0(struct client *c, struct key_event *event,
 	}
 
 	/*
-	 * 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.
+	 * Key presses in overlay mode, 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) {
@@ -1652,11 +1772,22 @@ 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 &&
+		if (wp != NULL && wp == wp->window->modal &&
 		    (wp->flags & PANE_CLOSEONCANCEL) &&
 		    (event->key == '\033' || event->key == ('c'|KEYC_CTRL))) {
 			server_kill_pane(wp);
@@ -2046,8 +2177,11 @@ server_client_reset_state(struct client *c)
 	flags = (tty->flags & TTY_BLOCK);
 	tty->flags &= ~TTY_BLOCK;
 
-	/* Get mode from the menu if any, else from the screen. */
-	if (w->menu != NULL) {
+	/* 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) {
 		menu_get_cursor(w->menu, &cx, &cy);
 		s = menu_screen(w->menu);
 	} else if (wp != NULL && c->prompt == NULL)
@@ -2069,7 +2203,7 @@ server_client_reset_state(struct client *c)
 	if (c->prompt != NULL) {
 		prompt = 1;
 		status_prompt_cursor(c, &cx, &cy);
-	} else if (wp != NULL) {
+	} else if (wp != NULL && c->overlay_draw == NULL) {
 		if (w->menu != NULL) {
 			tty_window_offset(tty, &ox, &oy, &sx, &sy);
 			if (cx < ox || cx >= ox + sx ||
@@ -2124,7 +2258,7 @@ server_client_reset_state(struct client *c)
 			if (!cursor)
 				mode &= ~MODE_CURSOR;
 		}
-	} else if (s == NULL)
+	} else if (c->overlay_mode == NULL || s == NULL)
 		mode &= ~MODE_CURSOR;
 	if (~pane_mode & MODE_SYNC) {
 		log_debug("%s: cursor to %u,%u", __func__, cx, cy);
@@ -2141,7 +2275,7 @@ server_client_reset_state(struct client *c)
 	 * movement events.
 	 */
 	if (options_get_number(oo, "mouse")) {
-		if (w->menu == NULL) {
+		if (c->overlay_draw == NULL && w->menu == NULL) {
 			mode &= ~ALL_MOUSE_MODES;
 			TAILQ_FOREACH(loop, &w->panes, entry) {
 				if (loop->screen->mode & MODE_MOUSE_ALL)
@@ -2157,7 +2291,7 @@ server_client_reset_state(struct client *c)
 	}
 
 	/* Clear bracketed paste mode if at the prompt. */
-	if (prompt)
+	if (c->overlay_draw == NULL && prompt)
 		mode &= ~MODE_BRACKETPASTE;
 
 	/* Set the terminal mode and reset attributes. */
@@ -2359,10 +2493,11 @@ 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", c->name,
+		log_debug("%s: redraw%s%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" : "");
 	}
 
@@ -2570,6 +2705,10 @@ 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);

server-fn.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.154 2026/09/21 12:43: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>
@@ -310,8 +310,8 @@ server_link_window(struct session *src, struct winlink *srcwl,
 		}
 		if (killflag) {
 			/*
-			 * Can't use session_detach as it won't detach the only
-			 * window.
+			 * Can't use session_detach as it will destroy session
+			 * if this makes it empty.
 			 */
 			events_fire_winlink("window-unlinked", dstwl);
 			dstwl->flags &= ~WINLINK_ALERTFLAGS;

session.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.108 2026/09/21 12:43:36 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.107 2026/08/05 07:35:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -336,17 +336,10 @@ session_attach(struct session *s, struct window *w, int idx, char **cause)
 	return (wl);
 }
 
-/*
- * Detach a window from a session. Returns 1 if the window has not been
- * detached - the caller must destroy the session.
- */
+/* Detach a window from a session. */
 int
 session_detach(struct session *s, struct winlink *wl)
 {
-	if (RB_MIN(winlinks, &s->windows) == wl &&
-	    RB_MAX(winlinks, &s->windows) == wl)
-		return (1);
-
 	if (s->curw == wl &&
 	    session_last(s) != 0 &&
 	    session_previous(s, 0) != 0)
@@ -359,6 +352,8 @@ session_detach(struct session *s, struct winlink *wl)
 
 	session_group_synchronize_from(s);
 
+	if (RB_EMPTY(&s->windows))
+		return (1);
 	return (0);
 }
 

spawn.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: spawn.c,v 1.53 2026/09/21 12:43:36 nicm Exp $ */
+/* $OpenBSD: spawn.c,v 1.52 2026/08/20 09:19:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -166,8 +166,8 @@ spawn_window(struct spawn_context *sc, char **cause)
 		}
 		if (wl != NULL) {
 			/*
-			 * Can't use session_detach as it won't detach the only
-			 * window.
+			 * Can't use session_detach as it will destroy session
+			 * if this makes it empty.
 			 */
 			wl->flags &= ~WINLINK_ALERTFLAGS;
 			events_fire_winlink("window-unlinked", wl);
@@ -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,
-    spawn_finish_edit_cb cb, void *arg)
+    const char *editor, 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);
 
-	editor = options_get_string(global_options, "editor");
+	if (editor == NULL)
+		editor = options_get_string(global_options, "editor");
 	fd = mkstemp(path);
 	if (fd == -1)
 		return (NULL);

status.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.274 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.273 2026/07/06 14:29:10 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -577,6 +577,8 @@ 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.1172 2026/09/22 06:58:05 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.1170 2026/09/11 10:17:16 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 22 2026 $
+.Dd $Mdocdate: September 11 2026 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -2006,6 +2006,25 @@ 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
@@ -2171,6 +2190,27 @@ 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)
@@ -2224,6 +2264,32 @@ 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)
@@ -2264,6 +2330,21 @@ 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 pipe\-selection
+.Op Ar command
+.Xc
+Pipe the selected text to
+.Ar command
+and clear the selection.
+.It Xo
 .Ic previous\-matching\-bracket
 (emacs: M\-C\-b)
 .Xc
@@ -2453,6 +2534,15 @@ Search forward for the specified plain text.
 Repeat the last search in the reverse direction (forward becomes backward and
 backward becomes forward).
 .It Xo
+.Ic select\-output
+.Op Fl a
+.Xc
+Select the current OSC 133 command output.
+The default emacs binding is
+.Ql C\-o
+and the default vi binding is
+.Ql M\-o .
+.It Xo
 .Ic select\-line
 (vi: V)
 .Xc
@@ -2496,6 +2586,20 @@ 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
+.Ql C
+marker up to its matching
+.Ql D
+marker.
+If there is no
+.Ql D
+marker, the output ends at the end of the copy-mode buffer.
+At the following prompt or below it, they use the most recent nonempty output.
+With
+.Fl a ,
+they use the entire copy-mode buffer instead.
+If no output range can be found, they do nothing.
+.Pp
 The search commands come in several varieties:
 .Ql search\-forward
 and
@@ -2603,12 +2707,19 @@ The synopsis for the
 command is:
 .Bl -tag -width Ds
 .It Xo Ic copy\-mode
-.Op Fl dekHMqSu
+.Op Fl UcdekHMqSu
 .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
@@ -5085,9 +5196,6 @@ The available features are:
 .Bl -tag -width Ds
 .It 256
 Supports 256 colours with the SGR escape sequences.
-.It appesc
-Supports application escape key mode, where the Escape key sends a sequence
-that cannot be mistaken for the start of another key.
 .It clipboard
 Allows setting the system clipboard.
 .It ccolour
@@ -5356,16 +5464,10 @@ section on how to specify
 .Ar style .
 .It Ic menu\-border\-lines Ar type
 Set the type of characters used for drawing menu borders.
-.Ar type
-may be one of
-.Ic single ,
-.Ic rounded ,
-.Ic double ,
-.Ic heavy ,
-.Ic simple ,
-.Ic padded ,
-or
-.Ic none .
+See
+.Ic popup\-border\-lines
+for possible values for
+.Ar border\-lines .
 .It Ic message\-command\-style Ar style
 Set status line message command style.
 This is used for the command prompt with
@@ -5818,6 +5920,20 @@ 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
@@ -6025,6 +6141,48 @@ 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
@@ -8171,16 +8329,10 @@ command should be omitted.
 .Pp
 .Fl b
 sets the type of characters used for drawing menu borders.
-.Ar border\-lines
-may be one of
-.Ic single ,
-.Ic rounded ,
-.Ic double ,
-.Ic heavy ,
-.Ic simple ,
-.Ic padded ,
-or
-.Ic none .
+See
+.Ic popup\-border\-lines
+for possible values for
+.Ar border\-lines .
 .Pp
 .Fl H
 sets the style for the selected menu item (see
@@ -8216,18 +8368,15 @@ 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 with the following additional variables.
-The
-.Ql popup_
-prefix is retained for compatibility:
+Or a format, which is expanded including the following additional variables:
 .Bl -column "XXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
 .It Sy "Variable name" Ta Sy "Replaced with"
-.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_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_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 at the mouse"
+.It Li "popup_mouse_bottom" Ta "Bottom of 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"
@@ -8238,7 +8387,7 @@ prefix is retained for compatibility:
 .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 the menu"
+.It Li "popup_width" Ta "Width of menu or popup"
 .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
@@ -8324,6 +8473,116 @@ 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
@@ -8836,8 +9095,6 @@ These are set automatically if the
 capability is present.
 .It Em \&Dseks , \&Eneks
 Disable and enable extended keys.
-.It Em \&Dsesc , \&Enesc
-Disable and enable application escape key mode.
 .It Em \&Dsfcs , \&Enfcs
 Disable and enable focus reporting.
 These are set automatically if the

tmux.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1447 2026/09/22 14:10:26 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1440 2026/09/11 10:17:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -464,7 +464,6 @@ enum tty_code_code {
 	TTYC_DL1,
 	TTYC_DSBP,
 	TTYC_DSEKS,
-	TTYC_DSESC,
 	TTYC_DSFCS,
 	TTYC_DSMG,
 	TTYC_E3,
@@ -475,7 +474,6 @@ enum tty_code_code {
 	TTYC_ENACS,
 	TTYC_ENBP,
 	TTYC_ENEKS,
-	TTYC_ENESC,
 	TTYC_ENFCS,
 	TTYC_ENMG,
 	TTYC_FSL,
@@ -818,6 +816,7 @@ 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 \
@@ -825,7 +824,8 @@ struct colour_palette {
 	 GRID_LINE_SECOND_PROMPT| \
 	 GRID_LINE_START_COMMAND| \
 	 GRID_LINE_START_OUTPUT| \
-	 GRID_LINE_END_OUTPUT)
+	 GRID_LINE_END_OUTPUT| \
+	 GRID_LINE_END_OUTPUT_STATUS)
 
 /* Grid string flags. */
 #define GRID_STRING_WITH_SEQUENCES 0x1
@@ -1184,7 +1184,6 @@ struct menu {
 	struct menu_item	*items;
 	u_int			 count;
 	u_int			 width;
-	u_int			 item_width;
 };
 typedef void (*menu_choice_cb)(struct menu *, u_int, key_code, void *);
 
@@ -1742,7 +1741,6 @@ struct tty_term {
 #define TERM_VT100LIKE 0x20
 #define TERM_SIXEL 0x40
 #define TERM_INVALIDMS 0x80
-#define TERM_NOREPLACE 0x100
 	int		 flags;
 
 	LIST_ENTRY(tty_term) entry;
@@ -1801,6 +1799,7 @@ struct tty {
 	size_t		 discarded;
 
 	struct termios	 tio;
+	struct visible_ranges r;
 
 	struct grid_cell cell;
 	struct grid_cell last_cell;
@@ -1862,6 +1861,7 @@ 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
 
@@ -2196,6 +2196,16 @@ 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;
@@ -2281,7 +2291,7 @@ struct client {
 #define CLIENT_SIZECHANGED 0x400000
 #define CLIENT_STATUSOFF 0x800000
 #define CLIENT_REDRAWSTATUSALWAYS 0x1000000
-/* 0x2000000 unused */
+#define CLIENT_REDRAWOVERLAY 0x2000000
 #define CLIENT_CONTROL_NOOUTPUT 0x4000000
 #define CLIENT_DEFAULTSOCKET 0x8000000
 #define CLIENT_STARTSERVER 0x10000000
@@ -2296,12 +2306,13 @@ struct client {
 #define CLIENT_ASSUMEPASTING 0x2000000000ULL
 #define CLIENT_WRITE_ACK 0x4000000000ULL
 #define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL
-#define CLIENT_CONTROL_DISCARD 0x10000000000ULL
+#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|		\
@@ -2347,6 +2358,15 @@ 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;
 
@@ -2948,6 +2968,8 @@ 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 **);
@@ -2988,7 +3010,7 @@ void	tty_default_colours(struct grid_cell *, struct window_pane *, u_int *);
 /* tty-term.c */
 extern struct tty_terms tty_terms;
 u_int		 tty_term_ncodes(void);
-void		 tty_term_apply(struct tty_term *, const char *, int, int);
+void		 tty_term_apply(struct tty_term *, const char *, int);
 void		 tty_term_apply_overrides(struct tty_term *);
 struct tty_term *tty_term_create(struct tty *, char *, char **, u_int, char **);
 void		 tty_term_free(struct tty_term *);
@@ -3208,7 +3230,6 @@ void 		 cmdq_print_data(struct cmdq_item *, struct evbuffer *);
 void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
 
 /* cmd-wait-for.c */
-void	cmd_wait_for_client_lost(struct client *);
 void	cmd_wait_for_flush(void);
 
 /* client.c */
@@ -3299,8 +3320,14 @@ 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 *);
@@ -3409,7 +3436,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 colour_palette *, struct client *);
 void	 input_free(struct input_ctx *);
 void	 input_reset(struct input_ctx *, int);
 struct evbuffer *input_pending(struct input_ctx *);
@@ -3809,7 +3836,6 @@ int		 window_pane_get_pane_status(struct window_pane *);
 struct style_range *window_pane_status_get_range(struct window_pane *, u_int,
 		     u_int);
 int		 window_pane_is_floating(struct window_pane *);
-int		 window_pane_is_floating_with_hidden(struct window_pane *);
 
 /* window-border.c */
 void		 window_set_fill_cells(struct window *);
@@ -4149,7 +4175,6 @@ void		 menu_add_item(struct menu *, const struct menu_item *,
 		    struct cmdq_item *, struct client *,
 		    struct cmd_find_state *);
 void		 menu_free(struct menu *);
-void		 menu_get_size(struct menu *, enum box_lines, u_int *, u_int *);
 int		 menu_display(struct menu *, int, int, struct cmdq_item *,
 		    u_int, u_int, struct client *, enum box_lines, const char *,
 		    const char *, const char *, struct cmd_find_state *,
@@ -4166,6 +4191,20 @@ 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 *);
@@ -4190,7 +4229,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,
-		     spawn_finish_edit_cb, void *);
+		     const char *, 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 *);

tty-draw.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-draw.c,v 1.17 2026/09/22 06:49:47 nicm Exp $ */
+/* $OpenBSD: tty-draw.c,v 1.15 2026/07/26 09:02:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -52,7 +52,8 @@ 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 (!wrapped &&
+	if (tty->client->overlay_check == NULL &&
+	    !wrapped &&
 	    nx >= 10 &&
 	    !tty_fake_bce(tty, defaults, bg)) {
 		/* Off the end of the line, use EL if available. */
@@ -218,12 +219,7 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 	}
 
 	/* Did the previous line wrap on to this one? */
-	if (py != 0 &&
-	    atx == 0 &&
-	    tty->cx >= tty->sx &&
-	    tty->cy != UINT_MAX &&
-	    tty->cy + 1 == aty &&
-	    nx == tty->sx) {
+	if (py != 0 && atx == 0 && tty->cx >= tty->sx && nx == tty->sx) {
 		gl = grid_get_line(gd, gd->hsize + py - 1);
 		if (gl->flags & GRID_LINE_WRAPPED)
 			wrapped = 1;

tty-features.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-features.c,v 1.45 2026/09/22 14:10:26 nicm Exp $ */
+/* $OpenBSD: tty-features.c,v 1.43 2026/08/31 12:41:03 kirill Exp $ */
 
 /*
  * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -189,18 +189,6 @@ static const struct tty_feature tty_feature_focus = {
 	0
 };
 
-/* Terminal supports application escape key mode. */
-static const char *const tty_feature_appesc_capabilities[] = {
-	"Enesc=\\E[?7727h",
-	"Dsesc=\\E[?7727l",
-	NULL
-};
-static const struct tty_feature tty_feature_appesc = {
-	"appesc",
-	tty_feature_appesc_capabilities,
-	0
-};
-
 /* Terminal supports cursor styles. */
 static const char *const tty_feature_cstyle_capabilities[] = {
 	"Ss=\\E[%p1%d q",
@@ -210,7 +198,7 @@ static const char *const tty_feature_cstyle_capabilities[] = {
 static const struct tty_feature tty_feature_cstyle = {
 	"cstyle",
 	tty_feature_cstyle_capabilities,
-	TERM_NOREPLACE
+	0
 };
 
 /* Terminal supports cursor colours. */
@@ -390,7 +378,6 @@ static const struct tty_feature tty_feature_utf8 = {
 /* Available terminal features. */
 static const struct tty_feature *const tty_features[] = {
 	&tty_feature_256,
-	&tty_feature_appesc,
 	&tty_feature_bpaste,
 	&tty_feature_ccolour,
 	&tty_feature_clipboard,
@@ -554,11 +541,11 @@ tty_apply_features(struct tty_term *term)
 			capability = tf->capabilities;
 			while (*capability != NULL) {
 				log_debug("adding capability: %s", *capability);
-				tty_term_apply(term, *capability, 1, tf->flags);
+				tty_term_apply(term, *capability, 1);
 				capability++;
 			}
 		}
-		term->flags |= (tf->flags & ~TERM_NOREPLACE);
+		term->flags |= tf->flags;
 		if (tf == &tty_feature_utf8)
 			c->flags |= CLIENT_UTF8;
 	}
@@ -581,7 +568,6 @@ tty_default_features(struct client *c, const char *name, u_int version)
 	"256,RGB,bpaste,clipboard,mouse,strikethrough,title"
 		{ .name = "mintty",
 		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
-			      "appesc,"
 			      "ccolour,"
 			      "cstyle,"
 			      "extkeys,"
@@ -637,7 +623,6 @@ tty_default_features(struct client *c, const char *name, u_int version)
 			      "extkeys,"
 			      "focus,"
 		  	      "hyperlinks,"
-			      "margins,"
 			      "usstyle"
 		},
 		{ .name = "ghostty",
@@ -646,7 +631,6 @@ tty_default_features(struct client *c, const char *name, u_int version)
 			      "cstyle,"
 			      "extkeys,"
 			      "focus,"
-			      "margins,"
 			      "overline,"
 			      "hyperlinks,"
 			      "osc7,"
@@ -677,7 +661,7 @@ tty_default_features(struct client *c, const char *name, u_int version)
 			      "cstyle,"
 			      "extkeys,"
 			      "focus"
-		},
+		}
 	};
 	u_int	i;
 

tty-term.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-term.c,v 1.111 2026/09/22 14:10:26 nicm Exp $ */
+/* $OpenBSD: tty-term.c,v 1.109 2026/08/25 08:37:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -90,7 +90,6 @@ static const struct tty_term_code_entry tty_term_codes[] = {
 	[TTYC_DL1] = { TTYCODE_STRING, "dl1" },
 	[TTYC_DL] = { TTYCODE_STRING, "dl" },
 	[TTYC_DSEKS] = { TTYCODE_STRING, "Dseks" },
-	[TTYC_DSESC] = { TTYCODE_STRING, "Dsesc" },
 	[TTYC_DSFCS] = { TTYCODE_STRING, "Dsfcs" },
 	[TTYC_DSBP] = { TTYCODE_STRING, "Dsbp" },
 	[TTYC_DSMG] = { TTYCODE_STRING, "Dsmg" },
@@ -102,7 +101,6 @@ static const struct tty_term_code_entry tty_term_codes[] = {
 	[TTYC_ENACS] = { TTYCODE_STRING, "enacs" },
 	[TTYC_ENBP] = { TTYCODE_STRING, "Enbp" },
 	[TTYC_ENEKS] = { TTYCODE_STRING, "Eneks" },
-	[TTYC_ENESC] = { TTYCODE_STRING, "Enesc" },
 	[TTYC_ENFCS] = { TTYCODE_STRING, "Enfcs" },
 	[TTYC_ENMG] = { TTYCODE_STRING, "Enmg" },
 	[TTYC_FSL] = { TTYCODE_STRING, "fsl" },
@@ -364,8 +362,7 @@ tty_term_override_next(const char *s, size_t *offset)
 }
 
 void
-tty_term_apply(struct tty_term *term, const char *capabilities, int quiet,
-    int flags)
+tty_term_apply(struct tty_term *term, const char *capabilities, int quiet)
 {
 	const struct tty_term_code_entry	*ent;
 	struct tty_code				*code;
@@ -408,9 +405,6 @@ tty_term_apply(struct tty_term *term, const char *capabilities, int quiet,
 			if (strcmp(s, ent->name) != 0)
 				continue;
 			code = &term->codes[i];
-			if ((flags & TERM_NOREPLACE) &&
-			    code->type != TTYCODE_NONE)
-				continue;
 
 			if (remove) {
 				code->type = TTYCODE_NONE;
@@ -463,7 +457,7 @@ tty_term_apply_overrides(struct tty_term *term)
 		offset = 0;
 		first = tty_term_override_next(s, &offset);
 		if (first != NULL && fnmatch(first, term->name, 0) == 0)
-			tty_term_apply(term, s + offset, 0, 0);
+			tty_term_apply(term, s + offset, 0);
 		a = options_array_next(a);
 	}
 

tty.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.482 2026/09/22 06:58:06 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.480 2026/08/25 08:37:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -66,6 +66,7 @@ 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 *),
@@ -502,7 +503,8 @@ tty_stop_tty(struct tty *tty)
 	if (tty_term_has(tty->term, TTYC_DSBP))
 		tty_raw(tty, tty_term_string(tty->term, TTYC_DSBP));
 
-	tty_raw(tty, tty_term_string(tty->term, TTYC_DSESC));
+	if (tty->term->flags & TERM_VT100LIKE)
+		tty_raw(tty, "\033[?7727l");
 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSFCS));
 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSEKS));
 
@@ -543,6 +545,8 @@ void
 tty_free(struct tty *tty)
 {
 	tty_close(tty);
+
+	free(tty->r.ranges);
 }
 
 void
@@ -559,7 +563,8 @@ tty_update_features(struct tty *tty)
 		tty_puts(tty, tty_term_string(tty->term, TTYC_ENEKS));
 	if (options_get_number(global_options, "focus-events"))
 		tty_puts(tty, tty_term_string(tty->term, TTYC_ENFCS));
-	tty_puts(tty, tty_term_string(tty->term, TTYC_ENESC));
+	if (tty->term->flags & TERM_VT100LIKE)
+		tty_puts(tty, "\033[?7727h");
 
 	/*
 	 * Features might have changed since the first draw during attach. For
@@ -1196,6 +1201,9 @@ 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);
 
@@ -1204,7 +1212,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 (!tty_fake_bce(tty, defaults, bg)) {
+	if (c->overlay_check == NULL && !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);
@@ -1227,9 +1235,18 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py,
 		}
 	}
 
-	/* Couldn't use an escape sequence, use spaces. */
-	tty_cursor(tty, px, py);
-	tty_repeat_space(tty, nx);
+	/*
+	 * 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);
+		}
+	}
 }
 
 /* Clear a line, adjusting to visible part of pane. */
@@ -1238,12 +1255,22 @@ 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;
-	u_int			 l, x, rx, ry;
+	struct visible_ranges	*r;
+	struct visible_range	*ri;
+	u_int			 i, 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))
-		tty_clear_line(tty, &ctx->defaults, ry, x, rx, bg);
+	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);
+		}
+	}
 }
 
 /* Clamp area position to visible part of pane. */
@@ -1324,8 +1351,11 @@ tty_clear_area(struct tty *tty, const struct tty_ctx *ctx, u_int py,
 	if (nx == 0 || ny == 0)
 		return;
 
-	/* If BCE is available, can try to clear as a region. */
-	if (!tty_fake_bce(tty, defaults, bg)) {
+	/*
+	 * 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)) {
 		/* Use ED if clearing off the bottom of the terminal. */
 		if (px == 0 &&
 		    px + nx >= tty->sx &&
@@ -1397,28 +1427,53 @@ 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;
+	u_int			 nx = ctx->sx, i, x, rx, ry, j;
+	struct visible_ranges	*r;
+	struct visible_range	*rr;
 
 	log_debug("%s: %s %u", __func__, tty->client->name, py);
 
 	if (~ctx->flags & TTY_CTX_WINDOW_BIGGER) {
-		tty_draw_line(tty, s, 0, py, nx, ctx->xoff, ctx->yoff + py,
-		    &ctx->style_ctx);
+		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);
+		}
 		return;
 	}
-	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);
+	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);
+		}
+	}
 }
 
 void
 tty_cmd_redrawline(struct tty *tty, const struct tty_ctx *ctx)
 {
-	u_int			 i, x, rx, ry;
+	u_int			 i, x, rx, ry, j;
+	struct visible_ranges	*r;
+	struct visible_range	*rr;
 
 	if (tty_clamp_line(tty, ctx, ctx->ocx, ctx->ocy, ctx->n,
-	    &i, &x, &rx, &ry))
-		tty_draw_line(tty, ctx->s, ctx->ocx + i, ctx->ocy, rx, x, ry,
-		    &ctx->style_ctx);
+	    &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);
+		}
+	}
 }
 
 /* Check if character needs to be mapped for codeset. */
@@ -1455,6 +1510,36 @@ 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
@@ -1598,11 +1683,14 @@ 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))) {
+	    !tty_term_has(tty->term, TTYC_ICH1)) ||
+	    c->overlay_check != NULL) {
 		tty_draw_pane(tty, ctx, ctx->ocy);
 		return;
 	}
@@ -1617,11 +1705,14 @@ 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))) {
+	    !tty_term_has(tty->term, TTYC_DCH1)) ||
+	    c->overlay_check != NULL) {
 		tty_draw_pane(tty, ctx, ctx->ocy);
 		return;
 	}
@@ -1644,13 +1735,16 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1668,13 +1762,16 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1718,6 +1815,8 @@ 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;
 
@@ -1728,7 +1827,8 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1748,6 +1848,8 @@ 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;
 
@@ -1756,7 +1858,8 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1787,6 +1890,7 @@ 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) ||
@@ -1794,7 +1898,8 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1824,6 +1929,7 @@ 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)) ||
@@ -1832,7 +1938,8 @@ 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) {
+	    ctx->sy == 1 ||
+	    c->overlay_check != NULL) {
 		tty_redraw_region(tty, ctx);
 		return;
 	}
@@ -1920,9 +2027,11 @@ 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) {
+	if ((ctx->flags & TTY_CTX_WINDOW_BIGGER) ||
+	    c->overlay_check != NULL) {
 		ctx->redraw_cb(ctx);
 		return;
 	}
@@ -1942,9 +2051,29 @@ 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))
@@ -1964,6 +2093,9 @@ 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;
 
@@ -1989,7 +2121,20 @@ 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);
-	tty_putn(tty, cp, n, n);
+
+	/* 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);
+		}
+	}
 }
 
 void
@@ -2083,8 +2228,23 @@ tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_syncstart(struct tty *tty, const struct tty_ctx *ctx)
 {
-	if (ctx->flags & TTY_CTX_SYNC)
+	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.
+		 */
 		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
@@ -2103,6 +2263,10 @@ 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);

utf8.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.73 2026/09/20 08:11:00 nicm Exp $ */
+/* $OpenBSD: utf8.c,v 1.72 2026/09/01 12:49:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -374,13 +374,8 @@ utf8_add_to_width_cache(const char *s)
 			wc_end = wc_start;
 		}
 
-		wc = wc_start;
-		for (;;) {
+		for (wc = wc_start; wc <= wc_end; wc++)
 			utf8_insert_width_cache(wc, width);
-			if (wc == wc_end)
-				break;
-			wc++;
-		}
 	} else {
 		utf8_no_width = 1;
 		ud = utf8_fromcstr(copy);

window-buffer.c

@@ -606,7 +606,8 @@ 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, window_buffer_edit_close_cb, ed);
+	ed->editor = spawn_editor(c, buf, len, NULL, 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, window_customize_edit_close_cb,
-	    ed);
+	ed->editor = spawn_editor(c, buf, len, NULL,
+	    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.377 2026/09/21 10:33:16 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>
@@ -449,17 +449,9 @@ window_create(u_int sx, u_int sy, u_int xpixel, u_int ypixel)
 static void
 window_destroy(struct window *w)
 {
-	struct window_pane	*wp;
-
 	log_debug("window @%u destroyed (%d references)", w->id, w->references);
 
-	if (w->flags & WINDOW_ZOOMED) {
-		w->flags &= ~WINDOW_ZOOMED;
-		TAILQ_FOREACH(wp, &w->panes, entry) {
-			wp->flags &= ~PANE_ZOOMED;
-			wp->saved_layout_cell = NULL;
-		}
-	}
+	window_unzoom(w, 0);
 	RB_REMOVE(windows, &windows, w);
 
 	layout_free_cell(w->layout_root, 0);
@@ -691,6 +683,7 @@ 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;
@@ -1632,7 +1625,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);
+	wp->ictx = input_init(wp, wp->event, &wp->palette, NULL);
 
 	bufferevent_enable(wp->event, EV_READ|EV_WRITE);
 }
@@ -2913,15 +2906,3 @@ window_pane_is_floating(struct window_pane *wp)
 		return (0);
 	return (1);
 }
-
-int
-window_pane_is_floating_with_hidden(struct window_pane *wp)
-{
-	struct layout_cell	*lc = wp->layout_cell;
-
-	if (lc == NULL)
-		lc = wp->saved_layout_cell;
-	if (lc == NULL || (lc->flags & LAYOUT_CELL_FLOATING) == 0)
-		return (0);
-	return (1);
-}