diff options
| author | nicm <nicm> | 2017-02-08 17:33:51 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2017-02-08 17:33:51 +0000 |
| commit | 05802a6fe309e3b4559286ca5ce3c51f7367d661 (patch) | |
| tree | dc69b32ed2d098883a0340f84a1e5331495a1a68 /window-copy.c | |
| parent | e100d465daefd20da0bb5eea87c4b4896badff16 (diff) | |
window_copy_pagedown shouldn't reset the mode anymore, instead let the
caller do it so it can free the marks. Problem reported by attila at
stalphonsos dot com.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/window-copy.c b/window-copy.c index f808e7af..cb6243db 100644 --- a/window-copy.c +++ b/window-copy.c @@ -29,7 +29,7 @@ static void window_copy_command(struct window_pane *, struct client *, struct session *, struct args *, struct mouse_event *); static struct screen *window_copy_init(struct window_pane *); static void window_copy_free(struct window_pane *); -static void window_copy_pagedown(struct window_pane *, int); +static int window_copy_pagedown(struct window_pane *, 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); @@ -380,7 +380,7 @@ window_copy_pageup(struct window_pane *wp, int half_page) window_copy_redraw_screen(wp); } -static void +static int window_copy_pagedown(struct window_pane *wp, int half_page) { struct window_copy_mode_data *data = wp->modedata; @@ -420,13 +420,11 @@ window_copy_pagedown(struct window_pane *wp, int half_page) window_copy_cursor_end_of_line(wp); } - if (data->scroll_exit && data->oy == 0) { - window_pane_reset_mode(wp); - return; - } - + if (data->scroll_exit && data->oy == 0) + return (1); window_copy_update_selection(wp, 1); window_copy_redraw_screen(wp); + return (0); } static void @@ -621,8 +619,12 @@ window_copy_command(struct window_pane *wp, struct client *c, struct session *s, if (strcmp(command, "end-of-line") == 0) window_copy_cursor_end_of_line(wp); if (strcmp(command, "halfpage-down") == 0) { - for (; np != 0; np--) - window_copy_pagedown(wp, 1); + for (; np != 0; np--) { + if (window_copy_pagedown(wp, 1)) { + cancel = 1; + break; + } + } } if (strcmp(command, "halfpage-up") == 0) { for (; np != 0; np--) @@ -715,8 +717,12 @@ window_copy_command(struct window_pane *wp, struct client *c, struct session *s, window_copy_other_end(wp); } if (strcmp(command, "page-down") == 0) { - for (; np != 0; np--) - window_copy_pagedown(wp, 0); + for (; np != 0; np--) { + if (window_copy_pagedown(wp, 0)) { + cancel = 1; + break; + } + } } if (strcmp(command, "page-up") == 0) { for (; np != 0; np--) |