mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #212

Browse Source 
fixed completion in command line
    add: EditToggleTabTWS,EditFindDefinition, EditLoadPrevFile, EditLoadNextFile actions into bindings list
    add string bindings for f21..f24

Signed-off-by: Ilia Maslakov <il.smind@google.com>
This commit is contained in:
Ilia Maslakov 2009-09-30 09:13:29 +00:00
parent 5128c729b0
commit 53b0f8546d
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
misc/mc.keymap
View File

@ -1,8 +1,8 @@
[editor] [editor]
EditXStore = ctrl-g EditXStore =
EditXPaste = ctrl-v EditXPaste =
EditXCut = ctrl-x EditXCut =
EditDeleteLine = ctrl-y EditDeleteLine = ctrl-y
EditDeleteToLineEnd = ctrl-k EditDeleteToLineEnd = ctrl-k
@ -22,15 +22,15 @@ EditWordRight = ctrl-right
EditHome = home EditHome = home
EditEnd = end EditEnd = end
EditTab = tab EditTab = tab
EditUndo = alt-backspace EditUndo = ctrl-u
EditBeginningOfText = ctrl-shift-pgup EditBeginningOfText = ctrl-pgup
EditEndOfText = ctrl-shift-pgdn EditEndOfText = ctrl-pgdn
EditScrollUp = ctrl-up EditScrollUp = ctrl-up
EditScrollDown = ctrl-down EditScrollDown = ctrl-down
EditReturn = shift-enter EditReturn = shift-enter
EditBeginPage = EditBeginPage = ctrl-home
EditEndPage = EditEndPage = ctrl-end
EditDeleteWordLeft = alt-f EditDeleteWordLeft = alt-backspace
EditDeleteWordRight = alt-d EditDeleteWordRight = alt-d
EditParagraphUp = EditParagraphUp =
EditParagraphDown = EditParagraphDown =
@ -144,7 +144,10 @@ EditBeginorEndMacro = ctrl-r
EditBeginRecordMacro = EditBeginRecordMacro =
EditEndRecordMacro = EditEndRecordMacro =
EditToggleLineState = alt-n EditToggleLineState = alt-n
EditToggleTabTWS = alt-underline
EditFindDefinition = alt-enter
EditLoadPrevFile = alt-minus
EditLoadNextFile = alt-equal
[viewer:hex] [viewer:hex]
HexViewToggleNavigationMode = tab HexViewToggleNavigationMode = tab

5
src/keybind.c
View File

@ -188,6 +188,11 @@ static const name_key_map_t command_names[] = {
{ "EditBeginorEndMacro", CK_Begin_End_Macro }, { "EditBeginorEndMacro", CK_Begin_End_Macro },
{ "EditExtmode", CK_Ext_Mode }, { "EditExtmode", CK_Ext_Mode },
{ "EditToggleLineState", CK_Toggle_Line_State }, { "EditToggleLineState", CK_Toggle_Line_State },
{ "EditToggleTabTWS", CK_Toggle_Tab_TWS },
{ "EditFindDefinition", CK_Find_Definition },
{ "EditLoadPrevFile", CK_Load_Prev_File },
{ "EditLoadNextFile", CK_Load_Next_File },
#if 0 #if 0
{ "EditFocusNext", CK_Focus_Next }, { "EditFocusNext", CK_Focus_Next },
{ "EditFocusPrev", CK_Focus_Prev }, { "EditFocusPrev", CK_Focus_Prev },

5
src/tty/key.c
View File

@ -145,6 +145,11 @@ key_code_name_t key_name_conv_tab[] = {
{KEY_IC, "kpinsert", N_("Insert on keypad")}, {KEY_IC, "kpinsert", N_("Insert on keypad")},
{KEY_DC, "kpdelete", N_("Delete on keypad")}, {KEY_DC, "kpdelete", N_("Delete on keypad")},
{(int) '\n', "kpenter", N_("Enter on keypad")}, {(int) '\n', "kpenter", N_("Enter on keypad")},
{KEY_F (21), "f21", N_("Function key 21")},
{KEY_F (22), "f22", N_("Function key 22")},
{KEY_F (23), "f23", N_("Function key 23")},
{KEY_F (24), "f24", N_("Function key 24")},
/* Alternative label */ /* Alternative label */
{KEY_BACKSPACE, "backspace", N_("Backspace key")}, {KEY_BACKSPACE, "backspace", N_("Backspace key")},

3
src/widget.c
View File

@ -1757,7 +1757,7 @@ handle_char (WInput *in, int key)
for (i = 0; input_map[i].key; i++) { for (i = 0; input_map[i].key; i++) {
if (key == input_map[i].key) { if (key == input_map[i].key) {
if (input_map[i].command != CK_InputComplete) { if (input_map[i].command != CK_InputComplete)
free_completions (in); free_completions (in);
input_execute_cmd (in, input_map[i].command); input_execute_cmd (in, input_map[i].command);
update_input (in, 1); update_input (in, 1);
@ -1765,7 +1765,6 @@ handle_char (WInput *in, int key)
break; break;
} }
} }
}
if (input_map[i].command == 0) { if (input_map[i].command == 0) {
if (key > 255) if (key > 255)
return MSG_NOT_HANDLED; return MSG_NOT_HANDLED;