From 319cc69db3a9e11bb024d5b7571bd70377e37451 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 27 Sep 2008 15:43:01 +0000 Subject: [PATCH] Continue the libcaca/libcucul merge. Source and binary compatibility are almost there. --- caca/Makefile.am | 2 +- caca/attr.c | 20 +++++ caca/box.c | 13 ++++ caca/caca.c | 6 ++ caca/caca.h | 197 ++++++++++++++++++++++++++++++++++++++++------- caca/canvas.c | 22 ++++++ caca/charset.c | 12 +++ caca/conic.c | 31 +++++--- caca/dither.c | 51 ++++++++++++ caca/export.c | 9 +++ caca/figfont.c | 9 +++ caca/file.c | 16 ++++ caca/font.c | 15 ++++ caca/frame.c | 14 ++++ caca/import.c | 11 +++ caca/line.c | 15 ++++ caca/string.c | 27 +++++++ caca/transform.c | 13 ++++ caca/triangle.c | 11 +++ 19 files changed, 456 insertions(+), 38 deletions(-) diff --git a/caca/Makefile.am b/caca/Makefile.am index a608ece..cb16a5b 100644 --- a/caca/Makefile.am +++ b/caca/Makefile.am @@ -52,7 +52,7 @@ libcaca_la_DEPENDENCIES = \ mono9.data \ monobold12.data \ $(NULL) -libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ +libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__ libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@ libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS) diff --git a/caca/attr.c b/caca/attr.c index 3aa6245..4bd7fbb 100644 --- a/caca/attr.c +++ b/caca/attr.c @@ -461,3 +461,23 @@ uint32_t _caca_attr_to_rgb24bg(uint32_t attr) return RGB12TO24(caca_attr_to_rgb12_bg(attr)); } +/* + * XXX: The following functions are aliases. + */ + +uint32_t cucul_get_attr(cucul_canvas_t const *, int, int) + CACA_ALIAS(caca_get_attr); +int cucul_set_attr(cucul_canvas_t *, uint32_t) CACA_ALIAS(caca_set_attr); +int cucul_put_attr(cucul_canvas_t *, int, int, uint32_t) + CACA_ALIAS(caca_put_attr); +int cucul_set_color_ansi(cucul_canvas_t *, uint8_t, uint8_t) + CACA_ALIAS(caca_set_color_ansi); +int cucul_set_color_argb(cucul_canvas_t *, uint16_t, uint16_t) + CACA_ALIAS(caca_set_color_argb); +uint8_t cucul_attr_to_ansi(uint32_t) CACA_ALIAS(caca_attr_to_ansi); +uint8_t cucul_attr_to_ansi_fg(uint32_t) CACA_ALIAS(caca_attr_to_ansi_fg); +uint8_t cucul_attr_to_ansi_bg(uint32_t) CACA_ALIAS(caca_attr_to_ansi_bg); +uint16_t cucul_attr_to_rgb12_fg(uint32_t) CACA_ALIAS(caca_attr_to_rgb12_fg); +uint16_t cucul_attr_to_rgb12_bg(uint32_t) CACA_ALIAS(caca_attr_to_rgb12_bg); +void cucul_attr_to_argb64(uint32_t, uint8_t[8]) CACA_ALIAS(caca_attr_to_argb64); + diff --git a/caca/box.c b/caca/box.c index 2462eb3..a47b18b 100644 --- a/caca/box.c +++ b/caca/box.c @@ -224,3 +224,16 @@ int caca_fill_box(caca_canvas_t *cv, int x, int y, int w, int h, return 0; } +/* + * XXX: The following functions are aliases. + */ + +int cucul_draw_box(cucul_canvas_t *, int, int, int, int, uint32_t) + CACA_ALIAS(caca_draw_box); +int cucul_draw_thin_box(cucul_canvas_t *, int, int, int, int) + CACA_ALIAS(caca_draw_thin_box); +int cucul_draw_cp437_box(cucul_canvas_t *, int, int, int, int) + CACA_ALIAS(caca_draw_cp437_box); +int cucul_fill_box(cucul_canvas_t *, int, int, int, int, uint32_t) + CACA_ALIAS(caca_fill_box); + diff --git a/caca/caca.c b/caca/caca.c index 311019d..82103b1 100644 --- a/caca/caca.c +++ b/caca/caca.c @@ -451,3 +451,9 @@ static int caca_plugin_install(caca_display_t *dp, char const *driver) } #endif +/* + * XXX: The following functions are aliases. + */ + +char const * cucul_get_version(void) CACA_ALIAS(caca_get_version); + diff --git a/caca/caca.h b/caca/caca.h index e1c30fe..c7eb728 100644 --- a/caca/caca.h +++ b/caca/caca.h @@ -226,11 +226,6 @@ __extern int caca_get_cursor_y(caca_canvas_t const *); __extern int caca_put_char(caca_canvas_t *, int, int, uint32_t); __extern uint32_t caca_get_char(caca_canvas_t const *, int, int); __extern int caca_put_str(caca_canvas_t *, int, int, char const *); -__extern uint32_t caca_get_attr(caca_canvas_t const *, int, int); -__extern int caca_set_attr(caca_canvas_t *, uint32_t); -__extern int caca_put_attr(caca_canvas_t *, int, int, uint32_t); -__extern int caca_set_color_ansi(caca_canvas_t *, uint8_t, uint8_t); -__extern int caca_set_color_argb(caca_canvas_t *, uint16_t, uint16_t); __extern int caca_printf(caca_canvas_t *, int, int, char const *, ...); __extern int caca_clear_canvas(caca_canvas_t *); __extern int caca_set_canvas_handle(caca_canvas_t *, int, int); @@ -261,6 +256,11 @@ __extern int caca_stretch_right(caca_canvas_t *); * These functions perform conversions between attribute values. * * @{ */ +__extern uint32_t caca_get_attr(caca_canvas_t const *, int, int); +__extern int caca_set_attr(caca_canvas_t *, uint32_t); +__extern int caca_put_attr(caca_canvas_t *, int, int, uint32_t); +__extern int caca_set_color_ansi(caca_canvas_t *, uint8_t, uint8_t); +__extern int caca_set_color_argb(caca_canvas_t *, uint16_t, uint16_t); __extern uint8_t caca_attr_to_ansi(uint32_t); __extern uint8_t caca_attr_to_ansi_fg(uint32_t); __extern uint8_t caca_attr_to_ansi_bg(uint32_t); @@ -470,35 +470,33 @@ __extern int caca_get_event_resize_height(caca_event_t const *); #if !defined(_DOXYGEN_SKIP_ME) /* Legacy stuff from beta versions, will probably disappear in 1.0 */ typedef struct cucul_buffer cucul_buffer_t; -#define cucul_canvas_t caca_canvas_t -#define cucul_dither_t caca_dither_t -#define cucul_font_t caca_font_t -#define cucul_file_t caca_file_t -#define cucul_display_t caca_display_t -#define cucul_event_t caca_event_t # if defined __GNUC__ && __GNUC__ >= 3 # define CACA_DEPRECATED __attribute__ ((__deprecated__)) +# define CACA_ALIAS(x) __attribute__ ((alias(#x))) # else # define CACA_DEPRECATED +# define CACA_ALIAS(x) # endif -__extern int cucul_putchar(cucul_canvas_t *, int, int, + +/* Aliases from old libcucul functions */ +__extern int cucul_putchar(caca_canvas_t *, int, int, unsigned long int) CACA_DEPRECATED; -__extern unsigned long int cucul_getchar(cucul_canvas_t *, +__extern unsigned long int cucul_getchar(caca_canvas_t *, int, int) CACA_DEPRECATED; -__extern int cucul_putstr(cucul_canvas_t *, int, int, +__extern int cucul_putstr(caca_canvas_t *, int, int, char const *) CACA_DEPRECATED; -__extern int cucul_set_color(cucul_canvas_t *, unsigned char, +__extern int cucul_set_color(caca_canvas_t *, unsigned char, unsigned char) CACA_DEPRECATED; -__extern int cucul_set_truecolor(cucul_canvas_t *, unsigned int, +__extern int cucul_set_truecolor(caca_canvas_t *, unsigned int, unsigned int) CACA_DEPRECATED; -__extern unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *) +__extern unsigned int cucul_get_canvas_frame_count(caca_canvas_t *) CACA_DEPRECATED; -__extern int cucul_set_canvas_frame(cucul_canvas_t *, +__extern int cucul_set_canvas_frame(caca_canvas_t *, unsigned int) CACA_DEPRECATED; -__extern int cucul_create_canvas_frame(cucul_canvas_t *, +__extern int cucul_create_canvas_frame(caca_canvas_t *, unsigned int) CACA_DEPRECATED; -__extern int cucul_free_canvas_frame(cucul_canvas_t *, +__extern int cucul_free_canvas_frame(caca_canvas_t *, unsigned int) CACA_DEPRECATED; __extern cucul_buffer_t *cucul_load_memory(void *, unsigned long int) CACA_DEPRECATED; @@ -507,16 +505,15 @@ __extern unsigned long int cucul_get_buffer_size(cucul_buffer_t *) CACA_DEPRECATED; __extern void * cucul_get_buffer_data(cucul_buffer_t *) CACA_DEPRECATED; __extern int cucul_free_buffer(cucul_buffer_t *) CACA_DEPRECATED; -__extern cucul_buffer_t * cucul_export_canvas(cucul_canvas_t *, +__extern cucul_buffer_t * cucul_export_canvas(caca_canvas_t *, char const *) CACA_DEPRECATED; -__extern cucul_canvas_t * cucul_import_canvas(cucul_buffer_t *, +__extern caca_canvas_t * cucul_import_canvas(cucul_buffer_t *, char const *) CACA_DEPRECATED; -__extern int cucul_rotate(cucul_canvas_t *) CACA_DEPRECATED; -__extern int cucul_set_dither_invert(cucul_dither_t *, int) CACA_DEPRECATED; -__extern int cucul_set_dither_mode(cucul_dither_t *, +__extern int cucul_rotate(caca_canvas_t *) CACA_DEPRECATED; +__extern int cucul_set_dither_invert(caca_dither_t *, int) CACA_DEPRECATED; +__extern int cucul_set_dither_mode(caca_dither_t *, char const *) CACA_DEPRECATED; -__extern char const * const * cucul_get_dither_mode_list(cucul_dither_t - const *) +__extern char const * const * cucul_get_dither_mode_list(caca_dither_t const *) CACA_DEPRECATED; # define CUCUL_COLOR_BLACK CACA_BLACK # define CUCUL_COLOR_BLUE CACA_BLUE @@ -536,6 +533,152 @@ __extern char const * const * cucul_get_dither_mode_list(cucul_dither_t # define CUCUL_COLOR_WHITE CACA_YELLOW # define CUCUL_COLOR_DEFAULT CACA_DEFAULT # define CUCUL_COLOR_TRANSPARENT CACA_TRANSPARENT + +/* Aliases from the libcucul/libcaca merge */ +# define cucul_canvas_t caca_canvas_t +# define cucul_dither_t caca_dither_t +# define cucul_font_t caca_font_t +# define cucul_file_t caca_file_t +# define cucul_display_t caca_display_t +# define cucul_event_t caca_event_t + +# define CUCUL_BLACK CACA_BLACK +# define CUCUL_BLUE CACA_BLUE +# define CUCUL_GREEN CACA_GREEN +# define CUCUL_CYAN CACA_CYAN +# define CUCUL_RED CACA_RED +# define CUCUL_MAGENTA CACA_MAGENTA +# define CUCUL_BROWN CACA_BROWN +# define CUCUL_LIGHTGRAY CACA_LIGHTGRAY +# define CUCUL_DARKGRAY CACA_DARKGRAY +# define CUCUL_LIGHTBLUE CACA_LIGHTBLUE +# define CUCUL_LIGHTGREEN CACA_LIGHTGREEN +# define CUCUL_LIGHTCYAN CACA_LIGHTCYAN +# define CUCUL_LIGHTRED CACA_LIGHTRED +# define CUCUL_LIGHTMAGENTA CACA_LIGHTMAGENTA +# define CUCUL_YELLOW CACA_YELLOW +# define CUCUL_WHITE CACA_YELLOW +# define CUCUL_DEFAULT CACA_DEFAULT +# define CUCUL_TRANSPARENT CACA_TRANSPARENT + +# if !defined __LIBCACA__ +# define cucul_draw_triangle caca_draw_triangle +# define cucul_draw_thin_triangle caca_draw_thin_triangle +# define cucul_fill_triangle caca_fill_triangle +# define cucul_load_font caca_load_font +# define cucul_get_font_list caca_get_font_list +# define cucul_get_font_width caca_get_font_width +# define cucul_get_font_height caca_get_font_height +# define cucul_get_font_blocks caca_get_font_blocks +# define cucul_render_canvas caca_render_canvas +# define cucul_free_font caca_free_font +# define cucul_gotoxy caca_gotoxy +# define cucul_get_cursor_x caca_get_cursor_x +# define cucul_get_cursor_y caca_get_cursor_y +# define cucul_put_char caca_put_char +# define cucul_get_char caca_get_char +# define cucul_put_str caca_put_str +# define cucul_printf caca_printf +# define cucul_clear_canvas caca_clear_canvas +# define cucul_set_canvas_handle caca_set_canvas_handle +# define cucul_get_canvas_handle_x caca_get_canvas_handle_x +# define cucul_get_canvas_handle_y caca_get_canvas_handle_y +# define cucul_blit caca_blit +# define cucul_set_canvas_boundaries caca_set_canvas_boundaries +# define cucul_import_memory caca_import_memory +# define cucul_import_file caca_import_file +# define cucul_get_import_list caca_get_import_list +# define cucul_create_canvas caca_create_canvas +# define cucul_manage_canvas caca_manage_canvas +# define cucul_unmanage_canvas caca_unmanage_canvas +# define cucul_set_canvas_size caca_set_canvas_size +# define cucul_get_canvas_width caca_get_canvas_width +# define cucul_get_canvas_height caca_get_canvas_height +# define cucul_get_canvas_chars caca_get_canvas_chars +# define cucul_get_canvas_attrs caca_get_canvas_attrs +# define cucul_free_canvas caca_free_canvas +# define cucul_rand caca_rand +# define cucul_export_memory caca_export_memory +# define cucul_get_export_list caca_get_export_list +# define cucul_get_version caca_get_version +# define cucul_utf8_to_utf32 caca_utf8_to_utf32 +# define cucul_utf32_to_utf8 caca_utf32_to_utf8 +# define cucul_utf32_to_cp437 caca_utf32_to_cp437 +# define cucul_cp437_to_utf32 caca_cp437_to_utf32 +# define cucul_utf32_to_ascii caca_utf32_to_ascii +# define cucul_utf32_is_fullwidth caca_utf32_is_fullwidth +# define cucul_draw_circle caca_draw_circle +# define cucul_draw_ellipse caca_draw_ellipse +# define cucul_draw_thin_ellipse caca_draw_thin_ellipse +# define cucul_fill_ellipse caca_fill_ellipse +# define cucul_canvas_set_figfont caca_canvas_set_figfont +# define cucul_put_figchar caca_put_figchar +# define cucul_flush_figlet caca_flush_figlet +# define cucul_putchar caca_putchar +# define cucul_getchar caca_getchar +# define cucul_get_attr caca_get_attr +# define cucul_set_attr caca_set_attr +# define cucul_put_attr caca_put_attr +# define cucul_set_color_ansi caca_set_color_ansi +# define cucul_set_color_argb caca_set_color_argb +# define cucul_attr_to_ansi caca_attr_to_ansi +# define cucul_attr_to_ansi_fg caca_attr_to_ansi_fg +# define cucul_attr_to_ansi_bg caca_attr_to_ansi_bg +# define cucul_attr_to_rgb12_fg caca_attr_to_rgb12_fg +# define cucul_attr_to_rgb12_bg caca_attr_to_rgb12_bg +# define cucul_attr_to_argb64 caca_attr_to_argb64 +# define cucul_invert caca_invert +# define cucul_flip caca_flip +# define cucul_flop caca_flop +# define cucul_rotate_180 caca_rotate_180 +# define cucul_rotate_left caca_rotate_left +# define cucul_rotate_right caca_rotate_right +# define cucul_stretch_left caca_stretch_left +# define cucul_stretch_right caca_stretch_right +# define cucul_file_open caca_file_open +# define cucul_file_close caca_file_close +# define cucul_file_tell caca_file_tell +# define cucul_file_read caca_file_read +# define cucul_file_write caca_file_write +# define cucul_file_gets caca_file_gets +# define cucul_file_eof caca_file_eof +# define cucul_create_dither caca_create_dither +# define cucul_set_dither_palette caca_set_dither_palette +# define cucul_set_dither_brightness caca_set_dither_brightness +# define cucul_get_dither_brightness caca_get_dither_brightness +# define cucul_set_dither_gamma caca_set_dither_gamma +# define cucul_get_dither_gamma caca_get_dither_gamma +# define cucul_set_dither_contrast caca_set_dither_contrast +# define cucul_get_dither_contrast caca_get_dither_contrast +# define cucul_set_dither_antialias caca_set_dither_antialias +# define cucul_get_dither_antialias_list caca_get_dither_antialias_list +# define cucul_get_dither_antialias caca_get_dither_antialias +# define cucul_set_dither_color caca_set_dither_color +# define cucul_get_dither_color_list caca_get_dither_color_list +# define cucul_get_dither_color caca_get_dither_color +# define cucul_set_dither_charset caca_set_dither_charset +# define cucul_get_dither_charset_list caca_get_dither_charset_list +# define cucul_get_dither_charset caca_get_dither_charset +# define cucul_set_dither_algorithm caca_set_dither_algorithm +# define cucul_get_dither_algorithm_list caca_get_dither_algorithm_list +# define cucul_get_dither_algorithm caca_get_dither_algorithm +# define cucul_dither_bitmap caca_dither_bitmap +# define cucul_free_dither caca_free_dither +# define cucul_draw_line caca_draw_line +# define cucul_draw_polyline caca_draw_polyline +# define cucul_draw_thin_line caca_draw_thin_line +# define cucul_draw_thin_polyline caca_draw_thin_polyline +# define cucul_draw_box caca_draw_box +# define cucul_draw_thin_box caca_draw_thin_box +# define cucul_draw_cp437_box caca_draw_cp437_box +# define cucul_fill_box caca_fill_box +# define cucul_get_frame_count caca_get_frame_count +# define cucul_set_frame caca_set_frame +# define cucul_get_frame_name caca_get_frame_name +# define cucul_set_frame_name caca_set_frame_name +# define cucul_create_frame caca_create_frame +# define cucul_free_frame caca_free_frame +# endif #endif #ifdef __cplusplus diff --git a/caca/canvas.c b/caca/canvas.c index 839d4cc..6f12407 100644 --- a/caca/canvas.c +++ b/caca/canvas.c @@ -500,3 +500,25 @@ int caca_resize(caca_canvas_t *cv, int width, int height) return 0; } +/* + * XXX: The following functions are aliases. + */ + +cucul_canvas_t * cucul_create_canvas(int, int) CACA_ALIAS(caca_create_canvas); +int cucul_manage_canvas(cucul_canvas_t *, int (*)(void *), void *) + CACA_ALIAS(caca_manage_canvas); +int cucul_unmanage_canvas(cucul_canvas_t *, int (*)(void *), void *) + CACA_ALIAS(caca_unmanage_canvas); +int cucul_set_canvas_size(cucul_canvas_t *, int, int) + CACA_ALIAS(caca_set_canvas_size); +int cucul_get_canvas_width(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_width); +int cucul_get_canvas_height(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_height); +uint8_t const * cucul_get_canvas_chars(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_chars); +uint8_t const * cucul_get_canvas_attrs(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_attrs); +int cucul_free_canvas(cucul_canvas_t *) CACA_ALIAS(caca_free_canvas); +int cucul_rand(int, int) CACA_ALIAS(caca_rand); + diff --git a/caca/charset.c b/caca/charset.c index efde596..b1169fe 100644 --- a/caca/charset.c +++ b/caca/charset.c @@ -420,3 +420,15 @@ int caca_utf32_is_fullwidth(uint32_t ch) return 0; } +/* + * XXX: The following functions are aliases. + */ + +uint32_t cucul_utf8_to_utf32(char const *, size_t *) + CACA_ALIAS(caca_utf8_to_utf32); +size_t cucul_utf32_to_utf8(char *, uint32_t) CACA_ALIAS(caca_utf32_to_utf8); +uint8_t cucul_utf32_to_cp437(uint32_t) CACA_ALIAS(caca_utf32_to_cp437); +uint32_t cucul_cp437_to_utf32(uint8_t) CACA_ALIAS(caca_cp437_to_utf32); +char cucul_utf32_to_ascii(uint32_t) CACA_ALIAS(caca_utf32_to_ascii); +int cucul_utf32_is_fullwidth(uint32_t) CACA_ALIAS(caca_utf32_is_fullwidth); + diff --git a/caca/conic.c b/caca/conic.c index b88894e..b62df1b 100644 --- a/caca/conic.c +++ b/caca/conic.c @@ -207,8 +207,8 @@ int caca_draw_thin_ellipse(caca_canvas_t *cv, int xo, int yo, int a, int b) ellipsepoints(cv, xo, yo, x + 1, y, '1', 1); } x++; - - + + } d2 = b*b*(x+0.5)*(x+0.5) + a*a*(y-1)*(y-1) - a*a*b*b; @@ -227,8 +227,8 @@ int caca_draw_thin_ellipse(caca_canvas_t *cv, int xo, int yo, int a, int b) } y--; - - + + } return 0; @@ -250,7 +250,7 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, if((b & (0x1|0x4)) == (0x1|0x4)) { uint32_t c = ch; - + if(thin) { switch(c) { case '0': @@ -272,7 +272,7 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, } if((b & (0x2|0x4)) == (0x2|0x4)) { uint32_t c = ch; - + if(thin) { switch(c) { case '0': @@ -296,7 +296,7 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, if((b & (0x1|0x8)) == (0x1|0x8)) { uint32_t c = ch; - + if(thin) { switch(c) { case '0': @@ -319,7 +319,7 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, if((b & (0x2|0x8)) == (0x2|0x8)) { uint32_t c = ch; - + if(thin) { switch(c) { case '0': @@ -339,7 +339,18 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, } caca_put_char(cv, xo - x, yo - y, c); } - - } +/* + * XXX: The following functions are aliases. + */ + +int cucul_draw_circle(cucul_canvas_t *, int, int, int, uint32_t) + CACA_ALIAS(caca_draw_circle); +int cucul_draw_ellipse(cucul_canvas_t *, int, int, int, int, uint32_t) + CACA_ALIAS(caca_draw_ellipse); +int cucul_draw_thin_ellipse(cucul_canvas_t *, int, int, int, int) + CACA_ALIAS(caca_draw_thin_ellipse); +int cucul_fill_ellipse(cucul_canvas_t *, int, int, int, int, uint32_t) + CACA_ALIAS(caca_fill_ellipse); + diff --git a/caca/dither.c b/caca/dither.c index 582c0f3..c85d5c2 100644 --- a/caca/dither.c +++ b/caca/dither.c @@ -1562,3 +1562,54 @@ static int init_lookup(void) return 0; } +/* + * XXX: The following functions are aliases. + */ + +cucul_dither_t *cucul_create_dither(int, int, int, int, uint32_t, uint32_t, + uint32_t, uint32_t) + CACA_ALIAS(caca_create_dither); +int cucul_set_dither_palette(cucul_dither_t *, uint32_t r[], uint32_t g[], + uint32_t b[], uint32_t a[]) + CACA_ALIAS(caca_set_dither_palette); +int cucul_set_dither_brightness(cucul_dither_t *, float) + CACA_ALIAS(caca_set_dither_brightness); +float cucul_get_dither_brightness(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_brightness); +int cucul_set_dither_gamma(cucul_dither_t *, float) + CACA_ALIAS(caca_set_dither_gamma); +float cucul_get_dither_gamma(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_gamma); +int cucul_set_dither_contrast(cucul_dither_t *, float) + CACA_ALIAS(caca_set_dither_contrast); +float cucul_get_dither_contrast(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_contrast); +int cucul_set_dither_antialias(cucul_dither_t *, char const *) + CACA_ALIAS(caca_set_dither_antialias); +char const * const * cucul_get_dither_antialias_list(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_antialias_list); +char const * cucul_get_dither_antialias(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_antialias); +int cucul_set_dither_color(cucul_dither_t *, char const *) + CACA_ALIAS(caca_set_dither_color); +char const * const * cucul_get_dither_color_list(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_color_list); +char const * cucul_get_dither_color(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_color); +int cucul_set_dither_charset(cucul_dither_t *, char const *) + CACA_ALIAS(caca_set_dither_charset); +char const * const * cucul_get_dither_charset_list(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_charset_list); +char const * cucul_get_dither_charset(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_charset); +int cucul_set_dither_algorithm(cucul_dither_t *, char const *) + CACA_ALIAS(caca_set_dither_algorithm); +char const * const * cucul_get_dither_algorithm_list(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_algorithm_list); +char const * cucul_get_dither_algorithm(cucul_dither_t const *) + CACA_ALIAS(caca_get_dither_algorithm); +int cucul_dither_bitmap(cucul_canvas_t *, int, int, int, int, + cucul_dither_t const *, void *) + CACA_ALIAS(caca_dither_bitmap); +int cucul_free_dither(cucul_dither_t *) CACA_ALIAS(caca_free_dither); + diff --git a/caca/export.c b/caca/export.c index d341642..0d49464 100644 --- a/caca/export.c +++ b/caca/export.c @@ -1017,3 +1017,12 @@ static void *export_tga(caca_canvas_t const *cv, size_t *bytes) return data; } +/* + * XXX: The following functions are aliases. + */ + +void *cucul_export_memory(cucul_canvas_t const *, char const *, + size_t *) CACA_ALIAS(caca_export_memory); +char const * const * cucul_get_export_list(void) + CACA_ALIAS(caca_get_export_list); + diff --git a/caca/figfont.c b/caca/figfont.c index cbcc616..9558429 100644 --- a/caca/figfont.c +++ b/caca/figfont.c @@ -552,3 +552,12 @@ static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule) return 0; } +/* + * XXX: The following functions are aliases. + */ + +int cucul_canvas_set_figfont(cucul_canvas_t *, char const *) + CACA_ALIAS(caca_canvas_set_figfont); +int cucul_put_figchar(cucul_canvas_t *, uint32_t) CACA_ALIAS(caca_put_figchar); +int cucul_flush_figlet(cucul_canvas_t *) CACA_ALIAS(caca_flush_figlet); + diff --git a/caca/file.c b/caca/file.c index b0ba3c1..d03fa48 100644 --- a/caca/file.c +++ b/caca/file.c @@ -287,3 +287,19 @@ static int zipread(caca_file_t *fp, void *buf, unsigned int len) } #endif +/* + * XXX: The following functions are aliases. + */ + +cucul_file_t *cucul_file_open(char const *, const char *) + CACA_ALIAS(caca_file_open); +int cucul_file_close(cucul_file_t *) CACA_ALIAS(caca_file_close); +uint64_t cucul_file_tell(cucul_file_t *) CACA_ALIAS(caca_file_tell); +size_t cucul_file_read(cucul_file_t *, void *, size_t) + CACA_ALIAS(caca_file_read); +size_t cucul_file_write(cucul_file_t *, const void *, size_t) + CACA_ALIAS(caca_file_write); +char * cucul_file_gets(cucul_file_t *, char *, int) + CACA_ALIAS(caca_file_gets); +int cucul_file_eof(cucul_file_t *) CACA_ALIAS(caca_file_eof); + diff --git a/caca/font.c b/caca/font.c index bdc4796..79cf7c4 100644 --- a/caca/font.c +++ b/caca/font.c @@ -520,3 +520,18 @@ int caca_render_canvas(caca_canvas_t const *cv, caca_font_t const *f, return 0; } +/* + * XXX: The following functions are aliases. + */ + +cucul_font_t *cucul_load_font(void const *, size_t) CACA_ALIAS(caca_load_font); +char const * const * cucul_get_font_list(void) CACA_ALIAS(caca_get_font_list); +int cucul_get_font_width(cucul_font_t const *) CACA_ALIAS(caca_get_font_width); +int cucul_get_font_height(cucul_font_t const *) + CACA_ALIAS(caca_get_font_height); +uint32_t const *cucul_get_font_blocks(cucul_font_t const *) + CACA_ALIAS(caca_get_font_blocks); +int cucul_render_canvas(cucul_canvas_t const *, cucul_font_t const *, + void *, int, int, int) CACA_ALIAS(caca_render_canvas); +int cucul_free_font(cucul_font_t *) CACA_ALIAS(caca_free_font); + diff --git a/caca/frame.c b/caca/frame.c index db3965b..1cffad9 100644 --- a/caca/frame.c +++ b/caca/frame.c @@ -258,3 +258,17 @@ void _caca_load_frame_info(caca_canvas_t *cv) cv->curattr = cv->frames[cv->frame].curattr; } +/* + * XXX: The following functions are aliases. + */ + +int cucul_get_frame_count(cucul_canvas_t const *) + CACA_ALIAS(caca_get_frame_count); +int cucul_set_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_set_frame); +char const *cucul_get_frame_name(cucul_canvas_t const *) + CACA_ALIAS(caca_get_frame_name); +int cucul_set_frame_name(cucul_canvas_t *, char const *) + CACA_ALIAS(caca_set_frame_name); +int cucul_create_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_create_frame); +int cucul_free_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_free_frame); + diff --git a/caca/import.c b/caca/import.c index c9aee8d..4f796ad 100644 --- a/caca/import.c +++ b/caca/import.c @@ -911,3 +911,14 @@ static void ansi_parse_grcm(caca_canvas_t *cv, struct import *im, caca_set_color_ansi(cv, efg, ebg); } +/* + * XXX: The following functions are aliases. + */ + +ssize_t cucul_import_memory(cucul_canvas_t *, void const *, size_t, + char const *) CACA_ALIAS(caca_import_memory); +ssize_t cucul_import_file(cucul_canvas_t *, char const *, + char const *) CACA_ALIAS(caca_import_file); +char const * const * cucul_get_import_list(void) + CACA_ALIAS(caca_get_import_list); + diff --git a/caca/line.c b/caca/line.c index 395cebf..d488b78 100644 --- a/caca/line.c +++ b/caca/line.c @@ -391,3 +391,18 @@ static void draw_thin_line(caca_canvas_t *cv, struct line* s) } } +/* + * XXX: The following functions are aliases. + */ + +int cucul_draw_line(cucul_canvas_t *, int, int, int, int, uint32_t) + CACA_ALIAS(caca_draw_line); +int cucul_draw_polyline(cucul_canvas_t *, int const x[], + int const y[], int, uint32_t) + CACA_ALIAS(caca_draw_polyline); +int cucul_draw_thin_line(cucul_canvas_t *, int, int, int, int) + CACA_ALIAS(caca_draw_thin_line); +int cucul_draw_thin_polyline(cucul_canvas_t *, int const x[], + int const y[], int) + CACA_ALIAS(caca_draw_thin_polyline); + diff --git a/caca/string.c b/caca/string.c index c5e823c..627e764 100644 --- a/caca/string.c +++ b/caca/string.c @@ -502,3 +502,30 @@ int caca_set_canvas_boundaries(caca_canvas_t *cv, int x, int y, int w, int h) return 0; } +/* + * XXX: The following functions are aliases. + */ + +int cucul_gotoxy(cucul_canvas_t *, int, int) CACA_ALIAS(caca_gotoxy); +int cucul_get_cursor_x(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_x); +int cucul_get_cursor_y(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_y); +int cucul_put_char(cucul_canvas_t *, int, int, uint32_t) + CACA_ALIAS(caca_put_char); +uint32_t cucul_get_char(cucul_canvas_t const *, int, int) + CACA_ALIAS(caca_get_char); +int cucul_put_str(cucul_canvas_t *, int, int, char const *) + CACA_ALIAS(caca_put_str); +int cucul_printf(cucul_canvas_t *, int, int, char const *, ...) + CACA_ALIAS(caca_printf); +int cucul_clear_canvas(cucul_canvas_t *) CACA_ALIAS(caca_clear_canvas); +int cucul_set_canvas_handle(cucul_canvas_t *, int, int) + CACA_ALIAS(caca_set_canvas_handle); +int cucul_get_canvas_handle_x(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_handle_x); +int cucul_get_canvas_handle_y(cucul_canvas_t const *) + CACA_ALIAS(caca_get_canvas_handle_y); +int cucul_blit(cucul_canvas_t *, int, int, cucul_canvas_t const *, + cucul_canvas_t const *) CACA_ALIAS(caca_blit); +int cucul_set_canvas_boundaries(cucul_canvas_t *, int, int, int, int) + CACA_ALIAS(caca_set_canvas_boundaries); + diff --git a/caca/transform.c b/caca/transform.c index 03c28bc..06db10d 100644 --- a/caca/transform.c +++ b/caca/transform.c @@ -1100,3 +1100,16 @@ static void rightpair(uint32_t pair[2]) } } +/* + * XXX: The following functions are aliases. + */ + +int cucul_invert(cucul_canvas_t *) CACA_ALIAS(caca_invert); +int cucul_flip(cucul_canvas_t *) CACA_ALIAS(caca_flip); +int cucul_flop(cucul_canvas_t *) CACA_ALIAS(caca_flop); +int cucul_rotate_180(cucul_canvas_t *) CACA_ALIAS(caca_rotate_180); +int cucul_rotate_left(cucul_canvas_t *) CACA_ALIAS(caca_rotate_left); +int cucul_rotate_right(cucul_canvas_t *) CACA_ALIAS(caca_rotate_right); +int cucul_stretch_left(cucul_canvas_t *) CACA_ALIAS(caca_stretch_left); +int cucul_stretch_right(cucul_canvas_t *) CACA_ALIAS(caca_stretch_right); + diff --git a/caca/triangle.c b/caca/triangle.c index abb74aa..5045e15 100644 --- a/caca/triangle.c +++ b/caca/triangle.c @@ -155,3 +155,14 @@ int caca_fill_triangle(caca_canvas_t *cv, int x1, int y1, int x2, int y2, return 0; } +/* + * XXX: The following functions are aliases. + */ + +int cucul_draw_triangle(cucul_canvas_t *, int, int, int, int, int, + int, uint32_t) CACA_ALIAS(caca_draw_triangle); +int cucul_draw_thin_triangle(cucul_canvas_t *, int, int, int, int, + int, int) CACA_ALIAS(caca_draw_thin_triangle); +int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int, + int, uint32_t) CACA_ALIAS(caca_fill_triangle); +