Changeset 2826 for libcaca


Ignore:
Timestamp:
Sep 27, 2008, 5:43:01 PM (12 years ago)
Author:
Sam Hocevar
Message:

Continue the libcaca/libcucul merge. Source and binary compatibility
are almost there.

Location:
libcaca/trunk/caca
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • libcaca/trunk/caca/Makefile.am

    r2821 r2826  
    5353        monobold12.data \
    5454        $(NULL)
    55 libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@
     55libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
    5656libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
    5757libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)

  • libcaca/trunk/caca/attr.c

    r2821 r2826  
    462462}
    463463
     464/*
     465 * XXX: The following functions are aliases.
     466 */
     467
     468uint32_t cucul_get_attr(cucul_canvas_t const *, int, int)
     469         CACA_ALIAS(caca_get_attr);
     470int cucul_set_attr(cucul_canvas_t *, uint32_t) CACA_ALIAS(caca_set_attr);
     471int cucul_put_attr(cucul_canvas_t *, int, int, uint32_t)
     472         CACA_ALIAS(caca_put_attr);
     473int cucul_set_color_ansi(cucul_canvas_t *, uint8_t, uint8_t)
     474         CACA_ALIAS(caca_set_color_ansi);
     475int cucul_set_color_argb(cucul_canvas_t *, uint16_t, uint16_t)
     476         CACA_ALIAS(caca_set_color_argb);
     477uint8_t cucul_attr_to_ansi(uint32_t) CACA_ALIAS(caca_attr_to_ansi);
     478uint8_t cucul_attr_to_ansi_fg(uint32_t) CACA_ALIAS(caca_attr_to_ansi_fg);
     479uint8_t cucul_attr_to_ansi_bg(uint32_t) CACA_ALIAS(caca_attr_to_ansi_bg);
     480uint16_t cucul_attr_to_rgb12_fg(uint32_t) CACA_ALIAS(caca_attr_to_rgb12_fg);
     481uint16_t cucul_attr_to_rgb12_bg(uint32_t) CACA_ALIAS(caca_attr_to_rgb12_bg);
     482void cucul_attr_to_argb64(uint32_t, uint8_t[8]) CACA_ALIAS(caca_attr_to_argb64);
     483

  • libcaca/trunk/caca/box.c

    r2821 r2826  
    225225}
    226226
     227/*
     228 * XXX: The following functions are aliases.
     229 */
     230
     231int cucul_draw_box(cucul_canvas_t *, int, int, int, int, uint32_t)
     232         CACA_ALIAS(caca_draw_box);
     233int cucul_draw_thin_box(cucul_canvas_t *, int, int, int, int)
     234         CACA_ALIAS(caca_draw_thin_box);
     235int cucul_draw_cp437_box(cucul_canvas_t *, int, int, int, int)
     236         CACA_ALIAS(caca_draw_cp437_box);
     237int cucul_fill_box(cucul_canvas_t *, int, int, int, int, uint32_t)
     238         CACA_ALIAS(caca_fill_box);
     239

  • libcaca/trunk/caca/caca.c

    r2821 r2826  
    452452#endif
    453453
     454/*
     455 * XXX: The following functions are aliases.
     456 */
     457
     458char const * cucul_get_version(void) CACA_ALIAS(caca_get_version);
     459

  • libcaca/trunk/caca/caca.h

    r2821 r2826  
    227227__extern uint32_t caca_get_char(caca_canvas_t const *, int, int);
    228228__extern int caca_put_str(caca_canvas_t *, int, int, char const *);
    229 __extern uint32_t caca_get_attr(caca_canvas_t const *, int, int);
    230 __extern int caca_set_attr(caca_canvas_t *, uint32_t);
    231 __extern int caca_put_attr(caca_canvas_t *, int, int, uint32_t);
    232 __extern int caca_set_color_ansi(caca_canvas_t *, uint8_t, uint8_t);
    233 __extern int caca_set_color_argb(caca_canvas_t *, uint16_t, uint16_t);
    234229__extern int caca_printf(caca_canvas_t *, int, int, char const *, ...);
    235230__extern int caca_clear_canvas(caca_canvas_t *);
    … …  
    262257 *
    263258 *  @{ */
     259__extern uint32_t caca_get_attr(caca_canvas_t const *, int, int);
     260__extern int caca_set_attr(caca_canvas_t *, uint32_t);
     261__extern int caca_put_attr(caca_canvas_t *, int, int, uint32_t);
     262__extern int caca_set_color_ansi(caca_canvas_t *, uint8_t, uint8_t);
     263__extern int caca_set_color_argb(caca_canvas_t *, uint16_t, uint16_t);
    264264__extern uint8_t caca_attr_to_ansi(uint32_t);
    265265__extern uint8_t caca_attr_to_ansi_fg(uint32_t);
    … …  
    471471    /* Legacy stuff from beta versions, will probably disappear in 1.0 */
    472472typedef struct cucul_buffer cucul_buffer_t;
    473 #define cucul_canvas_t caca_canvas_t
    474 #define cucul_dither_t caca_dither_t
    475 #define cucul_font_t caca_font_t
    476 #define cucul_file_t caca_file_t
    477 #define cucul_display_t caca_display_t
    478 #define cucul_event_t caca_event_t
    479473
    480474#   if defined __GNUC__ && __GNUC__ >= 3
    481475#       define CACA_DEPRECATED __attribute__ ((__deprecated__))
     476#       define CACA_ALIAS(x) __attribute__ ((alias(#x)))
    482477#   else
    483478#       define CACA_DEPRECATED
     479#       define CACA_ALIAS(x)
    484480#   endif
    485 __extern int cucul_putchar(cucul_canvas_t *, int, int,
     481
     482/* Aliases from old libcucul functions */
     483__extern int cucul_putchar(caca_canvas_t *, int, int,
    486484                           unsigned long int) CACA_DEPRECATED;
    487 __extern unsigned long int cucul_getchar(cucul_canvas_t *,
     485__extern unsigned long int cucul_getchar(caca_canvas_t *,
    488486                                         int, int) CACA_DEPRECATED;
    489 __extern int cucul_putstr(cucul_canvas_t *, int, int,
     487__extern int cucul_putstr(caca_canvas_t *, int, int,
    490488                          char const *) CACA_DEPRECATED;
    491 __extern int cucul_set_color(cucul_canvas_t *, unsigned char,
     489__extern int cucul_set_color(caca_canvas_t *, unsigned char,
    492490                             unsigned char) CACA_DEPRECATED;
    493 __extern int cucul_set_truecolor(cucul_canvas_t *, unsigned int,
     491__extern int cucul_set_truecolor(caca_canvas_t *, unsigned int,
    494492                                 unsigned int) CACA_DEPRECATED;
    495 __extern unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *)
     493__extern unsigned int cucul_get_canvas_frame_count(caca_canvas_t *)
    496494                                                   CACA_DEPRECATED;
    497 __extern int cucul_set_canvas_frame(cucul_canvas_t *,
     495__extern int cucul_set_canvas_frame(caca_canvas_t *,
    498496                                    unsigned int) CACA_DEPRECATED;
    499 __extern int cucul_create_canvas_frame(cucul_canvas_t *,
     497__extern int cucul_create_canvas_frame(caca_canvas_t *,
    500498                                       unsigned int) CACA_DEPRECATED;
    501 __extern int cucul_free_canvas_frame(cucul_canvas_t *,
     499__extern int cucul_free_canvas_frame(caca_canvas_t *,
    502500                                     unsigned int) CACA_DEPRECATED;
    503501__extern cucul_buffer_t *cucul_load_memory(void *,
    … …  
    508506__extern void * cucul_get_buffer_data(cucul_buffer_t *) CACA_DEPRECATED;
    509507__extern int cucul_free_buffer(cucul_buffer_t *) CACA_DEPRECATED;
    510 __extern cucul_buffer_t * cucul_export_canvas(cucul_canvas_t *,
     508__extern cucul_buffer_t * cucul_export_canvas(caca_canvas_t *,
    511509                                              char const *) CACA_DEPRECATED;
    512 __extern cucul_canvas_t * cucul_import_canvas(cucul_buffer_t *,
     510__extern caca_canvas_t * cucul_import_canvas(cucul_buffer_t *,
    513511                                              char const *) CACA_DEPRECATED;
    514 __extern int cucul_rotate(cucul_canvas_t *) CACA_DEPRECATED;
    515 __extern int cucul_set_dither_invert(cucul_dither_t *, int) CACA_DEPRECATED;
    516 __extern int cucul_set_dither_mode(cucul_dither_t *,
     512__extern int cucul_rotate(caca_canvas_t *) CACA_DEPRECATED;
     513__extern int cucul_set_dither_invert(caca_dither_t *, int) CACA_DEPRECATED;
     514__extern int cucul_set_dither_mode(caca_dither_t *,
    517515                                   char const *) CACA_DEPRECATED;
    518 __extern char const * const * cucul_get_dither_mode_list(cucul_dither_t
    519                                                          const *)
     516__extern char const * const * cucul_get_dither_mode_list(caca_dither_t const *)
    520517                                                         CACA_DEPRECATED;
    521518#   define CUCUL_COLOR_BLACK CACA_BLACK
    … …  
    537534#   define CUCUL_COLOR_DEFAULT CACA_DEFAULT
    538535#   define CUCUL_COLOR_TRANSPARENT CACA_TRANSPARENT
     536
     537/* Aliases from the libcucul/libcaca merge */
     538#   define cucul_canvas_t caca_canvas_t
     539#   define cucul_dither_t caca_dither_t
     540#   define cucul_font_t caca_font_t
     541#   define cucul_file_t caca_file_t
     542#   define cucul_display_t caca_display_t
     543#   define cucul_event_t caca_event_t
     544
     545#   define CUCUL_BLACK CACA_BLACK
     546#   define CUCUL_BLUE CACA_BLUE
     547#   define CUCUL_GREEN CACA_GREEN
     548#   define CUCUL_CYAN CACA_CYAN
     549#   define CUCUL_RED CACA_RED
     550#   define CUCUL_MAGENTA CACA_MAGENTA
     551#   define CUCUL_BROWN CACA_BROWN
     552#   define CUCUL_LIGHTGRAY CACA_LIGHTGRAY
     553#   define CUCUL_DARKGRAY CACA_DARKGRAY
     554#   define CUCUL_LIGHTBLUE CACA_LIGHTBLUE
     555#   define CUCUL_LIGHTGREEN CACA_LIGHTGREEN
     556#   define CUCUL_LIGHTCYAN CACA_LIGHTCYAN
     557#   define CUCUL_LIGHTRED CACA_LIGHTRED
     558#   define CUCUL_LIGHTMAGENTA CACA_LIGHTMAGENTA
     559#   define CUCUL_YELLOW CACA_YELLOW
     560#   define CUCUL_WHITE CACA_YELLOW
     561#   define CUCUL_DEFAULT CACA_DEFAULT
     562#   define CUCUL_TRANSPARENT CACA_TRANSPARENT
     563
     564#   if !defined __LIBCACA__
     565#       define cucul_draw_triangle caca_draw_triangle
     566#       define cucul_draw_thin_triangle caca_draw_thin_triangle
     567#       define cucul_fill_triangle caca_fill_triangle
     568#       define cucul_load_font caca_load_font
     569#       define cucul_get_font_list caca_get_font_list
     570#       define cucul_get_font_width caca_get_font_width
     571#       define cucul_get_font_height caca_get_font_height
     572#       define cucul_get_font_blocks caca_get_font_blocks
     573#       define cucul_render_canvas caca_render_canvas
     574#       define cucul_free_font caca_free_font
     575#       define cucul_gotoxy caca_gotoxy
     576#       define cucul_get_cursor_x caca_get_cursor_x
     577#       define cucul_get_cursor_y caca_get_cursor_y
     578#       define cucul_put_char caca_put_char
     579#       define cucul_get_char caca_get_char
     580#       define cucul_put_str caca_put_str
     581#       define cucul_printf caca_printf
     582#       define cucul_clear_canvas caca_clear_canvas
     583#       define cucul_set_canvas_handle caca_set_canvas_handle
     584#       define cucul_get_canvas_handle_x caca_get_canvas_handle_x
     585#       define cucul_get_canvas_handle_y caca_get_canvas_handle_y
     586#       define cucul_blit caca_blit
     587#       define cucul_set_canvas_boundaries caca_set_canvas_boundaries
     588#       define cucul_import_memory caca_import_memory
     589#       define cucul_import_file caca_import_file
     590#       define cucul_get_import_list caca_get_import_list
     591#       define cucul_create_canvas caca_create_canvas
     592#       define cucul_manage_canvas caca_manage_canvas
     593#       define cucul_unmanage_canvas caca_unmanage_canvas
     594#       define cucul_set_canvas_size caca_set_canvas_size
     595#       define cucul_get_canvas_width caca_get_canvas_width
     596#       define cucul_get_canvas_height caca_get_canvas_height
     597#       define cucul_get_canvas_chars caca_get_canvas_chars
     598#       define cucul_get_canvas_attrs caca_get_canvas_attrs
     599#       define cucul_free_canvas caca_free_canvas
     600#       define cucul_rand caca_rand
     601#       define cucul_export_memory caca_export_memory
     602#       define cucul_get_export_list caca_get_export_list
     603#       define cucul_get_version caca_get_version
     604#       define cucul_utf8_to_utf32 caca_utf8_to_utf32
     605#       define cucul_utf32_to_utf8 caca_utf32_to_utf8
     606#       define cucul_utf32_to_cp437 caca_utf32_to_cp437
     607#       define cucul_cp437_to_utf32 caca_cp437_to_utf32
     608#       define cucul_utf32_to_ascii caca_utf32_to_ascii
     609#       define cucul_utf32_is_fullwidth caca_utf32_is_fullwidth
     610#       define cucul_draw_circle caca_draw_circle
     611#       define cucul_draw_ellipse caca_draw_ellipse
     612#       define cucul_draw_thin_ellipse caca_draw_thin_ellipse
     613#       define cucul_fill_ellipse caca_fill_ellipse
     614#       define cucul_canvas_set_figfont caca_canvas_set_figfont
     615#       define cucul_put_figchar caca_put_figchar
     616#       define cucul_flush_figlet caca_flush_figlet
     617#       define cucul_putchar caca_putchar
     618#       define cucul_getchar caca_getchar
     619#       define cucul_get_attr caca_get_attr
     620#       define cucul_set_attr caca_set_attr
     621#       define cucul_put_attr caca_put_attr
     622#       define cucul_set_color_ansi caca_set_color_ansi
     623#       define cucul_set_color_argb caca_set_color_argb
     624#       define cucul_attr_to_ansi caca_attr_to_ansi
     625#       define cucul_attr_to_ansi_fg caca_attr_to_ansi_fg
     626#       define cucul_attr_to_ansi_bg caca_attr_to_ansi_bg
     627#       define cucul_attr_to_rgb12_fg caca_attr_to_rgb12_fg
     628#       define cucul_attr_to_rgb12_bg caca_attr_to_rgb12_bg
     629#       define cucul_attr_to_argb64 caca_attr_to_argb64
     630#       define cucul_invert caca_invert
     631#       define cucul_flip caca_flip
     632#       define cucul_flop caca_flop
     633#       define cucul_rotate_180 caca_rotate_180
     634#       define cucul_rotate_left caca_rotate_left
     635#       define cucul_rotate_right caca_rotate_right
     636#       define cucul_stretch_left caca_stretch_left
     637#       define cucul_stretch_right caca_stretch_right
     638#       define cucul_file_open caca_file_open
     639#       define cucul_file_close caca_file_close
     640#       define cucul_file_tell caca_file_tell
     641#       define cucul_file_read caca_file_read
     642#       define cucul_file_write caca_file_write
     643#       define cucul_file_gets caca_file_gets
     644#       define cucul_file_eof caca_file_eof
     645#       define cucul_create_dither caca_create_dither
     646#       define cucul_set_dither_palette caca_set_dither_palette
     647#       define cucul_set_dither_brightness caca_set_dither_brightness
     648#       define cucul_get_dither_brightness caca_get_dither_brightness
     649#       define cucul_set_dither_gamma caca_set_dither_gamma
     650#       define cucul_get_dither_gamma caca_get_dither_gamma
     651#       define cucul_set_dither_contrast caca_set_dither_contrast
     652#       define cucul_get_dither_contrast caca_get_dither_contrast
     653#       define cucul_set_dither_antialias caca_set_dither_antialias
     654#       define cucul_get_dither_antialias_list caca_get_dither_antialias_list
     655#       define cucul_get_dither_antialias caca_get_dither_antialias
     656#       define cucul_set_dither_color caca_set_dither_color
     657#       define cucul_get_dither_color_list caca_get_dither_color_list
     658#       define cucul_get_dither_color caca_get_dither_color
     659#       define cucul_set_dither_charset caca_set_dither_charset
     660#       define cucul_get_dither_charset_list caca_get_dither_charset_list
     661#       define cucul_get_dither_charset caca_get_dither_charset
     662#       define cucul_set_dither_algorithm caca_set_dither_algorithm
     663#       define cucul_get_dither_algorithm_list caca_get_dither_algorithm_list
     664#       define cucul_get_dither_algorithm caca_get_dither_algorithm
     665#       define cucul_dither_bitmap caca_dither_bitmap
     666#       define cucul_free_dither caca_free_dither
     667#       define cucul_draw_line caca_draw_line
     668#       define cucul_draw_polyline caca_draw_polyline
     669#       define cucul_draw_thin_line caca_draw_thin_line
     670#       define cucul_draw_thin_polyline caca_draw_thin_polyline
     671#       define cucul_draw_box caca_draw_box
     672#       define cucul_draw_thin_box caca_draw_thin_box
     673#       define cucul_draw_cp437_box caca_draw_cp437_box
     674#       define cucul_fill_box caca_fill_box
     675#       define cucul_get_frame_count caca_get_frame_count
     676#       define cucul_set_frame caca_set_frame
     677#       define cucul_get_frame_name caca_get_frame_name
     678#       define cucul_set_frame_name caca_set_frame_name
     679#       define cucul_create_frame caca_create_frame
     680#       define cucul_free_frame caca_free_frame
     681#   endif
    539682#endif
    540683

  • libcaca/trunk/caca/canvas.c

    r2821 r2826  
    501501}
    502502
     503/*
     504 * XXX: The following functions are aliases.
     505 */
     506
     507cucul_canvas_t * cucul_create_canvas(int, int) CACA_ALIAS(caca_create_canvas);
     508int cucul_manage_canvas(cucul_canvas_t *, int (*)(void *), void *)
     509    CACA_ALIAS(caca_manage_canvas);
     510int cucul_unmanage_canvas(cucul_canvas_t *, int (*)(void *), void *)
     511    CACA_ALIAS(caca_unmanage_canvas);
     512int cucul_set_canvas_size(cucul_canvas_t *, int, int)
     513    CACA_ALIAS(caca_set_canvas_size);
     514int cucul_get_canvas_width(cucul_canvas_t const *)
     515    CACA_ALIAS(caca_get_canvas_width);
     516int cucul_get_canvas_height(cucul_canvas_t const *)
     517    CACA_ALIAS(caca_get_canvas_height);
     518uint8_t const * cucul_get_canvas_chars(cucul_canvas_t const *)
     519    CACA_ALIAS(caca_get_canvas_chars);
     520uint8_t const * cucul_get_canvas_attrs(cucul_canvas_t const *)
     521    CACA_ALIAS(caca_get_canvas_attrs);
     522int cucul_free_canvas(cucul_canvas_t *) CACA_ALIAS(caca_free_canvas);
     523int cucul_rand(int, int) CACA_ALIAS(caca_rand);
     524

  • libcaca/trunk/caca/charset.c

    r2821 r2826  
    421421}
    422422
     423/*
     424 * XXX: The following functions are aliases.
     425 */
     426
     427uint32_t cucul_utf8_to_utf32(char const *, size_t *)
     428         CACA_ALIAS(caca_utf8_to_utf32);
     429size_t cucul_utf32_to_utf8(char *, uint32_t) CACA_ALIAS(caca_utf32_to_utf8);
     430uint8_t cucul_utf32_to_cp437(uint32_t) CACA_ALIAS(caca_utf32_to_cp437);
     431uint32_t cucul_cp437_to_utf32(uint8_t) CACA_ALIAS(caca_cp437_to_utf32);
     432char cucul_utf32_to_ascii(uint32_t) CACA_ALIAS(caca_utf32_to_ascii);
     433int cucul_utf32_is_fullwidth(uint32_t) CACA_ALIAS(caca_utf32_is_fullwidth);
     434

  • libcaca/trunk/caca/conic.c

    r2821 r2826  
    208208        }
    209209        x++;
    210        
    211        
     210
     211
    212212    }
    213213
    … …  
    228228
    229229        y--;
    230        
    231        
     230
     231
    232232    }
    233233
    … …  
    251251    if((b & (0x1|0x4)) == (0x1|0x4)) {
    252252        uint32_t c = ch;
    253        
     253
    254254        if(thin) {
    255255            switch(c) {
    … …  
    273273    if((b & (0x2|0x4)) == (0x2|0x4)) {
    274274        uint32_t c = ch;
    275        
     275
    276276        if(thin) {
    277277            switch(c) {
    … …  
    297297    if((b & (0x1|0x8)) == (0x1|0x8)) {
    298298        uint32_t c = ch;
    299        
     299
    300300        if(thin) {
    301301            switch(c) {
    … …  
    320320    if((b & (0x2|0x8)) == (0x2|0x8)) {
    321321        uint32_t c = ch;
    322        
     322
    323323        if(thin) {
    324324            switch(c) {
    … …  
    340340        caca_put_char(cv, xo - x, yo - y, c);
    341341    }
    342 
    343        
    344 }
    345 
     342}
     343
     344/*
     345 * XXX: The following functions are aliases.
     346 */
     347
     348int cucul_draw_circle(cucul_canvas_t *, int, int, int, uint32_t)
     349         CACA_ALIAS(caca_draw_circle);
     350int cucul_draw_ellipse(cucul_canvas_t *, int, int, int, int, uint32_t)
     351         CACA_ALIAS(caca_draw_ellipse);
     352int cucul_draw_thin_ellipse(cucul_canvas_t *, int, int, int, int)
     353         CACA_ALIAS(caca_draw_thin_ellipse);
     354int cucul_fill_ellipse(cucul_canvas_t *, int, int, int, int, uint32_t)
     355         CACA_ALIAS(caca_fill_ellipse);
     356

  • libcaca/trunk/caca/dither.c

    r2821 r2826  
    15631563}
    15641564
     1565/*
     1566 * XXX: The following functions are aliases.
     1567 */
     1568
     1569cucul_dither_t *cucul_create_dither(int, int, int, int, uint32_t, uint32_t,
     1570                                    uint32_t, uint32_t)
     1571         CACA_ALIAS(caca_create_dither);
     1572int cucul_set_dither_palette(cucul_dither_t *, uint32_t r[], uint32_t g[],
     1573                             uint32_t b[], uint32_t a[])
     1574         CACA_ALIAS(caca_set_dither_palette);
     1575int cucul_set_dither_brightness(cucul_dither_t *, float)
     1576         CACA_ALIAS(caca_set_dither_brightness);
     1577float cucul_get_dither_brightness(cucul_dither_t const *)
     1578         CACA_ALIAS(caca_get_dither_brightness);
     1579int cucul_set_dither_gamma(cucul_dither_t *, float)
     1580         CACA_ALIAS(caca_set_dither_gamma);
     1581float cucul_get_dither_gamma(cucul_dither_t const *)
     1582         CACA_ALIAS(caca_get_dither_gamma);
     1583int cucul_set_dither_contrast(cucul_dither_t *, float)
     1584         CACA_ALIAS(caca_set_dither_contrast);
     1585float cucul_get_dither_contrast(cucul_dither_t const *)
     1586         CACA_ALIAS(caca_get_dither_contrast);
     1587int cucul_set_dither_antialias(cucul_dither_t *, char const *)
     1588         CACA_ALIAS(caca_set_dither_antialias);
     1589char const * const * cucul_get_dither_antialias_list(cucul_dither_t const *)
     1590         CACA_ALIAS(caca_get_dither_antialias_list);
     1591char const * cucul_get_dither_antialias(cucul_dither_t const *)
     1592         CACA_ALIAS(caca_get_dither_antialias);
     1593int cucul_set_dither_color(cucul_dither_t *, char const *)
     1594         CACA_ALIAS(caca_set_dither_color);
     1595char const * const * cucul_get_dither_color_list(cucul_dither_t const *)
     1596         CACA_ALIAS(caca_get_dither_color_list);
     1597char const * cucul_get_dither_color(cucul_dither_t const *)
     1598         CACA_ALIAS(caca_get_dither_color);
     1599int cucul_set_dither_charset(cucul_dither_t *, char const *)
     1600         CACA_ALIAS(caca_set_dither_charset);
     1601char const * const * cucul_get_dither_charset_list(cucul_dither_t const *)
     1602         CACA_ALIAS(caca_get_dither_charset_list);
     1603char const * cucul_get_dither_charset(cucul_dither_t const *)
     1604         CACA_ALIAS(caca_get_dither_charset);
     1605int cucul_set_dither_algorithm(cucul_dither_t *, char const *)
     1606         CACA_ALIAS(caca_set_dither_algorithm);
     1607char const * const * cucul_get_dither_algorithm_list(cucul_dither_t const *)
     1608         CACA_ALIAS(caca_get_dither_algorithm_list);
     1609char const * cucul_get_dither_algorithm(cucul_dither_t const *)
     1610         CACA_ALIAS(caca_get_dither_algorithm);
     1611int cucul_dither_bitmap(cucul_canvas_t *, int, int, int, int,
     1612                        cucul_dither_t const *, void *)
     1613         CACA_ALIAS(caca_dither_bitmap);
     1614int cucul_free_dither(cucul_dither_t *) CACA_ALIAS(caca_free_dither);
     1615

  • libcaca/trunk/caca/export.c

    r2821 r2826  
    10181018}
    10191019
     1020/*
     1021 * XXX: The following functions are aliases.
     1022 */
     1023
     1024void *cucul_export_memory(cucul_canvas_t const *, char const *,
     1025                          size_t *) CACA_ALIAS(caca_export_memory);
     1026char const * const * cucul_get_export_list(void)
     1027         CACA_ALIAS(caca_get_export_list);
     1028

  • libcaca/trunk/caca/figfont.c

    r2821 r2826  
    553553}
    554554
     555/*
     556 * XXX: The following functions are aliases.
     557 */
     558
     559int cucul_canvas_set_figfont(cucul_canvas_t *, char const *)
     560         CACA_ALIAS(caca_canvas_set_figfont);
     561int cucul_put_figchar(cucul_canvas_t *, uint32_t) CACA_ALIAS(caca_put_figchar);
     562int cucul_flush_figlet(cucul_canvas_t *) CACA_ALIAS(caca_flush_figlet);
     563

  • libcaca/trunk/caca/file.c

    r2821 r2826  
    288288#endif
    289289
     290/*
     291 * XXX: The following functions are aliases.
     292 */
     293
     294cucul_file_t *cucul_file_open(char const *, const char *)
     295         CACA_ALIAS(caca_file_open);
     296int cucul_file_close(cucul_file_t *) CACA_ALIAS(caca_file_close);
     297uint64_t cucul_file_tell(cucul_file_t *) CACA_ALIAS(caca_file_tell);
     298size_t cucul_file_read(cucul_file_t *, void *, size_t)
     299         CACA_ALIAS(caca_file_read);
     300size_t cucul_file_write(cucul_file_t *, const void *, size_t)
     301         CACA_ALIAS(caca_file_write);
     302char * cucul_file_gets(cucul_file_t *, char *, int)
     303         CACA_ALIAS(caca_file_gets);
     304int cucul_file_eof(cucul_file_t *) CACA_ALIAS(caca_file_eof);
     305

  • libcaca/trunk/caca/font.c

    r2821 r2826  
    521521}
    522522
     523/*
     524 * XXX: The following functions are aliases.
     525 */
     526
     527cucul_font_t *cucul_load_font(void const *, size_t) CACA_ALIAS(caca_load_font);
     528char const * const * cucul_get_font_list(void) CACA_ALIAS(caca_get_font_list);
     529int cucul_get_font_width(cucul_font_t const *) CACA_ALIAS(caca_get_font_width);
     530int cucul_get_font_height(cucul_font_t const *)
     531         CACA_ALIAS(caca_get_font_height);
     532uint32_t const *cucul_get_font_blocks(cucul_font_t const *)
     533         CACA_ALIAS(caca_get_font_blocks);
     534int cucul_render_canvas(cucul_canvas_t const *, cucul_font_t const *,
     535                        void *, int, int, int) CACA_ALIAS(caca_render_canvas);
     536int cucul_free_font(cucul_font_t *) CACA_ALIAS(caca_free_font);
     537

  • libcaca/trunk/caca/frame.c

    r2821 r2826  
    259259}
    260260
     261/*
     262 * XXX: The following functions are aliases.
     263 */
     264
     265int cucul_get_frame_count(cucul_canvas_t const *)
     266         CACA_ALIAS(caca_get_frame_count);
     267int cucul_set_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_set_frame);
     268char const *cucul_get_frame_name(cucul_canvas_t const *)
     269         CACA_ALIAS(caca_get_frame_name);
     270int cucul_set_frame_name(cucul_canvas_t *, char const *)
     271         CACA_ALIAS(caca_set_frame_name);
     272int cucul_create_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_create_frame);
     273int cucul_free_frame(cucul_canvas_t *, int) CACA_ALIAS(caca_free_frame);
     274

  • libcaca/trunk/caca/import.c

    r2821 r2826  
    912912}
    913913
     914/*
     915 * XXX: The following functions are aliases.
     916 */
     917
     918ssize_t cucul_import_memory(cucul_canvas_t *, void const *, size_t,
     919                            char const *) CACA_ALIAS(caca_import_memory);
     920ssize_t cucul_import_file(cucul_canvas_t *, char const *,
     921                          char const *) CACA_ALIAS(caca_import_file);
     922char const * const * cucul_get_import_list(void)
     923         CACA_ALIAS(caca_get_import_list);
     924

  • libcaca/trunk/caca/line.c

    r2821 r2826  
    392392}
    393393
     394/*
     395 * XXX: The following functions are aliases.
     396 */
     397
     398int cucul_draw_line(cucul_canvas_t *, int, int, int, int, uint32_t)
     399         CACA_ALIAS(caca_draw_line);
     400int cucul_draw_polyline(cucul_canvas_t *, int const x[],
     401                        int const y[], int, uint32_t)
     402         CACA_ALIAS(caca_draw_polyline);
     403int cucul_draw_thin_line(cucul_canvas_t *, int, int, int, int)
     404         CACA_ALIAS(caca_draw_thin_line);
     405int cucul_draw_thin_polyline(cucul_canvas_t *, int const x[],
     406                             int const y[], int)
     407         CACA_ALIAS(caca_draw_thin_polyline);
     408

  • libcaca/trunk/caca/string.c

    r2821 r2826  
    503503}
    504504
     505/*
     506 * XXX: The following functions are aliases.
     507 */
     508
     509int cucul_gotoxy(cucul_canvas_t *, int, int) CACA_ALIAS(caca_gotoxy);
     510int cucul_get_cursor_x(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_x);
     511int cucul_get_cursor_y(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_y);
     512int cucul_put_char(cucul_canvas_t *, int, int, uint32_t)
     513         CACA_ALIAS(caca_put_char);
     514uint32_t cucul_get_char(cucul_canvas_t const *, int, int)
     515         CACA_ALIAS(caca_get_char);
     516int cucul_put_str(cucul_canvas_t *, int, int, char const *)
     517         CACA_ALIAS(caca_put_str);
     518int cucul_printf(cucul_canvas_t *, int, int, char const *, ...)
     519         CACA_ALIAS(caca_printf);
     520int cucul_clear_canvas(cucul_canvas_t *) CACA_ALIAS(caca_clear_canvas);
     521int cucul_set_canvas_handle(cucul_canvas_t *, int, int)
     522         CACA_ALIAS(caca_set_canvas_handle);
     523int cucul_get_canvas_handle_x(cucul_canvas_t const *)
     524         CACA_ALIAS(caca_get_canvas_handle_x);
     525int cucul_get_canvas_handle_y(cucul_canvas_t const *)
     526         CACA_ALIAS(caca_get_canvas_handle_y);
     527int cucul_blit(cucul_canvas_t *, int, int, cucul_canvas_t const *,
     528                        cucul_canvas_t const *) CACA_ALIAS(caca_blit);
     529int cucul_set_canvas_boundaries(cucul_canvas_t *, int, int, int, int)
     530         CACA_ALIAS(caca_set_canvas_boundaries);
     531

  • libcaca/trunk/caca/transform.c

    r2821 r2826  
    11011101}
    11021102
     1103/*
     1104 * XXX: The following functions are aliases.
     1105 */
     1106
     1107int cucul_invert(cucul_canvas_t *) CACA_ALIAS(caca_invert);
     1108int cucul_flip(cucul_canvas_t *) CACA_ALIAS(caca_flip);
     1109int cucul_flop(cucul_canvas_t *) CACA_ALIAS(caca_flop);
     1110int cucul_rotate_180(cucul_canvas_t *) CACA_ALIAS(caca_rotate_180);
     1111int cucul_rotate_left(cucul_canvas_t *) CACA_ALIAS(caca_rotate_left);
     1112int cucul_rotate_right(cucul_canvas_t *) CACA_ALIAS(caca_rotate_right);
     1113int cucul_stretch_left(cucul_canvas_t *) CACA_ALIAS(caca_stretch_left);
     1114int cucul_stretch_right(cucul_canvas_t *) CACA_ALIAS(caca_stretch_right);
     1115

  • libcaca/trunk/caca/triangle.c

    r2821 r2826  
    156156}
    157157
     158/*
     159 * XXX: The following functions are aliases.
     160 */
     161
     162int cucul_draw_triangle(cucul_canvas_t *, int, int, int, int, int,
     163                      int, uint32_t) CACA_ALIAS(caca_draw_triangle);
     164int cucul_draw_thin_triangle(cucul_canvas_t *, int, int, int, int,
     165                             int, int) CACA_ALIAS(caca_draw_thin_triangle);
     166int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int,
     167                        int, uint32_t) CACA_ALIAS(caca_fill_triangle);
     168
Note: See TracChangeset for help on using the changeset viewer.