diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-08-12 19:28:20 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-08-12 19:28:20 +0000 |
| commit | 200b0e5821d83de8c83fcc564fe7eda9253939e0 (patch) | |
| tree | d1d71f2cc5c061f1f4b3675990a4ebffbe0d55ca /mode-key.c | |
| parent | 30b801decf261b5e489b1067ee6f04bda40a3d17 (diff) | |
| download | rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.tar.gz rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.tar.bz2 rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.zip | |
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.
Diffstat (limited to 'mode-key.c')
| -rw-r--r-- | mode-key.c | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -74,6 +74,7 @@ const struct mode_key_cmdstr mode_key_cmdstr_edit[] = { /* Choice keys command strings. */ const struct mode_key_cmdstr mode_key_cmdstr_choice[] = { + { MODEKEYCHOICE_BACKSPACE, "backspace" }, { MODEKEYCHOICE_CANCEL, "cancel" }, { MODEKEYCHOICE_CHOOSE, "choose" }, { MODEKEYCHOICE_DOWN, "down" }, @@ -81,6 +82,7 @@ const struct mode_key_cmdstr mode_key_cmdstr_choice[] = { { MODEKEYCHOICE_PAGEUP, "page-up" }, { MODEKEYCHOICE_SCROLLDOWN, "scroll-down" }, { MODEKEYCHOICE_SCROLLUP, "scroll-up" }, + { MODEKEYCHOICE_STARTNUMBERPREFIX, "start-number-prefix" }, { MODEKEYCHOICE_UP, "up" }, { 0, NULL } @@ -190,6 +192,16 @@ struct mode_key_tree mode_key_tree_vi_edit; /* vi choice selection keys. */ const struct mode_key_entry mode_key_vi_choice[] = { + { '0', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '1', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '2', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '3', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '4', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '5', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '6', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '7', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '8', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '9', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, { '\002' /* C-b */, 0, MODEKEYCHOICE_PAGEUP }, { '\003' /* C-c */, 0, MODEKEYCHOICE_CANCEL }, { '\005' /* C-e */, 0, MODEKEYCHOICE_SCROLLDOWN }, @@ -199,6 +211,7 @@ const struct mode_key_entry mode_key_vi_choice[] = { { 'j', 0, MODEKEYCHOICE_DOWN }, { 'k', 0, MODEKEYCHOICE_UP }, { 'q', 0, MODEKEYCHOICE_CANCEL }, + { KEYC_BSPACE, 0, MODEKEYCHOICE_BACKSPACE }, { KEYC_DOWN | KEYC_CTRL,0, MODEKEYCHOICE_SCROLLDOWN }, { KEYC_DOWN, 0, MODEKEYCHOICE_DOWN }, { KEYC_NPAGE, 0, MODEKEYCHOICE_PAGEDOWN }, @@ -317,6 +330,16 @@ struct mode_key_tree mode_key_tree_emacs_edit; /* emacs choice selection keys. */ const struct mode_key_entry mode_key_emacs_choice[] = { + { '0', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '1', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '2', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '3', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '4', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '5', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '6', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '7', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '8', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '9', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, { '\003' /* C-c */, 0, MODEKEYCHOICE_CANCEL }, { '\016' /* C-n */, 0, MODEKEYCHOICE_DOWN }, { '\020' /* C-p */, 0, MODEKEYCHOICE_UP }, @@ -325,6 +348,7 @@ const struct mode_key_entry mode_key_emacs_choice[] = { { '\r', 0, MODEKEYCHOICE_CHOOSE }, { 'q', 0, MODEKEYCHOICE_CANCEL }, { 'v' | KEYC_ESCAPE, 0, MODEKEYCHOICE_PAGEUP }, + { KEYC_BSPACE, 0, MODEKEYCHOICE_BACKSPACE }, { KEYC_DOWN | KEYC_CTRL,0, MODEKEYCHOICE_SCROLLDOWN }, { KEYC_DOWN, 0, MODEKEYCHOICE_DOWN }, { KEYC_NPAGE, 0, MODEKEYCHOICE_PAGEDOWN }, |