Changeset 1015 for libcaca/trunk/caca/caca0.hTweet

Timestamp:

Sep 9, 2006, 6:53:13 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Made features (such as dithering mode) and caca_sqrt work in the legacy 0.x glue code.

File:

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

libcaca/trunk/caca/caca0.h

@@ -31 +31 @@
 extern void __caca0_end(void);
 extern unsigned int __caca0_get_event(unsigned int, int);
+extern unsigned int __caca0_sqrt(unsigned int);
 extern int __caca0_get_feature(int);
 extern void __caca0_set_feature(int);
 extern char const *__caca0_get_feature_name(int);
 extern cucul_canvas_t *__caca0_load_sprite(char const *);
+extern cucul_dither_t *__caca0_create_bitmap(unsigned int, unsigned int,
+          unsigned int, unsigned int, unsigned long int, unsigned long int,
+          unsigned long int, unsigned long int);
+extern void __caca0_free_bitmap(cucul_dither_t *);
 
 /* These variables are needed to emulate old non-thread safe behaviour */
@@ -87 +92 @@
 };
 
+/* This enum still exists in libcaca 1.x, thus cannot be redefined */
 #define CACA_EVENT_NONE          0x00000000
 #define CACA_EVENT_KEY_PRESS     0x01000000
@@ -124 +130 @@
 #define caca_get_mouse_y() caca_get_mouse_y(__caca0_dp)
 
-#define caca_set_color(x, y) cucul_set_color(__caca0_cv, x, y)
+#define caca_set_color(x, y) \
+    (__caca0_fg = (x), __caca0_bg = (y), cucul_set_color(__caca0_cv, x, y))
+#define caca_get_fg_color() __caca0_fg
+#define caca_get_bg_color() __caca0_bg
 #define caca_get_color_name cucul_get_color_name
 #define caca_putchar(x, y, c) cucul_putchar(__caca0_cv, x, y, c)
@@ -167 +176 @@
 
 #define caca_rand(a, b) cucul_rand(a, (b)+1)
+#define caca_sqrt __caca0_sqrt
 
 #define caca_sprite cucul_canvas
 #define caca_load_sprite __caca0_load_sprite
-#define caca_get_sprite_frames(c) 0
+#define caca_get_sprite_frames(c) 1
 #define caca_get_sprite_width(c, f) cucul_get_canvas_width(c)
 #define caca_get_sprite_height(c, f) cucul_get_canvas_height(c)
@@ -179 +189 @@
 
 #define caca_bitmap cucul_dither
-#define caca_create_bitmap cucul_create_dither
+#define caca_create_bitmap __caca0_create_bitmap
 #define caca_set_bitmap_palette cucul_set_dither_palette
 #define caca_draw_bitmap(x, y, z, t, b, p) \
     cucul_dither_bitmap(__caca0_cv, x, y, z, t, b, p)
-#define caca_free_bitmap cucul_free_dither
+#define caca_free_bitmap __caca0_free_bitmap
 
 #ifdef __cplusplus