Changeset 1221

Timestamp:

10/22/06 19:40:55 (7 years ago)

Author:

sam

Message:

• Updated documentation of fullwidth-aware functions.
• Fullwidth support in all exporters.

Location:

libcaca/trunk/cucul

Files:

• canvas.c (modified) (3 diffs)
• export.c (modified) (7 diffs)

libcaca/trunk/cucul/canvas.c

@@ -54 +54 @@
  *  The behaviour when printing non-printable characters or invalid UTF-32
  *  characters is undefined. To print a sequence of bytes forming an UTF-8
- *  character instead of an UTF-32 character, use the cucul_putstr() function
- *  instead.
+ *  character instead of an UTF-32 character, use the cucul_putstr() function.
  *
  *  This function never fails.
@@ -133 +132 @@
  *
  *  If the coordinates are outside the canvas boundaries, a space (0x20)
- *  is returned. FIXME: explain CUCUL_MAGIC_FULLWIDTH
+ *  is returned.
+ *
+ *  A special exception is when CUCUL_MAGIC_FULLWIDTH is returned. This
+ *  value is guaranteed not to be a valid Unicode character, and indicates
+ *  that the character at the left of the requested one is a fullwidth
+ *  character.
  *
  *  This function never fails.
@@ -270 +274 @@
  *  - \c EINVAL A mask was specified but the mask size and source canvas
  *    size do not match.
+ *
+ *  FIXME: this function may corrupt the canvas if fullwidth characters
+ *         appear at odd places.
  *
  *  \param dst The destination canvas.

libcaca/trunk/cucul/export.c

@@ -225 +225 @@
             uint8_t fg, bg;
 
+            if(ch == CUCUL_MAGIC_FULLWIDTH)
+                continue;
+
             fg = ((attr & 0xffff) == CUCUL_COLOR_DEFAULT) ?
                      0x10 : palette[_cucul_argb32_to_ansi4fg(attr)];
@@ -298 +301 @@
             uint8_t bg = palette[_cucul_argb32_to_ansi4bg(lineattr[x])];
             uint32_t ch = linechar[x];
+
+            if(ch == CUCUL_MAGIC_FULLWIDTH)
+                ch = '?';
 
             if(fg != prevfg || bg != prevbg)
@@ -378 +384 @@
                 len++)
             {
-                if(linechar[x + len] <= 0x00000020)
+                if(linechar[x + len] == CUCUL_MAGIC_FULLWIDTH)
+                    ;
+                else if(linechar[x + len] <= 0x00000020)
                     cur += sprintf(cur, "&nbsp;");
                 else if(linechar[x + len] < 0x00000080)
@@ -451 +459 @@
             for(i = 0; i < len; i++)
             {
-                if(linechar[x + i] <= 0x00000020)
+                if(linechar[x + i] == CUCUL_MAGIC_FULLWIDTH)
+                    ;
+                else if(linechar[x + i] <= 0x00000020)
                     cur += sprintf(cur, "&nbsp;");
                 else if(linechar[x + i] < 0x00000080)
@@ -511 +521 @@
             uint8_t bg = palette[_cucul_argb32_to_ansi4bg(attr)];
             uint32_t ch = linechar[x];
+
+            if(ch == CUCUL_MAGIC_FULLWIDTH)
+                continue;
 
             if((attr & 0xffff) == CUCUL_COLOR_DEFAULT)
@@ -698 +711 @@
                                     cv->width * 6, cv->height * 10);
 
-    cur += sprintf(cur, " <g id=\"mainlayer\" font-size=\"12\">\n");
+    cur += sprintf(cur, " <g id=\"mainlayer\" font-size=\"10\""
+                        " style=\"font-family: monospace\">\n");
 
     /* Background */
@@ -724 +738 @@
             uint32_t ch = *linechar++;
 
+            if(ch == ' ' || ch == CUCUL_MAGIC_FULLWIDTH)
+            {
+                lineattr++;
+                continue;
+            }
+
             cur += sprintf(cur, "<text style=\"fill:#%.03x\" "
                                 "x=\"%d\" y=\"%d\">",
                                 _cucul_argb32_to_rgb12fg(*lineattr++),
-                                x * 6, (y * 10) + 10);
+                                x * 6, (y * 10) + 8);
+
             if(ch < 0x00000020)
                 *cur++ = '?';