string.c (libcaca-0.99.beta19) | : | string.c (libcaca-0.99.beta20.tar.bz2) | ||
---|---|---|---|---|
/* | /* | |||
* libcaca Colour ASCII-Art library | * libcaca Colour ASCII-Art library | |||
* Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net> | * Copyright © 2002—2018 Sam Hocevar <sam@hocevar.net> | |||
* All Rights Reserved | * All Rights Reserved | |||
* | * | |||
* This library is free software. It comes without any warranty, to | * This library is free software. It comes without any warranty, to | |||
* the extent permitted by applicable law. You can redistribute it | * 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 | * 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 | * to Public License, Version 2, as published by Sam Hocevar. See | |||
* http://www.wtfpl.net/ for more details. | * http://www.wtfpl.net/ for more details. | |||
*/ | */ | |||
/* | /* | |||
* This file contains various canvas handling functions such as character | * This file contains various canvas handling functions such as character | |||
skipping to change at line 40 | skipping to change at line 40 | |||
# endif | # endif | |||
# if defined(HAVE_SYS_IOCTL_H) | # if defined(HAVE_SYS_IOCTL_H) | |||
# include <sys/ioctl.h> | # include <sys/ioctl.h> | |||
# endif | # endif | |||
#endif | #endif | |||
#include "caca.h" | #include "caca.h" | |||
#include "caca_internals.h" | #include "caca_internals.h" | |||
#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 | #if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 | |||
# if !HAVE_VSNPRINTF_S | ||||
int vsnprintf_s(char *s, size_t n, size_t c, | int vsnprintf_s(char *s, size_t n, size_t c, | |||
const char *fmt, va_list ap) CACA_WEAK; | const char *fmt, va_list ap) CACA_WEAK; | |||
# endif | ||||
# if !HAVE_VSNPRINTF | ||||
int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; | int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; | |||
# endif | ||||
#endif | #endif | |||
/** \brief Set cursor position. | /** \brief Set cursor position. | |||
* | * | |||
* Put the cursor at the given coordinates. Functions making use of the | * Put the cursor at the given coordinates. Functions making use of the | |||
* cursor will use the new values. Setting the cursor position outside the | * cursor will use the new values. Setting the cursor position outside the | |||
* canvas is legal but the cursor will not be shown. | * canvas is legal but the cursor will not be shown. | |||
* | * | |||
* This function never fails. | * This function never fails. | |||
* | * | |||
skipping to change at line 613 | skipping to change at line 617 | |||
caca_add_dirty_rect(cv, 0, 0, cv->width, cv->height); | caca_add_dirty_rect(cv, 0, 0, cv->width, cv->height); | |||
return 0; | return 0; | |||
} | } | |||
/* | /* | |||
* Functions for the mingw32 runtime | * Functions for the mingw32 runtime | |||
*/ | */ | |||
#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 | #if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 | |||
# if !HAVE_VSNPRINTF_S | ||||
int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap) | int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap) | |||
{ | { | |||
return vsnprintf(s, n, fmt, ap); | return vsnprintf(s, n, fmt, ap); | |||
} | } | |||
# endif | ||||
# if !HAVE_VSNPRINTF | ||||
int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) | int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) | |||
{ | { | |||
return 0; | return 0; | |||
} | } | |||
# endif | ||||
#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); | ||||
End of changes. 9 change blocks. | ||||
3 lines changed or deleted | 11 lines changed or added |