diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
| commit | 907ad00300506c25ee84223811e25a411dc21517 (patch) | |
| tree | ec84d431722e22820564b77157df41c11ccc25be /window-choose.c | |
| parent | 5b1cf02f2ea224922661495af32d46b024e28eef (diff) | |
| parent | fce095665c62eb38826f42ae55a0fbe998f18be0 (diff) | |
| download | rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.gz rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.bz2 rtmux-907ad00300506c25ee84223811e25a411dc21517.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/window-choose.c b/window-choose.c index 3c68d101..5ed85f0e 100644 --- a/window-choose.c +++ b/window-choose.c @@ -44,7 +44,6 @@ void window_choose_scroll_down(struct window_pane *); void window_choose_collapse(struct window_pane *, struct session *); void window_choose_expand(struct window_pane *, struct session *, u_int); -void window_choose_collapse_all(struct window_pane *); enum window_choose_input_type { WINDOW_CHOOSE_NORMAL = -1, @@ -102,8 +101,7 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd) } void -window_choose_ready(struct window_pane *wp, u_int cur, - void (*callbackfn)(struct window_choose_data *)) +window_choose_set_current(struct window_pane *wp, u_int cur) { struct window_choose_mode_data *data = wp->modedata; struct screen *s = &data->screen; @@ -112,12 +110,22 @@ window_choose_ready(struct window_pane *wp, u_int cur, if (data->selected > screen_size_y(s) - 1) data->top = ARRAY_LENGTH(&data->list) - screen_size_y(s); + window_choose_redraw_screen(wp); +} + +void +window_choose_ready(struct window_pane *wp, u_int cur, + void (*callbackfn)(struct window_choose_data *)) +{ + struct window_choose_mode_data *data = wp->modedata; + data->callbackfn = callbackfn; if (data->callbackfn == NULL) data->callbackfn = window_choose_default_callback; ARRAY_CONCAT(&data->old_list, &data->list); + window_choose_set_current(wp, cur); window_choose_collapse_all(wp); } |