mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 13:02:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Many shortcuts were fixed.

Browse Source 
Ticket #1764:
  * fxed shortcuts for select/unselect/reverse selection
of file group;
  * removed 'C-x C-c' default shortcut for Quit command.

Also fixed some emacs-like keybindings for editor and viewer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-11-14 12:19:19 +03:00
parent d8130a82a3
commit 5e68b69020
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/mc.keymap.default
View File

@ -233,7 +233,7 @@ CmdCopyOtherPathname = alt-shift-a
CmdFilteredView = alt-exclamation CmdFilteredView = alt-exclamation
CmdSelect = kpplus CmdSelect = kpplus
CmdUnselect = kpminus CmdUnselect = kpminus
CmdReverseSelection = alt-kpasterisk CmdReverseSelection = kpasterisk
ExtMap1 = ctrl-x ExtMap1 = ctrl-x
[main:xmap] [main:xmap]

9
misc/mc.keymap.emacs
View File

@ -60,8 +60,8 @@ EditBeginningOfTextHighlight = ctrl-shift-home
EditEndOfTextHighlight = ctrl-shift-end EditEndOfTextHighlight = ctrl-shift-end
EditBeginPageHighlight = ctrl-shift-pgup EditBeginPageHighlight = ctrl-shift-pgup
EditEndPageHighlight = ctrl-shift-pgdn EditEndPageHighlight = ctrl-shift-pgdn
EditScrollUpHighlight = EditScrollUpHighlight = ctrl-shift-up
EditScrollDownHighlight = EditScrollDownHighlight = ctrl-shift-down
EditParagraphUpHighlight = EditParagraphUpHighlight =
EditParagraphDownHighlight = EditParagraphDownHighlight =
@ -170,8 +170,7 @@ ViewGoto = f5
ViewSearch = f7; question; slash ViewSearch = f7; question; slash
ViewToggleMagicMode = f8 ViewToggleMagicMode = f8
ViewToggleNroffMode = f9 ViewToggleNroffMode = f9
ViewQuit = f3; f10; q; esc; ctrl-g ViewContinueSearch = ctrl-r; ctrl-s; f17; n
ViewContinueSearch = ctrl-r; ctrl-s; f17
ViewMoveToBol = ctrl-a ViewMoveToBol = ctrl-a
ViewMoveToEol = ctrl-e ViewMoveToEol = ctrl-e
ViewMoveLeft = h; left ViewMoveLeft = h; left
@ -238,7 +237,7 @@ CmdCopyOtherPathname = alt-shift-a
CmdFilteredView = alt-exclamation CmdFilteredView = alt-exclamation
CmdSelect = kpplus CmdSelect = kpplus
CmdUnselect = kpminus CmdUnselect = kpminus
CmdReverseSelection = alt-kpasterisk CmdReverseSelection = kpasterisk
ExtMap1 = ctrl-x ExtMap1 = ctrl-x
[main:xmap] [main:xmap]

11
src/keybind.c
View File

@ -762,8 +762,8 @@ const global_keymap_t default_panel_keymap[] = {
{ KEY_F (14), CK_PanelCmdEditNew, "S-F4" }, { KEY_F (14), CK_PanelCmdEditNew, "S-F4" },
{ KEY_F (16), CK_PanelCmdRenameLocal, "S-F6" }, { KEY_F (16), CK_PanelCmdRenameLocal, "S-F6" },
{ ALT ('*'), CK_PanelCmdReverseSelection, "M-*" }, { ALT ('*'), CK_PanelCmdReverseSelection, "M-*" },
{ KEY_KP_ADD, CK_PanelCmdSelect, "Gray+" }, { KEY_KP_ADD, CK_PanelCmdSelect, "M-+" },
{ KEY_KP_SUBTRACT, CK_PanelCmdUnselect, "Gray-" }, { KEY_KP_SUBTRACT, CK_PanelCmdUnselect, "M--" },
{ KEY_F (13), CK_PanelCmdViewSimple, "S-F3" }, { KEY_F (13), CK_PanelCmdViewSimple, "S-F3" },
{ KEY_M_CTRL | KEY_NPAGE, CK_PanelCtrlNextPage, "C-PgDn" }, { KEY_M_CTRL | KEY_NPAGE, CK_PanelCtrlNextPage, "C-PgDn" },
{ KEY_M_CTRL | KEY_PPAGE, CK_PanelCtrlPrevPage, "C-PgUp" }, { KEY_M_CTRL | KEY_PPAGE, CK_PanelCtrlPrevPage, "C-PgUp" },
@ -830,14 +830,13 @@ const global_keymap_t default_main_map[] = {
{ ALT ('.'), CK_ToggleShowHidden, "M-." }, { ALT ('.'), CK_ToggleShowHidden, "M-." },
{ XCTRL ('x'), CK_StartExtMap1, "C-x" }, { XCTRL ('x'), CK_StartExtMap1, "C-x" },
/* Select/unselect group */ /* Select/unselect group */
{ ALT ('*'), CK_SelectCmd, "M-*" }, { KEY_KP_ADD, CK_SelectCmd, "+" },
{ KEY_KP_ADD, CK_UnselectCmd, "Gray+" }, { KEY_KP_SUBTRACT, CK_UnselectCmd, "-" },
{ KEY_KP_SUBTRACT, CK_ReverseSelectionCmd, "Gray-" }, { ALT ('*'), CK_ReverseSelectionCmd, "*" },
{ 0, CK_Ignore_Key, "" } { 0, CK_Ignore_Key, "" }
}; };
const global_keymap_t default_main_x_map[] = { const global_keymap_t default_main_x_map[] = {
{ XCTRL ('c'), CK_QuitCmd, "C-c" },
{ 'd', CK_CompareDirsCmd, "d" }, { 'd', CK_CompareDirsCmd, "d" },
#ifdef USE_VFS #ifdef USE_VFS
{ 'a', CK_ReselectVfs, "a"}, { 'a', CK_ReselectVfs, "a"},

6
src/tty/key.c
View File

@ -128,10 +128,10 @@ const key_code_name_t key_name_conv_tab[] = {
{ KEY_IC, "insert", N_("Insert key"), "Ins" }, { KEY_IC, "insert", N_("Insert key"), "Ins" },
{ KEY_DC, "delete", N_("Delete key"), "Del" }, { KEY_DC, "delete", N_("Delete key"), "Del" },
{ ALT ('\t'), "complete", N_("Completion/M-tab"), "Meta-Tab" }, { ALT ('\t'), "complete", N_("Completion/M-tab"), "Meta-Tab" },
{ KEY_KP_ADD, "kpplus", N_("+ on keypad"), "Gray+" }, { KEY_KP_ADD, "kpplus", N_("+ on keypad"), "+" },
{ KEY_KP_SUBTRACT, "kpminus", N_("- on keypad"), "Gray-" }, { KEY_KP_SUBTRACT, "kpminus", N_("- on keypad"), "-" },
{ (int) '/', "kpslash", N_("Slash on keypad"), "/" }, { (int) '/', "kpslash", N_("Slash on keypad"), "/" },
{ KEY_KP_MULTIPLY, "kpasterisk", N_("* on keypad"), "Gray*" }, { KEY_KP_MULTIPLY, "kpasterisk", N_("* on keypad"), "*" },
/* From here on, these won't be shown in Learn keys (no space) */ /* From here on, these won't be shown in Learn keys (no space) */
{ ESC_CHAR, "escape", N_("Escape key"), "Esc" }, { ESC_CHAR, "escape", N_("Escape key"), "Esc" },