Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

* refs/remotes/tmux-openbsd/master: Add a feature for mintty's application escape to avoid dodgy terminals whinging about not supporting it, GitHub issue 5626 from Pete Dietl. Only rely on the previous line wrapping when the cursor is actually on it, GitHub issue 5625 from Ben Maurer. Correctly write Z indexes to v2 layouts if zoomed, GitHub issue 5624. Do not leak waiting clients (in wait-for) if they are killed, GitHub issue 5614.
2026-09-23 13:23:57 +00:00 · 2026-09-22 11:58:43 +00:00
parent 21ea1c91c5 83f62d0acc
commit fca57a5fc9
10 changed files with 119 additions and 20 deletions
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.123 2026/08/24 20:34:26 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.124 2026/09/22 06:46:50 nicm Exp $ */

 /*
 * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -580,6 +580,9 @@ 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) {
--- a/cmd-wait-for.c
+++ b/cmd-wait-for.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-wait-for.c,v 1.23 2026/07/10 13:38:45 nicm Exp $ */
+/* $OpenBSD: cmd-wait-for.c,v 1.24 2026/09/22 06:46:50 nicm Exp $ */

 /*
 * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -480,6 +480,40 @@ 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)
 {
--- a/layout-custom.c
+++ b/layout-custom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: layout-custom.c,v 1.42 2026/09/20 08:37:47 nicm Exp $ */
+/* $OpenBSD: layout-custom.c,v 1.43 2026/09/22 06:48:01 nicm Exp $ */

 /*
 * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -307,6 +307,37 @@ bad:
 	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;
+		else
+			other = wq->layout_cell;
+		if (other != NULL && (other->flags & LAYOUT_CELL_FLOATING))
+			i++;
+	}
+	return (i);
+}
+
 /* Append information for a single cell in a JSON (v2) format. */
 static int
 layout_append_v2(struct layout_cell *lc, struct layout_string *ls)
@@ -315,7 +346,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;
+	u_int			 i, n, z;

 	if (lc == NULL)
 		return (-1);
@@ -356,9 +387,10 @@ 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) &&
-		    window_pane_zindex(wp, &i) == 0)
-			layout_string_write(ls, ",\"z\":%u", i);
+		if (lc->flags & LAYOUT_CELL_FLOATING) {
+			z = layout_cell_zindex(lc);
+			layout_string_write(ls, ",\"z\":%u", z);
+		}
 		layout_string_write(ls, ",\"I\":\"%%%u\"", wp->id);
 	}

--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.513 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.514 2026/09/22 06:46:50 nicm Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -384,6 +384,9 @@ 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);
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.1171 2026/09/21 10:22:31 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.1172 2026/09/22 06:58:05 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 21 2026 $
+.Dd $Mdocdate: September 22 2026 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -5085,6 +5085,9 @@ 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
@@ -8833,6 +8836,8 @@ 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
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1444 2026/09/21 12:14:32 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1446 2026/09/22 06:58:06 nicm Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -464,6 +464,7 @@ enum tty_code_code {
 	TTYC_DL1,
 	TTYC_DSBP,
 	TTYC_DSEKS,
+	TTYC_DSESC,
 	TTYC_DSFCS,
 	TTYC_DSMG,
 	TTYC_E3,
@@ -474,6 +475,7 @@ enum tty_code_code {
 	TTYC_ENACS,
 	TTYC_ENBP,
 	TTYC_ENEKS,
+	TTYC_ENESC,
 	TTYC_ENFCS,
 	TTYC_ENMG,
 	TTYC_FSL,
@@ -3205,6 +3207,7 @@ 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 */
--- a/tty-draw.c
+++ b/tty-draw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-draw.c,v 1.16 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: tty-draw.c,v 1.17 2026/09/22 06:49:47 nicm Exp $ */

 /*
 * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -218,7 +218,12 @@ 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 && nx == tty->sx) {
+	if (py != 0 &&
+	    atx == 0 &&
+	    tty->cx >= tty->sx &&
+	    tty->cy != UINT_MAX &&
+	    tty->cy + 1 == aty &&
+	    nx == tty->sx) {
 		gl = grid_get_line(gd, gd->hsize + py - 1);
 		if (gl->flags & GRID_LINE_WRAPPED)
 			wrapped = 1;
--- a/tty-features.c
+++ b/tty-features.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-features.c,v 1.43 2026/08/31 12:41:03 kirill Exp $ */
+/* $OpenBSD: tty-features.c,v 1.44 2026/09/22 06:58:06 nicm Exp $ */

 /*
 * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -189,6 +189,18 @@ 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",
@@ -378,6 +390,7 @@ 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,
@@ -568,6 +581,7 @@ 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,"
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-term.c,v 1.109 2026/08/25 08:37:08 nicm Exp $ */
+/* $OpenBSD: tty-term.c,v 1.110 2026/09/22 06:58:06 nicm Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -90,6 +90,7 @@ 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" },
@@ -101,6 +102,7 @@ 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" },
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.481 2026/09/21 10:22:31 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.482 2026/09/22 06:58:06 nicm Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -502,8 +502,7 @@ tty_stop_tty(struct tty *tty)
 	if (tty_term_has(tty->term, TTYC_DSBP))
 		tty_raw(tty, tty_term_string(tty->term, TTYC_DSBP));

-	if (tty->term->flags & TERM_VT100LIKE)
-		tty_raw(tty, "\033[?7727l");
+	tty_raw(tty, tty_term_string(tty->term, TTYC_DSESC));
 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSFCS));
 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSEKS));

@@ -560,8 +559,7 @@ 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));
-	if (tty->term->flags & TERM_VT100LIKE)
-		tty_puts(tty, "\033[?7727h");
+	tty_puts(tty, tty_term_string(tty->term, TTYC_ENESC));

 	/*
 	 * Features might have changed since the first draw during attach. For