diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
| commit | b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (patch) | |
| tree | 8704cc16b1ed5380bcd7c678351d85adfd5907c8 /mode-key.c | |
| parent | 8edbbb98656a76f0a25b5243b526709a67ae3531 (diff) | |
| parent | 81db6bab91309e7cb42628048408c10504522a48 (diff) | |
| download | rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.gz rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.bz2 rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.1
tmux.c
Diffstat (limited to 'mode-key.c')
| -rw-r--r-- | mode-key.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -153,6 +153,7 @@ const struct mode_key_entry mode_key_vi_edit[] = { { '\025' /* C-u */, 0, MODEKEYEDIT_DELETELINE }, { '\027' /* C-w */, 0, MODEKEYEDIT_DELETEWORD }, { '\033' /* Escape */, 0, MODEKEYEDIT_SWITCHMODE }, + { '\n', 0, MODEKEYEDIT_ENTER }, { '\r', 0, MODEKEYEDIT_ENTER }, { KEYC_BSPACE, 0, MODEKEYEDIT_BACKSPACE }, { KEYC_DC, 0, MODEKEYEDIT_DELETE }, @@ -176,6 +177,7 @@ const struct mode_key_entry mode_key_vi_edit[] = { { 'X', 1, MODEKEYEDIT_BACKSPACE }, { '\003' /* C-c */, 1, MODEKEYEDIT_CANCEL }, { '\010' /* C-h */, 1, MODEKEYEDIT_BACKSPACE }, + { '\n', 1, MODEKEYEDIT_ENTER }, { '\r', 1, MODEKEYEDIT_ENTER }, { '^', 1, MODEKEYEDIT_STARTOFLINE }, { 'a', 1, MODEKEYEDIT_SWITCHMODEAPPEND }, @@ -219,6 +221,7 @@ const struct mode_key_entry mode_key_vi_choice[] = { { '\005' /* C-e */, 0, MODEKEYCHOICE_SCROLLDOWN }, { '\006' /* C-f */, 0, MODEKEYCHOICE_PAGEDOWN }, { '\031' /* C-y */, 0, MODEKEYCHOICE_SCROLLUP }, + { '\n', 0, MODEKEYCHOICE_CHOOSE }, { '\r', 0, MODEKEYCHOICE_CHOOSE }, { 'j', 0, MODEKEYCHOICE_DOWN }, { 'k', 0, MODEKEYCHOICE_UP }, @@ -281,6 +284,7 @@ const struct mode_key_entry mode_key_vi_copy[] = { { '\025' /* C-u */, 0, MODEKEYCOPY_HALFPAGEUP }, { '\031' /* C-y */, 0, MODEKEYCOPY_SCROLLUP }, { '\033' /* Escape */, 0, MODEKEYCOPY_CLEARSELECTION }, + { '\n', 0, MODEKEYCOPY_COPYSELECTION }, { '\r', 0, MODEKEYCOPY_COPYSELECTION }, { '^', 0, MODEKEYCOPY_BACKTOINDENTATION }, { 'b', 0, MODEKEYCOPY_PREVIOUSWORD }, @@ -329,6 +333,7 @@ const struct mode_key_entry mode_key_emacs_edit[] = { { '\027' /* C-w */, 0, MODEKEYEDIT_DELETEWORD }, { '\031' /* C-y */, 0, MODEKEYEDIT_PASTE }, { '\033' /* Escape */, 0, MODEKEYEDIT_CANCEL }, + { '\n', 0, MODEKEYEDIT_ENTER }, { '\r', 0, MODEKEYEDIT_ENTER }, { 'b' | KEYC_ESCAPE, 0, MODEKEYEDIT_PREVIOUSWORD }, { 'f' | KEYC_ESCAPE, 0, MODEKEYEDIT_NEXTWORDEND }, @@ -363,6 +368,7 @@ const struct mode_key_entry mode_key_emacs_choice[] = { { '\020' /* C-p */, 0, MODEKEYCHOICE_UP }, { '\026' /* C-v */, 0, MODEKEYCHOICE_PAGEDOWN }, { '\033' /* Escape */, 0, MODEKEYCHOICE_CANCEL }, + { '\n', 0, MODEKEYCHOICE_CHOOSE }, { '\r', 0, MODEKEYCHOICE_CHOOSE }, { 'q', 0, MODEKEYCHOICE_CANCEL }, { 'v' | KEYC_ESCAPE, 0, MODEKEYCHOICE_PAGEUP }, |