Renamed frame symbol names.

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

lib/skin/hc-skins.c

@@ -81,19 +81,29 @@ mc_skin_hardcoded_blackwhite_colors (mc_skin_t * mc_skin)
 void
 mc_skin_hardcoded_space_lines (mc_skin_t * mc_skin)
 {
+    /* single lines */
+    set_lines ("vert", " ");
+    set_lines ("horiz", " ");
     set_lines ("lefttop", " ");
     set_lines ("righttop", " ");
-    set_lines ("centertop", " ");
-    set_lines ("centerbottom", " ");
     set_lines ("leftbottom", " ");
     set_lines ("rightbottom", " ");
+    set_lines ("topmiddle", " ");
+    set_lines ("bottommiddle", " ");
     set_lines ("leftmiddle", " ");
     set_lines ("rightmiddle", " ");
-    set_lines ("centermiddle", " ");
-    set_lines ("horiz", " ");
-    set_lines ("vert", " ");
-    set_lines ("thinhoriz", " ");
-    set_lines ("thinvert", " ");
+    set_lines ("cross", " ");
+
+    set_lines ("dvert", " ");
+    set_lines ("dhoriz", " ");
+    set_lines ("dlefttop", " ");
+    set_lines ("drighttop", " ");
+    set_lines ("dleftbottom", " ");
+    set_lines ("drightbottom", " ");
+    set_lines ("dtopmiddle", " ");
+    set_lines ("dbottommiddle", " ");
+    set_lines ("dleftmiddle", " ");
+    set_lines ("drightmiddle", " ");
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -101,31 +111,30 @@ mc_skin_hardcoded_space_lines (mc_skin_t * mc_skin)
 void
 mc_skin_hardcoded_ugly_lines (mc_skin_t * mc_skin)
 {
+    /* single lines */
+    set_lines ("vert", "|");
+    set_lines ("horiz", "-");
     set_lines ("lefttop", "+");
     set_lines ("righttop", "+");
-    set_lines ("centertop", "-");
-    set_lines ("centerbottom", "-");
     set_lines ("leftbottom", "+");
     set_lines ("rightbottom", "+");
+    set_lines ("topmiddle", "-");
+    set_lines ("bottommiddle", "-");
     set_lines ("leftmiddle", "|");
     set_lines ("rightmiddle", "|");
-    set_lines ("centermiddle", "+");
-    set_lines ("horiz", "-");
-    set_lines ("vert", "|");
-    set_lines ("thinhoriz", "-");
-    set_lines ("thinvert", "|");
-
-    set_lines ("grouplefttop", "+");
-    set_lines ("grouprighttop", "+");
-    set_lines ("groupcentertop", "-");
-    set_lines ("groupcenterbottom", "-");
-    set_lines ("groupleftbottom", "+");
-    set_lines ("grouprightbottom", "+");
-    set_lines ("groupleftmiddle", "|");
-    set_lines ("grouprightmiddle", "|");
-    set_lines ("groupcentermiddle", "+");
-    set_lines ("grouphoriz", "-");
-    set_lines ("groupvert", "|");
+    set_lines ("cross", "+");
+
+    /* double lines */
+    set_lines ("dvert", "|");
+    set_lines ("dhoriz", "-");
+    set_lines ("dlefttop", "+");
+    set_lines ("drighttop", "+");
+    set_lines ("dleftbottom", "+");
+    set_lines ("drightbottom", "+");
+    set_lines ("dtopmiddle", "-");
+    set_lines ("dbottommiddle", "-");
+    set_lines ("dleftmiddle", "|");
+    set_lines ("drightmiddle", "|");
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/skin/lines.c

@@ -97,37 +97,35 @@ mc_skin_lines_load_frm (mc_skin_t * mc_skin, const char *name)
 void
 mc_skin_lines_parse_ini_file (mc_skin_t * mc_skin)
 {
-    if (mc_args__slow_terminal) {
+    if (mc_args__slow_terminal)
         mc_skin_hardcoded_space_lines (mc_skin);
-    } else if (mc_args__ugly_line_drawing) {
+    else if (mc_args__ugly_line_drawing)
         mc_skin_hardcoded_ugly_lines (mc_skin);
-    }
 
-    mc_tty_ugly_frm[MC_TTY_FRM_horiz] = mc_skin_lines_load_frm (mc_skin, "horiz");
-    mc_tty_ugly_frm[MC_TTY_FRM_vert] = mc_skin_lines_load_frm (mc_skin, "vert");
-    mc_tty_ugly_frm[MC_TTY_FRM_lefttop] = mc_skin_lines_load_frm (mc_skin, "lefttop");
-    mc_tty_ugly_frm[MC_TTY_FRM_righttop] = mc_skin_lines_load_frm (mc_skin, "righttop");
-    mc_tty_ugly_frm[MC_TTY_FRM_leftbottom] = mc_skin_lines_load_frm (mc_skin, "leftbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_rightbottom] = mc_skin_lines_load_frm (mc_skin, "rightbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_thinvert] = mc_skin_lines_load_frm (mc_skin, "thinvert");
-    mc_tty_ugly_frm[MC_TTY_FRM_thinhoriz] = mc_skin_lines_load_frm (mc_skin, "thinhoriz");
-    mc_tty_ugly_frm[MC_TTY_FRM_rightmiddle] = mc_skin_lines_load_frm (mc_skin, "rightmiddle");
-    mc_tty_ugly_frm[MC_TTY_FRM_centertop] = mc_skin_lines_load_frm (mc_skin, "centertop");
-    mc_tty_ugly_frm[MC_TTY_FRM_centerbottom] = mc_skin_lines_load_frm (mc_skin, "centerbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_centermiddle] = mc_skin_lines_load_frm (mc_skin, "centermiddle");
-    mc_tty_ugly_frm[MC_TTY_FRM_leftmiddle] = mc_skin_lines_load_frm (mc_skin, "leftmiddle");
-
-    mc_tty_ugly_frm[MC_TTY_FRM_grphoriz] = mc_skin_lines_load_frm (mc_skin, "grouphoriz");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpvert] = mc_skin_lines_load_frm (mc_skin, "groupvert");
-    mc_tty_ugly_frm[MC_TTY_FRM_grplefttop] = mc_skin_lines_load_frm (mc_skin, "grouplefttop");
-    mc_tty_ugly_frm[MC_TTY_FRM_grprighttop] = mc_skin_lines_load_frm (mc_skin, "grouprighttop");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpleftbottom] = mc_skin_lines_load_frm (mc_skin, "groupleftbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_grprightbottom] = mc_skin_lines_load_frm (mc_skin, "grouprightbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_grprightmiddle] = mc_skin_lines_load_frm (mc_skin, "grouprightmiddle");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpcentertop] = mc_skin_lines_load_frm (mc_skin, "groupcentertop");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpcenterbottom] = mc_skin_lines_load_frm (mc_skin, "groupcenterbottom");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpcentermiddle] = mc_skin_lines_load_frm (mc_skin, "groupcentermiddle");
-    mc_tty_ugly_frm[MC_TTY_FRM_grpleftmiddle] = mc_skin_lines_load_frm (mc_skin, "groupleftmiddle");
+    /* single lines */
+    mc_tty_frm[MC_TTY_FRM_VERT] = mc_skin_lines_load_frm (mc_skin, "vert");
+    mc_tty_frm[MC_TTY_FRM_HORIZ] = mc_skin_lines_load_frm (mc_skin, "horiz");
+    mc_tty_frm[MC_TTY_FRM_LEFTTOP] = mc_skin_lines_load_frm (mc_skin, "lefttop");
+    mc_tty_frm[MC_TTY_FRM_RIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "righttop");
+    mc_tty_frm[MC_TTY_FRM_LEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "leftbottom");
+    mc_tty_frm[MC_TTY_FRM_RIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "rightbottom");
+    mc_tty_frm[MC_TTY_FRM_TOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "topmiddle");
+    mc_tty_frm[MC_TTY_FRM_BOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "bottommiddle");
+    mc_tty_frm[MC_TTY_FRM_LEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "leftmiddle");
+    mc_tty_frm[MC_TTY_FRM_RIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "rightmiddle");
+    mc_tty_frm[MC_TTY_FRM_CROSS] = mc_skin_lines_load_frm (mc_skin, "cross");
+
+    /* double lines */
+    mc_tty_frm[MC_TTY_FRM_DVERT] = mc_skin_lines_load_frm (mc_skin, "dvert");
+    mc_tty_frm[MC_TTY_FRM_DHORIZ] = mc_skin_lines_load_frm (mc_skin, "dhoriz");
+    mc_tty_frm[MC_TTY_FRM_DLEFTTOP] = mc_skin_lines_load_frm (mc_skin, "dlefttop");
+    mc_tty_frm[MC_TTY_FRM_DRIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "drighttop");
+    mc_tty_frm[MC_TTY_FRM_DLEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "dleftbottom");
+    mc_tty_frm[MC_TTY_FRM_DRIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "drightbottom");
+    mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dtopmiddle");
+    mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dbottommiddle");
+    mc_tty_frm[MC_TTY_FRM_DLEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dleftmiddle");
+    mc_tty_frm[MC_TTY_FRM_DRIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "drightmiddle");
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/tty/tty-ncurses.c

@@ -269,7 +269,7 @@ void
 tty_draw_hline (int y, int x, int ch, int len)
 {
     if ((chtype) ch == ACS_HLINE)
-        ch = mc_tty_ugly_frm[MC_TTY_FRM_thinhoriz];
+        ch = mc_tty_frm[MC_TTY_FRM_HORIZ];
 
     if ((y >= 0) && (x >= 0))
         move (y, x);
@@ -281,7 +281,7 @@ void
 tty_draw_vline (int y, int x, int ch, int len)
 {
     if ((chtype) ch == ACS_VLINE)
-        ch = mc_tty_ugly_frm[MC_TTY_FRM_thinvert];
+        ch = mc_tty_frm[MC_TTY_FRM_VERT];
 
     if ((y >= 0) && (x >= 0))
         move (y, x);
@@ -343,23 +343,23 @@ void
 tty_print_alt_char (int c, gboolean single)
 {
     if ((chtype) c == ACS_VLINE)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_thinvert: MC_TTY_FRM_vert];
+        c = mc_tty_frm[single ? MC_TTY_FRM_VERT : MC_TTY_FRM_DVERT];
     else if ((chtype) c == ACS_HLINE)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_thinhoriz : MC_TTY_FRM_horiz];
+        c = mc_tty_frm[single ? MC_TTY_FRM_HORIZ : MC_TTY_FRM_DHORIZ];
     else if ((chtype) c == ACS_LTEE)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grpleftmiddle : MC_TTY_FRM_leftmiddle];
+        c = mc_tty_frm[single ? MC_TTY_FRM_LEFTMIDDLE : MC_TTY_FRM_DLEFTMIDDLE];
     else if ((chtype) c == ACS_RTEE)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grprightmiddle : MC_TTY_FRM_rightmiddle];
+        c = mc_tty_frm[single ? MC_TTY_FRM_RIGHTMIDDLE : MC_TTY_FRM_DRIGHTMIDDLE];
     else if ((chtype) c == ACS_ULCORNER)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grplefttop : MC_TTY_FRM_lefttop];
+        c = mc_tty_frm[single ? MC_TTY_FRM_LEFTTOP : MC_TTY_FRM_DLEFTTOP];
     else if ((chtype) c == ACS_LLCORNER)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grpleftbottom : MC_TTY_FRM_leftbottom];
+        c = mc_tty_frm[single ? MC_TTY_FRM_LEFTBOTTOM : MC_TTY_FRM_DLEFTBOTTOM];
     else if ((chtype) c == ACS_URCORNER)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grprighttop : MC_TTY_FRM_righttop];
+        c = mc_tty_frm[single ? MC_TTY_FRM_RIGHTTOP : MC_TTY_FRM_DRIGHTTOP];
     else if ((chtype) c == ACS_LRCORNER)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grprightbottom : MC_TTY_FRM_rightbottom];
+        c = mc_tty_frm[single ? MC_TTY_FRM_RIGHTBOTTOM : MC_TTY_FRM_DRIGHTBOTTOM];
     else if ((chtype) c == ACS_PLUS)
-        c = mc_tty_ugly_frm[single ? MC_TTY_FRM_grpcentermiddle : MC_TTY_FRM_centermiddle];
+        c = mc_tty_frm[MC_TTY_FRM_CROSS];
 
     addch (c);
 }

lib/tty/tty-slang.c

@@ -420,7 +420,7 @@ void
 tty_draw_hline (int y, int x, int ch, int len)
 {
     if (ch == ACS_HLINE)
-        ch = mc_tty_ugly_frm[MC_TTY_FRM_thinhoriz];
+        ch = mc_tty_frm[MC_TTY_FRM_HORIZ];
 
     if ((y < 0) || (x < 0)) {
         y = SLsmg_get_row ();
@@ -445,7 +445,7 @@ void
 tty_draw_vline (int y, int x, int ch, int len)
 {
     if (ch == ACS_VLINE)
-        ch = mc_tty_ugly_frm[MC_TTY_FRM_thinvert];
+        ch = mc_tty_frm[MC_TTY_FRM_VERT];
 
     if ((y < 0) || (x < 0)) {
         y = SLsmg_get_row ();
@@ -503,31 +503,31 @@ tty_print_alt_char (int c, gboolean single)
        : SLsmg_write_char ((unsigned int) y)
     switch (c) {
     case ACS_VLINE:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_thinvert : MC_TTY_FRM_vert]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_VERT : MC_TTY_FRM_DVERT]);
         break;
     case ACS_HLINE:
-        DRAW (c, mc_tty_ugly_frm[single ?  MC_TTY_FRM_thinhoriz : MC_TTY_FRM_horiz]);
+        DRAW (c, mc_tty_frm[single ?  MC_TTY_FRM_HORIZ : MC_TTY_FRM_DHORIZ]);
         break;
     case ACS_LTEE:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grpleftmiddle : MC_TTY_FRM_leftmiddle]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_LEFTMIDDLE : MC_TTY_FRM_DLEFTMIDDLE]);
         break;
     case ACS_RTEE:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grprightmiddle : MC_TTY_FRM_rightmiddle]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_RIGHTMIDDLE : MC_TTY_FRM_DRIGHTMIDDLE]);
         break;
     case ACS_ULCORNER:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grplefttop : MC_TTY_FRM_lefttop]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_LEFTTOP : MC_TTY_FRM_DLEFTTOP]);
         break;
     case ACS_LLCORNER:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grpleftbottom : MC_TTY_FRM_leftbottom]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_LEFTBOTTOM : MC_TTY_FRM_DLEFTBOTTOM]);
         break;
     case ACS_URCORNER:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grprighttop : MC_TTY_FRM_righttop]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_RIGHTTOP : MC_TTY_FRM_DRIGHTTOP]);
         break;
     case ACS_LRCORNER:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grprightbottom : MC_TTY_FRM_rightbottom]);
+        DRAW (c, mc_tty_frm[single ? MC_TTY_FRM_RIGHTBOTTOM : MC_TTY_FRM_DRIGHTBOTTOM]);
         break;
     case ACS_PLUS:
-        DRAW (c, mc_tty_ugly_frm[single ? MC_TTY_FRM_grpcentermiddle : MC_TTY_FRM_centermiddle]);
+        DRAW (c, mc_tty_frm[MC_TTY_FRM_CROSS]);
         break;
     default:
         SLsmg_write_char ((unsigned int) c);

lib/tty/tty.c

@@ -54,7 +54,7 @@ gboolean slow_tty = FALSE;
 /* If true use +, -, | for line drawing */
 gboolean ugly_line_drawing = FALSE;
 
-int mc_tty_ugly_frm[MC_TTY_FRM_MAX];
+int mc_tty_frm[MC_TTY_FRM_MAX];
 
 /*** file scope macro definitions **************************************/
 
@@ -140,35 +140,35 @@ tty_print_one_vline (gboolean single)
 void
 tty_draw_box (int y, int x, int ys, int xs)
 {
-    tty_draw_vline (y, x, mc_tty_ugly_frm[MC_TTY_FRM_grpvert], ys);
-    tty_draw_vline (y, x + xs - 1, mc_tty_ugly_frm[MC_TTY_FRM_grpvert], ys);
-    tty_draw_hline (y, x, mc_tty_ugly_frm[MC_TTY_FRM_grphoriz], xs);
-    tty_draw_hline (y + ys - 1, x, mc_tty_ugly_frm[MC_TTY_FRM_grphoriz], xs);
+    tty_draw_vline (y, x, mc_tty_frm[MC_TTY_FRM_VERT], ys);
+    tty_draw_vline (y, x + xs - 1, mc_tty_frm[MC_TTY_FRM_VERT], ys);
+    tty_draw_hline (y, x, mc_tty_frm[MC_TTY_FRM_HORIZ], xs);
+    tty_draw_hline (y + ys - 1, x, mc_tty_frm[MC_TTY_FRM_HORIZ], xs);
     tty_gotoyx (y, x);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_grplefttop], TRUE);
+    tty_print_alt_char (ACS_ULCORNER, TRUE);
     tty_gotoyx (y + ys - 1, x);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_grpleftbottom], TRUE);
+    tty_print_alt_char (ACS_LLCORNER, TRUE);
     tty_gotoyx (y, x + xs - 1);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_grprighttop], TRUE);
+    tty_print_alt_char (ACS_URCORNER, TRUE);
     tty_gotoyx (y + ys - 1, x + xs - 1);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_grprightbottom], TRUE);
+    tty_print_alt_char (ACS_LRCORNER, TRUE);
 }
 
 void
 tty_draw_double_box (int y, int x, int ys, int xs)
 {
-    tty_draw_vline (y, x, mc_tty_ugly_frm[MC_TTY_FRM_vert], ys);
-    tty_draw_vline (y, x + xs - 1, mc_tty_ugly_frm[MC_TTY_FRM_vert], ys);
-    tty_draw_hline (y, x, mc_tty_ugly_frm[MC_TTY_FRM_horiz], xs);
-    tty_draw_hline (y + ys - 1, x, mc_tty_ugly_frm[MC_TTY_FRM_horiz], xs);
+    tty_draw_vline (y, x, mc_tty_frm[MC_TTY_FRM_DVERT], ys);
+    tty_draw_vline (y, x + xs - 1, mc_tty_frm[MC_TTY_FRM_DVERT], ys);
+    tty_draw_hline (y, x, mc_tty_frm[MC_TTY_FRM_DHORIZ], xs);
+    tty_draw_hline (y + ys - 1, x, mc_tty_frm[MC_TTY_FRM_DHORIZ], xs);
     tty_gotoyx (y, x);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_lefttop], FALSE);
+    tty_print_alt_char (ACS_ULCORNER, FALSE);
     tty_gotoyx (y + ys - 1, x);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_leftbottom], FALSE);
+    tty_print_alt_char (ACS_LLCORNER], FALSE);
     tty_gotoyx (y, x + xs - 1);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_righttop], FALSE);
+    tty_print_alt_char (ACS_URCORNER, FALSE);
     tty_gotoyx (y + ys - 1, x + xs - 1);
-    tty_print_alt_char (mc_tty_ugly_frm[MC_TTY_FRM_rightbottom], FALSE);
+    tty_print_alt_char (ACS_LRCORNER, FALSE);
 }
 
 char *

lib/tty/tty.h

@@ -79,34 +79,33 @@ extern void tty_draw_box (int y, int x, int rows, int cols);
 extern void tty_draw_double_box (int y, int x, int rows, int cols);
 extern void tty_fill_region (int y, int x, int rows, int cols, unsigned char ch);
 
-extern int mc_tty_ugly_frm[];
+extern int mc_tty_frm[];
 
 typedef enum {
-    MC_TTY_FRM_thinvert,
-    MC_TTY_FRM_thinhoriz,
-    MC_TTY_FRM_vert,
-    MC_TTY_FRM_horiz,
-    MC_TTY_FRM_lefttop,
-    MC_TTY_FRM_righttop,
-    MC_TTY_FRM_leftbottom,
-    MC_TTY_FRM_rightbottom,
-    MC_TTY_FRM_centertop,
-    MC_TTY_FRM_centerbottom,
-    MC_TTY_FRM_leftmiddle,
-    MC_TTY_FRM_rightmiddle,
-    MC_TTY_FRM_centermiddle,
-
-    MC_TTY_FRM_grpvert,
-    MC_TTY_FRM_grphoriz,
-    MC_TTY_FRM_grplefttop,
-    MC_TTY_FRM_grprighttop,
-    MC_TTY_FRM_grpleftbottom,
-    MC_TTY_FRM_grprightbottom,
-    MC_TTY_FRM_grpcentertop,
-    MC_TTY_FRM_grpcenterbottom,
-    MC_TTY_FRM_grpleftmiddle,
-    MC_TTY_FRM_grprightmiddle,
-    MC_TTY_FRM_grpcentermiddle,
+    /* single lines */
+    MC_TTY_FRM_VERT,
+    MC_TTY_FRM_HORIZ,
+    MC_TTY_FRM_LEFTTOP,
+    MC_TTY_FRM_RIGHTTOP,
+    MC_TTY_FRM_LEFTBOTTOM,
+    MC_TTY_FRM_RIGHTBOTTOM,
+    MC_TTY_FRM_TOPMIDDLE,
+    MC_TTY_FRM_BOTTOMMIDDLE,
+    MC_TTY_FRM_LEFTMIDDLE,
+    MC_TTY_FRM_RIGHTMIDDLE,
+    MC_TTY_FRM_CROSS,
+
+    /* double lines */
+    MC_TTY_FRM_DVERT,
+    MC_TTY_FRM_DHORIZ,
+    MC_TTY_FRM_DLEFTTOP,
+    MC_TTY_FRM_DRIGHTTOP,
+    MC_TTY_FRM_DLEFTBOTTOM,
+    MC_TTY_FRM_DRIGHTBOTTOM,
+    MC_TTY_FRM_DTOPMIDDLE,
+    MC_TTY_FRM_DBOTTOMMIDDLE,
+    MC_TTY_FRM_DLEFTMIDDLE,
+    MC_TTY_FRM_DRIGHTMIDDLE,
 
     MC_TTY_FRM_MAX
 } mc_tty_frm_t;

misc/skins/darkfar.ini

@@ -2,19 +2,27 @@
     description=Dark Far skin
 
 [Lines]
-    lefttop=╔
-    righttop=╗
-    centertop=╤
-    centerbottom=╧
-    leftbottom=╚
-    rightbottom=╝
-    leftmiddle=╟
-    rightmiddle=╢
-    centermiddle=┼
-    horiz=═
-    vert=║
-    thinhoriz=─
-    thinvert=│
+    horiz=─
+    vert=│
+    lefttop=┌
+    righttop=┐
+    leftbottom=└
+    rightbottom=┘
+    topmiddle=─
+    bottommiddle=─
+    leftmiddle=├
+    rightmiddle=┤
+    cross=┼
+    dhoriz=═
+    dvert=║
+    dlefttop=╔
+    drighttop=╗
+    dleftbottom=╚
+    drightbottom=╝
+    dtopmiddle=╤
+    dbottommiddle=╧
+    dleftmiddle=╟
+    drightmiddle=╢
 
 [core]
     _default_=lightgray;black

misc/skins/default.ini

@@ -2,31 +2,27 @@
     description=Standart skin
 
 [Lines]
+    horiz=─
+    vert=│
     lefttop=┌
     righttop=┐
-    centertop=─
-    centerbottom=─
     leftbottom=└
     rightbottom=┘
+    topmiddle=─
+    bottommiddle=─
     leftmiddle=├
     rightmiddle=┤
-    centermiddle=┼
-    horiz=─
-    vert=│
-    thinhoriz=─
-    thinvert=│
-
-    grouplefttop=┌
-    grouprighttop=┐
-    groupcentertop=─
-    groupcenterbottom=─
-    groupleftbottom=└
-    grouprightbottom=┘
-    groupleftmiddle=├
-    grouprightmiddle=┤
-    groupcentermiddle=┼
-    grouphoriz=─
-    groupvert=│
+    cross=┼
+    dhoriz=─
+    dvert=│
+    dlefttop=┌
+    drighttop=┐
+    dleftbottom=└
+    drightbottom=┘
+    dtopmiddle=─
+    dbottommiddle=─
+    dleftmiddle=├
+    drightmiddle=┤
 
 [core]
     _default_=lightgray;blue
@@ -48,7 +44,6 @@
     errdhotnormal=yellow;red
     errdhotfocus=yellow;lightgray
 
-
 [filehighlight]
     directory=white;
     executable=brightgreen;

misc/skins/double-lines.ini

@@ -2,31 +2,27 @@
     description=Far-like skin
 
 [Lines]
-    lefttop=╔
-    righttop=╗
-    centertop=╤
-    centerbottom=╧
-    leftbottom=╚
-    rightbottom=╝
-    leftmiddle=╟
-    rightmiddle=╢
-    centermiddle=┼
-    horiz=═
-    vert=║
-    thinhoriz=─
-    thinvert=│
-
-    grouplefttop=┌
-    grouprighttop=┐
-    groupcentertop=─
-    groupcenterbottom=─
-    groupleftbottom=└
-    grouprightbottom=┘
-    groupleftmiddle=├
-    grouprightmiddle=┤
-    groupcentermiddle=┼
-    grouphoriz=─
-    groupvert=│
+    horiz=─
+    vert=│
+    lefttop=┌
+    righttop=┐
+    leftbottom=└
+    rightbottom=┘
+    topmiddle=─
+    bottommiddle=─
+    leftmiddle=├
+    rightmiddle=┤
+    cross=┼
+    dhoriz=═
+    dvert=║
+    dlefttop=╔
+    drighttop=╗
+    dleftbottom=╚
+    drightbottom=╝
+    dtopmiddle=╤
+    dbottommiddle=╧
+    dleftmiddle=╟
+    drightmiddle=╢
 
 [core]
     _default_=lightgray;blue
@@ -48,7 +44,6 @@
     errdhotnormal=yellow;red
     errdhotfocus=yellow;lightgray
 
-
 [filehighlight]
     directory=white;
     executable=brightgreen;

misc/skins/featured.ini

@@ -4,19 +4,27 @@
     description=Enhanced standart skin
 
 [Lines]
-    lefttop=╔
-    righttop=╗
-    centertop=╤
-    centerbottom=╧
-    leftbottom=╚
-    rightbottom=╝
-    leftmiddle=╟
-    rightmiddle=╢
-    centermiddle=┼
-    horiz=═
-    vert=║
-    thinhoriz=─
-    thinvert=│
+    horiz=─
+    vert=│
+    lefttop=┌
+    righttop=┐
+    leftbottom=└
+    rightbottom=┘
+    topmiddle=─
+    bottommiddle=─
+    leftmiddle=├
+    rightmiddle=┤
+    cross=┼
+    dhoriz=═
+    dvert=║
+    dlefttop=╔
+    drighttop=╗
+    dleftbottom=╚
+    drightbottom=╝
+    dtopmiddle=╤
+    dbottommiddle=╧
+    dleftmiddle=╟
+    drightmiddle=╢
 
 [core]
     _default_=lightgray;blue
@@ -38,7 +46,6 @@
     errdhotnormal=yellow;red
     errdhotfocus=yellow;lightgray
 
-
 [filehighlight]
     directory=white;
     executable=brightgreen;
@@ -96,4 +103,14 @@
     history-prev-item-sign = «
     history-next-item-sign = »
     history-show-list-sign = ^
-
+    horiz=─
+    vert=│
+    lefttop=┌
+    righttop=┐
+    leftbottom=└
+    rightbottom=┘
+    topmiddle=─
+    bottommiddle=─
+    leftmiddle=├
+    rightmiddle=┤
+    cross=┼