[ViewVC] Diff of: cvs/rxvt-unicode/src/defaultfont.C

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

…		…
1	/---------------------------------C----------------------------------;	1	/---------------------------------C----------------------------------;
2	* File: defaultfont.C	2	* File: defaultfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003 Marc Lehmann rxvt@plan9.de>	4	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
29	#define DRAWABLE r->TermWin.vt
30	#define GC r->TermWin.gc	29	#define GC r->TermWin.gc
31		30
32	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
33	codeset cs;	32	codeset cs;
34	const char *name;	33	const char *name;
…		…
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	76	# endif
		77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
		80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },	85	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },	86	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },	87	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },	88	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	89	#endif
87		90
88	#if XFT	91	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	92	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	93	{ CS_UNICODE, "xft:Arial Unicode MS" },
…		…
93	{ CS_UNICODE, "xft:FreeMono" },	96	{ CS_UNICODE, "xft:FreeMono" },
94	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	97	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
95	{ CS_UNICODE, "----r-------c--iso10646-1" },	98	{ CS_UNICODE, "----r-------c--iso10646-1" },
96	{ CS_UNICODE, "----r-------m--iso10646-1" },	99	{ CS_UNICODE, "----r-------m--iso10646-1" },
97		100
		101	#if UNICODE_3 && XFT
		102	{ CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
		103	#endif
		104
98	{ CS_UNKNOWN, 0 }	105	{ CS_UNKNOWN, 0 }
99	};	106	};
100		107
101	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
102		109
		110	#if XFT
		111	rxvt_drawable::~rxvt_drawable ()
		112	{
		113	if (xftdrawable)
		114	XftDrawDestroy (xftdrawable);
		115	}
		116
		117	rxvt_drawable::operator XftDraw *()
		118	{
		119	if (!xftdrawable)
		120	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		121
		122	return xftdrawable;
		123	}
		124	#endif
		125
		126	/////////////////////////////////////////////////////////////////////////////
		127
103	static void *enc_buf;	128	static void *enc_buf;
104	static uint32_t enc_len;	129	static uint32_t enc_len;
105		130
106	static inline void *	131	static inline void *
107	get_enc_buf (int len)	132	get_enc_buf (uint32_t len)
108	{	133	{
109	if (len > enc_len)	134	if (len > enc_len)
110	{	135	{
111	free (enc_buf);	136	free (enc_buf);
112	enc_buf = malloc (len);	137	enc_buf = malloc (len);
…		…
114		139
115	return enc_buf;	140	return enc_buf;
116	}	141	}
117		142
118	static const char *	143	static const char *
119	enc_char (const text_t *text, int len, codeset cs, bool &zero)	144	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120	{	145	{
121	uint8_t buf = (uint8_t )get_enc_buf (len);	146	uint8_t buf = (uint8_t )get_enc_buf (len);
122		147
123	while (len--)	148	while (len--)
124	{	149	{
…		…
135		160
136	return (const char *)enc_buf;	161	return (const char *)enc_buf;
137	}	162	}
138		163
139	static const XChar2b *	164	static const XChar2b *
140	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	165	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141	{	166	{
142	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	167	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
143		168
144	while (len--)	169	while (len--)
145	{	170	{
…		…
160	}	185	}
161		186
162	/////////////////////////////////////////////////////////////////////////////	187	/////////////////////////////////////////////////////////////////////////////
163		188
164	void	189	void
165	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	190	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166	{	191	{
167	if (color == Color_bg)	192	if (color == Color_bg)
168	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	193	XClearArea (d.display->display, d, x, y, w, h, FALSE);
169	else if (color >= 0)	194	else if (color >= 0)
170	{	195	{
		196	#if XFT
		197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		198	#else
171	XSetForeground (DISPLAY, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, GC, r->PixColors[color]);
172	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		201	#endif
173	}	202	}
174	}	203	}
175		204
176	static const char *linedraw_cmds[128] = {	205	static const char *linedraw_cmds[128] = {
177	"1hH", "2hH", "1vV", "2vV",	206	"1hH", "2hH", "1vV", "2vV",
…		…
246		275
247	bool has_codepoint (uint32_t unicode)	276	bool has_codepoint (uint32_t unicode)
248	{	277	{
249	if (unicode <= 0x001f)	278	if (unicode <= 0x001f)
250	return true;	279	return true;
		280
251	if (unicode >= 0x0080 && unicode <= 0x009f)	281	if (unicode >= 0x0080 && unicode <= 0x009f)
252	return true;	282	return true;
253		283
254	if (unicode >= 0x2500 && unicode <= 0x257f	284	if (unicode >= 0x2500 && unicode <= 0x257f
255	&& linedraw_cmds[unicode - 0x2500])	285	&& linedraw_cmds[unicode - 0x2500])
		286	return true;
		287
		288	if (IS_COMPOSE (unicode))
256	return true;	289	return true;
257		290
258	switch (unicode)	291	switch (unicode)
259	{	292	{
260	case ZERO_WIDTH_CHAR:	293	case ZERO_WIDTH_CHAR:
…		…
262	}	295	}
263		296
264	return false;	297	return false;
265	}	298	}
266		299
267	void draw (int x, int y,	300	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	301	const text_t *text, int len,
269	int fg, int bg);	302	int fg, int bg);
270	};	303	};
271		304
272	void	305	void
273	rxvt_font_default::draw (int x, int y,	306	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	307	const text_t *text, int len,
275	int fg, int bg)	308	int fg, int bg)
276	{	309	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	310	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		311
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	312	XSetForeground (d.display->display, GC, r->PixColors[fg]);
280		313
281	while (len--)	314	while (len--)
282	{	315	{
		316	compose_char *cc;
283	text_t t = *text++;	317	text_t t = *text++;
284		318
		319	// is it in our linedrawing table?
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	320	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286	{	321	{
287	const char *p = linedraw_cmds[t - 0x2500];	322	const char *p = linedraw_cmds[t - 0x2500];
288		323
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	324	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	325	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
291		326
292	XGCValues gcv;	327	XGCValues gcv;
293		328
294	while (*p)	329	while (*p)
295	{	330	{
296	switch (*p++)	331	switch (*p++)
297	{	332	{
298	case '1':	333	case '1':
299	gcv.line_width = 0;	334	gcv.line_width = 0;
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	335	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301	break;	336	break;
302		337
303	case '2':	338	case '2':
304	gcv.line_width = 2;	339	gcv.line_width = 2;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	340	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306	break;	341	break;
307		342
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	343	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
309	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	344	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
310	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	345	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
311	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	346	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
312	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;	347	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
313	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;	348	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314	}	349	}
315	}	350	}
316		351
317	gcv.line_width = 0;	352	gcv.line_width = 0;
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	353	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		354	}
		355	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
		356	{
		357	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		358	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		359	if (cc->c2 != NOCHAR)
		360	{
		361	// prefer font of first character, for no good reasons
		362	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		363	? f1
		364	: (*fs)[fs->find_font (cc->c2)];
		365
		366	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		367	}
319	}	368	}
320	else	369	else
321	switch (*text++)	370	switch (t)
322	{	371	{
323	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	372	case ZERO_WIDTH_CHAR:
325	break;	373	break;
326	default:	374	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	375	int w = 0;
		376	while (len > 0 && *text == NOCHAR)
		377	{
		378	++text;
		379	--len;
		380	w += r->TermWin.fwidth;
		381	}
		382
		383	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		384	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		385	x += w;
328	}	386	}
329		387
330	x += r->TermWin.fwidth;	388	x += r->TermWin.fwidth;
331	}	389	}
332	}	390	}
…		…
337	rxvt_font_x11 () { f = 0; }	395	rxvt_font_x11 () { f = 0; }
338		396
339	void clear ();	397	void clear ();
340		398
341	rxvt_fontprop properties ();	399	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		400
344	bool load (const rxvt_fontprop &prop);	401	bool load (const rxvt_fontprop &prop);
345		402
346	bool has_codepoint (uint32_t unicode);	403	bool has_codepoint (uint32_t unicode);
347		404
348	void draw (int x, int y,	405	void draw (rxvt_drawable &d, int x, int y,
349	const text_t *text, int len,	406	const text_t *text, int len,
350	int fg, int bg);	407	int fg, int bg);
351		408
352	XFontStruct *f;	409	XFontStruct *f;
353	codeset cs;	410	codeset cs;
354	bool enc2b, encm;	411	bool enc2b, encm;
355		412
356	const char get_property (XFontStruct f, const char property, const char repl) const;	413	const char get_property (XFontStruct f, const char property, const char repl) const;
		414	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		415	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		416	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	417	};
358		418
359	const char *	419	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	420	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	421	{
…		…
368	}	428	}
369		429
370	rxvt_fontprop	430	rxvt_fontprop
371	rxvt_font_x11::properties ()	431	rxvt_font_x11::properties ()
372	{	432	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	433	rxvt_fontprop p;
		434	set_properties (p, f);
		435	return p;
		436	}
380		437
		438	bool
		439	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		440	{
		441	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		442	p.height = height;
		443	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		444	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		445
		446	return true;
		447	}
		448
		449	bool
		450	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		451	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	452	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	453	const char *slant = get_property (f, "SLANT", "r");
383		454
		455	unsigned long height;
		456	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		457	return false;
		458
384	unsigned long avgwidth;	459	unsigned long avgwidth;
385	p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)	460	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
386	? avgwidth / 10	461	avgwidth = 0;
387	: (height + 1) / 2;
388	p.height = height;
389	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391		462
392	return p;	463	return set_properties (p, height, weight, slant, avgwidth);
		464	}
		465
		466	bool
		467	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		468	{
		469	int slashes = 0;
		470	const char *comp[13];
		471
		472	for (const char c = name; c; c++)
		473	if (*c == '-')
		474	{
		475	comp[slashes++] = c + 1;
		476	if (slashes >= 13)
		477	break;
		478	}
		479
		480	/* can we short-circuit the costly XLoadQueryFont? */
		481	if (slashes >= 13
		482	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		483	&& (comp[11] >= '0' && comp[11] <= '9'))
		484	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		485
		486	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		487
		488	if (f)
		489	{
		490	// the font should really exist now. if not, we have a problem
		491	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		492	// in that case, just return garbage.
		493	bool ret = set_properties (p, f);
		494	XFreeFont (DISPLAY, f);
		495	return ret;
		496	}
		497	else
		498	return false;
		499	}
		500
		501	// fix the size of scalable fonts
		502	static void
		503	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		504	{
		505	int slashes = 0;
		506	const char *size;
		507
		508	for (const char c = name; c; c++)
		509	if (*c == '-')
		510	{
		511	if (slashes == 6)
		512	size = c + 1;
		513
		514	if (++slashes >= 13)
		515	break;
		516	}
		517
		518	if (slashes >= 13 && size[0] == '0')
		519	{
		520	strncpy (buf, name, size - name);
		521	buf += size - name;
		522	buf += sprintf (buf, "%d", prop.height);
		523	strcpy (buf, size + 1);
		524	}
		525	else
		526	strcpy (buf, name);
393	}	527	}
394		528
395	bool	529	bool
396	rxvt_font_x11::load (const rxvt_fontprop &prop)	530	rxvt_font_x11::load (const rxvt_fontprop &prop)
397	{	531	{
398	clear ();	532	clear ();
399		533
400	char **list;	534	char **list;
401	int count;	535	int count;
402	XFontStruct *info;
403	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	536	list = XListFonts (DISPLAY, name, 512, &count);
		537	set_name (0);
404		538
405	if (!list)	539	if (!list)
406	return false;	540	return false;
407		541
408	int bestdiff = 0x7fffffff;	542	int bestdiff = 0x7fffffff;
409	XFontStruct *best = 0;
410	for (int i = 0; i < count; i++)	543	for (int i = 0; i < count; i++)
411	{	544	{
412	XFontStruct *f = info + i;	545	rxvt_fontprop p;
		546	char fname[1024];
		547	fix_scalable (fname, list[i], prop);
413		548
		549	if (!set_properties (p, fname))
		550	continue;
		551
414	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	552	if (p.height > prop.height) // weed out too large fonts
415	{	553	continue;
416	rxvt_fontprop p = properties (f);	554
417	int diff = (prop.height - f->ascent + f->descent) * 32	555	int diff = (prop.height - p.height) * 32
418	+ abs (prop.weight - p.weight)	556	+ abs (prop.weight - p.weight)
419	+ abs (prop.slant - p.slant );	557	+ abs (prop.slant - p.slant );
420		558
421	if (!best // compare against best found so far	559	if (!name // compare against best found so far
422	\|\| diff < bestdiff)	560	\|\| diff < bestdiff)
423	{	561	{
424	best = f;	562	set_name (strdup (fname));
425	bestdiff = diff;	563	bestdiff = diff;
426	}	564	}
427	}
428	}	565	}
429		566
		567	XFreeFontNames (list);
		568
430	if (!best)	569	if (!name)
431	return false;	570	return false;
432
433	set_name (strdup (list[best - info]));
434
435	XFreeFontInfo (list, info, count);
436		571
437	f = XLoadQueryFont (DISPLAY, name);	572	f = XLoadQueryFont (DISPLAY, name);
438		573
439	if (!f)	574	if (!f)
440	return false;	575	return false;
441
442	unsigned long value;
443		576
444	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	577	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	578	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446		579
447	if (registry && encoding)	580	if (registry && encoding)
…		…
534	/* check wether the character exists in _this_ font. horrible. */	667	/* check wether the character exists in _this_ font. horrible. */
535	XCharStruct *xcs;	668	XCharStruct *xcs;
536		669
537	if (encm)	670	if (encm)
538	{	671	{
539	int byte1 = ch >> 8;	672	unsigned char byte1 = ch >> 8;
540	int byte2 = ch & 255;	673	unsigned char byte2 = ch & 255;
541		674
542	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	675	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
543	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	676	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
544	return false;	677	return false;
545		678
…		…
568		701
569	return true;	702	return true;
570	}	703	}
571		704
572	void	705	void
573	rxvt_font_x11::draw (int x, int y,	706	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
574	const text_t *text, int len,	707	const text_t *text, int len,
575	int fg, int bg)	708	int fg, int bg)
576	{	709	{
577	// this looks like a mess /.	710	// this looks like a mess /.
578	// and it is a mess /.	711	// and it is a mess /.
…		…
594	{	727	{
595	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	728	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
596		729
597	if (bg == Color_bg && !slow)	730	if (bg == Color_bg && !slow)
598	{	731	{
599	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	732	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
600	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	733	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
601	}	734	}
602	else	735	else
603	{	736	{
604	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	737	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
605		738
606	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	739	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
607		740
608	if (slow)	741	if (slow)
609	{	742	{
610	do	743	do
611	{	744	{
612	if (xc->byte1 \|\| xc->byte2)	745	if (xc->byte1 \|\| xc->byte2)
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	746	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
614		747
615	x += r->TermWin.fwidth;	748	x += r->TermWin.fwidth;
616	xc++; len--;	749	xc++; len--;
617	}	750	}
618	while (len);	751	while (len);
619	}	752	}
620	else	753	else
621	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	754	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
622	}	755	}
623	}	756	}
624	else	757	else
625	{	758	{
626	const char *xc = enc_char (text, len, cs, slow);	759	const char *xc = enc_char (text, len, cs, slow);
627		760
628	if (bg == Color_bg && !slow)	761	if (bg == Color_bg && !slow)
629	{	762	{
630	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	763	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
631	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	764	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
632	}	765	}
633	else	766	else
634	{	767	{
635	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	768	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
636		769
637	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	770	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
638		771
639	if (slow)	772	if (slow)
640	{	773	{
641	do	774	do
642	{	775	{
643	if (*xc)	776	if (*xc)
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	777	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
645		778
646	x += r->TermWin.fwidth;	779	x += r->TermWin.fwidth;
647	xc++; len--;	780	xc++; len--;
648	}	781	}
649	while (len);	782	while (len);
650	}	783	}
651	else	784	else
652	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	785	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
653	}	786	}
654	}	787	}
655	}	788	}
656		789
657	/////////////////////////////////////////////////////////////////////////////	790	/////////////////////////////////////////////////////////////////////////////
…		…
662	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	795	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
663	#define SWATHBITS 8	796	#define SWATHBITS 8
664	#endif	797	#endif
665		798
666	struct rxvt_font_xft : rxvt_font {	799	struct rxvt_font_xft : rxvt_font {
667	rxvt_font_xft () { f = 0; d = 0; }	800	rxvt_font_xft () { f = 0; }
668		801
669	void clear ();	802	void clear ();
670		803
671	rxvt_fontprop properties ();	804	rxvt_fontprop properties ();
672		805
673	bool load (const rxvt_fontprop &prop);	806	bool load (const rxvt_fontprop &prop);
674		807
675	void draw (int x, int y,	808	void draw (rxvt_drawable &d, int x, int y,
676	const text_t *text, int len,	809	const text_t *text, int len,
677	int fg, int bg);	810	int fg, int bg);
678		811
679	bool has_codepoint (uint32_t unicode);	812	bool has_codepoint (uint32_t unicode);
680		813
681	protected:	814	protected:
682	XftFont *f;	815	XftFont *f;
683	XftDraw *d;
684	};	816	};
685		817
686	void	818	void
687	rxvt_font_xft::clear ()	819	rxvt_font_xft::clear ()
688	{	820	{
689	if (f)	821	if (f)
690	{	822	{
691	XftFontClose (DISPLAY, f);	823	XftFontClose (DISPLAY, f);
692	f = 0;	824	f = 0;
693	}
694
695	if (d)
696	{
697	XftDrawDestroy (d);
698	d = 0;
699	}	825	}
700	}	826	}
701		827
702	rxvt_fontprop	828	rxvt_fontprop
703	rxvt_font_xft::properties ()	829	rxvt_font_xft::properties ()
…		…
736	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	862	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
737		863
738	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	864	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
739	FcPatternAddInteger (p, FC_SLANT, prop.slant);	865	FcPatternAddInteger (p, FC_SLANT, prop.slant);
740		866
		867	#if 0 // clipping unfortunately destroys our precious double-width-characters
741	// clip width, we can't do better, or can we?	868	// clip width, we can't do better, or can we?
742	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	869	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
743	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);	870	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		871	#endif
744		872
745	//FcPatternAddBool (p, FC_MINSPACE, 1);	873	//FcPatternAddBool (p, FC_MINSPACE, 1);
746		874
747	XftResult result;	875	XftResult result;
748	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	876	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
…		…
808	{	936	{
809	return XftCharExists (DISPLAY, f, unicode);	937	return XftCharExists (DISPLAY, f, unicode);
810	}	938	}
811		939
812	void	940	void
813	rxvt_font_xft::draw (int x, int y,	941	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
814	const text_t *text, int len,	942	const text_t *text, int len,
815	int fg, int bg)	943	int fg, int bg)
816	{	944	{
817	if (!d)
818	{
819	dR;
820	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
821	}
822
823	if (bg >= 0 && bg != Color_bg)
824	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
825	else
826	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	945	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
827		946
828	if (!slow && width == r->TermWin.fwidth)	947	if (!slow && width == r->TermWin.fwidth && 0)
829	{	948	{
830	if (sizeof (text_t) == sizeof (FcChar16))	949	if (sizeof (text_t) == sizeof (FcChar16))
831	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	950	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
832	else	951	else
833	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	952	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
836	{	955	{
837	while (len)	956	while (len)
838	{	957	{
839	if (text != NOCHAR && text != ' ')	958	if (text != NOCHAR && text != ' ')
840	{	959	{
		960	int fwidth = r->TermWin.fwidth;
		961	if (len >= 2 && text[1] == NOCHAR)
		962	fwidth *= 2;
		963
		964	XGlyphInfo extents;
841	if (sizeof (text_t) == sizeof (FcChar16))	965	if (sizeof (text_t) == sizeof (FcChar16))
842	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	966	{
		967	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		968	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		969	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		970	}
843	else	971	else
844	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	972	{
		973	XGlyphInfo extents;
		974	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		975	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		976	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		977	}
845	}	978	}
846		979
847	x += r->TermWin.fwidth;	980	x += r->TermWin.fwidth;
848	text++;	981	text++;
849	len--;	982	len--;
…		…
853	#endif	986	#endif
854		987
855	/////////////////////////////////////////////////////////////////////////////	988	/////////////////////////////////////////////////////////////////////////////
856		989
857	rxvt_fontset::rxvt_fontset (rxvt_t r)	990	rxvt_fontset::rxvt_fontset (rxvt_t r)
858	#ifdef EXPLICIT_CONTEXT
859	: r(r)	991	: r (r)
860	#endif
861	{	992	{
862	clear ();	993	clear ();
863	}	994	}
864		995
865	rxvt_fontset::~rxvt_fontset ()	996	rxvt_fontset::~rxvt_fontset ()
…		…
868	}	999	}
869		1000
870	void	1001	void
871	rxvt_fontset::clear ()	1002	rxvt_fontset::clear ()
872	{	1003	{
873	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1004	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
874	FONT_UNREF (*i);	1005	FONT_UNREF (*i);
875		1006
876	fonts.clear ();	1007	fonts.clear ();
877	base_id = 0;	1008	base_id = 0;
878	base_prop.height = 0x7fffffff;	1009	base_prop.height = 0x7fffffff;
…		…
905	f = new rxvt_font_x11;	1036	f = new rxvt_font_x11;
906	}	1037	}
907	else	1038	else
908	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
909		1040
		1041	f->fs = this;
910	f->set_term (r);	1042	f->set_term (r);
911	f->set_name (strdup (name));	1043	f->set_name (strdup (name));
912		1044
913	f->cs = cs;	1045	f->cs = cs;
914	f->loaded = false;	1046	f->loaded = false;
…		…
932		1064
933	if (*desc == '[')	1065	if (*desc == '[')
934	{	1066	{
935	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1067	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
936		1068
937	const char *extra = desc++;	1069	//const char *extra = desc++; // not yet used
938		1070
939	desc = strchr (desc, ']');	1071	desc = strchr (desc, ']');
940		1072
941	if (!desc)	1073	if (!desc)
942	{	1074	{
…		…
981	}	1113	}
982		1114
983	return true;	1115	return true;
984	}	1116	}
985		1117
986	void	1118	bool
987	rxvt_fontset::populate (const char *desc)	1119	rxvt_fontset::populate (const char *desc)
988	{	1120	{
989	clear ();	1121	clear ();
990		1122
991	fonts.push_back (new_font (0, CS_UNICODE));	1123	fonts.push_back (new_font (0, CS_UNICODE));
…		…
995		1127
996	if (!base_id)	1128	if (!base_id)
997	base_id = 1;	1129	base_id = 1;
998		1130
999	// we currently need a base-font, no matter what	1131	// we currently need a base-font, no matter what
1000	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1132	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1001	{	1133	{
		1134	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1002	add_fonts ("fixed");	1135	add_fonts ("fixed");
1003	base_id = fonts.size () - 1;	1136	base_id = fonts.size () - 1;
1004	}	1137	}
1005		1138
1006	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1139	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1007	{	1140	return false;
1008	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1009	exit (1);
1010	}
1011		1141
1012	base_prop = fonts[base_id]->properties ();	1142	base_prop = fonts[base_id]->properties ();
		1143
		1144	return true;
1013	}	1145	}
1014		1146
1015	int	1147	int
1016	rxvt_fontset::find_font (uint32_t unicode)	1148	rxvt_fontset::find_font (uint32_t unicode)
1017	{	1149	{
1018	for (int i = 0; i < fonts.size (); i++)	1150	for (unsigned int i = 0; i < fonts.size (); i++)
1019	{	1151	{
1020	rxvt_font *f = fonts[i];	1152	rxvt_font *f = fonts[i];
1021		1153
1022	if (!f->loaded)	1154	if (!f->loaded)
1023	{	1155	{

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs. Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC