Show hotkeys as 'alt-s' instread of 'alt s'.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

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-right=\\e[[1;6C
-    ctrl alt left=\\e[[1;6D
+    ctrl-alt-left=\\e[[1;6D
 .fi
 
 .PP

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-right=\\e[[1;6C
-    ctrl alt left=\\e[[1;6D
+    ctrl-alt-left=\\e[[1;6D
 .fi
 
 .PP

misc/mc.keymap

@@ -1,11 +1,11 @@
 [editor]
 
-EditXStore = ctrl g
+EditXStore = ctrl-g
-EditXPaste = ctrl v
+EditXPaste = ctrl-v
-EditXCut = ctrl x
+EditXCut = ctrl-x
 
-EditDeleteLine = ctrl y
+EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl k
+EditDeleteToLineEnd = ctrl-k
 EditDeleteToLineBegin =
 
 EditLeft = left
@@ -17,21 +17,21 @@ EditBackSpace = backspace
 EditDelete = delete
 EditPageUp = pgup
 EditPageDown = pgdn
-EditWordLeft = ctrl left
+EditWordLeft = ctrl-left
-EditWordRight = ctrl right
+EditWordRight = ctrl-right
 EditHome = home
 EditEnd = end
 EditTab = tab
-EditUndo = alt backspace
+EditUndo = alt-backspace
-EditBeginningOfText = ctrl shift pgup
+EditBeginningOfText = ctrl-shift-pgup
-EditEndOfText = ctrl shift pgdn
+EditEndOfText = ctrl-shift-pgdn
-EditScrollUp = ctrl up
+EditScrollUp = ctrl-up
-EditScrollDown = ctrl down
+EditScrollDown = ctrl-down
-EditReturn = shift enter
+EditReturn = shift-enter
 EditBeginPage =
 EditEndPage =
-EditDeleteWordLeft = alt f
+EditDeleteWordLeft = alt-f
-EditDeleteWordRight = alt d
+EditDeleteWordRight = alt-d
 EditParagraphUp =
 EditParagraphDown =
 EditSave = f2
@@ -45,31 +45,31 @@ EditRemove = f8
 EditUnmark =
 EditFind = f7
 
-EditPageUpHighlight = shift pgup
+EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift pgdn
+EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift left
+EditLeftHighlight = shift-left
-EditRightHighlight = shift right
+EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl shift left
+EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl shift right
+EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift up
+EditUpHighlight = shift-up
-EditDownHighlight = shift down
+EditDownHighlight = shift-down
-EditHomeHighlight = shift home
+EditHomeHighlight = shift-home
-EditEndHighlight = shift end
+EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl shift home
+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 =
 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
+EditRefresh = ctrl-l
-EditGoto = alt 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
+EditToggleBookmark = alt-k
-EditFlushBookmarks = alt o
+EditFlushBookmarks = alt-o
-EditNextBookmark = alt j
+EditNextBookmark = alt-j
-EditPrevBookmark = alt i
+EditPrevBookmark = alt-i
 
 EditSelectionHistory =
-EditShell = ctrl o
+EditShell = ctrl-o
-EditInsertLiteral = ctrl q
+EditInsertLiteral = ctrl-q
-EditExecuteMacro ctrl a
+EditExecuteMacro = ctrl-a
-EditBeginorEndMacro = ctrl r
+EditBeginorEndMacro = ctrl-r
 EditBeginRecordMacro =
 EditEndRecordMacro =
-EditToggleLineState = alt n
+EditToggleLineState = alt-n
 
 
 [viewer:hex]
 HexViewToggleNavigationMode = tab
-ViewMoveToBol = ctrl a; home
+ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl e; end
+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
+ViewNextFile = ctrl-f
-ViewPrevFile = ctrl b
+ViewPrevFile = ctrl-b
 ViewQuit = q; esc
-SelectCodepage = ctrl t
+SelectCodepage = ctrl-t
-ShowCommandLine = ctrl o
+ShowCommandLine = ctrl-o
-ViewToggleRuler = alt r
+ViewToggleRuler = alt-r
 
 [main]
 CmdMenuLastSelected = f19
 CmdQuietQuit = f20
-CmdSingleDirsize = ctrl @
+CmdSingleDirsize = ctrl-@
-CmdCopyCurrentPathname = alt a
+CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt A
+CmdCopyOtherPathname = alt-A
-CmdQuickCd = alt c
+CmdQuickCd = alt-c
-CmdQuickChdir = ctrl \\
+CmdQuickChdir = ctrl-\\
-CmdSuspend = ctrl z
+CmdSuspend = ctrl-z
-CmdFilteredView = alt !
+CmdFilteredView = alt-!
-CmdFind = alt ?
+CmdFind = alt-?
-CmdReread = ctrl r
+CmdReread = ctrl-r
-CmdToggleListing = alt t
+CmdToggleListing = alt-t
-CmdSwapPanel = ctrl u
+CmdSwapPanel = ctrl-u
-ShowCommandLine = ctrl o
+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
+PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt l
+PanelChdirToReadlink = alt-l
-PanelViewSimple = shift F3
+PanelViewSimple = shift-F3
 PanelEditNew = F14
 PanelCopyLocal = F15
 PanelRenameLocal = F16
 PanelDeleteLocal = F18
-PanelReverseSelection = alt *
+PanelReverseSelection = alt-*
 PanelSelect = plus
 PanelUnselect = minus
-PanelCtrlNextPage = ctrl pgdn
+PanelCtrlNextPage = ctrl-pgdn
-PanelCtrlPrevPage = ctrl pgup
+PanelCtrlPrevPage = ctrl-pgup
-PanelDirectoryHistoryList = alt h
+PanelDirectoryHistoryList = alt-h
-PanelDirectoryHistoryNext = alt u
+PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt y
+PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt j
+PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt r
+PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt i
+PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt g
+PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = ctrl t
+PanelSetPanelEncoding = ctrl-t
 
 [panel:xmap]
 
 [widget]
-WidgetBol = ctrl a; alt <; home
+WidgetBol = ctrl-a; alt-<; home
-WidgetEol = ctrl e; alt >;end
+WidgetEol = ctrl-e; alt->; end
-WidgetMoveLeft = alt left
+WidgetMoveLeft = alt-left
-WidgetWordLeft = ctrl left
+WidgetWordLeft = ctrl-left
-WidgetBackwardChar = ctrl b
+WidgetBackwardChar = ctrl-b
-WidgetBackwardWord = alt b
+WidgetBackwardWord = alt-b
-WidgetMoveRight = alt right
+WidgetMoveRight = alt-right
-WidgetWordRight = ctrl right
+WidgetWordRight = ctrl-right
-WidgetForwardChar = ctrl f
+WidgetForwardChar = ctrl-f
-WidgetForwardWord = alt f
+WidgetForwardWord = alt-f
 
 WidgetBackwardDelete = backspace
 WidgetDeleteChar = delete
-WidgetKillWord = alt d
+WidgetKillWord = alt-d
-WidgetBackwardKillWord = alt backspace
+WidgetBackwardKillWord = alt-backspace
 WidgetSetMark = 
-WidgetKillRegion = ctrl w
+WidgetKillRegion = ctrl-w
-WidgetKillSave = alt w
+WidgetKillSave = alt-w
-WidgetYank = ctrl y
+WidgetYank = ctrl-y
-WidgetKillLine = ctrl k
+WidgetKillLine = ctrl-k
-WidgetHistoryPrev = alt p; ctrl down
+WidgetHistoryPrev = alt-p; ctrl-down
-WidgetHistoryNext = alt n; ctrl up
+WidgetHistoryNext = alt-n; ctrl-up
-WidgetHistoryShow = alt h
+WidgetHistoryShow = alt-h
-WidgetComplete = alt tab
+WidgetComplete = alt-tab

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) {