From 69440d19b783c72139f22c5c72b34b55d99e71de Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 7 May 2019 10:25:15 +0000
Subject: Do not use evbuffer_add_buffer because it is destructive and doesn't
 work in newer libevent.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 31b03180..e6ed8c87 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1699,7 +1699,7 @@ char		*format_trim_right(const char *, u_int);
 
 /* notify.c */
 void	notify_hook(struct cmdq_item *, const char *);
-void	notify_input(struct window_pane *, struct evbuffer *);
+void	notify_input(struct window_pane *, const u_char *, size_t);
 void	notify_client(const char *, struct client *);
 void	notify_session(const char *, struct session *);
 void	notify_winlink(const char *, struct winlink *);
@@ -2087,6 +2087,7 @@ void	 input_free(struct window_pane *);
 void	 input_reset(struct window_pane *, int);
 struct evbuffer *input_pending(struct window_pane *);
 void	 input_parse(struct window_pane *);
+void	 input_parse_buffer(struct window_pane *, u_char *, size_t);
 
 /* input-key.c */
 void	 input_key(struct window_pane *, key_code, struct mouse_event *);
@@ -2428,7 +2429,7 @@ void	control_write_buffer(struct client *, struct evbuffer *);
 
 /* control-notify.c */
 void	control_notify_input(struct client *, struct window_pane *,
-	    struct evbuffer *);
+	    const u_char *, size_t);
 void	control_notify_pane_mode_changed(int);
 void	control_notify_window_layout_changed(struct window *);
 void	control_notify_window_pane_changed(struct window *);
-- 
cgit 


From 85a9c2f52b8855560fa9fdaa033d1c7bca738429 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 7 May 2019 11:24:03 +0000
Subject: Treat keys in identify mode (display-panes) specially and handle them
 immediately rather than queuing them (the command can block the queue which
 means they were not being seen until it finished which was too late).
 Reported by denis@ and solene@, ok solene@.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index e6ed8c87..55c24531 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2012,7 +2012,7 @@ void	 server_client_set_identify(struct client *, u_int);
 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 *);
-enum cmd_retval server_client_key_callback(struct cmdq_item *, void *);
+int	 server_client_handle_key(struct client *, struct key_event *);
 struct client *server_client_create(int);
 int	 server_client_open(struct client *, char **);
 void	 server_client_unref(struct client *);
-- 
cgit