Sync OpenBSD patchset 1156:

Instead of numbering choose mode items 0-9a-z and then nothing, number
them all and if there are more than 10 use a prompt when 0-9 is
pressed. From Thomas Adam.
This commit is contained in:
Tiago Cunha
2012-08-12 19:28:20 +00:00
parent 30b801decf
commit 200b0e5821
5 changed files with 152 additions and 60 deletions

9
tmux.h
View File

@ -499,6 +499,7 @@ enum mode_key_cmd {
MODEKEYEDIT_TRANSPOSECHARS,
/* Menu (choice) keys. */
MODEKEYCHOICE_BACKSPACE,
MODEKEYCHOICE_CANCEL,
MODEKEYCHOICE_CHOOSE,
MODEKEYCHOICE_DOWN,
@ -506,6 +507,7 @@ enum mode_key_cmd {
MODEKEYCHOICE_PAGEUP,
MODEKEYCHOICE_SCROLLDOWN,
MODEKEYCHOICE_SCROLLUP,
MODEKEYCHOICE_STARTNUMBERPREFIX,
MODEKEYCHOICE_UP,
/* Copy keys. */
@ -847,14 +849,16 @@ struct window_choose_data {
struct client *client;
struct session *session;
struct format_tree *ft;
struct winlink *wl;
char *ft_template;
char *command;
u_int idx;
};
struct window_choose_mode_item {
struct window_choose_data *wcd;
char *name;
struct window_choose_data *wcd;
char *name;
int pos;
};
/* Child window structure. */
@ -2083,6 +2087,7 @@ struct window_pane *window_pane_find_left(struct window_pane *);
struct window_pane *window_pane_find_right(struct window_pane *);
void window_set_name(struct window *, const char *);
void winlink_clear_flags(struct winlink *);
void window_mode_attrs(struct grid_cell *, struct options *);
/* layout.c */
u_int layout_count_cells(struct layout_cell *);