Changeset 3283 for libcacaTweet

Timestamp:

Nov 4, 2008, 6:45:21 AM (11 years ago)

Author:

bsittler

Message:

force a column alignment after each column containing a fullwidth character.

File:

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

libcaca/trunk/caca/codec/export.c

@@ -504 +504 @@
     {
         uint32_t *lineattr = cv->attrs + y * cv->width;
+        uint32_t *linechar = cv->chars + y * cv->width;
 
         for(x = 1; x < cv->width; x++)
@@ -512 +513 @@
                    has_multi_cell_row))
                &&
-               ((caca_attr_to_ansi_bg(lineattr[x - 1])
+               ((linechar[x - 1] == CACA_MAGIC_FULLWIDTH)
+                ||
+                (caca_attr_to_ansi_bg(lineattr[x - 1])
                  !=
                  caca_attr_to_ansi_bg(lineattr[x]))
@@ -569 +572 @@
                    ||
                    (cv->height == 1))
+                  &&
+                  (linechar[x + len - 1] != CACA_MAGIC_FULLWIDTH)
                   &&
                   (caca_attr_to_ansi_bg(lineattr[x + len])