figfont.c (libcaca-0.99.beta19) | : | figfont.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 FIGlet and TOIlet font handling functions. | * This file contains FIGlet and TOIlet font handling functions. | |||
skipping to change at line 33 | skipping to change at line 33 | |||
#if !defined(__KERNEL__) | #if !defined(__KERNEL__) | |||
# include <stdio.h> | # include <stdio.h> | |||
# include <stdlib.h> | # include <stdlib.h> | |||
# include <string.h> | # include <string.h> | |||
#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_SPRINTF_S | ||||
int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK; | int sprintf_s(char *s, size_t n, const char *fmt, ...) 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 | |||
struct caca_charfont | struct caca_charfont | |||
{ | { | |||
int term_width; | int term_width; | |||
int x, y, w, h, lines; | int x, y, w, h, lines; | |||
enum { H_DEFAULT, H_KERN, H_SMUSH, H_NONE, H_OVERLAP } hmode; | enum { H_DEFAULT, H_KERN, H_SMUSH, H_NONE, H_OVERLAP } hmode; | |||
int hsmushrule; | int hsmushrule; | |||
uint32_t hardblank; | uint32_t hardblank; | |||
skipping to change at line 640 | skipping to change at line 644 | |||
} | } | |||
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_SPRINTF_S | ||||
int sprintf_s(char *s, size_t n, const char *fmt, ...) | int sprintf_s(char *s, size_t n, const char *fmt, ...) | |||
{ | { | |||
va_list args; | va_list args; | |||
int ret; | int ret; | |||
va_start(args, fmt); | va_start(args, fmt); | |||
ret = vsnprintf(s, n, fmt, args); | ret = vsnprintf(s, n, fmt, args); | |||
va_end(args); | va_end(args); | |||
return ret; | return ret; | |||
} | } | |||
# 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_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); | ||||
End of changes. 9 change blocks. | ||||
3 lines changed or deleted | 11 lines changed or added |