diff options
| author |   nicm <nicm@openbsd.org> | 2016-10-12 14:50:14 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-10-12 14:50:14 +0000 |
| commit | ce3f476a9998545a4f10486560f8ebd4594ab525 (patch) | |
| tree | c31ee3a1799f20bf30c14547dd3e4ebad141455a /usr.bin/tmux/tmux.h | |
| parent | client_identifier is not a string so using strlen() on it is (diff) | |
| download | wireguard-openbsd-ce3f476a9998545a4f10486560f8ebd4594ab525.tar.xz wireguard-openbsd-ce3f476a9998545a4f10486560f8ebd4594ab525.zip | |
Drop the edit mode key tables and just use fixed key bindings for the
command prompt.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index ea313365334..6b756fc855c 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.657 2016/10/12 13:24:07 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.658 2016/10/12 14:50:14 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -471,37 +471,6 @@ enum mode_key_cmd { MODEKEY_NONE, MODEKEY_OTHER, - /* Editing keys. */ - MODEKEYEDIT_BACKSPACE, - MODEKEYEDIT_CANCEL, - MODEKEYEDIT_COMPLETE, - MODEKEYEDIT_CURSORLEFT, - MODEKEYEDIT_CURSORRIGHT, - MODEKEYEDIT_DELETE, - MODEKEYEDIT_DELETELINE, - MODEKEYEDIT_DELETETOENDOFLINE, - MODEKEYEDIT_DELETEWORD, - MODEKEYEDIT_ENDOFLINE, - MODEKEYEDIT_ENTER, - MODEKEYEDIT_HISTORYDOWN, - MODEKEYEDIT_HISTORYUP, - MODEKEYEDIT_NEXTSPACE, - MODEKEYEDIT_NEXTSPACEEND, - MODEKEYEDIT_NEXTWORD, - MODEKEYEDIT_NEXTWORDEND, - MODEKEYEDIT_PASTE, - MODEKEYEDIT_PREVIOUSSPACE, - MODEKEYEDIT_PREVIOUSWORD, - MODEKEYEDIT_STARTOFLINE, - MODEKEYEDIT_SWITCHMODE, - MODEKEYEDIT_SWITCHMODEAPPEND, - MODEKEYEDIT_SWITCHMODEAPPENDLINE, - MODEKEYEDIT_SWITCHMODEBEGINLINE, - MODEKEYEDIT_SWITCHMODECHANGELINE, - MODEKEYEDIT_SWITCHMODESUBSTITUTE, - MODEKEYEDIT_SWITCHMODESUBSTITUTELINE, - MODEKEYEDIT_TRANSPOSECHARS, - /* Menu (choice) keys. */ MODEKEYCHOICE_BACKSPACE, MODEKEYCHOICE_BOTTOMLINE, @@ -527,7 +496,6 @@ enum mode_key_cmd { /* Data required while mode keys are in use. */ struct mode_key_data { struct mode_key_tree *tree; - int mode; }; #define MODEKEY_EMACS 0 #define MODEKEY_VI 1 @@ -535,8 +503,6 @@ struct mode_key_data { /* Binding between a key and a command. */ struct mode_key_binding { key_code key; - - int mode; enum mode_key_cmd cmd; RB_ENTRY(mode_key_binding) entry; @@ -1267,13 +1233,12 @@ struct client { void (*prompt_freefn)(void *); void *prompt_data; u_int prompt_hindex; + enum { PROMPT_ENTRY, PROMPT_COMMAND } prompt_mode; #define PROMPT_SINGLE 0x1 #define PROMPT_NUMERIC 0x2 int prompt_flags; - struct mode_key_data prompt_mdata; - struct session *session; struct session *last_session; |