16 |
|
|
17 |
|
#define galloc(nv) (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv)) |
18 |
|
|
19 |
– |
|
19 |
|
int retainfonts = 0; /* retain loaded fonts? */ |
20 |
|
|
21 |
|
static FONT *fontlist = NULL; /* list of loaded fonts */ |
26 |
|
char *fname |
27 |
|
) |
28 |
|
{ |
29 |
+ |
char embuf[512]; |
30 |
|
FILE *fp; |
31 |
|
char *pathname, *err = NULL; |
32 |
|
unsigned wsum, hsum, ngly; |
42 |
|
} |
43 |
|
/* load the font file */ |
44 |
|
if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) { |
45 |
< |
sprintf(errmsg, "cannot find font file \"%s\"", fname); |
46 |
< |
error(SYSTEM, errmsg); |
45 |
> |
sprintf(embuf, "cannot find font file \"%s\"\n", fname); |
46 |
> |
eputs(embuf); |
47 |
> |
return(NULL); |
48 |
|
} |
49 |
+ |
if ((fp = fopen(pathname, "r")) == NULL) { |
50 |
+ |
sprintf(embuf, "cannot open font file \"%s\"\n", pathname); |
51 |
+ |
eputs(embuf); |
52 |
+ |
return(NULL); |
53 |
+ |
} |
54 |
|
f = (FONT *)calloc(1, sizeof(FONT)); |
55 |
|
if (f == NULL) |
56 |
|
goto memerr; |
57 |
< |
f->name = savestr(fname); |
57 |
> |
strcpy(f->name, fname); |
58 |
|
f->nref = 1; |
53 |
– |
if ((fp = fopen(pathname, "r")) == NULL) { |
54 |
– |
sprintf(errmsg, "cannot open font file \"%s\"", |
55 |
– |
pathname); |
56 |
– |
error(SYSTEM, errmsg); |
57 |
– |
} |
59 |
|
wsum = hsum = ngly = 0; /* get each glyph */ |
60 |
|
while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) { |
61 |
|
if (ngv == 0) |
73 |
|
err = "bad # vertices for"; |
74 |
|
goto fonterr; |
75 |
|
} |
76 |
+ |
if (ngv > f->maxgv) |
77 |
+ |
f->maxgv = ngv; |
78 |
|
g = galloc(ngv); |
79 |
|
if (g == NULL) |
80 |
|
goto memerr; |
116 |
|
f->next = fontlist; |
117 |
|
return(fontlist = f); |
118 |
|
nonint: |
119 |
< |
sprintf(errmsg, "non-integer in font file \"%s\"", pathname); |
120 |
< |
error(USER, errmsg); |
119 |
> |
sprintf(embuf, "non-integer in font file \"%s\"\n", pathname); |
120 |
> |
eputs(embuf); |
121 |
> |
fclose(fp); |
122 |
> |
return(NULL); |
123 |
|
fonterr: |
124 |
< |
sprintf(errmsg, "%s character (%d) in font file \"%s\"", |
124 |
> |
sprintf(embuf, "%s character (%d) in font file \"%s\"\n", |
125 |
|
err, gn, pathname); |
126 |
< |
error(USER, errmsg); |
126 |
> |
eputs(embuf); |
127 |
> |
fclose(fp); |
128 |
> |
return(NULL); |
129 |
|
memerr: |
130 |
< |
error(SYSTEM, "out of memory in fontglyph"); |
131 |
< |
return NULL; /* pro forma return */ |
130 |
> |
eputs("out of memory in getfont()\n"); |
131 |
> |
fclose(fp); |
132 |
> |
return(NULL); |
133 |
|
} |
134 |
|
|
135 |
|
|
142 |
|
FONT *fl, *f; |
143 |
|
int i; |
144 |
|
/* check reference count */ |
145 |
< |
if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts)) |
145 |
> |
if (fnt != NULL && ((fnt->nref -= (f->nref > 0)) | retainfonts)) |
146 |
|
return; |
147 |
|
head.next = fontlist; |
148 |
|
fl = &head; |
152 |
|
for (i = 0; i < 256; i++) |
153 |
|
if (f->fg[i] != NULL) |
154 |
|
free((void *)f->fg[i]); |
147 |
– |
freestr(f->name); |
155 |
|
free((void *)f); |
156 |
|
} else |
157 |
|
fl = f; |