From 7f093fcddcf82c01b6c4d1446af2ebfac5d8a686 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 Mar 2019 19:01:21 +0000
Subject: Make adding mode formats a function pointer as well.

---
 window-copy.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'window-copy.c')

diff --git a/window-copy.c b/window-copy.c
index 65b29df0..ed36efc0 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -31,10 +31,11 @@ static void	window_copy_command(struct window_pane *, struct client *,
 static struct screen *window_copy_init(struct window_pane *,
 		    struct cmd_find_state *, struct args *);
 static void	window_copy_free(struct window_pane *);
+static void	window_copy_resize(struct window_pane *, u_int, u_int);
+static void	window_copy_formats(struct window_pane *, struct format_tree *);
 static int	window_copy_pagedown(struct window_pane *, int, int);
 static void	window_copy_next_paragraph(struct window_pane *);
 static void	window_copy_previous_paragraph(struct window_pane *);
-static void	window_copy_resize(struct window_pane *, u_int, u_int);
 
 static void	window_copy_redraw_selection(struct window_pane *, u_int);
 static void	window_copy_redraw_lines(struct window_pane *, u_int, u_int);
@@ -113,6 +114,7 @@ const struct window_mode window_copy_mode = {
 	.resize = window_copy_resize,
 	.key_table = window_copy_key_table,
 	.command = window_copy_command,
+	.formats = window_copy_formats,
 };
 
 enum {
@@ -472,6 +474,16 @@ window_copy_next_paragraph(struct window_pane *wp)
 	window_copy_scroll_to(wp, ox, oy);
 }
 
+static void
+window_copy_formats(struct window_pane *wp, struct format_tree *ft)
+{
+	struct window_copy_mode_data	*data = wp->modedata;
+
+	format_add(ft, "selection_present", "%d", data->screen.sel != NULL);
+	format_add(ft, "scroll_position", "%d", data->oy);
+	format_add(ft, "rectangle_toggle", "%d", data->rectflag);
+}
+
 static void
 window_copy_resize(struct window_pane *wp, u_int sx, u_int sy)
 {
@@ -2447,19 +2459,6 @@ window_copy_scroll_down(struct window_pane *wp, u_int ny)
 	screen_write_stop(&ctx);
 }
 
-void
-window_copy_add_formats(struct window_pane *wp, struct format_tree *ft)
-{
-	struct window_copy_mode_data	*data = wp->modedata;
-
-	if (wp->mode != &window_copy_mode)
-		return;
-
-	format_add(ft, "selection_present", "%d", data->screen.sel != NULL);
-	format_add(ft, "scroll_position", "%d", data->oy);
-	format_add(ft, "rectangle_toggle", "%d", data->rectflag);
-}
-
 static void
 window_copy_rectangle_toggle(struct window_pane *wp)
 {
-- 
cgit 


From 3c24bc5617bfdf90f94cc088f3769397c7569649 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 Mar 2019 19:34:22 +0000
Subject: Tidy changing the mode into window_copy_init_for_output.

---
 window-copy.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'window-copy.c')

diff --git a/window-copy.c b/window-copy.c
index ed36efc0..a79e3bf4 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -263,6 +263,12 @@ window_copy_init_for_output(struct window_pane *wp)
 {
 	struct window_copy_mode_data	*data = wp->modedata;
 
+	if (wp->mode == &window_copy_mode && data->backing != &wp->base)
+		return;
+	window_pane_reset_mode(wp);
+	window_pane_set_mode(wp, &window_copy_mode, NULL, NULL);
+
+	data = wp->modedata;
 	data->backing = xmalloc(sizeof *data->backing);
 	screen_init(data->backing, screen_size_x(&wp->base),
 	    screen_size_y(&wp->base), UINT_MAX);
-- 
cgit