From b243f1b2ee19d5a019b0365f31523130ad26c2c5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 2 Mar 2021 12:37:23 +0000 Subject: [PATCH 1/5] No sys/queue.h. --- proc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/proc.c b/proc.c index a1a2b36a..958a9483 100644 --- a/proc.c +++ b/proc.c @@ -17,7 +17,6 @@ */ #include -#include #include #include #include From 7bef887fd1051e2bbeb268888b51588ccaac306e Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 8 Mar 2021 08:59:58 +0000 Subject: [PATCH 2/5] Update version. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4175f5c8..b8762e2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], next-3.3) +AC_INIT([tmux], 3.2-rc5) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) From 30cf20d6153924d031fefde1e4ca7cfe31b32d88 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 13 Apr 2021 06:28:16 +0100 Subject: [PATCH 3/5] Update CHANGES. --- CHANGES | 12 ++++++++++++ configure.ac | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a81f160c..209d7d31 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,17 @@ CHANGES FROM 3.1c TO 3.2 +* Add a flag to disable keys to close a message. + +* Permit shortcut keys in buffer, client, tree modes to be configured with a + format (-K flag to choose-buffer, choose-client, choose-tree). + +* Add a current_file format for the config file being parsed. + +* When display-message used in config file, show the message after the config + file finishes. + +* Add client-detached notification in control mode. + * Improve performance of format evaluation. * Make jump command support UTF-8 in copy mode. diff --git a/configure.ac b/configure.ac index b8762e2f..c1915f50 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.2-rc5) +AC_INIT([tmux], 3.2) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) From f29d3c7f74c10666c9970382ea735e11e12186c5 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 13 Apr 2021 05:23:34 +0000 Subject: [PATCH 4/5] Handle C-Tab correctly with extended keys, GitHub issue 2642. --- tty-keys.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tty-keys.c b/tty-keys.c index e88ff227..c0aceb32 100644 --- a/tty-keys.c +++ b/tty-keys.c @@ -953,11 +953,14 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len, * Don't allow both KEYC_CTRL and as an implied modifier. Also convert * C-X into C-x and so on. */ - if (nkey & KEYC_CTRL){ + if (nkey & KEYC_CTRL) { onlykey = (nkey & KEYC_MASK_KEY); - if (onlykey < 32) - onlykey = (nkey & ~KEYC_CTRL); - else { + if (onlykey < 32) { + if (onlykey != 9) + onlykey = (nkey & ~KEYC_CTRL); + else + onlykey = (9|KEYC_CTRL); + } else { if (onlykey >= 97 && onlykey <= 122) onlykey -= 96; else if (onlykey >= 64 && onlykey <= 95) From bc4681c83d612a3d9609dd609e7d89b035b25dd5 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 13 Apr 2021 05:25:05 +0000 Subject: [PATCH 5/5] Move mode set/reset after sync so cursor doesn't flicker, from Avi Halachmi. --- screen-redraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screen-redraw.c b/screen-redraw.c index 6ddabc52..cf3e29f6 100644 --- a/screen-redraw.c +++ b/screen-redraw.c @@ -604,8 +604,8 @@ screen_redraw_screen(struct client *c) return; screen_redraw_set_context(c, &ctx); - tty_update_mode(&c->tty, c->tty.mode, NULL); tty_sync_start(&c->tty); + tty_update_mode(&c->tty, c->tty.mode, NULL); if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) { log_debug("%s: redrawing borders", c->name); @@ -640,8 +640,8 @@ screen_redraw_pane(struct client *c, struct window_pane *wp) return; screen_redraw_set_context(c, &ctx); - tty_update_mode(&c->tty, c->tty.mode, NULL); tty_sync_start(&c->tty); + tty_update_mode(&c->tty, c->tty.mode, NULL); screen_redraw_draw_pane(&ctx, wp);