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

Attempting to debug/fix SDL_Pango stuff.

Browse source 
Added icon for Kalidescope magic tool.
Added Canada map starter.
Added Japan map starter.
Improved comments near gettext() calls to improve POT and PO files.
Regenerated PO files and POT file.
Added .cvsignore to make sure tp_magic_api.h (which is generated) isn't noticed.
This commit is contained in:
William Kendrick 2007-07-17 18:41:16 +00:00
parent 21d9cf24be
commit 21ea42f38f
93 changed files with 21568 additions and 10201 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/fonts.c
View file

@ -242,19 +242,22 @@ void TuxPaint_Font_CloseFont(TuxPaint_Font * tpf)
TuxPaint_Font * TuxPaint_Font_OpenFont(const char * pangodesc, const char * ttffilename, int size)
{
TuxPaint_Font * tpf = NULL;
#ifndef NO_SDLPANGO
char desc[1024];
#endif
printf("OpenFont(%s, %s)\n", pangodesc, ttffilename);
printf("OpenFont(pango:\"%s\", ttf:\"%s\")\n", pangodesc, ttffilename);
#ifndef NO_SDLPANGO
char desc[1024];
if (pangodesc != NULL && pangodesc[0] != '\0')
{
tpf = (TuxPaint_Font *) malloc(sizeof(TuxPaint_Font));
tpf->typ = FONT_TYPE_PANGO;
snprintf(desc, sizeof(desc), "%s %d", pangodesc, (size * 3) / 4);
printf("Creating context: \"%s\"\n", desc);
tpf->pango_context = SDLPango_CreateContext_GivenFontDesc(desc);
if (tpf->pango_context == NULL)
{
@ -271,6 +274,8 @@ TuxPaint_Font * TuxPaint_Font_OpenFont(const char * pangodesc, const char * ttff
if (ttffilename != NULL && ttffilename[0] != '\0')
{
printf("Opening TTF\n"); fflush(stdout);
tpf = (TuxPaint_Font *) malloc(sizeof(TuxPaint_Font));
tpf->typ = FONT_TYPE_TTF;
tpf->ttf_font = TTF_OpenFont(ttffilename, size);
@ -281,7 +286,10 @@ TuxPaint_Font * TuxPaint_Font_OpenFont(const char * pangodesc, const char * ttff
tpf = NULL;
}
else
{
printf("Succeeded loading %s\n", ttffilename);
tpf->height = TTF_FontHeight(tpf->ttf_font);
}
}
return(tpf);
@ -1156,9 +1164,17 @@ TuxPaint_Font *getfonthandle(int desire)
char *pathname;
char description[1024];
if (fi == NULL)
{
printf("getfonthandle(%d) points to a NULL family\n", desire);
fflush(stdout);
return NULL;
}
if (fi->handle)
return fi->handle;
/*
#ifndef NO_SDLPANGO
snprintf(description, sizeof(description), "%s%s%s", fi->family,
(text_state ^ TTF_STYLE_ITALIC ? " italic" : ""),
@ -1171,6 +1187,7 @@ TuxPaint_Font *getfonthandle(int desire)
printf("getfonthandle(%d) asking SDL_Pango for %s\n", desire, description);
#else
*/
if (!name)
{
@ -1191,14 +1208,22 @@ TuxPaint_Font *getfonthandle(int desire)
sprintf(pathname, "%s/%s", fi->directory, name);
strcpy(description, "");
#endif
/* #endif */
fi->handle = TuxPaint_Font_OpenFont(description, pathname, text_sizes[text_size]);
// if the font doesn't load, we die -- it did load OK before though
#ifdef NO_SDLPANGO
/* #ifdef NO_SDLPANGO */
if (fi->handle->ttf_font == NULL)
{
printf("fi->handle->ttf_font is NULL!\n");
fflush(stdout);
return(NULL);
}
TTF_SetFontStyle(fi->handle->ttf_font, missing);
#endif
/* #endif */
return fi->handle;
}