Ticket #1563: hotkey-label.diff

src/keybind.c

@@ -711 +711 @@
 }
 
 void
-keymap_add(GArray *keymap, int key, int cmd)
+keymap_add(GArray *keymap, int key, int cmd, char *caption)
 {
     global_key_map_t new_bind, *map;
     map = &(g_array_index(keymap, global_key_map_t, 0));
@@ -719 +719 @@
     if (key !=0 && cmd !=0) {
         new_bind.key = key;
         new_bind.command = cmd;
+        new_bind.caption = g_strdup (caption);
         g_array_append_val(keymap, new_bind);
     }
 
@@ -727 +728 @@
 void
 keybind_cmd_bind(GArray *keymap, char *keybind, int action)
 {
-    keymap_add(keymap, lookup_key(keybind), action);
+    char *caplion
+    int key = lookup_key(keybind, caplion);
+    keymap_add(keymap, lookup_key(keybind), action, caplion);
+    g_free (caplion);
 }

src/keybind.h

@@ -20 +20 @@
 typedef struct global_key_map_t {
     long key;
     long command;
+    char *caption;
 } global_key_map_t;
 
 int lookup_action (char *keyname);

src/tty/key.c

@@ -1249 +1249 @@
 
 /* Return the code associated with the symbolic name keyname */
 int
-lookup_key (char *keyname)
+lookup_key (char *keyname, char **label)
 {
     int k = -1;
     char **keys;
     guint keys_count = -1;
     int key = 0;
     int i = 0;
-
+    char buf[BUF_TINY];
+    int buf_pos = 0;
+    char *p;
     if (keyname == NULL)
         return 0;
 
@@ -1269 +1271 @@
 
             if (key & KEY_M_SHIFT) {
                 if (k < 127) {
+                    if (buf_pos > 0)
+                        buf[++buf_pos] = '-';
+                    }
+                    buf[++buf_pos] = 'S';
                     k = (gchar) g_ascii_toupper ((gchar) k);
                     continue;
                 }
             }
             if (key & KEY_M_CTRL) {
+                if (buf_pos > 0)
+                    buf[++buf_pos] = '-';
+                }
+                buf[++buf_pos] = 'C';
                 if (k < 256)
                     k = XCTRL (k);
                 else
@@ -1283 +1293 @@
                     if (key < 127)
                         key = (gchar) g_ascii_tolower ((gchar) key);
                     k = key;
-                } else
+                } else {
+                    buf[++buf_pos] = '-';
                     k |= key;
+                }
+
+                for (p = keys[i]; *p; p++)
+                    buf[++buf_pos] = *p;
+                buf[buf_pos] = '\0';
             }
         }
     }
@@ -1292 +1308 @@
     if (k == -1)
         return 0;
 
+    *label = g_strdup (buf);
     return k;
 }