From 200b0e5821d83de8c83fcc564fe7eda9253939e0 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 12 Aug 2012 19:28:20 +0000 Subject: 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. --- tmux.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 223d5e94..452ef1ee 100644 --- a/tmux.h +++ b/tmux.h @@ -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 *); -- cgit