Changeset 1330 for libcaca/trunk/cacaTweet

Timestamp:

Nov 11, 2006, 9:11:26 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Switch back to UTF-32 arguments for drawing primitives, now that we properly export cucul_utf8_to_utf32(). Evil API breakage, but no one uses these functions anyway.

File:

• libcaca/trunk/caca/caca0.h (modified) (3 diffs)

libcaca/trunk/caca/caca0.h

@@ -47 +47 @@
 extern unsigned char __caca0_fg;
 extern unsigned char __caca0_bg;
-extern char __caca0_utf8[];
 
 /* These enums and macros changed names or values */
@@ -142 +141 @@
 
 #define caca_draw_line(x, y, z, t, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_draw_line(__caca0_cv, x, y, z, t, __caca0_utf8))
+    cucul_draw_line(__caca0_cv, x, y, z, t, c)
 #define caca_draw_polyline(x, y, z, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_draw_polyline(__caca0_cv, x, y, z, __caca0_utf8))
+    cucul_draw_polyline(__caca0_cv, x, y, z, c)
 #define caca_draw_thin_line(x, y, z, t) \
     cucul_draw_thin_line(__caca0_cv, x, y, z, t)
@@ -152 +149 @@
     cucul_draw_thin_polyline(__caca0_cv, x, y, z)
 #define caca_draw_circle(x, y, z, c) \
-    (__caca0_utf8[0] = c, cucul_draw_circle(__caca0_cv, x, y, z, __caca0_utf8))
+    cucul_draw_circle(__caca0_cv, x, y, z, c)
 #define caca_draw_ellipse(x, y, z, t, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_draw_ellipse(__caca0_cv, x, y, z, t, __caca0_utf8))
+    cucul_draw_ellipse(__caca0_cv, x, y, z, t, c)
 #define caca_draw_thin_ellipse(x, y, z, t) \
     cucul_draw_thin_ellipse(__caca0_cv, x, y, z, t)
 #define caca_fill_ellipse(x, y, z, t, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_fill_ellipse(__caca0_cv, x, y, z, t, __caca0_utf8))
+    cucul_fill_ellipse(__caca0_cv, x, y, z, t, c)
 #define caca_draw_box(x, y, z, t, c) \
-    (__caca0_utf8[0] = c, cucul_draw_box(__caca0_cv, x, y, z, t, __caca0_utf8))
+    cucul_draw_box(__caca0_cv, x, y, z, t, c)
 #define caca_draw_thin_box(x, y, z, t) \
     cucul_draw_thin_box(__caca0_cv, x, y, z, t)
 #define caca_fill_box(x, y, z, t, c) \
-    (__caca0_utf8[0] = c, cucul_fill_box(__caca0_cv, x, y, z, t, __caca0_utf8))
+    cucul_fill_box(__caca0_cv, x, y, z, t, c)
 #define caca_draw_triangle(x, y, z, t, u, v, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_draw_triangle(__caca0_cv, x, y, z, t, u, v, __caca0_utf8))
+    cucul_draw_triangle(__caca0_cv, x, y, z, t, u, v, c)
 #define caca_draw_thin_triangle(x, y, z, t, u, v) \
     cucul_draw_thin_triangle(__caca0_cv, x, y, z, t, u, v)
 #define caca_fill_triangle(x, y, z, t, u, v, c) \
-    (__caca0_utf8[0] = c, \
-     cucul_fill_triangle(__caca0_cv, x, y, z, t, u, v, __caca0_utf8))
+    cucul_fill_triangle(__caca0_cv, x, y, z, t, u, v, c)
 
 #define caca_rand(a, b) cucul_rand(a, (b)+1)