goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

search path for font mroe sanely 

SVN revision: 1863
This commit is contained in:
Carsten Haitzler 2000-01-06 06:32:43 +00:00
parent cb1be843d7
commit df05d35899
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/font.c
View File

@ -168,36 +168,58 @@ __imlib_load_font(char *fontname)
memcpy(name, fontname, j); memcpy(name, fontname, j);
name[j] = 0; name[j] = 0;
/* find file if it exists */ /* find file if it exists */
for (j = 0; (j < fpath_num) && (!file); j++) tmp = malloc(strlen(name) + 4 + 1);
if (!tmp)
{ {
tmp = malloc(strlen(fpath[j]) + 1 + strlen(name) + 4 + 1); free(name);
if (!tmp) return NULL;
{ }
free(name); sprintf(tmp, "%s.ttf", name);
return NULL; if (__imlib_FileIsFile(tmp))
} file = strdup(tmp);
sprintf(tmp, "%s.ttf", name); else
{
sprintf(tmp, "%s.TTF", name);
if (__imlib_FileIsFile(tmp)) if (__imlib_FileIsFile(tmp))
file = strdup(tmp); file = strdup(tmp);
else else
{ {
sprintf(tmp, "%s/%s.ttf", fpath[j], name); sprintf(tmp, "%s", name);
if (__imlib_FileIsFile(tmp)) if (__imlib_FileIsFile(tmp))
file = strdup(tmp); file = strdup(tmp);
}
}
free(tmp);
if (!file)
{
for (j = 0; (j < fpath_num) && (!file); j++)
{
tmp = malloc(strlen(fpath[j]) + 1 + strlen(name) + 4 + 1);
if (!tmp)
{
free(name);
return NULL;
}
else else
{ {
sprintf(tmp, "%s/%s.TTF", fpath[j], name); sprintf(tmp, "%s/%s.ttf", fpath[j], name);
if (__imlib_FileIsFile(tmp)) if (__imlib_FileIsFile(tmp))
file = strdup(tmp); file = strdup(tmp);
else else
{ {
sprintf(tmp, "%s/%s", fpath[j], name); sprintf(tmp, "%s/%s.TTF", fpath[j], name);
if (__imlib_FileIsFile(tmp)) if (__imlib_FileIsFile(tmp))
file = strdup(tmp); file = strdup(tmp);
else
{
sprintf(tmp, "%s/%s", fpath[j], name);
if (__imlib_FileIsFile(tmp))
file = strdup(tmp);
}
} }
} }
free(tmp);
} }
free(tmp);
} }
free(name); free(name);
/* didnt find a file? abort */ /* didnt find a file? abort */