From df59561ab0550fb0f40e255e888125d00a936c31 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Thu, 24 Sep 2009 14:31:30 +0300 Subject: [PATCH] Show hotkeys as 'alt-s' instread of 'alt s'. Signed-off-by: Slava Zanko --- doc/man/es/mc.1.in | 4 +- doc/man/mc.1.in | 4 +- misc/mc.keymap | 204 ++++++++++++++++++++++----------------------- src/tty/key.c | 2 +- 4 files changed, 107 insertions(+), 107 deletions(-) diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in index 29e894ada..c9f1a69e1 100644 --- a/doc/man/es/mc.1.in +++ b/doc/man/es/mc.1.in @@ -3294,8 +3294,8 @@ También se pueden usar Por ejemplo: .nf - ctrl alt right=\\e[[1;6C - ctrl alt left=\\e[[1;6D + ctrl-alt-right=\\e[[1;6C + ctrl-alt-left=\\e[[1;6D .fi .PP diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index 03ae6ce3c..00b247e53 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -3696,8 +3696,8 @@ Also now you can use For example: .nf - ctrl alt right=\\e[[1;6C - ctrl alt left=\\e[[1;6D + ctrl-alt-right=\\e[[1;6C + ctrl-alt-left=\\e[[1;6D .fi .PP diff --git a/misc/mc.keymap b/misc/mc.keymap index 214c79078..2ce2fe2bf 100644 --- a/misc/mc.keymap +++ b/misc/mc.keymap @@ -1,11 +1,11 @@ [editor] -EditXStore = ctrl g -EditXPaste = ctrl v -EditXCut = ctrl x +EditXStore = ctrl-g +EditXPaste = ctrl-v +EditXCut = ctrl-x -EditDeleteLine = ctrl y -EditDeleteToLineEnd = ctrl k +EditDeleteLine = ctrl-y +EditDeleteToLineEnd = ctrl-k EditDeleteToLineBegin = EditLeft = left @@ -17,21 +17,21 @@ EditBackSpace = backspace EditDelete = delete EditPageUp = pgup EditPageDown = pgdn -EditWordLeft = ctrl left -EditWordRight = ctrl right +EditWordLeft = ctrl-left +EditWordRight = ctrl-right EditHome = home EditEnd = end EditTab = tab -EditUndo = alt backspace -EditBeginningOfText = ctrl shift pgup -EditEndOfText = ctrl shift pgdn -EditScrollUp = ctrl up -EditScrollDown = ctrl down -EditReturn = shift enter +EditUndo = alt-backspace +EditBeginningOfText = ctrl-shift-pgup +EditEndOfText = ctrl-shift-pgdn +EditScrollUp = ctrl-up +EditScrollDown = ctrl-down +EditReturn = shift-enter EditBeginPage = EditEndPage = -EditDeleteWordLeft = alt f -EditDeleteWordRight = alt d +EditDeleteWordLeft = alt-f +EditDeleteWordRight = alt-d EditParagraphUp = EditParagraphDown = EditSave = f2 @@ -45,31 +45,31 @@ EditRemove = f8 EditUnmark = EditFind = f7 -EditPageUpHighlight = shift pgup -EditPageDownHighlight = shift pgdn -EditLeftHighlight = shift left -EditRightHighlight = shift right -EditWordLeftHighlight = ctrl shift left -EditWordRightHighlight = ctrl shift right -EditUpHighlight = shift up -EditDownHighlight = shift down -EditHomeHighlight = shift home -EditEndHighlight = shift end -EditBeginningOfTextHighlight = ctrl shift home -EditEndOfTextHighlight = ctrl shift end -EditBeginPageHighlight = ctrl shift pgup -EditEndPageHighlight = ctrl shift pgdn +EditPageUpHighlight = shift-pgup +EditPageDownHighlight = shift-pgdn +EditLeftHighlight = shift-left +EditRightHighlight = shift-right +EditWordLeftHighlight = ctrl-shift-left +EditWordRightHighlight = ctrl-shift-right +EditUpHighlight = shift-up +EditDownHighlight = shift-down +EditHomeHighlight = shift-home +EditEndHighlight = shift-end +EditBeginningOfTextHighlight = ctrl-shift-home +EditEndOfTextHighlight = ctrl-shift-end +EditBeginPageHighlight = ctrl-shift-pgup +EditEndPageHighlight = ctrl-shift-pgdn EditScrollUpHighlight = EditScrollDownHighlight = EditParagraphUpHighlight = EditParagraphDownHighlight = -EditSaveBlock = ctrl f +EditSaveBlock = ctrl-f EditColumnMark = f13 EditFindAgain = f17 EditReplace = f4 EditReplaceAgain = f14 -EditCompleteWord = alt tab +EditCompleteWord = alt-tab EditDebugStart = EditDebugStop = EditDebugToggleBreak = @@ -85,23 +85,23 @@ EditExit = f10 EditToggleInsert = ins EditHelp = f1 EditDate = -EditRefresh = ctrl l -EditGoto = alt l +EditRefresh = ctrl-l +EditGoto = alt-l EditManPage = -EditSort = alt t +EditSort = alt-t EditMail = EditCancel = EditComplete = -EditParagraphFormat = alt p +EditParagraphFormat = alt-p EditUtil = EditTypeLoadPython = EditFindFile = EditCtags = -EditMatchBracket = alt b +EditMatchBracket = alt-b EditTerminal = EditTerminalApp = -EditExtCmd = alt u +EditExtCmd = alt-u EditUserMenu = f11 EditSaveDesktop = EditNewWindow = @@ -112,25 +112,25 @@ EditRunAnother = EditCheckSaveAndQuit = EditMaximize = EditDeleteMacro = -EditToggleBookmark = alt k -EditFlushBookmarks = alt o -EditNextBookmark = alt j -EditPrevBookmark = alt i +EditToggleBookmark = alt-k +EditFlushBookmarks = alt-o +EditNextBookmark = alt-j +EditPrevBookmark = alt-i EditSelectionHistory = -EditShell = ctrl o -EditInsertLiteral = ctrl q -EditExecuteMacro ctrl a -EditBeginorEndMacro = ctrl r +EditShell = ctrl-o +EditInsertLiteral = ctrl-q +EditExecuteMacro = ctrl-a +EditBeginorEndMacro = ctrl-r EditBeginRecordMacro = EditEndRecordMacro = -EditToggleLineState = alt n +EditToggleLineState = alt-n [viewer:hex] HexViewToggleNavigationMode = tab -ViewMoveToBol = ctrl a; home -ViewMoveToEol = ctrl e; end +ViewMoveToBol = ctrl-a; home +ViewMoveToEol = ctrl-e; end ViewMoveLeft = b; left ViewMoveRight = f; right ViewMoveUp = k; y; up @@ -138,7 +138,7 @@ ViewMoveDown = j; delete; down [viewer] ViewSearch = ?; /; f7 -ViewContinueSearch = ctrl r; ctrl s; f17 +ViewContinueSearch = ctrl-r; ctrl-s; f17 ViewMoveToBol = home ViewMoveToEol = end ViewMoveLeft = h; left @@ -151,35 +151,35 @@ ViewMoveHalfPgDn = d ViewMoveHalfPgUp = u ViewGotoBookmark = m ViewNewBookmark = r -ViewNextFile = ctrl f -ViewPrevFile = ctrl b +ViewNextFile = ctrl-f +ViewPrevFile = ctrl-b ViewQuit = q; esc -SelectCodepage = ctrl t -ShowCommandLine = ctrl o -ViewToggleRuler = alt r +SelectCodepage = ctrl-t +ShowCommandLine = ctrl-o +ViewToggleRuler = alt-r [main] CmdMenuLastSelected = f19 CmdQuietQuit = f20 -CmdSingleDirsize = ctrl @ -CmdCopyCurrentPathname = alt a -CmdCopyOtherPathname = alt A -CmdQuickCd = alt c -CmdQuickChdir = ctrl \\ -CmdSuspend = ctrl z -CmdFilteredView = alt ! -CmdFind = alt ? -CmdReread = ctrl r -CmdToggleListing = alt t -CmdSwapPanel = ctrl u -ShowCommandLine = ctrl o +CmdSingleDirsize = ctrl-@ +CmdCopyCurrentPathname = alt-a +CmdCopyOtherPathname = alt-A +CmdQuickCd = alt-c +CmdQuickChdir = ctrl-\\ +CmdSuspend = ctrl-z +CmdFilteredView = alt-! +CmdFind = alt-? +CmdReread = ctrl-r +CmdToggleListing = alt-t +CmdSwapPanel = ctrl-u +ShowCommandLine = ctrl-o -ExtMap1 = ctrl x +ExtMap1 = ctrl-x [main:xmap] [panel] -PanelStartSearch = ctrl s +PanelStartSearch = ctrl-s PanelMarkFile = ins PanelMoveDown = down PanelMoveUp = up @@ -188,51 +188,51 @@ PanelMoveRight = right PanelPrevPage = pgup PanelNextPage = pgdn PanelDoEnter = enter -PanelChdirOtherPanel = alt o -PanelChdirToReadlink = alt l -PanelViewSimple = shift F3 +PanelChdirOtherPanel = alt-o +PanelChdirToReadlink = alt-l +PanelViewSimple = shift-F3 PanelEditNew = F14 PanelCopyLocal = F15 PanelRenameLocal = F16 PanelDeleteLocal = F18 -PanelReverseSelection = alt * +PanelReverseSelection = alt-* PanelSelect = plus PanelUnselect = minus -PanelCtrlNextPage = ctrl pgdn -PanelCtrlPrevPage = ctrl pgup -PanelDirectoryHistoryList = alt h -PanelDirectoryHistoryNext = alt u -PanelDirectoryHistoryPrev = alt y -PanelGotoBottomFile = alt j -PanelGotoMiddleFile = alt r -PanelSyncOtherPanel = alt i -PanelGotoTopFile = alt g -PanelSetPanelEncoding = ctrl t +PanelCtrlNextPage = ctrl-pgdn +PanelCtrlPrevPage = ctrl-pgup +PanelDirectoryHistoryList = alt-h +PanelDirectoryHistoryNext = alt-u +PanelDirectoryHistoryPrev = alt-y +PanelGotoBottomFile = alt-j +PanelGotoMiddleFile = alt-r +PanelSyncOtherPanel = alt-i +PanelGotoTopFile = alt-g +PanelSetPanelEncoding = ctrl-t [panel:xmap] [widget] -WidgetBol = ctrl a; alt <; home -WidgetEol = ctrl e; alt >;end -WidgetMoveLeft = alt left -WidgetWordLeft = ctrl left -WidgetBackwardChar = ctrl b -WidgetBackwardWord = alt b -WidgetMoveRight = alt right -WidgetWordRight = ctrl right -WidgetForwardChar = ctrl f -WidgetForwardWord = alt f +WidgetBol = ctrl-a; alt-<; home +WidgetEol = ctrl-e; alt->; end +WidgetMoveLeft = alt-left +WidgetWordLeft = ctrl-left +WidgetBackwardChar = ctrl-b +WidgetBackwardWord = alt-b +WidgetMoveRight = alt-right +WidgetWordRight = ctrl-right +WidgetForwardChar = ctrl-f +WidgetForwardWord = alt-f WidgetBackwardDelete = backspace WidgetDeleteChar = delete -WidgetKillWord = alt d -WidgetBackwardKillWord = alt backspace +WidgetKillWord = alt-d +WidgetBackwardKillWord = alt-backspace WidgetSetMark = -WidgetKillRegion = ctrl w -WidgetKillSave = alt w -WidgetYank = ctrl y -WidgetKillLine = ctrl k -WidgetHistoryPrev = alt p; ctrl down -WidgetHistoryNext = alt n; ctrl up -WidgetHistoryShow = alt h -WidgetComplete = alt tab +WidgetKillRegion = ctrl-w +WidgetKillSave = alt-w +WidgetYank = ctrl-y +WidgetKillLine = ctrl-k +WidgetHistoryPrev = alt-p; ctrl-down +WidgetHistoryNext = alt-n; ctrl-up +WidgetHistoryShow = alt-h +WidgetComplete = alt-tab diff --git a/src/tty/key.c b/src/tty/key.c index 02c8d30d4..ab45d966e 100644 --- a/src/tty/key.c +++ b/src/tty/key.c @@ -1232,7 +1232,7 @@ lookup_key (char *keyname) if (keyname == NULL) return 0; - keys = g_strsplit (keyname, " ", -1); + keys = g_strsplit (keyname, "-", -1); keys_count = g_strv_length (keys); for (i = keys_count - 1; i >= 0; i--) { if (keys[i] != NULL && keys[i][0] != 0) {