Changeset 3223 for libcaca/trunk/cacaTweet

Timestamp:

Nov 2, 2008, 10:18:51 PM (12 years ago)

Author:

bsittler

Message:

work around table layout bugs by ensuring that if there are multiple
cells on any row of the table then the very first row does not use the
cell-merging optimization; this appears to fix the last of the table
layout bugs seen in truecolor.php; also fix the foreground and
background color bugs seen in truecolor.php.

File:

• libcaca/trunk/caca/codec/export.c (modified) (6 diffs)

libcaca/trunk/caca/codec/export.c

@@ -461 +461 @@
     int x, y, len;
     int maxcols;
+    int has_multi_cell_row = 0;
 
     /* Table */
@@ -466 +467 @@
     for(y = 0; y < cv->height; y++)
     {
+        uint32_t *lineattr = cv->attrs + y * cv->width;
         uint32_t *linechar = cv->chars + y * cv->width;
         int cols = 0;
@@ -471 +473 @@
         for(x = 0; x < cv->width; x++)
         {
+            if((! has_multi_cell_row)
+               &&
+               (x > 1)
+               &&
+               (caca_attr_to_ansi_bg(lineattr[x - 1])
+                !=
+                caca_attr_to_ansi_bg(lineattr[x]))
+               &&
+               ((caca_attr_to_ansi_bg(lineattr[x]) < 0x10)
+                ?
+                (_caca_attr_to_rgb24bg(lineattr[x - 1])
+                 !=
+                 _caca_attr_to_rgb24bg(lineattr[x]))
+                :
+                0))
+            {
+                has_multi_cell_row = 1;
+            }
             if(linechar[x] == 0x00000009)
                 while((cols + 1) % 8)
@@ -507 +527 @@
              * (see below) */
             len = 1;
-            while((x + len < cv->width)
+            while((y || ! has_multi_cell_row)
+                  &&
+                  (x + len < cv->width)
                   &&
                   (caca_attr_to_ansi_bg(lineattr[x + len])
@@ -516 +538 @@
                    ?
                    (_caca_attr_to_rgb24bg(lineattr[x + len])
-                    &&
+                    ==
                     _caca_attr_to_rgb24bg(lineattr[x]))
                    :
@@ -544 +566 @@
                 if((! i) || (lineattr[x + i] != lineattr[x + i - 1]))
                 {
-                    needfont = caca_attr_to_ansi_fg(lineattr[x + i]) < 0x10;
+                    needfont = (caca_attr_to_ansi_fg(lineattr[x + i]) != CACA_DEFAULT);
 
                     if(needfont)