ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/font.c

Comparing ray/src/common/font.c (file contents):
Revision 2.14 by greg, Tue May 13 17:58:32 2003 UTC vs.
Revision 2.21 by greg, Fri Nov 19 21:56:48 2021 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	<	#include "standard.h"
10	>	#include <stdlib.h>
11
12	+	#include "paths.h"
13	+	#include "rtio.h"
14	+	#include "rterror.h"
15		#include "font.h"
16
17		#define galloc(nv)      (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
#	Line 20 | Line 23 | static FONT    *fontlist = NULL;       /* list of loaded fonts
23
24
25		FONT *
26	<	getfont(fname)                          /* return font fname */
27	<	char  *fname;
26	>	getfont(                        /* return font fname */
27	>	char  *fname
28	>	)
29		{
30		FILE  *fp;
31	<	char  *pathname, *err;
31	>	char  *pathname, *err = NULL;
32		unsigned  wsum, hsum, ngly;
33		int  gn, ngv, gv;
34	<	register GLYPH  *g;
34	>	GLYPH   *g;
35		GORD  *gp;
36	<	register FONT  *f;
36	>	FONT  *f;
37
38		for (f = fontlist; f != NULL; f = f->next)
39		if (!strcmp(f->name, fname)) {
#	Line 39 | Line 43 | char  *fname;
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(USER, errmsg);
46	>	error(SYSTEM, errmsg);
47		}
48		f = (FONT *)calloc(1, sizeof(FONT));
49		if (f == NULL)
#	Line 117 | Line 121 | fonterr:
121		error(USER, errmsg);
122		memerr:
123		error(SYSTEM, "out of memory in fontglyph");
124	+	return NULL; /* pro forma return */
125		}
126
127
128		void
129	<	freefont(fnt)                   /* release a font (free all if NULL) */
130	<	FONT *fnt;
129	>	freefont(                       /* release a font (free all if NULL) */
130	>	FONT *fnt
131	>	)
132		{
133		FONT  head;
134	<	register FONT  *fl, *f;
135	<	register int  i;
134	>	FONT  *fl, *f;
135	>	int  i;
136		/* check reference count */
137	<	if (fnt != NULL && (fnt->nref-- > 1 | retainfonts))
137	>	if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts))
138		return;
139		head.next = fontlist;
140		fl = &head;
141		while ((f = fl->next) != NULL)
142	<	if ((fnt == NULL | fnt == f)) {
142	>	if ((fnt == NULL) | (fnt == f)) {
143		fl->next = f->next;
144		for (i = 0; i < 256; i++)
145		if (f->fg[i] != NULL)
#	Line 147 | Line 153 | FONT *fnt;
153
154
155		int
156	<	uniftext(sp, tp, f)                     /* uniformly space text line */
157	<	register short  *sp;            /* returned character spacing */
158	<	register char  *tp;             /* text line */
159	<	register FONT  *f;              /* font */
156	>	uniftext(                       /* uniformly space text line */
157	>	short   *sp,            /* returned character spacing */
158	>	char  *tp,              /* text line */
159	>	FONT  *f                /* font */
160	>	)
161		{
162		int  linelen;
163
#	Line 165 | Line 172 | register FONT  *f;             /* font */
172
173
174		int
175	<	squeeztext(sp, tp, f, cis)              /* squeeze text line */
176	<	short  *sp;                     /* returned character spacing */
177	<	char  *tp;                      /* text line */
178	<	FONT  *f;                       /* font */
179	<	int  cis;                       /* intercharacter spacing */
175	>	squeeztext(             /* squeeze text line */
176	>	short  *sp,                     /* returned character spacing */
177	>	char  *tp,                      /* text line */
178	>	FONT  *f,                       /* font */
179	>	int  cis                        /* intercharacter spacing */
180	>	)
181		{
182		int  linelen;
183	<	register GLYPH  *gp;
183	>	GLYPH   *gp;
184
185		linelen = 0;
186		gp = NULL;
#	Line 200 | Line 208 | int  cis;                      /* intercharacter spacing */
208
209
210		int
211	<	proptext(sp, tp, f, cis, nsi)           /* space line proportionally */
212	<	short  *sp;                     /* returned character spacing */
213	<	char  *tp;                      /* text line */
214	<	FONT  *f;                       /* font */
215	<	int  cis;                       /* target intercharacter spacing */
216	<	int  nsi;                       /* minimum number of spaces for indent */
211	>	proptext(               /* space line proportionally */
212	>	short  *sp,                     /* returned character spacing */
213	>	char  *tp,                      /* text line */
214	>	FONT  *f,                       /* font */
215	>	int  cis,                       /* target intercharacter spacing */
216	>	int  nsi                        /* minimum number of spaces for indent */
217	>	)
218		{
219	<	register char  *end, *tab;
219	>	char  *end, *tab = NULL;
220		GLYPH  *gp;
221		short  *nsp;
222		int  alen, len, width;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)