diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-16 19:23:07 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-16 19:23:07 +0000 |
| commit | 98e9e09588a33a062a8ac694544a2e8884c425c4 (patch) | |
| tree | 4885da3ea276cadf8902afe5290af0848fcd27d4 /window-scroll.c | |
| parent | 9541471f876886b622daf6fa5c66f3cbe779c691 (diff) | |
| download | rtmux-98e9e09588a33a062a8ac694544a2e8884c425c4.tar.gz rtmux-98e9e09588a33a062a8ac694544a2e8884c425c4.tar.bz2 rtmux-98e9e09588a33a062a8ac694544a2e8884c425c4.zip | |
Sync OpenBSD patchset 259:
Scroll by two less than the number of lines in the screen, like emacs, rather
than by the entire screen, to make it easier to pull things out from under the
line indicator. Suggested by claudio.
Diffstat (limited to 'window-scroll.c')
| -rw-r--r-- | window-scroll.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/window-scroll.c b/window-scroll.c index e8951fc6..80f683e9 100644 --- a/window-scroll.c +++ b/window-scroll.c @@ -1,4 +1,4 @@ -/* $Id: window-scroll.c,v 1.38 2009-08-09 16:50:57 tcunha Exp $ */ +/* $Id: window-scroll.c,v 1.39 2009-08-16 19:23:07 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -101,11 +101,15 @@ window_scroll_pageup(struct window_pane *wp) { struct window_scroll_mode_data *data = wp->modedata; struct screen *s = &data->screen; + u_int n; - if (data->oy + screen_size_y(s) > screen_hsize(&wp->base)) + n = 1; + if (screen_size_y(s) > 2) + n = screen_size_y(s) - 2; + if (data->oy + n > screen_hsize(&wp->base)) data->oy = screen_hsize(&wp->base); else - data->oy += screen_size_y(s); + data->oy += n; window_scroll_redraw_screen(wp); } @@ -130,6 +134,7 @@ window_scroll_key(struct window_pane *wp, unused struct client *c, int key) { struct window_scroll_mode_data *data = wp->modedata; struct screen *s = &data->screen; + u_int n; switch (mode_key_lookup(&data->mdata, key)) { case MODEKEYCOPY_CANCEL: @@ -151,10 +156,13 @@ window_scroll_key(struct window_pane *wp, unused struct client *c, int key) window_scroll_pageup(wp); break; case MODEKEYCOPY_NEXTPAGE: - if (data->oy < screen_size_y(s)) + n = 1; + if (screen_size_y(s) > 2) + n = screen_size_y(s) - 2; + if (data->oy < n) data->oy = 0; else - data->oy -= screen_size_y(s); + data->oy -= n; window_scroll_redraw_screen(wp); break; default: |