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

Timestamp:

Sep 23, 2006, 9:07:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Fix a bug in the ANSI importer. We need to set the proper fg/bg colours before calling cucul_set_canvas_size(), otherwise it'll fill the new area with the current values.

File:

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

libcaca/trunk/cucul/import.c

@@ -34 +34 @@
 struct ansi_grcm
 {
-    uint8_t fg, bg;
+    uint8_t fg, bg;   /* ANSI-context fg/bg */
+    uint8_t efg, ebg; /* Effective (libcucul) fg/bg */
     uint8_t bold, negative, concealed;
 };
@@ -381 +382 @@
             case 'K': /* EL - Erase In Line */
                 if(width < 80)
+                    cucul_set_color(cv, CUCUL_COLOR_DEFAULT,
+                                        CUCUL_COLOR_TRANSPARENT);
                     cucul_set_canvas_size(cv, width = 80, height);
                 for(j = x; j < 80; j++)
@@ -400 +403 @@
          * is big enough. */
         if((unsigned int)x >= width)
+        {
+            cucul_set_color(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_TRANSPARENT);
             cucul_set_canvas_size(cv, width = x + 1, height);
+        }
 
         if((unsigned int)y >= height)
+        {
+            cucul_set_color(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_TRANSPARENT);
             cucul_set_canvas_size(cv, width, height = y + 1);
+        }
 
         /* Now paste our character */
+        cucul_set_color(cv, grcm.efg, grcm.ebg);
         cucul_putchar(cv, x, y, cucul_cp437_to_utf32(buffer[i]));
         x++;
@@ -427 +437 @@
 
     unsigned int j;
-    uint8_t myfg, mybg;
 
     for(j = 0; j < argc; j++)
@@ -480 +489 @@
     if(g->concealed)
     {
-        myfg = mybg = CUCUL_COLOR_TRANSPARENT;
+        g->efg = g->ebg = CUCUL_COLOR_TRANSPARENT;
     }
     else
     {
-        myfg = g->negative ? g->bg : g->fg;
-        mybg = g->negative ? g->fg : g->bg;
+        g->efg = g->negative ? g->bg : g->fg;
+        g->ebg = g->negative ? g->fg : g->bg;
 
         if(g->bold)
         {
-            if(myfg < 8)
-                myfg += 8;
-            else if(myfg == CUCUL_COLOR_DEFAULT)
-                myfg = CUCUL_COLOR_WHITE;
-        }
-    }
-
-    cucul_set_color(cv, myfg, mybg);
+            if(g->efg < 8)
+                g->efg += 8;
+            else if(g->efg == CUCUL_COLOR_DEFAULT)
+                g->efg = CUCUL_COLOR_WHITE;
+        }
+    }
 }