Changeset 1378 for libcaca/trunk/cucul/import.cTweet

Timestamp:

Nov 12, 2006, 10:29:31 PM (16 years ago)

Author:

Sam Hocevar

Message:

• When importing an utf-8 file, set background and foreground colours to the nearest ANSI values for the current attribute. When importing an ANSI file, force them to lightgray on black.

File:

• libcaca/trunk/cucul/import.c (modified) (8 diffs)

libcaca/trunk/cucul/import.c

@@ -47 +47 @@
     uint8_t fg, bg;   /* ANSI-context fg/bg */
     uint8_t efg, ebg; /* Effective (libcucul) fg/bg */
+    uint8_t dfg, dbg; /* Default fg/bg */
     uint8_t bold, negative, concealed;
 };
@@ -354 +355 @@
 
     cucul_set_canvas_size(cv, width, height);
+    if(utf8)
+    {
+        grcm.dfg = cucul_attr_to_ansi_fg(cv->curattr);
+        grcm.dbg = cucul_attr_to_ansi_bg(cv->curattr);
+    }
+    else
+    {
+        grcm.dfg = CUCUL_LIGHTGRAY;
+        grcm.dbg = CUCUL_BLACK;
+        cucul_set_color_ansi(cv, grcm.dfg, grcm.dbg);
+    }
+
     ansi_parse_grcm(cv, &grcm, 1, &dummy);
 
@@ -479 +492 @@
             case 'K': /* EL - Erase In Line */
                 if(width < 80)
-                    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
+                    cucul_set_color_ansi(cv, grcm.dfg, grcm.dbg);
                     cucul_set_canvas_size(cv, width = 80, height);
                 for(j = x; j < 80; j++)
@@ -529 +542 @@
         if((unsigned int)x + wch > width)
         {
-            cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
+            cucul_set_color_ansi(cv, grcm.dfg, grcm.dbg);
             cucul_set_canvas_size(cv, width = x + wch, height);
         }
@@ -535 +548 @@
         if((unsigned int)y >= height)
         {
-            cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
+            cucul_set_color_ansi(cv, grcm.dfg, grcm.dbg);
             cucul_set_canvas_size(cv, width, height = y + 1);
         }
@@ -547 +560 @@
     if((unsigned int)y > height)
     {
-        cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
+        cucul_set_color_ansi(cv, grcm.dfg, grcm.dbg);
         cucul_set_canvas_size(cv, width, height = y);
     }
@@ -581 +594 @@
         {
         case 0: /* default rendition */
-            g->fg = CUCUL_DEFAULT;
-            g->bg = CUCUL_TRANSPARENT;
+            g->fg = g->dfg;
+            g->bg = g->dbg;
             g->bold = g->negative = g->concealed = 0;
             break;
@@ -605 +618 @@
             break;
         case 39: /* default display colour (implementation-defined) */
-            g->fg = CUCUL_DEFAULT;
+            g->fg = g->dfg;
             break;
         case 49: /* default background colour (implementation-defined) */
-            g->bg = CUCUL_TRANSPARENT;
+            g->bg = g->dbg;
             break;
         default: