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

Timestamp:

Sep 30, 2006, 1:34:03 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Add "utf8" import format.
• Documented "text" import format.

File:

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

libcaca/trunk/cucul/import.c

@@ -41 +41 @@
 static cucul_canvas_t *import_caca(void const *, unsigned int);
 static cucul_canvas_t *import_text(void const *, unsigned int);
-static cucul_canvas_t *import_ansi(void const *, unsigned int);
+static cucul_canvas_t *import_ansi(void const *, unsigned int, int);
 
 static void ansi_parse_grcm(cucul_canvas_t *, struct ansi_grcm *,
@@ -53 +53 @@
  *  Valid values for \c format are:
  *  - \c "": attempt to autodetect the file format.
+ *  - \c "text": import ASCII text files.
  *  - \c "ansi": import ANSI files.
+ *  - \c "utf8": import UTF-8 files with ANSI colour files.
  *  - \c "caca": import native libcaca files.
  *
@@ -71 +73 @@
     if(!strcasecmp("caca", format))
         return import_caca(buffer->data, buffer->size);
+    if(!strcasecmp("utf8", format))
+        return import_ansi(buffer->data, buffer->size, 1);
     if(!strcasecmp("text", format))
         return import_text(buffer->data, buffer->size);
     if(!strcasecmp("ansi", format))
-        return import_ansi(buffer->data, buffer->size);
+        return import_ansi(buffer->data, buffer->size, 0);
 
     /* Autodetection */
@@ -89 +93 @@
         for(i = 0; i < buffer->size - 1; i++)
             if((buf[i] == 0x1b) && (buf[i + 1] == '['))
-                return import_ansi(buffer->data, buffer->size);
+                return import_ansi(buffer->data, buffer->size, 0);
 
         /* Otherwise, import it as text */
@@ -236 +240 @@
 }
 
-static cucul_canvas_t *import_ansi(void const *data, unsigned int size)
+static cucul_canvas_t *import_ansi(void const *data, unsigned int size,
+                                   int utf8)
 {
     struct ansi_grcm grcm;
@@ -243 +248 @@
     unsigned int i, j, skip, dummy = 0;
     unsigned int width = 1, height = 1;
+    unsigned long int ch;
     int x = 0, y = 0, save_x = 0, save_y = 0;
 
@@ -412 +418 @@
 
         /* Now paste our character */
+        if(utf8)
+        {
+            unsigned int bytes;
+            ch = cucul_utf8_to_utf32((char const *)(buffer + i), &bytes);
+            skip += bytes - 1;
+        }
+        else
+        {
+            ch = cucul_cp437_to_utf32(buffer[i]);
+        }
         cucul_set_color(cv, grcm.efg, grcm.ebg);
-        cucul_putchar(cv, x, y, cucul_cp437_to_utf32(buffer[i]));
+        cucul_putchar(cv, x, y, ch);
         x++;
     }