Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

1 files changed, 11 insertions, 4 deletions

diff --git a/tmux.h b/tmux.h
index 1f80f41f..c4c52360 100644
--- a/tmux.h
+++ b/tmux.h
@@ -800,14 +800,22 @@ struct screen_write_ctx {
 #define screen_hsize(s) ((s)->grid->hsize)
 #define screen_hlimit(s) ((s)->grid->hlimit)
 
+/* Input parser cell. */
+struct input_cell {
+	struct grid_cell	cell;
+	int			set;
+	int			g0set;	/* 1 if ACS */
+	int			g1set;	/* 1 if ACS */
+};
+
 /* Input parser context. */
 struct input_ctx {
 	struct window_pane     *wp;
 	struct screen_write_ctx ctx;
 
-	struct grid_cell	cell;
+	struct input_cell	cell;
 
-	struct grid_cell	old_cell;
+	struct input_cell	old_cell;
 	u_int 			old_cx;
 	u_int			old_cy;
 
@@ -819,7 +827,7 @@ struct input_ctx {
 
 #define INPUT_BUF_START 32
 #define INPUT_BUF_LIMIT 1048576
-	u_char*			input_buf;
+	u_char		       *input_buf;
 	size_t			input_len;
 	size_t			input_space;
 
@@ -1886,7 +1894,6 @@ RB_PROTOTYPE(key_bindings, key_binding, entry, key_bindings_cmp);
 struct key_binding *key_bindings_lookup(int);
 void	 key_bindings_add(int, int, struct cmd_list *);
 void	 key_bindings_remove(int);
-void	 key_bindings_clean(void);
 void	 key_bindings_init(void);
 void	 key_bindings_dispatch(struct key_binding *, struct client *);