github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-24 03:51:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pager

Browse Source
This commit is contained in:
ridiculousfish 2014-01-21 16:09:03 -08:00
commit e6c70bf392
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
input.cpp
View File

@ -111,7 +111,6 @@ static const wchar_t * const name_arr[] =
L"kill-word", L"kill-word",
L"backward-kill-word", L"backward-kill-word",
L"backward-kill-path-component", L"backward-kill-path-component",
L"dump-functions",
L"history-token-search-backward", L"history-token-search-backward",
L"history-token-search-forward", L"history-token-search-forward",
L"self-insert", L"self-insert",
@ -120,9 +119,8 @@ static const wchar_t * const name_arr[] =
L"upcase-word", L"upcase-word",
L"downcase-word", L"downcase-word",
L"capitalize-word", L"capitalize-word",
L"null",
L"eof",
L"vi-arg-digit", L"vi-arg-digit",
L"vi-delete-to",
L"execute", L"execute",
L"beginning-of-buffer", L"beginning-of-buffer",
L"end-of-buffer", L"end-of-buffer",
@ -131,8 +129,18 @@ static const wchar_t * const name_arr[] =
L"down-line", L"down-line",
L"suppress-autosuggestion", L"suppress-autosuggestion",
L"accept-autosuggestion" L"accept-autosuggestion"
};
wcstring describe_char(wchar_t c)
{
wchar_t initial_cmd_char = R_BEGINNING_OF_LINE;
size_t name_count = sizeof name_arr / sizeof *name_arr;
if (c >= initial_cmd_char && c < initial_cmd_char + name_count)
{
return format_string(L"%02x (%ls)", c, name_arr[c - initial_cmd_char]);
}
return format_string(L"%02x", c);
} }
;
/** /**
Description of each supported input function Description of each supported input function
@ -200,7 +208,6 @@ static const wchar_t code_arr[] =
R_KILL_WORD, R_KILL_WORD,
R_BACKWARD_KILL_WORD, R_BACKWARD_KILL_WORD,
R_BACKWARD_KILL_PATH_COMPONENT, R_BACKWARD_KILL_PATH_COMPONENT,
R_DUMP_FUNCTIONS,
R_HISTORY_TOKEN_SEARCH_BACKWARD, R_HISTORY_TOKEN_SEARCH_BACKWARD,
R_HISTORY_TOKEN_SEARCH_FORWARD, R_HISTORY_TOKEN_SEARCH_FORWARD,
R_SELF_INSERT, R_SELF_INSERT,
@ -209,9 +216,8 @@ static const wchar_t code_arr[] =
R_UPCASE_WORD, R_UPCASE_WORD,
R_DOWNCASE_WORD, R_DOWNCASE_WORD,
R_CAPITALIZE_WORD, R_CAPITALIZE_WORD,
R_NULL,
R_EOF,
R_VI_ARG_DIGIT, R_VI_ARG_DIGIT,
R_VI_DELETE_TO,
R_EXECUTE, R_EXECUTE,
R_BEGINNING_OF_BUFFER, R_BEGINNING_OF_BUFFER,
R_END_OF_BUFFER, R_END_OF_BUFFER,
@ -220,8 +226,7 @@ static const wchar_t code_arr[] =
R_DOWN_LINE, R_DOWN_LINE,
R_SUPPRESS_AUTOSUGGESTION, R_SUPPRESS_AUTOSUGGESTION,
R_ACCEPT_AUTOSUGGESTION R_ACCEPT_AUTOSUGGESTION
} };
;
/** Mappings for the current input mode */ /** Mappings for the current input mode */
static std::vector<input_mapping_t> mapping_list; static std::vector<input_mapping_t> mapping_list;

8
input.h
View File

@ -14,6 +14,8 @@ inputrc information for key bindings.
/** /**
Key codes for inputrc-style keyboard functions that are passed on Key codes for inputrc-style keyboard functions that are passed on
to the caller of input_read() to the caller of input_read()
NOTE: IF YOU MODIFY THIS YOU MUST UPDATE THE name_arr AND code_arr VARIABLES TO MATCH!
*/ */
enum enum
{ {
@ -38,7 +40,6 @@ enum
R_KILL_WORD, R_KILL_WORD,
R_BACKWARD_KILL_WORD, R_BACKWARD_KILL_WORD,
R_BACKWARD_KILL_PATH_COMPONENT, R_BACKWARD_KILL_PATH_COMPONENT,
R_DUMP_FUNCTIONS,
R_HISTORY_TOKEN_SEARCH_BACKWARD, R_HISTORY_TOKEN_SEARCH_BACKWARD,
R_HISTORY_TOKEN_SEARCH_FORWARD, R_HISTORY_TOKEN_SEARCH_FORWARD,
R_SELF_INSERT, R_SELF_INSERT,
@ -57,8 +58,9 @@ enum
R_DOWN_LINE, R_DOWN_LINE,
R_SUPPRESS_AUTOSUGGESTION, R_SUPPRESS_AUTOSUGGESTION,
R_ACCEPT_AUTOSUGGESTION R_ACCEPT_AUTOSUGGESTION
} };
;
wcstring describe_char(wchar_t c);
/** /**
Initialize the terminal by calling setupterm, and set up arrays Initialize the terminal by calling setupterm, and set up arrays