From 40e65c511502fe47932e230290537e7391ab8a83 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 27 Jul 2020 08:03:10 +0000
Subject: Add a -d option to display-message to set delay, from theonekeyg at
 gmail dot com in GitHub issue 2322.

---
 tmux.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a6749e99..daba4b25 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2450,8 +2450,7 @@ struct style_range *status_get_range(struct client *, u_int, u_int);
 void	 status_init(struct client *);
 void	 status_free(struct client *);
 int	 status_redraw(struct client *);
-void printflike(3, 4) status_message_set(struct client *, int, const char *,
-	     ...);
+void status_message_set(struct client *, int, int, const char *, ...);
 void	 status_message_clear(struct client *);
 int	 status_message_redraw(struct client *);
 void	 status_prompt_set(struct client *, struct cmd_find_state *,
-- 
cgit 


From 20fcdcfea1651d26990ae482cbc0f3594c4cea54 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 25 Aug 2020 11:35:32 +0000
Subject: Allow colour to be spelt as color, from Boris Verkhovsky. GitHub
 issue 2317.

---
 tmux.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index daba4b25..76953c3e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1788,6 +1788,7 @@ enum options_table_type {
 
 struct options_table_entry {
 	const char		 *name;
+	const char		 *alternative_name;
 	enum options_table_type	  type;
 	int			  scope;
 	int			  flags;
@@ -1807,6 +1808,11 @@ struct options_table_entry {
 	const char		 *unit;
 };
 
+struct options_name_map {
+	const char		*from;
+	const char		*to;
+};
+
 /* Common command usages. */
 #define CMD_TARGET_PANE_USAGE "[-t target-pane]"
 #define CMD_TARGET_WINDOW_USAGE "[-t target-window]"
@@ -2039,7 +2045,8 @@ int		 options_remove_or_default(struct options_entry *, int,
 		     char **);
 
 /* options-table.c */
-extern const struct options_table_entry options_table[];
+extern const struct options_table_entry	options_table[];
+extern const struct options_name_map	options_other_names[];
 
 /* job.c */
 typedef void (*job_update_cb) (struct job *);
-- 
cgit 


From 37b1600d9cf7076498760372dcc20f021e4c181a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 2 Sep 2020 13:46:35 +0000
Subject: Add a -w flag to set- and load-buffer to send to clipboard using OSC
 52. GitHub issue 2363.

---
 tmux.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 76953c3e..9fb3830a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2126,6 +2126,7 @@ int	tty_open(struct tty *, char **);
 void	tty_close(struct tty *);
 void	tty_free(struct tty *);
 void	tty_update_features(struct tty *);
+void	tty_set_selection(struct tty *, const char *, size_t);
 void	tty_write(void (*)(struct tty *, const struct tty_ctx *),
 	    struct tty_ctx *);
 void	tty_cmd_alignmenttest(struct tty *, const struct tty_ctx *);
-- 
cgit 


From 86d6ac2f0695b02bdbef542cce3cdb0cca39160e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 22 Sep 2020 05:23:34 +0000
Subject: Fix warnings on some platforms with %llx and add a new message to
 handle 64-bit client flags.

---
 tmux.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 9fb3830a..dd8ac2c1 100644
--- a/tmux.h
+++ b/tmux.h
@@ -496,6 +496,7 @@ enum msgtype {
 	MSG_IDENTIFY_CWD,
 	MSG_IDENTIFY_FEATURES,
 	MSG_IDENTIFY_STDOUT,
+	MSG_IDENTIFY_LONGFLAGS,
 
 	MSG_COMMAND = 200,
 	MSG_DETACH,
@@ -2331,7 +2332,7 @@ void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
 void	cmd_wait_for_flush(void);
 
 /* client.c */
-int	client_main(struct event_base *, int, char **, int, int);
+int	client_main(struct event_base *, int, char **, uint64_t, int);
 
 /* key-bindings.c */
 struct key_table *key_bindings_get_table(const char *, int);
-- 
cgit 


From c8f3736b07a0ae4c73bd6517ab8c8596d74c1c67 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 5 Oct 2020 09:53:01 +0000
Subject: Use the setal capability as well as (tmux's) Setulc.

---
 tmux.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index dd8ac2c1..4ba2c13b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -448,6 +448,7 @@ enum tty_code_code {
 	TTYC_KUP6,
 	TTYC_KUP7,
 	TTYC_MS,
+	TTYC_OL,
 	TTYC_OP,
 	TTYC_REV,
 	TTYC_RGB,
@@ -459,6 +460,7 @@ enum tty_code_code {
 	TTYC_SE,
 	TTYC_SETAB,
 	TTYC_SETAF,
+	TTYC_SETAL,
 	TTYC_SETRGBB,
 	TTYC_SETRGBF,
 	TTYC_SETULC,
-- 
cgit 


From 649e5970e98b0073763f42a25dcab02aadea688f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 30 Oct 2020 08:55:56 +0000
Subject: Add a -O flag to display-menu to change the mouse behaviour and not
 close the menu when the mouse is released, from teo_paul1 at yahoo dot com.

---
 tmux.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 4ba2c13b..1845775d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2978,6 +2978,7 @@ __dead void printflike(1, 2) fatalx(const char *, ...);
 /* menu.c */
 #define MENU_NOMOUSE 0x1
 #define MENU_TAB 0x2
+#define MENU_STAYOPEN 0x4
 struct menu	*menu_create(const char *);
 void		 menu_add_items(struct menu *, const struct menu_item *,
 		    struct cmdq_item *, struct client *,
-- 
cgit