From 5f0ec215f8c9915ed028324a8ecac8212f68e18d Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 3 May 2018 10:33:30 +0200 Subject: [PATCH] Remove legacy code from 10 years ago. --- XCode/libcacaXCode.xcodeproj/project.pbxproj | 2 - caca/Makefile.am | 7 - caca/attr.c | 20 -- caca/box.c | 13 - caca/caca.c | 6 - caca/caca.h | 204 +-------------- caca/canvas.c | 22 -- caca/charset.c | 12 - caca/codec/export.c | 4 - caca/codec/import.c | 15 -- caca/conic.c | 13 - caca/dither.c | 51 ---- caca/figfont.c | 9 - caca/file.c | 16 -- caca/font.c | 15 -- caca/frame.c | 14 -- caca/legacy.c | 250 ------------------- caca/libcaca.vcxproj | 1 - caca/libcaca.vcxproj.filters | 1 - caca/line.c | 15 -- caca/string.c | 29 --- caca/transform.c | 13 - caca/triangle.c | 14 -- cxx/Makefile.am | 5 - doc/Makefile.am | 1 - 25 files changed, 1 insertion(+), 751 deletions(-) delete mode 100644 caca/legacy.c diff --git a/XCode/libcacaXCode.xcodeproj/project.pbxproj b/XCode/libcacaXCode.xcodeproj/project.pbxproj index 3a1b7af..0a4a1da 100644 --- a/XCode/libcacaXCode.xcodeproj/project.pbxproj +++ b/XCode/libcacaXCode.xcodeproj/project.pbxproj @@ -85,7 +85,6 @@ E6DB661C10AECC7800B6F924 /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = font.c; path = ../caca/font.c; sourceTree = SOURCE_ROOT; }; E6DB661D10AECC7800B6F924 /* frame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = frame.c; path = ../caca/frame.c; sourceTree = SOURCE_ROOT; }; E6DB661E10AECC7800B6F924 /* graphics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = graphics.c; path = ../caca/graphics.c; sourceTree = SOURCE_ROOT; }; - E6DB661F10AECC7800B6F924 /* legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = legacy.c; path = ../caca/legacy.c; sourceTree = SOURCE_ROOT; }; E6DB662010AECC7800B6F924 /* line.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = line.c; path = ../caca/line.c; sourceTree = SOURCE_ROOT; }; E6DB662110AECC7800B6F924 /* string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = string.c; path = ../caca/string.c; sourceTree = SOURCE_ROOT; }; E6DB662210AECC7800B6F924 /* time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = time.c; path = ../caca/time.c; sourceTree = SOURCE_ROOT; }; @@ -255,7 +254,6 @@ E6DB661C10AECC7800B6F924 /* font.c */, E6DB661D10AECC7800B6F924 /* frame.c */, E6DB661E10AECC7800B6F924 /* graphics.c */, - E6DB661F10AECC7800B6F924 /* legacy.c */, E6DB662010AECC7800B6F924 /* line.c */, E6DB662110AECC7800B6F924 /* string.c */, E6DB662210AECC7800B6F924 /* time.c */, diff --git a/caca/Makefile.am b/caca/Makefile.am index 8af4af5..ea881e8 100644 --- a/caca/Makefile.am +++ b/caca/Makefile.am @@ -32,7 +32,6 @@ libcaca_la_SOURCES = \ canvas.c \ dirty.c \ string.c \ - legacy.c \ transform.c \ charset.c \ attr.c \ @@ -80,14 +79,8 @@ driver_source = \ uninstall-local: . ./libcaca.la || exit 1; \ - for x in $$library_names; do \ - rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \ - done - rm -f $(DESTDIR)$(libdir)/libcucul.la rmdir $(DESTDIR)$(libdir) 2>/dev/null || true - rm -f $(DESTDIR)$(pkgconfigdir)/cucul.pc rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true - rm -f $(DESTDIR)$(includedir)/cucul.h if USE_PLUGINS plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la diff --git a/caca/attr.c b/caca/attr.c index afb0584..b805d81 100644 --- a/caca/attr.c +++ b/caca/attr.c @@ -525,23 +525,3 @@ 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 6f47efc..4c7a9ff 100644 --- a/caca/box.c +++ b/caca/box.c @@ -214,16 +214,3 @@ static int draw_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 7ff89c2..9674b6c 100644 --- a/caca/caca.c +++ b/caca/caca.c @@ -473,9 +473,3 @@ 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 b978dab..9fc3fe4 100644 --- a/caca/caca.h +++ b/caca/caca.h @@ -675,7 +675,6 @@ __extern void caca_conio_window(int left, int top, int right, int bottom); #if !defined(_DOXYGEN_SKIP_ME) /* Legacy stuff from beta versions, will probably disappear in 1.0 */ -typedef struct cucul_buffer cucul_buffer_t; # if defined __GNUC__ && __GNUC__ >= 3 # define CACA_DEPRECATED __attribute__ ((__deprecated__)) @@ -696,36 +695,7 @@ typedef struct cucul_buffer cucul_buffer_t; # endif -/* Aliases from old libcaca and libcucul functions */ -__extern int cucul_putchar(caca_canvas_t *, int, int, - unsigned long int) CACA_DEPRECATED; -__extern unsigned long int cucul_getchar(caca_canvas_t *, - int, int) CACA_DEPRECATED; -__extern int cucul_putstr(caca_canvas_t *, int, int, - char const *) CACA_DEPRECATED; -__extern int cucul_set_color(caca_canvas_t *, unsigned char, - unsigned char) CACA_DEPRECATED; -__extern int cucul_set_truecolor(caca_canvas_t *, unsigned int, - unsigned int) CACA_DEPRECATED; -__extern unsigned int cucul_get_canvas_frame_count(caca_canvas_t *) - CACA_DEPRECATED; -__extern int cucul_set_canvas_frame(caca_canvas_t *, - unsigned int) CACA_DEPRECATED; -__extern int cucul_create_canvas_frame(caca_canvas_t *, - unsigned int) CACA_DEPRECATED; -__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; -__extern cucul_buffer_t *cucul_load_file(char const *) CACA_DEPRECATED; -__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(caca_canvas_t *, - char const *) CACA_DEPRECATED; -__extern caca_canvas_t * cucul_import_canvas(cucul_buffer_t *, - char const *) CACA_DEPRECATED; +/* Aliases from old libcaca functions */ #if !defined _WIN32 || !defined __GNUC__ __extern ssize_t caca_import_memory(caca_canvas_t *, void const *, size_t, char const *) CACA_DEPRECATED; @@ -734,182 +704,10 @@ __extern ssize_t caca_import_file(caca_canvas_t *, char const *, __extern void *caca_export_memory(caca_canvas_t const *, char const *, size_t *) CACA_DEPRECATED; #endif -__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(caca_dither_t const *) - CACA_DEPRECATED; -# define CUCUL_COLOR_BLACK CACA_BLACK -# define CUCUL_COLOR_BLUE CACA_BLUE -# define CUCUL_COLOR_GREEN CACA_GREEN -# define CUCUL_COLOR_CYAN CACA_CYAN -# define CUCUL_COLOR_RED CACA_RED -# define CUCUL_COLOR_MAGENTA CACA_MAGENTA -# define CUCUL_COLOR_BROWN CACA_BROWN -# define CUCUL_COLOR_LIGHTGRAY CACA_LIGHTGRAY -# define CUCUL_COLOR_DARKGRAY CACA_DARKGRAY -# define CUCUL_COLOR_LIGHTBLUE CACA_LIGHTBLUE -# define CUCUL_COLOR_LIGHTGREEN CACA_LIGHTGREEN -# define CUCUL_COLOR_LIGHTCYAN CACA_LIGHTCYAN -# define CUCUL_COLOR_LIGHTRED CACA_LIGHTRED -# define CUCUL_COLOR_LIGHTMAGENTA CACA_LIGHTMAGENTA -# define CUCUL_COLOR_YELLOW CACA_YELLOW -# 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 - -# define CUCUL_BOLD CACA_BOLD -# define CUCUL_ITALICS CACA_ITALICS -# define CUCUL_UNDERLINE CACA_UNDERLINE -# define CUCUL_BLINK CACA_BLINK # if !defined __LIBCACA__ # define caca_get_cursor_x caca_wherex # define caca_get_cursor_y caca_wherey -# 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_wherex -# define cucul_get_cursor_y caca_wherey -# 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 diff --git a/caca/canvas.c b/caca/canvas.c index 55dd213..c6f225c 100644 --- a/caca/canvas.c +++ b/caca/canvas.c @@ -524,25 +524,3 @@ 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); -uint32_t const * cucul_get_canvas_chars(cucul_canvas_t const *) - CACA_ALIAS(caca_get_canvas_chars); -uint32_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 63824ea..b7ae3fd 100644 --- a/caca/charset.c +++ b/caca/charset.c @@ -418,15 +418,3 @@ 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/codec/export.c b/caca/codec/export.c index 1bb7bab..7f34a43 100644 --- a/caca/codec/export.c +++ b/caca/codec/export.c @@ -1069,10 +1069,6 @@ static void *export_troff(caca_canvas_t const *cv, size_t *bytes) * XXX: The following functions are aliases. */ -void *cucul_export_memory(cucul_canvas_t const *, char const *, - size_t *) CACA_ALIAS(caca_export_canvas_to_memory); void *caca_export_memory(caca_canvas_t const *, char const *, size_t *) CACA_ALIAS(caca_export_canvas_to_memory); -char const * const * cucul_get_export_list(void) - CACA_ALIAS(caca_get_export_list); diff --git a/caca/codec/import.c b/caca/codec/import.c index f366336..627559e 100644 --- a/caca/codec/import.c +++ b/caca/codec/import.c @@ -435,18 +435,3 @@ ssize_t _import_bin(caca_canvas_t *cv, void const *data, size_t len) return len & ~(size_t)1; } -/* - * XXX: The following functions are aliases. - */ - -ssize_t cucul_import_memory(cucul_canvas_t *, void const *, size_t, - char const *) CACA_ALIAS(caca_import_canvas_from_memory); -ssize_t cucul_import_file(cucul_canvas_t *, char const *, - char const *) CACA_ALIAS(caca_import_canvas_from_file); -ssize_t caca_import_memory(caca_canvas_t *, void const *, size_t, char const *) - CACA_ALIAS(caca_import_canvas_from_memory); -ssize_t caca_import_file(caca_canvas_t *, char const *, char const *) - CACA_ALIAS(caca_import_canvas_from_file); -char const * const * cucul_get_import_list(void) - CACA_ALIAS(caca_get_import_list); - diff --git a/caca/conic.c b/caca/conic.c index 9184a79..c66d276 100644 --- a/caca/conic.c +++ b/caca/conic.c @@ -339,16 +339,3 @@ static void ellipsepoints(caca_canvas_t *cv, int xo, int yo, int x, int y, } } -/* - * 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 a32f4cf..6a18e6a 100644 --- a/caca/dither.c +++ b/caca/dither.c @@ -1575,54 +1575,3 @@ 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/figfont.c b/caca/figfont.c index e098d1a..4c50b4e 100644 --- a/caca/figfont.c +++ b/caca/figfont.c @@ -661,12 +661,3 @@ int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) # endif #endif -/* - * 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 27e4e83..5e6026f 100644 --- a/caca/file.c +++ b/caca/file.c @@ -354,19 +354,3 @@ 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 263bb52..dadca63 100644 --- a/caca/font.c +++ b/caca/font.c @@ -518,18 +518,3 @@ 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 bf1a3b9..b36aed5 100644 --- a/caca/frame.c +++ b/caca/frame.c @@ -265,17 +265,3 @@ 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/legacy.c b/caca/legacy.c deleted file mode 100644 index 5439b48..0000000 --- a/caca/legacy.c +++ /dev/null @@ -1,250 +0,0 @@ -/* - * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar - * All Rights Reserved - * - * This library is free software. It comes without any warranty, to - * the extent permitted by applicable law. You can redistribute it - * and/or modify it under the terms of the Do What the Fuck You Want - * to Public License, Version 2, as published by Sam Hocevar. See - * http://www.wtfpl.net/ for more details. - */ - -/* - * This file contains legacy functions that we keep around until all - * applications are ported. - */ - -#include "config.h" - -#if !defined(__KERNEL__) -# include -# include -# include -#endif - -#include "caca.h" -#include "caca_internals.h" - -struct cucul_buffer -{ - size_t size; - char *data; - int user_data; -}; - -/* - * Functions from canvas.c - */ - -int cucul_putchar(cucul_canvas_t *cv, int x, int y, unsigned long int ch) -{ - return caca_put_char(cv, x, y, ch); -} - -unsigned long int cucul_getchar(cucul_canvas_t *cv, int x, int y) -{ - return caca_get_char(cv, x, y); -} - -int cucul_putstr(cucul_canvas_t *cv, int x, int y, char const *s) -{ - return caca_put_str(cv, x, y, s); -} - -/* - * Functions from color.c - */ - -int cucul_set_color(cucul_canvas_t *cv, unsigned char fg, unsigned char bg) -{ - return caca_set_color_ansi(cv, fg, bg); -} - -int cucul_set_truecolor(cucul_canvas_t *cv, unsigned int fg, unsigned int bg) -{ - return caca_set_color_argb(cv, fg, bg); -} - -/* - * Functions from dither.c - */ -int cucul_set_dither_invert(cucul_dither_t *d, int value) -{ - float gamma = caca_get_dither_gamma(d); - - if(gamma * (value ? -1 : 1) < 0) - caca_set_dither_gamma(d, -gamma); - - return 0; -} - -int cucul_set_dither_mode(cucul_dither_t *d, char const *s) -{ - return caca_set_dither_algorithm(d, s); -} - -char const * const * cucul_get_dither_mode_list(cucul_dither_t const *d) -{ - return caca_get_dither_algorithm_list(d); -} - -/* - * Functions from import.c - */ - -cucul_canvas_t * cucul_import_canvas(cucul_buffer_t *buf, char const *format) -{ - caca_canvas_t *cv = caca_create_canvas(0, 0); - int ret = caca_import_canvas_from_memory(cv, - (unsigned char const *)buf->data, - buf->size, format); - if(ret < 0) - { - caca_free_canvas(cv); - return NULL; - } - - return cv; -} - -/* - * Functions from export.c - */ - -cucul_buffer_t * cucul_export_canvas(cucul_canvas_t *cv, char const *format) -{ - cucul_buffer_t *ex; - - ex = malloc(sizeof(cucul_buffer_t)); - if(!ex) - { - seterrno(ENOMEM); - return NULL; - } - - ex->data = caca_export_canvas_to_memory(cv, format, &ex->size); - if(!ex->data) - { - free(ex); - return NULL; - } - - ex->user_data = 0; - - return ex; -} - -/* - * Functions from frame.c - */ - -unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *cv) -{ - return caca_get_frame_count(cv); -} - -int cucul_set_canvas_frame(cucul_canvas_t *cv, unsigned int id) -{ - return caca_set_frame(cv, id); -} - -int cucul_create_canvas_frame(cucul_canvas_t *cv, unsigned int id) -{ - return caca_create_frame(cv, id); -} - -int cucul_free_canvas_frame(cucul_canvas_t *cv, unsigned int id) -{ - return caca_free_frame(cv, id); -} - -/* - * Functions from buffer.c - */ - -cucul_buffer_t *cucul_load_memory(void *data, unsigned long int size) -{ - cucul_buffer_t *buf; - - buf = malloc(sizeof(cucul_buffer_t)); - if(!buf) - return NULL; - - buf->data = data; - buf->size = size; - buf->user_data = 1; - - return buf; -} - -cucul_buffer_t *cucul_load_file(char const *file) -{ - cucul_buffer_t *buf; - caca_file_t *f; - int ret; - - f = caca_file_open(file, "rb"); - if(!f) - return NULL; - - buf = malloc(sizeof(cucul_buffer_t)); - if(!buf) - { - caca_file_close(f); - return NULL; - } - - buf->data = NULL; - buf->size = 0; - - while(!caca_file_eof(f)) - { - buf->data = realloc(buf->data, buf->size + 1024); - if(!buf->data) - { - int saved_errno = geterrno(); - free(buf); - caca_file_close(f); - seterrno(saved_errno); - return NULL; - } - - ret = caca_file_read(f, buf->data + buf->size, 1024); - if(ret >= 0) - buf->size += ret; - } - caca_file_close(f); - - return buf; -} - -unsigned long int cucul_get_buffer_size(cucul_buffer_t *buf) -{ - return buf->size; -} - -void * cucul_get_buffer_data(cucul_buffer_t *buf) -{ - return buf->data; -} - -int cucul_free_buffer(cucul_buffer_t *buf) -{ - if(!buf->user_data) - free(buf->data); - - free(buf); - - return 0; -} - -/* - * Functions from transform.c - */ - -int cucul_rotate(cucul_canvas_t *cv) -{ - return caca_rotate_180(cv); -} - diff --git a/caca/libcaca.vcxproj b/caca/libcaca.vcxproj index 52239ba..2e4eccc 100644 --- a/caca/libcaca.vcxproj +++ b/caca/libcaca.vcxproj @@ -201,7 +201,6 @@ - diff --git a/caca/libcaca.vcxproj.filters b/caca/libcaca.vcxproj.filters index d4465ae..f8f09e2 100644 --- a/caca/libcaca.vcxproj.filters +++ b/caca/libcaca.vcxproj.filters @@ -17,7 +17,6 @@ - diff --git a/caca/line.c b/caca/line.c index 4ed4948..053e2cd 100644 --- a/caca/line.c +++ b/caca/line.c @@ -389,18 +389,3 @@ 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 795207e..b2a67ce 100644 --- a/caca/string.c +++ b/caca/string.c @@ -630,32 +630,3 @@ int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) # endif #endif -/* - * 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_wherex); -int cucul_get_cursor_y(cucul_canvas_t const *) CACA_ALIAS(caca_wherey); -int caca_get_cursor_x(caca_canvas_t const *) CACA_ALIAS(caca_wherex); -int caca_get_cursor_y(caca_canvas_t const *) CACA_ALIAS(caca_wherey); -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 b14e229..aa8fe68 100644 --- a/caca/transform.c +++ b/caca/transform.c @@ -1228,16 +1228,3 @@ 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 540b813..9c6cf65 100644 --- a/caca/triangle.c +++ b/caca/triangle.c @@ -362,7 +362,6 @@ int caca_fill_triangle_textured(caca_canvas_t * cv, int coords[6], caca_canvas_t * tex, float uv[6]) { - return caca_fill_triangle_textured_l(cv, coords[0], coords[1], coords[2], coords[3], @@ -372,16 +371,3 @@ int caca_fill_triangle_textured(caca_canvas_t * cv, uv[2], uv[3], uv[4], uv[5]); } - - -/* - * 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); diff --git a/cxx/Makefile.am b/cxx/Makefile.am index 2a2def7..2c65279 100644 --- a/cxx/Makefile.am +++ b/cxx/Makefile.am @@ -23,11 +23,6 @@ cxxtest_LDADD = libcaca++.la ../caca/libcaca.la uninstall-local: . ./libcaca++.la || exit 1; \ - for x in $$library_names; do \ - rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \ - done - rm -f $(DESTDIR)$(libdir)/libcucul++.la rmdir $(DESTDIR)$(libdir) 2>/dev/null || true - rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true diff --git a/doc/Makefile.am b/doc/Makefile.am index 0b58c76..57be74e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -59,6 +59,5 @@ endif ln -sf cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1 uninstall-local: - rm -f $(DESTDIR)$(datadir)/doc/libcucul-dev rmdir $(DESTDIR)$(datadir)/doc 2>/dev/null || true