From 837ca176d1874273f3de615c75b506e1b1787a1b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 13 Oct 2021 09:28:36 +0000
Subject: Add popup-style and popup-border-style options, from Alexis
 Hildebrandt in GitHub issue 2927.

---
 options-table.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 607a90b6..e728dbe9 100644
--- a/options-table.c
+++ b/options-table.c
@@ -982,6 +982,24 @@ const struct options_table_entry options_table[] = {
 	  .text = "The default colour palette for colours zero to 255."
 	},
 
+	{ .name = "popup-style",
+	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW,
+	  .default_str = "default",
+	  .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 = "default",
+	  .flags = OPTIONS_TABLE_IS_STYLE,
+	  .separator = ",",
+	  .text = "Default style of popup borders."
+	},
+
 	{ .name = "remain-on-exit",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
-- 
cgit 


From add20637f256c0118d3c687d5d1446612d14389a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Oct 2021 13:19:01 +0000
Subject: Add popup-border-lines option to set popup line style, from Alexis
 Hildebrandt, GitHub issue 2930.

---
 options-table.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index e728dbe9..6c57e3ff 100644
--- a/options-table.c
+++ b/options-table.c
@@ -60,9 +60,12 @@ static const char *options_table_visual_bell_list[] = {
 static const char *options_table_pane_status_list[] = {
 	"off", "top", "bottom", NULL
 };
-static const char *options_table_pane_lines_list[] = {
+static const char *options_table_pane_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "number", NULL
 };
+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[] = {
 	"off", "external", "on", NULL
 };
@@ -951,7 +954,7 @@ const struct options_table_entry options_table[] = {
 	{ .name = "pane-border-lines",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_WINDOW,
-	  .choices = options_table_pane_lines_list,
+	  .choices = options_table_pane_border_lines_list,
 	  .default_num = PANE_LINES_SINGLE,
 	  .text = "Type of characters used to draw pane border lines. Some of "
 	          "these are only supported on terminals with UTF-8 support."
@@ -1000,6 +1003,15 @@ const struct options_table_entry options_table[] = {
 	  .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,
-- 
cgit 


From 8d2286b76917debc4f6c3b0903ad2807ae254bb5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Nov 2021 09:34:49 +0000
Subject: Add a cursor-colour option, from Alexis Hildebrandt in GitHub issue
 2959.

---
 options-table.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 6c57e3ff..d23f7d57 100644
--- a/options-table.c
+++ b/options-table.c
@@ -188,6 +188,7 @@ const struct options_name_map options_other_names[] = {
 	{ "display-panes-color", "display-panes-colour" },
 	{ "display-panes-active-color", "display-panes-active-colour" },
 	{ "clock-mode-color", "clock-mode-colour" },
+	{ "cursor-color", "cursor-colour" },
 	{ "pane-colors", "pane-colours" },
 	{ NULL, NULL }
 };
@@ -235,6 +236,13 @@ const struct options_table_entry options_table[] = {
 		  "If empty, no command is run."
 	},
 
+	{ .name = "cursor-colour",
+	  .type = OPTIONS_TABLE_COLOUR,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
+	  .default_num = -1,
+	  .text = "Colour of the cursor."
+	},
+
 	{ .name = "default-terminal",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_SERVER,
-- 
cgit 


From 57100376cc70739f53a1f8a4bacf192b8cdcd124 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 3 Nov 2021 13:37:17 +0000
Subject: Add a cursor-style option, from Alexis Hildebrandt in GitHub issue
 2960.

---
 options-table.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index d23f7d57..bad22bfb 100644
--- a/options-table.c
+++ b/options-table.c
@@ -57,6 +57,10 @@ static const char *options_table_bell_action_list[] = {
 static const char *options_table_visual_bell_list[] = {
 	"off", "on", "both", NULL
 };
+static const char *options_table_cursor_style_list[] = {
+	"default", "blinking-block", "block", "blinking-underline", "underline",
+	"blinking-bar", "bar", NULL
+};
 static const char *options_table_pane_status_list[] = {
 	"off", "top", "bottom", NULL
 };
@@ -243,6 +247,14 @@ const struct options_table_entry options_table[] = {
 	  .text = "Colour of the cursor."
 	},
 
+	{ .name = "cursor-style",
+	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
+	  .choices = options_table_cursor_style_list,
+	  .default_num = 0,
+	  .text = "Style of the cursor."
+	},
+
 	{ .name = "default-terminal",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_SERVER,
-- 
cgit 


From c6149adf55a1ab108a9336ba15a82bd11a809cb3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Dec 2021 09:42:20 +0000
Subject: Make pane-border-format a pane option, GitHub issue 2999.

---
 options-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index bad22bfb..cfb8162e 100644
--- a/options-table.c
+++ b/options-table.c
@@ -965,7 +965,7 @@ const struct options_table_entry options_table[] = {
 
 	{ .name = "pane-border-format",
 	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
 	  .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
 			 "\"#{pane_title}\"",
 	  .text = "Format of text in the pane status lines."
-- 
cgit 


From 7e34645fcbe93984461343d67373a29e552fec20 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Feb 2022 14:46:41 +0000
Subject: Add option to show arrows for active pane indicator, GitHub issue
 3022 from Marcel Partap.

---
 options-table.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index cfb8162e..5cbec546 100644
--- a/options-table.c
+++ b/options-table.c
@@ -64,6 +64,9 @@ static const char *options_table_cursor_style_list[] = {
 static const char *options_table_pane_status_list[] = {
 	"off", "top", "bottom", NULL
 };
+static const char *options_table_pane_border_indicators_list[] = {
+	"off", "colour", "arrows", "both", NULL
+};
 static const char *options_table_pane_border_lines_list[] = {
 	"single", "double", "heavy", "simple", "number", NULL
 };
@@ -971,6 +974,15 @@ const struct options_table_entry options_table[] = {
 	  .text = "Format of text in the pane status lines."
 	},
 
+	{ .name = "pane-border-indicators",
+	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_WINDOW,
+	  .choices = options_table_pane_border_indicators_list,
+	  .default_num = PANE_BORDER_COLOUR,
+	  .text = "Whether to indicate the active pane by colouring border or "
+		  "displaying arrow markers."
+	},
+
 	{ .name = "pane-border-lines",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_WINDOW,
-- 
cgit 


From 5076beb009f761999a3b218a1a8d7cbfbc80ee03 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 15 Feb 2022 13:11:29 +0000
Subject: Add an option (default off) to control the passthrough escape
 sequence. Like set-clipboard and allow-rename it is safer to forbid this by
 default.

---
 options-table.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 5cbec546..62d37c39 100644
--- a/options-table.c
+++ b/options-table.c
@@ -302,7 +302,7 @@ const struct options_table_entry options_table[] = {
 	  .choices = options_table_extended_keys_list,
 	  .default_num = 0,
 	  .text = "Whether to request extended key sequences from terminals "
-	          "that support it."
+		  "that support it."
 	},
 
 	{ .name = "focus-events",
@@ -801,6 +801,14 @@ const struct options_table_entry options_table[] = {
 		  "linked to ('off')."
 	},
 
+	{ .name = "allow-passthrough",
+	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
+	  .default_num = 0,
+	  .text = "Whether applications are allowed to use the escape sequence "
+	          "to bypass tmux."
+	},
+
 	{ .name = "allow-rename",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
@@ -989,7 +997,7 @@ const struct options_table_entry options_table[] = {
 	  .choices = options_table_pane_border_lines_list,
 	  .default_num = PANE_LINES_SINGLE,
 	  .text = "Type of characters used to draw pane border lines. Some of "
-	          "these are only supported on terminals with UTF-8 support."
+		  "these are only supported on terminals with UTF-8 support."
 	},
 
 	{ .name = "pane-border-status",
@@ -1041,7 +1049,7 @@ const struct options_table_entry options_table[] = {
 	  .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."
+		  "these are only supported on terminals with UTF-8 support."
 	},
 
 	{ .name = "remain-on-exit",
@@ -1171,7 +1179,7 @@ const struct options_table_entry options_table[] = {
 	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 1,
 	  .text = "Whether xterm-style function key sequences should be sent. "
-	          "This option is no longer used."
+		  "This option is no longer used."
 	},
 
 	/* Hook options. */
@@ -1219,8 +1227,8 @@ const struct options_table_entry options_table[] = {
 	OPTIONS_TABLE_HOOK("client-active", ""),
 	OPTIONS_TABLE_HOOK("client-attached", ""),
 	OPTIONS_TABLE_HOOK("client-detached", ""),
- 	OPTIONS_TABLE_HOOK("client-focus-in", ""),
- 	OPTIONS_TABLE_HOOK("client-focus-out", ""),
+	OPTIONS_TABLE_HOOK("client-focus-in", ""),
+	OPTIONS_TABLE_HOOK("client-focus-out", ""),
 	OPTIONS_TABLE_HOOK("client-resized", ""),
 	OPTIONS_TABLE_HOOK("client-session-changed", ""),
 	OPTIONS_TABLE_PANE_HOOK("pane-died", ""),
-- 
cgit 


From 818b2176ef52a13867905d3d3e0269dc1b4d6fb4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Feb 2022 09:58:47 +0000
Subject: Add a window-resized hook which is fired when the window is actually
 resized which may be later than the client resize, GitHub issue 2995.

---
 options-table.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 62d37c39..6d136f76 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1246,6 +1246,7 @@ const struct options_table_entry options_table[] = {
 	OPTIONS_TABLE_HOOK("window-linked", ""),
 	OPTIONS_TABLE_WINDOW_HOOK("window-pane-changed", ""),
 	OPTIONS_TABLE_WINDOW_HOOK("window-renamed", ""),
+	OPTIONS_TABLE_WINDOW_HOOK("window-resized", ""),
 	OPTIONS_TABLE_HOOK("window-unlinked", ""),
 
 	{ .name = NULL }
-- 
cgit 


From a3d920930bf77cafa5260e25584dd3ba1d26f9cb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 8 Mar 2022 18:31:46 +0000
Subject: Add remain-on-exit-format to set text shown when pane is dead.

---
 options-table.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 6d136f76..d1bc3577 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1061,6 +1061,19 @@ const struct options_table_entry options_table[] = {
 		  "killed ('off' or 'failed') when the program inside exits."
 	},
 
+	{ .name = "remain-on-exit-format",
+	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
+	  .default_str = "Pane is dead ("
+			 "#{?#{!=:#{pane_dead_status},},"
+	                 "status #{pane_dead_status},}"
+			 "#{?#{!=:#{pane_dead_signal},},"
+	                 "signal #{pane_dead_signal},}, "
+			 "#{t:pane_dead_time})",
+	  .text = "Message shown after the program in a pane has exited, if "
+	          "remain-on-exit is enabled."
+	},
+
 	{ .name = "synchronize-panes",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
-- 
cgit 


From e6e737ac0bf9a5be729b5c71f3a582355432d041 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 16 Mar 2022 17:00:17 +0000
Subject: Add an option to set the character used for unused areas of the
 terminal, GitHub issue 3110.

---
 options-table.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index d1bc3577..46b96ec4 100644
--- a/options-table.c
+++ b/options-table.c
@@ -882,6 +882,13 @@ const struct options_table_entry options_table[] = {
 	  .text = "Style of the marked line in copy mode."
 	},
 
+	{ .name = "fill-character",
+	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW,
+	  .default_str = "",
+	  .text = "Character used to fill unused parts of window."
+	},
+
 	{ .name = "main-pane-height",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW,
-- 
cgit 


From 10d689e7354f789f951016f7f4d57a0c2d14e124 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Mar 2022 11:35:37 +0000
Subject: Add an option (scroll-on-clear) to control if tmux scrolls into
 history on clear, from Robert Lange in GitHub issue 3121.

---
 options-table.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 46b96ec4..b0870118 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1081,6 +1081,14 @@ const struct options_table_entry options_table[] = {
 	          "remain-on-exit is enabled."
 	},
 
+	{ .name = "scroll-on-clear",
+	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
+	  .default_num = 1,
+	  .text = "Whether the contents of the screen should be scrolled into"
+		  "history when clearing the whole screen."
+	},
+
 	{ .name = "synchronize-panes",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
-- 
cgit 


From 938130bc6925808681cbc003a392ccce2a4455c1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 24 Mar 2022 12:07:25 +0000
Subject: Add unit (milliseconds) to escape-time, show unset colours as "none"
 rather than "invalid" and don't show the same text twice for user options in
 customize mode.

---
 options-table.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index b0870118..4e68af00 100644
--- a/options-table.c
+++ b/options-table.c
@@ -278,6 +278,7 @@ const struct options_table_entry options_table[] = {
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 500,
+	  .unit = "milliseconds",
 	  .text = "Time to wait before assuming a key is Escape."
 	},
 
-- 
cgit 


From 616bde08ac74d4be0ae06087aa3103df54833f86 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 14 Jun 2022 07:29:00 +0000
Subject: kf* terminfo capabilities are poorly defined and rxvt uses them in a
 different way from xterm, so add a feature flag for rxvt to make tmux ignore
 the capabilities and instead rely on its builtin definitions.

---
 options-table.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 4e68af00..d1e65f15 100644
--- a/options-table.c
+++ b/options-table.c
@@ -363,7 +363,8 @@ const struct options_table_entry options_table[] = {
 	  .scope = OPTIONS_TABLE_SERVER,
 	  .flags = OPTIONS_TABLE_IS_ARRAY,
 	  .default_str = "xterm*:clipboard:ccolour:cstyle:focus:title,"
-			 "screen*:title",
+			 "screen*:title,"
+	                 "rxvt*:ignorefkeys",
 	  .separator = ",",
 	  .text = "List of terminal features, used if they cannot be "
 		  "automatically detected."
-- 
cgit