Browse Source

Added Esc key to the key name table.

Also some fixes of DLG_ACTION message handling in panels and viewer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 15 years ago
parent
commit
e252488ac2
3 changed files with 4 additions and 3 deletions
  1. 1 1
      src/main.c
  2. 2 1
      src/tty/key.c
  3. 1 1
      src/viewer/actions_cmd.c

+ 1 - 1
src/main.c

@@ -1733,7 +1733,7 @@ midnight_callback (Dlg_head *h, Widget *sender,
 	    if (data == NULL)
 		midnight_execute_cmd (sender, parm);
 	    else
-		return send_message ((Widget *) data, WIDGET_COMMAND, parm);
+		send_message ((Widget *) data, WIDGET_COMMAND, parm);
 	}
 	return MSG_HANDLED;
 

+ 2 - 1
src/tty/key.c

@@ -134,6 +134,7 @@ const key_code_name_t key_name_conv_tab[] = {
     { KEY_KP_MULTIPLY,	"kpasterisk",	N_("* on keypad"),	"Gray*" },
 
     /* From here on, these won't be shown in Learn keys (no space) */
+    { ESC_CHAR,		"escape",	N_("Escape key"),		"Esc" },
     { KEY_LEFT,		"kpleft",	N_("Left arrow keypad"),	"Left" },
     { KEY_RIGHT,	"kpright",	N_("Right arrow keypad"),	"Right" },
     { KEY_UP,		"kpup",		N_("Up arrow keypad"),		"Up" },
@@ -150,8 +151,8 @@ const key_code_name_t key_name_conv_tab[] = {
     { KEY_F (23),	"f23",		N_("Function key 23"),		"F23" },
     { KEY_F (24),	"f24",		N_("Function key 24"),		"F24" },
 
-
     /* Alternative label */
+    { ESC_CHAR,		"esc",		N_("Escape key"),	"Esc" },
     { KEY_BACKSPACE,	"bs",		N_("Backspace key"),	"Bakspace" },
     { KEY_IC,		"ins",		N_("Insert key"),	"Ins" },
     { KEY_DC,		"del",		N_("Delete key"),	"Del" },

+ 1 - 1
src/viewer/actions_cmd.c

@@ -585,7 +585,7 @@ mcview_dialog_callback (Dlg_head *h, Widget *sender,
 
     case DLG_ACTION:
         /* command from buttonbar */
-        return send_message (view, WIDGET_COMMAND, parm);
+        return send_message ((Widget *) view, WIDGET_COMMAND, parm);
 
     default:
         return default_dlg_callback (h, sender, msg, parm, data);