notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lots of functions made static (some had to be moved)

Browse source
This commit is contained in:
Albert Cahalan 2009-11-22 23:17:35 +00:00
parent 463564076f
commit 3d15a468cd
11 changed files with 884 additions and 916 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/fonts.h
View file

@ -68,14 +68,12 @@
extern SDL_Thread *font_thread;
extern volatile long font_thread_done, font_thread_aborted;
extern volatile long font_thread_done;
extern volatile long waiting_for_fonts;
extern int font_scanner_pid;
extern int font_socket_fd;
extern int no_system_fonts;
extern int all_locale_fonts;
extern int was_bad_font;
/* FIXME: SDL_ttf is up to 2.0.8, so we can probably fully remove this;
-bjk 2007.06.05 */
@ -106,13 +104,8 @@ typedef struct TuxPaint_Font_s {
int TuxPaint_Font_FontHeight(TuxPaint_Font * tpf);
TuxPaint_Font *try_alternate_font(int size);
TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size);
int load_user_fonts(SDL_Surface * screen, void *vp, const char *restrict locale);
#ifdef FORKED_FONTS
void reliable_write(int fd, const void *buf, size_t count);
void reliable_read(int fd, void *buf, size_t count);
void run_font_scanner(SDL_Surface * screen, const char *restrict locale);
void receive_some_font_info(SDL_Surface * screen);
#endif
@ -171,7 +164,6 @@ extern TuxPaint_Font *medium_font, *small_font, *large_font, *locale_font;
extern family_info **user_font_families;
extern int num_font_families;
extern int num_font_families_max;
extern style_info **user_font_styles;
extern int num_font_styles;
@ -179,19 +171,8 @@ extern int num_font_styles_max;
extern int button_label_y_nudge;
int compar_fontgroup(const void *v1, const void *v2);
int compar_fontkiller(const void *v1, const void *v2);
int compar_fontscore(const void *v1, const void *v2);
void parse_font_style(style_info * si);
void groupfonts_range(style_info ** base, int count);
void dupe_markdown_range(family_info ** base, int count);
void groupfonts(void);
TuxPaint_Font *getfonthandle(int desire);
void loadfonts(SDL_Surface * screen, const char *const dir);
int do_surfcmp(const SDL_Surface * const *const v1,
const SDL_Surface * const *const v2);
int surfcmp(const void *s1, const void *s2);
int charset_works(TuxPaint_Font * font, const char *s);
TuxPaint_Font * TuxPaint_Font_OpenFont(const char * pangodesc, const char * ttffilename, int size);
@ -199,9 +180,10 @@ void TuxPaint_Font_CloseFont(TuxPaint_Font * tpf);
const char * TuxPaint_Font_FontFaceFamilyName(TuxPaint_Font * tpf);
const char * TuxPaint_Font_FontFaceStyleName(TuxPaint_Font * tpf);
#ifndef NO_SDLPANGO
void sdl_color_to_pango_color(SDL_Color sdl_color,
SDLPango_Matrix * pango_color);
#ifdef NO_SDLPANGO
TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size);
#else
void sdl_color_to_pango_color(SDL_Color sdl_color, SDLPango_Matrix *pango_color);
#endif
#endif