Ticket #5047: Drop the "terminal:" prefix from mc.keydef section names

Also rename [general] to [_common_], emphasizing that it's not a
terminal name and that it's always loaded.

Signed-off-by: Egmont Koblinger <egmont@gmail.com>

Author: egmontkob

misc/mc.keydef

@@ -45,7 +45,7 @@
 #
 #   tput rmkx
 
-[terminal:console]
+[console]
 insert     = \e[2~
 f11        = \e[23~
 f12        = \e[24~
@@ -74,10 +74,10 @@ kpenter    = \eOM
 kpslash    = \eOQ
 kpnumlock  = \eOP
 
-[terminal:linux]
+[linux]
 copy = console
 
-[terminal:xterm]
+[xterm]
 insert     = \e[2~
 f11        = \e[23~ \eO2P \eO1;2P \e[1;2P
 f12        = \e[24~ \eO2Q \eO1;2Q \e[1;2Q
@@ -113,49 +113,49 @@ down       = \e[B \eOB
 right      = \e[C \eOC
 left       = \e[D \eOD
 
-[terminal:alacritty]
+[alacritty]
 copy = xterm
 
-[terminal:gnome]
+[gnome]
 copy = xterm
 
-[terminal:rxvt]
+[rxvt]
 copy = xterm
 
-[terminal:xterm-new]
+[xterm-new]
 copy = xterm
 
-[terminal:xterm-clear]
+[xterm-clear]
 copy = xterm
 
-[terminal:xterm-color]
+[xterm-color]
 copy = xterm
 
-[terminal:xterm-256color]
+[xterm-256color]
 copy = xterm
 
-[terminal:xterm-direct]
+[xterm-direct]
 copy = xterm
 
-[terminal:xterm-direct16]
+[xterm-direct16]
 copy = xterm
 
-[terminal:xterm-direct256]
+[xterm-direct256]
 copy = xterm
 
-[terminal:screen]
+[screen]
 copy = xterm
 
-[terminal:screen-256color]
+[screen-256color]
 copy = xterm
 
-[terminal:tmux]
+[tmux]
 copy = xterm
 
-[terminal:tmux-256color]
+[tmux-256color]
 copy = xterm
 
-[terminal:ibmpc3]
+[ibmpc3]
 f11        = \e[Y
 f12        = \e[Z
 f13        = \e[a
@@ -172,7 +172,7 @@ kpplus     = \e[+
 kpminus    = \e[-
 kpasterisk = \e[*
 
-[terminal:cons25]
+[cons25]
 f11 = \e[Y
 f12 = \e[Z
 f13 = \e[a
@@ -184,7 +184,7 @@ f18 = \e[f
 f19 = \e[g
 f20 = \e[h
 
-[terminal:st]
+[st]
 shift-right     = \e[1;2C
 shift-left      = \e[1;2D
 shift-up        = \e[1;2A
@@ -194,11 +194,11 @@ alt-shift-left  = \e[1;4D
 alt-shift-up    = \e[1;4A
 alt-shift-down  = \e[1;4B
 
-[terminal:st-256color]
+[st-256color]
 copy = st
 
-[terminal:st-git-256color]
+[st-git-256color]
 copy = st
 
-[terminal:xterm-kitty]
+[xterm-kitty]
 copy = xterm

src/learn.c

@@ -362,7 +362,6 @@ learn_save (void)
     int i;
     mc_config_t *keydef_config;
     char *fname;
-    char *section;
     const char *list[2];
     gboolean profile_changed = FALSE;
 
@@ -372,23 +371,20 @@ learn_save (void)
     if (exist_file (fname))
         mc_config_read_file (keydef_config, fname, FALSE, TRUE);
 
-    section = g_strconcat ("terminal:", getenv ("TERM"), (char *) NULL);
-
     for (i = 0; i < learn_total; i++)
         if (learnkeys[i].sequence != NULL)
         {
             list[0] = learnkeys[i].sequence;
             list[1] = NULL;
-            mc_config_set_escape_sequence_list (keydef_config, section, key_name_conv_tab[i].name,
-                                                list, 1);
+            mc_config_set_escape_sequence_list (keydef_config, getenv ("TERM"),
+                                                key_name_conv_tab[i].name, list, 1);
             profile_changed = TRUE;
         }
 
     if (profile_changed)
         mc_config_save_file (keydef_config, NULL);
 
     g_free (fname);
-    g_free (section);
     mc_config_deinit (keydef_config);
 }
 

src/setup.c

@@ -683,22 +683,20 @@ load_setup_get_full_config_name (const char *subdir, const char *config_file_nam
 static void
 load_keydefs_from_section (const char *terminal, mc_config_t *cfg)
 {
-    char *section_name;
     gchar **profile_keys, **keys;
     char *valcopy;
 
     if (terminal == NULL)
         return;
 
-    section_name = g_strconcat ("terminal:", terminal, (char *) NULL);
-    keys = mc_config_get_keys (cfg, section_name, NULL);
+    keys = mc_config_get_keys (cfg, terminal, NULL);
 
     for (profile_keys = keys; *profile_keys != NULL; profile_keys++)
     {
-        // copy=other causes all keys from [terminal:other] to be loaded.
+        // copy=other causes all keys from [other] to be loaded.
         if (g_ascii_strcasecmp (*profile_keys, "copy") == 0)
         {
-            valcopy = mc_config_get_string (cfg, section_name, *profile_keys, "");
+            valcopy = mc_config_get_string (cfg, terminal, *profile_keys, "");
             load_keydefs_from_section (valcopy, cfg);
             g_free (valcopy);
             continue;
@@ -710,7 +708,7 @@ load_keydefs_from_section (const char *terminal, mc_config_t *cfg)
         {
             gchar **values;
 
-            values = mc_config_get_escape_sequence_list (cfg, section_name, *profile_keys, NULL);
+            values = mc_config_get_escape_sequence_list (cfg, terminal, *profile_keys, NULL);
             if (values != NULL)
             {
                 gchar **curr_values;
@@ -724,7 +722,6 @@ load_keydefs_from_section (const char *terminal, mc_config_t *cfg)
         }
     }
     g_strfreev (keys);
-    g_free (section_name);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -741,7 +738,7 @@ load_keydefs_from_file (const char *fname)
 
     mc_config_read_file (keydef_config, fname, TRUE, TRUE);
 
-    load_keydefs_from_section ("general", keydef_config);
+    load_keydefs_from_section ("_common_", keydef_config);
     load_keydefs_from_section (getenv ("TERM"), keydef_config);
 
     mc_config_deinit (keydef_config);