Added missed shortcuts for ButtonBar commands.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

misc/mc.keymap.default

@@ -189,6 +189,7 @@ ViewMoveUp = k; y; up
 ViewMoveDown = j; delete; down
 
 [main]
+CmdHelp = f1
 CmdUserMenu = f2
 CmdView = f3
 CmdViewFile = f13
@@ -197,6 +198,7 @@ CmdCopy = f5
 CmdRename = f6
 CmdMkdir = f7
 CmdDelete = f8
+CmdMenu = f9
 CmdQuit = f10
 CmdMenuLastSelected = f19
 CmdQuietQuit = f20
@@ -293,7 +295,6 @@ InputMoveRight = right; alt-right
 InputWordRight = ctrl-right
 InputForwardChar = ctrl-f
 InputForwardWord = alt-f
-
 InputBackwardDelete = backspace
 InputDeleteChar = delete
 InputKillWord = alt-d

misc/mc.keymap.emacs

@@ -193,6 +193,7 @@ ViewMoveUp = k; y; up
 ViewMoveDown = j; delete; down
 
 [main]
+CmdHelp = f1
 CmdUserMenu = f2
 CmdView = f3
 CmdViewFile = f13
@@ -201,6 +202,7 @@ CmdCopy = f5
 CmdRename = f6
 CmdMkdir = f7
 CmdDelete = f8
+CmdMenu = f9
 CmdQuit = f10
 CmdMenuLastSelected = f19
 CmdQuietQuit = f20
@@ -297,7 +299,6 @@ InputMoveRight = right; alt-right
 InputWordRight = ctrl-right
 InputForwardChar = ctrl-f
 InputForwardWord = alt-f
-
 InputBackwardDelete = backspace
 InputDeleteChar = delete
 InputKillWord = alt-d

src/cmddef.h

@@ -51,6 +51,7 @@
 #define CK_Load_Next_File	112
 #define CK_Load_Syntax_File	121
 #define CK_Load_Menu_File	122
+#define CK_Menu			123
 
 /* block commands */
 #define CK_Mark			201
@@ -121,7 +122,6 @@
 #define CK_Save_Desktop		451
 #define CK_New_Window		452
 #define CK_Cycle		453
-#define CK_Menu			454
 #define CK_Save_And_Quit	455
 #define CK_Run_Another		456
 #define CK_Check_Save_And_Quit	457
@@ -344,6 +344,8 @@
 #define CK_UserMenuCmd                  7069
 #define CK_ViewCmd                      7070
 #define CK_ViewFileCmd                  7071
+#define CK_HelpCmd                      7072
+#define CK_MenuCmd                      7073
 
 /* panels */
 #define CK_PanelChdirOtherPanel         8001

src/keybind.c

@@ -75,6 +75,7 @@ static name_keymap_t command_names[] = {
     { "EditDeleteWordRight",               CK_Delete_Word_Right },
     { "EditParagraphUp",                   CK_Paragraph_Up },
     { "EditParagraphDown",                 CK_Paragraph_Down },
+    { "EditMenu",                          CK_Menu },
     { "EditSave",                          CK_Save },
     { "EditLoad",                          CK_Load },
     { "EditNew",                           CK_New },
@@ -210,7 +211,6 @@ static name_keymap_t command_names[] = {
     { "EditSaveDesktop",                 CK_Save_Desktop },
     { "EditNewWindow",                   CK_New_Window },
     { "EditCycle",                       CK_Cycle },
-    { "EditMenu",                        CK_Menu },
     { "EditSaveAndQuit",                 CK_Save_And_Quit },
     { "EditRunAnother",                  CK_Run_Another },
     { "EditCheckSaveAndQuit",            CK_Check_Save_And_Quit },
@@ -261,6 +261,8 @@ static name_keymap_t command_names[] = {
     { "TreeRemove",                      CK_TreeRemove },
 
     /* main commands */
+    { "CmdHelp",                         CK_HelpCmd },
+    { "CmdMenu",                         CK_MenuCmd },
     { "CmdChmod",                        CK_ChmodCmd },
     { "CmdMenuLastSelected",             CK_MenuLastSelectedCmd },
     { "CmdSingleDirsize",                CK_SingleDirsizeCmd },
@@ -565,6 +567,7 @@ const global_keymap_t default_editor_keymap[] = {
     { KEY_F (6),                            CK_Move,                "F6" },
     { KEY_F (7),                            CK_Find,                "F7" },
     { KEY_F (8),                            CK_Remove,              "F8" },
+    { KEY_F (9),                            CK_Menu,                "F9" },
     { KEY_F (10),                           CK_Quit,                "F10" },
     /* edit user menu */
     { KEY_F (11),                           CK_User_Menu,           "S-F1" },
@@ -713,6 +716,7 @@ const global_keymap_t default_panel_keymap[] = {
 
 /* main.c */
 const global_keymap_t default_main_map[] = {
+    { KEY_F (1),    CK_HelpCmd,                       "F1" },
     { KEY_F (2),    CK_UserMenuCmd,                   "F2" },
     { KEY_F (3),    CK_ViewCmd,                       "F3" },
     { KEY_F (4),    CK_EditCmd,                       "F4" },
@@ -720,6 +724,7 @@ const global_keymap_t default_main_map[] = {
     { KEY_F (6),    CK_RenameCmd,                     "F6" },
     { KEY_F (7),    CK_MkdirCmd,                      "F7" },
     { KEY_F (8),    CK_DeleteCmd,                     "F6" },
+    { KEY_F (9),    CK_MenuCmd,                       "F9" },
     { KEY_F (10),   CK_QuitCmd,                       "F10" },
     { KEY_F (13),   CK_ViewFileCmd,                   "S-F3" },
     { KEY_F (19),   CK_MenuLastSelectedCmd,           "S-F9" },

src/main.c

@@ -1226,6 +1226,9 @@ midnight_execute_cmd (Widget *sender, Widget *receiver,
         ftplink_cmd ();
         break;
 #endif
+    case CK_HelpCmd:
+        help_cmd ();
+        break;
     case CK_HistoryCmd:
         history_cmd ();
         break;
@@ -1254,6 +1257,9 @@ midnight_execute_cmd (Widget *sender, Widget *receiver,
         listmode_cmd ();
         break;
 #endif
+    case CK_MenuCmd:
+        menu_cmd ();
+        break;
     case CK_MenuInfoCmd:
         info_cmd ();
         break;
@@ -1579,11 +1585,10 @@ midnight_callback (struct Dlg_head *h, dlg_msg_t msg, int parm)
     switch (msg) {
 
     case DLG_IDLE:
-	/* We only need the first idle event */
+	/* We only need the first idle event to show user menu after start */
 	set_idle_proc (h, 0);
-	if (auto_menu) {
+	if (auto_menu)
-	    user_file_menu_cmd ();
+	    midnight_execute_cmd (NULL, NULL, CK_UserMenuCmd, NULL);
-	}
 	return MSG_HANDLED;
 
     case DLG_KEY:
@@ -1598,11 +1603,6 @@ midnight_callback (struct Dlg_head *h, dlg_msg_t msg, int parm)
 	if (the_menubar->is_active)
 	    return MSG_NOT_HANDLED;
 
-	if (parm == KEY_F (10)) {
-	    quit_cmd ();
-	    return MSG_HANDLED;
-	}
-
 	if (parm == '\t')
 	    free_completions (cmdline);