Changeset 1376 for toilet/trunk/srcTweet

Timestamp:

Nov 12, 2006, 9:37:58 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Now that libcaca 0.99.beta10 is out, we can switch to the new API.

Location:

toilet/trunk/src

Files:

• figlet.c (modified) (5 diffs)
• filter.c (modified) (5 diffs)
• render.c (modified) (2 diffs)
• term.c (modified) (1 diff)

toilet/trunk/src/figlet.c

@@ -97 +97 @@
         for(x = 0; x < w; x++)
     {
-        uint32_t tmp = cucul_getchar(cx->image, x, y + c * cx->height);
-        cucul_putchar(cx->cv, cx->x + x, cx->y + y, tmp);
+        uint32_t tmp = cucul_get_char(cx->image, x, y + c * cx->height);
+        cucul_put_char(cx->cv, cx->x + x, cx->y + y, tmp);
     }
 
@@ -133 +133 @@
     char buf[2048];
     char hardblank[10];
-    cucul_buffer_t *b;
     TOIFILE *f;
     unsigned int i, j, size, comment_lines;
@@ -250 +249 @@
 
     /* Import buffer into canvas */
-    b = cucul_load_memory(data, i);
-    cx->image = cucul_import_canvas(b, "utf8");
-    cucul_free_buffer(b);
+    cx->image = cucul_create_canvas(0, 0);
+    cucul_import_memory(cx->image, data, i, "utf8");
     free(data);
-
-    if(!cx->image)
-    {
-        free(cx->lookup);
-        fprintf(stderr, "libcucul could not load data in `%s'\n", path);
-        return -1;
-    }
 
     /* Remove EOL characters. For now we ignore hardblanks, don’t do any
@@ -270 +261 @@
         for(i = cx->max_length; i--;)
         {
-            ch = cucul_getchar(cx->image, i, j);
+            ch = cucul_get_char(cx->image, i, j);
 
             /* TODO: Replace hardblanks with U+00A0 NO-BREAK SPACE */
             if(ch == cx->hardblank)
-                cucul_putchar(cx->image, i, j, ch = ' ');
-                //cucul_putchar(cx->image, i, j, ch = 0xa0);
+                cucul_put_char(cx->image, i, j, ch = ' ');
+                //cucul_put_char(cx->image, i, j, ch = 0xa0);
 
             if(oldch && ch != oldch)
@@ -283 +274 @@
             }
             else if(oldch && ch == oldch)
-                cucul_putchar(cx->image, i, j, ' ');
+                cucul_put_char(cx->image, i, j, ' ');
             else if(ch != ' ')
             {
                 oldch = ch;
-                cucul_putchar(cx->image, i, j, ' ');
-            }
-        }
-    }
-
-    return 0;
-}
-
+                cucul_put_char(cx->image, i, j, ' ');
+            }
+        }
+    }
+
+    return 0;
+}
+

toilet/trunk/src/filter.c

@@ -131 +131 @@
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_getchar(cx->torender, x, y);
+        unsigned long int ch = cucul_get_char(cx->torender, x, y);
         if(ch != (unsigned char)' ')
         {
@@ -167 +167 @@
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_getchar(cx->torender, x, y);
+        unsigned long int ch = cucul_get_char(cx->torender, x, y);
         int i;
 
@@ -175 +175 @@
         i = ((cx->lines + y + x / 8) / 2) % 4;
         cucul_set_color_ansi(cx->torender, palette[i], CUCUL_TRANSPARENT);
-        cucul_putchar(cx->torender, x, y, ch);
+        cucul_put_char(cx->torender, x, y, ch);
     }
 }
@@ -194 +194 @@
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_getchar(cx->torender, x, y);
+        unsigned long int ch = cucul_get_char(cx->torender, x, y);
         if(ch != (unsigned char)' ')
         {
@@ -200 +200 @@
                                  rainbow[(x / 2 + y + cx->lines) % 6],
                                  CUCUL_TRANSPARENT);
-            cucul_putchar(cx->torender, x, y, ch);
+            cucul_put_char(cx->torender, x, y, ch);
         }
     }

toilet/trunk/src/render.c

@@ -108 +108 @@
 static int render_flush(context_t *cx)
 {
-    cucul_buffer_t *buffer;
+    unsigned long int len;
+    void *buffer;
 
     /* Flush current line */
@@ -119 +120 @@
 
     /* Output line */
-    buffer = cucul_export_canvas(cx->torender, cx->export);
+    buffer = cucul_export_memory(cx->torender, cx->export, &len);
     if(!buffer)
         return -1;
-    fwrite(cucul_get_buffer_data(buffer),
-           cucul_get_buffer_size(buffer), 1, stdout);
-    cucul_free_buffer(buffer);
+    fwrite(buffer, len, 1, stdout);
+    free(buffer);
     cucul_free_canvas(cx->torender);
 

toilet/trunk/src/term.c

@@ -82 +82 @@
     cucul_set_canvas_size(cx->cv, cx->ew, cx->eh);
 
-    cucul_putchar(cx->cv, cx->x, cx->y, ch);
+    cucul_put_char(cx->cv, cx->x, cx->y, ch);
     cx->x++;