Continue development of skins

 * Remove highlight of hidden filenames.
 * Fixed colors with ncurses screen library
 * Fix lines drawing with ncurses screen library.
 * Fix drawing of lines in slang with non-utf codepages.

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

 * Code cleanup.
 * Code cleanup, refactoring and optimization.

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

misc/filehighlight.ini

@@ -27,9 +27,6 @@
 [archive]
     extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;
 
-[hidden]
-    regexp=^\\..*
-
 [doc]
     extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm
 

misc/skins/default.ini

@@ -47,7 +47,6 @@
     core=red;
     temp=gray;
     archive=brightmagenta;
-    hidden=black;
     doc=brown;
     source=cyan;
     media=green;

misc/skins/far.ini

@@ -47,7 +47,6 @@
     core=red;
     temp=gray;
     archive=brightmagenta;
-    hidden=black;
     doc=brown;
     source=cyan;
     media=green;

src/mcconfig/get.c

@@ -87,6 +87,7 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group,
     GIConv conv;
     GString *buffer;
     gchar *ret;
+    const char *_system_codepage = str_detect_termencoding();
 
     if (!mc_config || !group || !param)
 	return def ? g_strdup (def) : NULL;
@@ -102,10 +103,10 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group,
     if (!ret)
 	ret = def ? g_strdup (def) : NULL;
 
-    if (utf8_display)
+    if (str_isutf8 (_system_codepage))
         return ret;
 
-    conv = str_crt_conv_from ("UTF-8");
+    conv = g_iconv_open (_system_codepage, "UTF-8");
     if (conv == INVALID_CONV)
         return ret;
 
@@ -126,6 +127,31 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group,
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+gchar *
+mc_config_get_string_raw (mc_config_t * mc_config, const gchar * group,
+		      const gchar * param, const gchar * def)
+{
+    gchar *ret;
+
+    if (!mc_config || !group || !param)
+	return def ? g_strdup (def) : NULL;
+
+    if (! mc_config_has_param(mc_config, group, param))
+    {
+	mc_config_set_string (mc_config, group, param, def ? def : "");
+	return def ? g_strdup (def) : NULL;
+    }
+
+    ret = g_key_file_get_string (mc_config->handle, group, param, NULL);
+
+    if (!ret)
+	ret = def ? g_strdup (def) : NULL;
+
+    return ret;
+}
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
 gboolean
 mc_config_get_bool (mc_config_t * mc_config, const gchar * group,
 		    const gchar * param, gboolean def)

src/mcconfig/mcconfig.h

@@ -49,6 +49,9 @@ gchar **mc_config_get_keys (mc_config_t *, const gchar *, gsize *);
 gchar *mc_config_get_string (mc_config_t *, const gchar *, const gchar *,
 			     const gchar *);
 
+gchar *mc_config_get_string_raw (mc_config_t *, const gchar *, const gchar *,
+			     const gchar *);
+
 gboolean mc_config_get_bool (mc_config_t *, const gchar *, const gchar *,
 			     gboolean);
 

src/setup.c

@@ -40,7 +40,6 @@
 #include "main.h"
 #include "tree.h"		/* xtree_mode */
 #include "../src/mcconfig/mcconfig.h"
-#include "../src/skin/skin.h"
 #include "setup.h"
 #include "../src/viewer/mcviewer.h" /* For the externs */
 #include "hotlist.h"		/* load/save/done hotlist */
@@ -683,12 +682,6 @@ load_setup (void)
     if ( get_codepage_id( display_codepage ) )
         utf8_display = str_isutf8 (get_codepage_id( display_codepage ));
 #endif /* HAVE_CHARSET */
-
-    /*
-	WARNING! We need to reinitialize 'Skin lines' again!
-	Because need to init systemCodepage parameter as well.
-    */
-    mc_skin_lines_parse_ini_file(&mc_skin__default);
 }
 
 #if defined(USE_VFS) && defined (USE_NETCODE)

src/skin/BUGS.txt

@@ -1 +0,0 @@
-1) CHECK in ncurses !!!

src/skin/colors-old.c

@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <sys/types.h>				/* size_t */
+#include <sys/types.h>          /* size_t */
 #include "../src/tty/color.h"
 
 #include "../src/global.h"
@@ -42,48 +42,45 @@
 
 /*** file scope type declarations ****************************************************************/
 
-typedef struct mc_skin_colors_old_struct
-{
+typedef struct mc_skin_colors_old_struct {
     const char *old_color;
     const char *group;
     const char *key;
-
 } mc_skin_colors_old_t;
 
 /*** file scope variables ************************************************************************/
 
-mc_skin_colors_old_t old_colors[] =
-{
-    {"normal","core","_default_"},
-    {"selected","ore","selected"},
-    {"marked","core","marked"},
-    {"markselect","core","markselect"},
-    {"errors","error","_default_"},
-    {"menu","menu","_default_"},
-    {"reverse","core","reverse"},
-    {"dnormal","dialog","_default_"},
-    {"dfocus","dialog","dfocus"},
-    {"dhotnormal","dialog","dhotnormal"},
-    {"dhotfocus","dialog","dhotfocus"},
-    {"viewunderline","viewer","viewunderline"},
-    {"menuhot","menu","menuhot"},
-    {"menusel","menu","menusel"},
-    {"menuhotsel","menu","menuhotsel"},
-    {"helpnormal","help","_default_"},
-    {"helpitalic","help","helpitalic"},
-    {"helpbold","help","helpbold"},
-    {"helplink","help","helplink"},
-    {"helpslink","help","helpslink"},
-    {"gauge","core","gauge"},
-    {"input","core","input"},
-    {"editnormal","editor","_default_"},
-    {"editbold","editor","editbold"},
-    {"editmarked","editor","editmarked"},
-    {"editwhitespace","editor","editwhitespace"},
-    {"editlinestate","editor","linestate"},
-    {"errdhotnormal","error","errdhotnormal"},
-    {"errdhotfocus","error","errdhotfocus"},
-    {NULL,NULL,NULL}
+mc_skin_colors_old_t old_colors[] = {
+    {"normal", "core", "_default_"},
+    {"selected", "ore", "selected"},
+    {"marked", "core", "marked"},
+    {"markselect", "core", "markselect"},
+    {"errors", "error", "_default_"},
+    {"menu", "menu", "_default_"},
+    {"reverse", "core", "reverse"},
+    {"dnormal", "dialog", "_default_"},
+    {"dfocus", "dialog", "dfocus"},
+    {"dhotnormal", "dialog", "dhotnormal"},
+    {"dhotfocus", "dialog", "dhotfocus"},
+    {"viewunderline", "viewer", "viewunderline"},
+    {"menuhot", "menu", "menuhot"},
+    {"menusel", "menu", "menusel"},
+    {"menuhotsel", "menu", "menuhotsel"},
+    {"helpnormal", "help", "_default_"},
+    {"helpitalic", "help", "helpitalic"},
+    {"helpbold", "help", "helpbold"},
+    {"helplink", "help", "helplink"},
+    {"helpslink", "help", "helpslink"},
+    {"gauge", "core", "gauge"},
+    {"input", "core", "input"},
+    {"editnormal", "editor", "_default_"},
+    {"editbold", "editor", "editbold"},
+    {"editmarked", "editor", "editmarked"},
+    {"editwhitespace", "editor", "editwhitespace"},
+    {"editlinestate", "editor", "linestate"},
+    {"errdhotnormal", "error", "errdhotnormal"},
+    {"errdhotfocus", "error", "errdhotfocus"},
+    {NULL, NULL, NULL}
 };
 
 
@@ -91,24 +88,19 @@ mc_skin_colors_old_t old_colors[] =
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-mc_skin_colors_old_transform(const char *old_color, const char **group, const char **key)
+mc_skin_colors_old_transform (const char *old_color, const char **group, const char **key)
 {
     int index;
 
-    if (old_color == NULL)
-	return FALSE;
-
-    for (index=0; old_colors[index].old_color;index++)
-    {
-	if (strcasecmp(old_color,old_colors[index].old_color) == 0)
-	{
-	    if (group)
-		*group = old_colors[index].group;
-
-	    if (key)
-		*key = old_colors[index].key;
-	    return TRUE;
-	}
+    if (old_color != NULL)
+        for (index = 0; old_colors[index].old_color; index++) {
+            if (strcasecmp (old_color, old_colors[index].old_color) == 0) {
+                if (group != NULL)
+                    *group = old_colors[index].group;
+                if (key != NULL)
+                   *key = old_colors[index].key;
+                return TRUE;
+            }
     }
     return FALSE;
 }
@@ -116,7 +108,7 @@ mc_skin_colors_old_transform(const char *old_color, const char **group, const ch
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-mc_skin_colors_old_configure_one (mc_skin_t *mc_skin, const char *the_color_string)
+mc_skin_colors_old_configure_one (mc_skin_t * mc_skin, const char *the_color_string)
 {
     gchar **colors, **orig_colors;
     gchar **key_val;
@@ -124,33 +116,32 @@ mc_skin_colors_old_configure_one (mc_skin_t *mc_skin, const char *the_color_stri
     gchar *skin_val;
 
     if (the_color_string == NULL)
-	return;
+        return;
 
     orig_colors = colors = g_strsplit (the_color_string, ":", -1);
     if (colors == NULL)
-	return;
+        return;
 
-    for(;*colors; colors++)
-    {
-	key_val = g_strsplit_set (*colors, "=,", 3);
+    for (; *colors; colors++) {
+        key_val = g_strsplit_set (*colors, "=,", 3);
 
-	if (!key_val)
-	    continue;
+        if (!key_val)
+            continue;
 
-	if(key_val[1] == NULL || !mc_skin_colors_old_transform(key_val[0], &skin_group, &skin_key))
-	{
-	    g_strfreev (key_val);
-	    continue;
-	}
-	if (key_val[2] != NULL)
-	    skin_val = g_strdup_printf("%s;%s",key_val[1],key_val[2]);
-	else
-	    skin_val = g_strdup_printf("%s;",key_val[1]);
-	mc_config_set_string(mc_skin->config, skin_group, skin_key, skin_val);
+        if (key_val[1] == NULL
+            || !mc_skin_colors_old_transform (key_val[0], &skin_group, &skin_key)) {
+            g_strfreev (key_val);
+            continue;
+        }
+        if (key_val[2] != NULL)
+            skin_val = g_strdup_printf ("%s;%s", key_val[1], key_val[2]);
+        else
+            skin_val = g_strdup_printf ("%s;", key_val[1]);
+        mc_config_set_string (mc_skin->config, skin_group, skin_key, skin_val);
 
-	g_free(skin_val);
+        g_free (skin_val);
 
-	g_strfreev (key_val);
+        g_strfreev (key_val);
     }
     g_strfreev (orig_colors);
 }
@@ -160,7 +151,7 @@ mc_skin_colors_old_configure_one (mc_skin_t *mc_skin, const char *the_color_stri
 /* --------------------------------------------------------------------------------------------- */
 
 void
-mc_skin_colors_old_configure (mc_skin_t *mc_skin)
+mc_skin_colors_old_configure (mc_skin_t * mc_skin)
 {
     mc_skin_colors_old_configure_one (mc_skin, setup_color_string);
     mc_skin_colors_old_configure_one (mc_skin, term_color_string);
@@ -169,4 +160,3 @@ mc_skin_colors_old_configure (mc_skin_t *mc_skin)
 }
 
 /* --------------------------------------------------------------------------------------------- */
-

src/skin/colors.c

@@ -45,20 +45,11 @@ int mc_skin_color__cache[MC_SKIN_COLOR_CACHE_COUNT];
 /*** file scope variables ************************************************************************/
 
 /*** file scope functions ************************************************************************/
-/* --------------------------------------------------------------------------------------------- */
-
-inline static gchar *
-mc_skin_color_make_hash_key (const gchar * group, const gchar * key)
-{
-    return g_strdup_printf ("%s.%s", group, key);
-}
-
-/* --------------------------------------------------------------------------------------------- */
 
 static mc_skin_color_t *
 mc_skin_color_get_from_hash (mc_skin_t * mc_skin, const gchar * group, const gchar * key)
 {
-    gchar *key_name;
+    gchar key_name[BUF_TINY];
     mc_skin_color_t *mc_skin_color;
 
     if (group == NULL || key == NULL)
@@ -67,30 +58,29 @@ mc_skin_color_get_from_hash (mc_skin_t * mc_skin, const gchar * group, const gch
     if (mc_skin == NULL)
         mc_skin = &mc_skin__default;
 
-    key_name = mc_skin_color_make_hash_key (group, key);
+    g_snprintf (key_name, sizeof (key_name), "%s.%s", group, key);
     mc_skin_color = (mc_skin_color_t *) g_hash_table_lookup (mc_skin->colors, (gpointer) key_name);
-    g_free (key_name);
 
     return mc_skin_color;
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
+#if 0
 static void
 mc_skin_color_remove_from_hash (mc_skin_t * mc_skin, const gchar * group, const gchar * key)
 {
-    gchar *key_name;
+    gchar key_name[BUF_TINY];
     if (group == NULL || key == NULL)
         return;
 
     if (mc_skin == NULL)
         mc_skin = &mc_skin__default;
 
-    key_name = mc_skin_color_make_hash_key (group, key);
+    g_snprintf (key_name, sizeof (key_name), "%s.%s", group, key);
     g_hash_table_remove (mc_skin->colors, (gpointer) key_name);
-    g_free (key_name);
 }
-
+#endif
 /* --------------------------------------------------------------------------------------------- */
 
 static void
@@ -99,13 +89,12 @@ mc_skin_color_add_to_hash (mc_skin_t * mc_skin, const gchar * group, const gchar
 {
     gchar *key_name;
 
-    key_name = mc_skin_color_make_hash_key (group, key);
+    key_name = g_strdup_printf ("%s.%s", group, key);
     if (key_name == NULL)
         return;
 
-    if (g_hash_table_lookup (mc_skin->colors, (gpointer) key_name) != NULL) {
+    if (g_hash_table_lookup (mc_skin->colors, (gpointer) key_name) != NULL)
         g_hash_table_remove (mc_skin->colors, (gpointer) key_name);
-    }
 
     g_hash_table_insert (mc_skin->colors, (gpointer) key_name, (gpointer) mc_skin_color);
 }
@@ -141,7 +130,7 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const
     values = mc_config_get_string_list (mc_skin->config, group, key, &items_count);
 
     if (values == NULL || *values == NULL) {
-        if (values)
+        if (values != NULL)
             g_strfreev (values);
         return NULL;
     }
@@ -166,11 +155,7 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const
     case 1:
         mc_skin_color->fgcolor = (values[0]) ? g_strdup (values[0]) : NULL;
         tmp = mc_skin_color_get_with_defaults (group, "_default_");
-        if (tmp)
-            mc_skin_color->bgcolor = g_strdup (tmp->bgcolor);
-        else
-
-            mc_skin_color->bgcolor = NULL;
+        mc_skin_color->bgcolor = (tmp != NULL) ? g_strdup (tmp->bgcolor) : NULL;
         break;
     case 2:
         mc_skin_color->fgcolor = (values[0]) ? g_strdup (values[0]) : NULL;
@@ -251,10 +236,8 @@ mc_skin_color_cache_init (void)
 static gboolean
 mc_skin_color_check_inisection (const gchar * group)
 {
-    if (strcasecmp ("skin", group) == 0)
-        return FALSE;
-
-    if (strcasecmp ("lines", group) == 0)
+    if ((strcasecmp ("skin", group) == 0)
+        || (strcasecmp ("lines", group) == 0))
         return FALSE;
 
     return TRUE;
@@ -276,12 +259,9 @@ mc_skin_color_check_bw_mode (mc_skin_t * mc_skin)
     if (groups == NULL)
         return;
 
-
-    for (; *groups; groups++) {
-        if (!mc_skin_color_check_inisection (*groups))
-            continue;
-
-        mc_config_del_group (mc_skin->config, *groups);
+    for (; *groups != NULL; groups++) {
+        if (mc_skin_color_check_inisection (*groups))
+            mc_config_del_group (mc_skin->config, *groups);
     }
     g_strfreev (orig_groups);
     mc_skin_hardcoded_blackwhite_colors (mc_skin);
@@ -304,7 +284,7 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin)
     orig_groups = groups = mc_config_get_groups (mc_skin->config, &items_count);
 
     if (groups == NULL || *groups == NULL) {
-        if (groups)
+        if (groups != NULL)
             g_strfreev (groups);
         return FALSE;
     }
@@ -315,25 +295,24 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin)
     if (mc_skin_color == NULL)
         return FALSE;
 
-    tty_color_set_defaults(mc_skin_color->fgcolor, mc_skin_color->bgcolor);
+    tty_color_set_defaults (mc_skin_color->fgcolor, mc_skin_color->bgcolor);
     mc_skin_color_add_to_hash (mc_skin, "core", "_default_", mc_skin_color);
 
-    for (; *groups; groups++) {
+    for (; *groups != NULL; groups++) {
         if (!mc_skin_color_check_inisection (*groups))
             continue;
 
         orig_keys = keys = mc_config_get_keys (mc_skin->config, *groups, &items_count);
         if (keys == NULL || *keys == NULL) {
-            if (keys)
+            if (keys != NULL)
                 g_strfreev (keys);
             continue;
         }
 
         for (; *keys; keys++) {
             mc_skin_color = mc_skin_color_get_from_ini_file (mc_skin, *groups, *keys);
-            if (mc_skin_color == NULL)
-                continue;
-            mc_skin_color_add_to_hash (mc_skin, *groups, *keys, mc_skin_color);
+            if (mc_skin_color != NULL)
+                mc_skin_color_add_to_hash (mc_skin, *groups, *keys, mc_skin_color);
         }
         g_strfreev (orig_keys);
     }
@@ -351,10 +330,8 @@ mc_skin_color_get (const gchar * group, const gchar * name)
     mc_skin_color_t *mc_skin_color;
 
     mc_skin_color = mc_skin_color_get_with_defaults (group, name);
-    if (mc_skin_color == NULL)
-        return 0;
 
-    return mc_skin_color->pair_index;
+    return (mc_skin_color != NULL) ? mc_skin_color->pair_index : 0;
 }
 
 /* --------------------------------------------------------------------------------------------- */

src/skin/common.c

@@ -49,10 +49,10 @@ static gboolean mc_skin_is_init = FALSE;
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-static void
+static inline void
 mc_skin_hash_destroy_key (gpointer data)
 {
-    g_free(data);
+    g_free (data);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -69,33 +69,33 @@ mc_skin_hash_destroy_value (gpointer data)
 /* --------------------------------------------------------------------------------------------- */
 
 static char *
-mc_skin_get_default_name(void)
+mc_skin_get_default_name (void)
 {
     char *tmp_str;
 
     /* from command line */
     if (mc_args__skin != NULL)
-	return g_strdup(mc_args__skin);
+        return g_strdup (mc_args__skin);
 
     /* from envirovement variable */
     tmp_str = getenv ("MC_SKIN");
     if (tmp_str != NULL)
-	return g_strdup(tmp_str);
+        return g_strdup (tmp_str);
 
     /*  from config. Or 'default' if no present in config */
-    return mc_config_get_string(mc_main_config, CONFIG_APP_SECTION, "skin" , "default");
+    return mc_config_get_string (mc_main_config, CONFIG_APP_SECTION, "skin", "default");
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-mc_skin_reinit(void)
+mc_skin_reinit (void)
 {
-    mc_skin_deinit();
-    mc_skin__default.name = mc_skin_get_default_name();
+    mc_skin_deinit ();
+    mc_skin__default.name = mc_skin_get_default_name ();
     mc_skin__default.colors = g_hash_table_new_full (g_str_hash, g_str_equal,
-			       mc_skin_hash_destroy_key,
-			       mc_skin_hash_destroy_value);
+                                                     mc_skin_hash_destroy_key,
+                                                     mc_skin_hash_destroy_value);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -103,26 +103,24 @@ mc_skin_reinit(void)
 /* --------------------------------------------------------------------------------------------- */
 
 void
-mc_skin_init(void)
+mc_skin_init (void)
 {
-    mc_skin__default.name = mc_skin_get_default_name();
+    mc_skin__default.name = mc_skin_get_default_name ();
     mc_skin__default.colors = g_hash_table_new_full (g_str_hash, g_str_equal,
-			       mc_skin_hash_destroy_key,
-			       mc_skin_hash_destroy_value);
+                                                     mc_skin_hash_destroy_key,
+                                                     mc_skin_hash_destroy_value);
 
-    if (! mc_skin_ini_file_load(&mc_skin__default))
-    {
-	mc_skin_reinit();
-	mc_skin_set_hardcoded_skin(&mc_skin__default);
+    if (!mc_skin_ini_file_load (&mc_skin__default)) {
+        mc_skin_reinit ();
+        mc_skin_set_hardcoded_skin (&mc_skin__default);
     }
     mc_skin_colors_old_configure (&mc_skin__default);
 
-    if (! mc_skin_ini_file_parse(&mc_skin__default))
-    {
-	mc_skin_reinit();
-	mc_skin_set_hardcoded_skin(&mc_skin__default);
-	mc_skin_colors_old_configure (&mc_skin__default);
-	(void) mc_skin_ini_file_parse(&mc_skin__default);
+    if (!mc_skin_ini_file_parse (&mc_skin__default)) {
+        mc_skin_reinit ();
+        mc_skin_set_hardcoded_skin (&mc_skin__default);
+        mc_skin_colors_old_configure (&mc_skin__default);
+        (void) mc_skin_ini_file_parse (&mc_skin__default);
     }
     mc_skin_is_init = TRUE;
 }
@@ -130,19 +128,18 @@ mc_skin_init(void)
 /* --------------------------------------------------------------------------------------------- */
 
 void
-mc_skin_deinit(void)
+mc_skin_deinit (void)
 {
 
-    g_free(mc_skin__default.name);
+    g_free (mc_skin__default.name);
     mc_skin__default.name = NULL;
     g_hash_table_destroy (mc_skin__default.colors);
     mc_skin__default.colors = NULL;
 
-    g_free(mc_skin__default.description);
+    g_free (mc_skin__default.description);
     mc_skin__default.description = NULL;
 
-    if (mc_skin__default.config)
-    {
+    if (mc_skin__default.config) {
         mc_config_deinit (mc_skin__default.config);
         mc_skin__default.config = NULL;
     }