summaryrefslogtreecommitdiffstats
path: root/window-copy.c
diff options
context:
space:
mode:
authornicm <nicm>2020-04-15 19:06:49 +0000
committernicm <nicm>2020-04-15 19:06:49 +0000
commitfc1855f514028941df1acb79a2dfd728a2197f94 (patch)
treeb2598fda1bbf11021bd66a8d5532488aace25577 /window-copy.c
parent53a29a2ffa0d7f167499b67ec36bc7a1adf78b49 (diff)
Clear the selection and repeat the search on refresh same as resize.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c36
1 files changed, 22 insertions, 14 deletions
diff --git a/window-copy.c b/window-copy.c
index 2b42eb2a..a9307cb5 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -693,24 +693,13 @@ window_copy_formats(struct window_mode_entry *wme, struct format_tree *ft)
}
static void
-window_copy_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
+window_copy_size_changed(struct window_mode_entry *wme)
{
struct window_copy_mode_data *data = wme->data;
struct screen *s = &data->screen;
- struct screen_write_ctx ctx;
- int search;
-
- screen_resize(s, sx, sy, 0);
- screen_resize_cursor(data->backing, sx, sy, 1, 0, NULL, NULL);
-
- if (data->cy > sy - 1)
- data->cy = sy - 1;
- if (data->cx > sx)
- data->cx = sx;
- if (data->oy > screen_hsize(data->backing))
- data->oy = screen_hsize(data->backing);
+ struct screen_write_ctx ctx;
+ int search = (data->searchmark != NULL);
- search = (data->searchmark != NULL);
window_copy_clear_selection(wme);
window_copy_clear_marks(wme);
@@ -723,7 +712,25 @@ window_copy_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
data->searchx = data->cx;
data->searchy = data->cy;
data->searcho = data->oy;
+}
+
+static void
+window_copy_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
+{
+ struct window_copy_mode_data *data = wme->data;
+ struct screen *s = &data->screen;
+
+ screen_resize(s, sx, sy, 0);
+ screen_resize_cursor(data->backing, sx, sy, 1, 0, NULL, NULL);
+
+ if (data->cy > sy - 1)
+ data->cy = sy - 1;
+ if (data->cx > sx)
+ data->cx = sx;
+ if (data->oy > screen_hsize(data->backing))
+ data->oy = screen_hsize(data->backing);
+ window_copy_size_changed(wme);
window_copy_redraw_screen(wme);
}
@@ -2030,6 +2037,7 @@ window_copy_cmd_refresh_from_pane(struct window_copy_cmd_state *cs)
data->backing = window_copy_clone_screen(&wp->base, &data->screen, NULL,
NULL);
+ window_copy_size_changed(wme);
return (WINDOW_COPY_CMD_REDRAW);
}