Changeset 2988 for toilet/trunk/src/filter.cTweet

Timestamp:

10/18/08 23:36:17 (5 years ago)

Author:

sam

Message:

Port toilet to the unified libcaca 0.99.beta15 API.

File:

• toilet/trunk/src/filter.c (modified) (8 diffs)

toilet/trunk/src/filter.c

@@ -25 +25 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <cucul.h>
+#include <caca.h>
 
 #include "toilet.h"
@@ -130 +130 @@
     unsigned int xmin, xmax, ymin, ymax;
 
-    xmin = w = cucul_get_canvas_width(cx->torender);
+    xmin = w = caca_get_canvas_width(cx->torender);
     xmax = 0;
-    ymin = h = cucul_get_canvas_height(cx->torender);
+    ymin = h = caca_get_canvas_height(cx->torender);
     ymax = 0;
 
@@ -138 +138 @@
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_get_char(cx->torender, x, y);
+        unsigned long int ch = caca_get_char(cx->torender, x, y);
         if(ch != (unsigned char)' ')
         {
@@ -155 +155 @@
         return;
 
-    cucul_set_canvas_boundaries(cx->torender, xmin, ymin,
+    caca_set_canvas_boundaries(cx->torender, xmin, ymin,
                                 xmax - xmin + 1, ymax - ymin + 1);
 }
@@ -163 +163 @@
     static unsigned char const palette[] =
     {
-        CUCUL_LIGHTBLUE, CUCUL_BLUE, CUCUL_LIGHTGRAY, CUCUL_DARKGRAY,
+        CACA_LIGHTBLUE, CACA_BLUE, CACA_LIGHTGRAY, CACA_DARKGRAY,
     };
 
     unsigned int x, y, w, h;
 
-    w = cucul_get_canvas_width(cx->torender);
-    h = cucul_get_canvas_height(cx->torender);
+    w = caca_get_canvas_width(cx->torender);
+    h = caca_get_canvas_height(cx->torender);
 
     for(y = 0; y < h; y++)
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_get_char(cx->torender, x, y);
+        unsigned long int ch = caca_get_char(cx->torender, x, y);
         int i;
 
@@ -181 +181 @@
 
         i = ((cx->lines + y + x / 8) / 2) % 4;
-        cucul_set_color_ansi(cx->torender, palette[i], CUCUL_TRANSPARENT);
-        cucul_put_char(cx->torender, x, y, ch);
+        caca_set_color_ansi(cx->torender, palette[i], CACA_TRANSPARENT);
+        caca_put_char(cx->torender, x, y, ch);
     }
 }
@@ -190 +190 @@
     static unsigned char const rainbow[] =
     {
-        CUCUL_LIGHTMAGENTA, CUCUL_LIGHTRED, CUCUL_YELLOW,
-        CUCUL_LIGHTGREEN, CUCUL_LIGHTCYAN, CUCUL_LIGHTBLUE,
+        CACA_LIGHTMAGENTA, CACA_LIGHTRED, CACA_YELLOW,
+        CACA_LIGHTGREEN, CACA_LIGHTCYAN, CACA_LIGHTBLUE,
     };
     unsigned int x, y, w, h;
 
-    w = cucul_get_canvas_width(cx->torender);
-    h = cucul_get_canvas_height(cx->torender);
+    w = caca_get_canvas_width(cx->torender);
+    h = caca_get_canvas_height(cx->torender);
 
     for(y = 0; y < h; y++)
         for(x = 0; x < w; x++)
     {
-        unsigned long int ch = cucul_get_char(cx->torender, x, y);
+        unsigned long int ch = caca_get_char(cx->torender, x, y);
         if(ch != (unsigned char)' ')
         {
-            cucul_set_color_ansi(cx->torender,
+            caca_set_color_ansi(cx->torender,
                                  rainbow[(x / 2 + y + cx->lines) % 6],
-                                 CUCUL_TRANSPARENT);
-            cucul_put_char(cx->torender, x, y, ch);
+                                 CACA_TRANSPARENT);
+            caca_put_char(cx->torender, x, y, ch);
         }
     }
@@ -214 +214 @@
 static void filter_flip(context_t *cx)
 {
-    cucul_flip(cx->torender);
+    caca_flip(cx->torender);
 }
 
 static void filter_flop(context_t *cx)
 {
-    cucul_flop(cx->torender);
+    caca_flop(cx->torender);
 }
 
 static void filter_180(context_t *cx)
 {
-    cucul_rotate_180(cx->torender);
+    caca_rotate_180(cx->torender);
 }
 
 static void filter_left(context_t *cx)
 {
-    cucul_rotate_left(cx->torender);
+    caca_rotate_left(cx->torender);
 }
 
 static void filter_right(context_t *cx)
 {
-    cucul_rotate_right(cx->torender);
-}
-
+    caca_rotate_right(cx->torender);
+}
+