Make numeric keys and backspace have meaning in choice-mode so that they can
be used later on in prompts, etc.
---
trunk/mode-key.c | 24 ++++++++++++++++++++++++
trunk/tmux.h | 2 ++
2 files changed, 26 insertions(+)
diff --git a/trunk/mode-key.c b/trunk/mode-key.c
index b82e9b9..a5540f1 100644
--- a/trunk/mode-key.c
+++ b/trunk/mode-key.c
@@ -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 },
diff --git a/trunk/tmux.h b/trunk/tmux.h
index 5a18411..39d1489 100644
--- a/trunk/tmux.h
+++ b/trunk/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. */
--
1.7.10
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
