diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-02-02 23:55:21 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-02-02 23:55:21 +0000 |
| commit | c4724c7861a230e8158522a90bbed101a0ea142f (patch) | |
| tree | d05553e77cbf6e11aff55d077d05b9c9bce80364 /window-choose.c | |
| parent | 998d76c6b466a6e9426a183693634a08e9796ff8 (diff) | |
| download | rtmux-c4724c7861a230e8158522a90bbed101a0ea142f.tar.gz rtmux-c4724c7861a230e8158522a90bbed101a0ea142f.tar.bz2 rtmux-c4724c7861a230e8158522a90bbed101a0ea142f.zip | |
Sync OpenBSD patchset 629:
Add scroll-up/scroll-down for choose/more mode, from Micah Cowan.
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/window-choose.c b/window-choose.c index e77bfa75..5eee090e 100644 --- a/window-choose.c +++ b/window-choose.c @@ -1,4 +1,4 @@ -/* $Id: window-choose.c,v 1.28 2010-01-17 19:00:05 tcunha Exp $ */ +/* $Id: window-choose.c,v 1.29 2010-02-02 23:55:21 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -225,16 +225,41 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key) } data->selected++; - if (data->selected >= data->top + screen_size_y(&data->screen)) - window_choose_scroll_down(wp); - else { + if (data->selected < data->top + screen_size_y(s)) { screen_write_start(&ctx, wp, NULL); window_choose_write_line( wp, &ctx, data->selected - data->top); window_choose_write_line( wp, &ctx, data->selected - 1 - data->top); screen_write_stop(&ctx); - } + } else + window_choose_scroll_down(wp); + break; + case MODEKEYCHOICE_SCROLLUP: + if (items == 0 || data->top == 0) + break; + if (data->selected == data->top + screen_size_y(s) - 1) { + data->selected--; + window_choose_scroll_up(wp); + screen_write_start(&ctx, wp, NULL); + window_choose_write_line( + wp, &ctx, screen_size_y(s) - 1); + screen_write_stop(&ctx); + } else + window_choose_scroll_up(wp); + break; + case MODEKEYCHOICE_SCROLLDOWN: + if (items == 0 || + data->top + screen_size_y(&data->screen) >= items) + break; + if (data->selected == data->top) { + data->selected++; + window_choose_scroll_down(wp); + screen_write_start(&ctx, wp, NULL); + window_choose_write_line(wp, &ctx, 0); + screen_write_stop(&ctx); + } else + window_choose_scroll_down(wp); break; case MODEKEYCHOICE_PAGEUP: if (data->selected < screen_size_y(s)) { |