circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

window_copy_pagedown shouldn't reset the mode anymore, instead let the

Browse Source 
caller do it so it can free the marks. Problem reported by attila at
stalphonsos dot com.
This commit is contained in:
nicm 2017-02-08 17:33:51 +00:00
parent e100d465da
commit 05802a6fe3
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
window-copy.c
View File

@ -29,7 +29,7 @@ static void window_copy_command(struct window_pane *, struct client *,
struct session *, struct args *, struct mouse_event *); struct session *, struct args *, struct mouse_event *);
static struct screen *window_copy_init(struct window_pane *); static struct screen *window_copy_init(struct window_pane *);
static void window_copy_free(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_next_paragraph(struct window_pane *);
static void window_copy_previous_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_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); window_copy_redraw_screen(wp);
} }
static void static int
window_copy_pagedown(struct window_pane *wp, int half_page) window_copy_pagedown(struct window_pane *wp, int half_page)
{ {
struct window_copy_mode_data *data = wp->modedata; 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); window_copy_cursor_end_of_line(wp);
} }
if (data->scroll_exit && data->oy == 0) { if (data->scroll_exit && data->oy == 0)
window_pane_reset_mode(wp); return (1);
return;
}
window_copy_update_selection(wp, 1); window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp); window_copy_redraw_screen(wp);
return (0);
} }
static void 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) if (strcmp(command, "end-of-line") == 0)
window_copy_cursor_end_of_line(wp); window_copy_cursor_end_of_line(wp);
if (strcmp(command, "halfpage-down") == 0) { if (strcmp(command, "halfpage-down") == 0) {
for (; np != 0; np--) for (; np != 0; np--) {
window_copy_pagedown(wp, 1); if (window_copy_pagedown(wp, 1)) {
cancel = 1;
break;
}
}
} }
if (strcmp(command, "halfpage-up") == 0) { if (strcmp(command, "halfpage-up") == 0) {
for (; np != 0; np--) 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); window_copy_other_end(wp);
} }
if (strcmp(command, "page-down") == 0) { if (strcmp(command, "page-down") == 0) {
for (; np != 0; np--) for (; np != 0; np--) {
window_copy_pagedown(wp, 0); if (window_copy_pagedown(wp, 0)) {
cancel = 1;
break;
}
}
} }
if (strcmp(command, "page-up") == 0) { if (strcmp(command, "page-up") == 0) {
for (; np != 0; np--) for (; np != 0; np--)