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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

…		…
43	const char *name;	43	const char *name;
44	} fallback_fonts[] = {	44	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		48
49	#if ENCODING_EU	49	#if ENCODING_EU
50	// cyrillic	50	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		53
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		67
68	# if XFT	68	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	69	{ CS_KOI8_U, "xft::lang=ru" },
70		70
71	{ CS_ISO8859_5, "xft::lang=ru" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	73	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	74	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
231	void	231	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	233	{
234	dTermDisplay;	234	dTermDisplay;
235	dTermGC;	235	dTermGC;
236		236
237	if (color == Color_bg \|\| color == Color_transparent)	237	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
239	else if (color >= 0)	239	else if (color >= 0)
240	{	240	{
241	#if XFT	241	#if XFT
		242	bool done = false;
		243	#ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
		245	{
		246	Picture dst = XftDrawPicture (d);
		247	if (dst != 0)
		248	{
		249	XClearArea (disp, d, x, y, w, h, false);
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	done = true;
		253	}
		254	}
		255	#endif
		256	if (!done)
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
243	#else	258	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	261	#endif
247	}	262	}
248	}	263	}
249		264
250	/////////////////////////////////////////////////////////////////////////////	265	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		266
254	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
256		269
257	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
293	return false;	306	return false;
294		307
295	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
296	return true;	309	return true;
297		310
		311	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	314	return true;
		315	#endif
301		316
302	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
303	return true;	318	return true;
304		319
305	switch (unicode)	320	switch (unicode)
…		…
341	;	356	;
342		357
343	int width = text - tp;	358	int width = text - tp;
344	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
345		360
		361	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
347	{	363	{
		364	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
351		368
352	int W = fwidth;	369	int W = fwidth;
…		…
390		407
391	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
392	if (a)	409	if (a)
393	{	410	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		412
396	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
400		417
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
420	break;	437	break;
421	}	438	}
422	}	439	}
423	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
424	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	447	{
427	min_it (width, 2); // we only support wcwidth up to 2	448	min_it (width, 2); // we only support wcwidth up to 2
428		449
…		…
497	unsigned long value;	518	unsigned long value;
498		519
499	if (XGetFontProperty (f, property, &value))	520	if (XGetFontProperty (f, property, &value))
500	return XGetAtomName (term->dpy, value);	521	return XGetAtomName (term->dpy, value);
501	else	522	else
502	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
503	}	524	}
504		525
505	rxvt_fontprop	526	rxvt_fontprop
506	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
507	{	528	{
…		…
659	f = 0;	680	f = 0;
660	}	681	}
661		682
662	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
663	{	684	{
664	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
665	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
666	? "medium" : "bold");	687	? "medium" : "bold");
667	set_name (strdup (fname));	688	set_name (strdup (fname));
668	}	689	}
669		690
…		…
813	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	834	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814		835
815	if (encm)	836	if (encm)
816	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
817	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818		839
819	while (N)	840	while (N)
820	{	841	{
821	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
822	width = f->per_char[N].width;	843	width = f->per_char[N].width;
823		844
…		…
975	else	996	else
976	{	997	{
977	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978		999
979	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
980		1001
981	if (slow)	1002	if (slow)
982	{	1003	{
983	do	1004	do
984	{	1005	{
985	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
…		…
1007	else	1028	else
1008	{	1029	{
1009	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010		1031
1011	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1012		1033
1013	if (slow)	1034	if (slow)
1014	{	1035	{
1015	do	1036	do
1016	{	1037	{
1017	if (*xc)	1038	if (*xc)
…		…
1043		1064
1044	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1045	const text_t *text, int len,	1066	const text_t *text, int len,
1046	int fg, int bg);	1067	int fg, int bg);
1047		1068
1048	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1069	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049		1070
1050	protected:	1071	protected:
1051	XftFont *f;	1072	XftFont *f;
1052	};	1073	};
1053		1074
…		…
1272	dTermGC;	1293	dTermGC;
1273		1294
1274	int w = term->fwidth * len;	1295	int w = term->fwidth * len;
1275	int h = term->fheight;	1296	int h = term->fheight;
1276		1297
1277	bool buffered = bg >= 0 // we don't use a transparent bg	1298	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1299	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1300	* good idea from the perspective of packaging for wide variety of user configs.
		1301	*/
		1302	bool buffered = true
1278	#ifndef FORCE_UNBUFFERED_XFT	1303	#ifdef FORCE_UNBUFFERED_XFT
1279	# ifdef ENABLE_TRANSPARENCY	1304	&& bg >= 0
1280	\|\| !term->am_transparent // we aren't transparent
1281	# endif
1282	#endif	1305	#endif
1283	;	1306	;
1284
1285	// cut trailing spaces	1307	// cut trailing spaces
1286	while (len && text [len - 1] == ' ')	1308	while (len && text [len - 1] == ' ')
1287	len--;	1309	len--;
1288		1310
1289	int x_ = buffered ? 0 : x;	1311	int x_ = buffered ? 0 : x;
…		…
1294	int cwidth = term->fwidth;	1316	int cwidth = term->fwidth;
1295	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1296		1318
1297	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1298	text++, len--, cwidth += term->fwidth;	1320	text++, len--, cwidth += term->fwidth;
1299		1321
1300	if (fc != ' ') // skip spaces	1322	if (fc != ' ') // skip spaces
1301	{	1323	{
1302	FT_UInt glyph = XftCharIndex (disp, f, fc);	1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
1303	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304		1326
…		…
1315	x_ += cwidth;	1337	x_ += cwidth;
1316	}	1338	}
1317		1339
1318	if (buffered)	1340	if (buffered)
1319	{	1341	{
		1342	bool back_rendered = false;
1320	if (ep != enc)	1343	if (ep != enc)
1321	{	1344	{
1322	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1345	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323		1346
1324	if (0)	1347	#ifdef HAVE_BG_PIXMAP
1325	;
1326	#if defined(ENABLE_TRANSPARENCY) \|\| defined(XPM_BACKGROUND)
1327	else if (bg < 0 && term->bgPixmap.pixmap)	1348	if (term->bgPixmap.pixmap)
1328	{	1349	{
1329	if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w	1350	Picture dst = 0;
1330	&& term->bgPixmap.pmap_height >= y + term->window_vt_y+h)	1351
		1352	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1353	dst = XftDrawPicture (d2);
		1354
		1355	if (bg < 0 \|\| dst != 0)
1331	{	1356	{
		1357	int src_x = x, src_y = y ;
		1358
		1359	if (term->bgPixmap.is_parentOrigin ())
		1360	{
		1361	src_x += term->window_vt_x;
		1362	src_y += term->window_vt_y;
		1363	}
		1364
		1365	if (term->bgPixmap.pmap_width >= src_x+w
		1366	&& term->bgPixmap.pmap_height >= src_y+h)
		1367	{
1332	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,	1368	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1333	x + term->window_vt_x, y + term->window_vt_y,
1334	w, h, 0, 0);	1369	src_x, src_y, w, h, 0, 0);
1335	}	1370	}
1336	else	1371	else
1337	{	1372	{
1338	XGCValues gcv;	1373	XGCValues gcv;
1339		1374
1340	gcv.fill_style = FillTiled;	1375	gcv.fill_style = FillTiled;
1341	gcv.tile = term->bgPixmap.pixmap;	1376	gcv.tile = term->bgPixmap.pixmap;
1342	gcv.ts_x_origin = -x;	1377	gcv.ts_x_origin = -src_x;
1343	gcv.ts_y_origin = -y;	1378	gcv.ts_y_origin = -src_y;
1344		1379
1345	#if 0
1346	GC gc2 = XCreateGC (disp, d2,
1347	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1348	&gcv);
1349	#endif
1350	XChangeGC (disp, gc,	1380	XChangeGC (disp, gc,
1351	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1381	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1352	&gcv);	1382	&gcv);
1353		1383
1354	XFillRectangle (disp, d2, gc/gc2/, 0, 0, w, h);	1384	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1355		1385
1356	gcv.fill_style = FillSolid;	1386	gcv.fill_style = FillSolid;
1357	XChangeGC (disp, gc, GCFillStyle, &gcv);	1387	XChangeGC (disp, gc, GCFillStyle, &gcv);
1358	/* XFreeGC (disp, gc2); */	1388	}
1359		1389
		1390	if (bg >= 0)
		1391	{
		1392	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1393	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1394	}
		1395
		1396	back_rendered = true;
1360	}	1397	}
1361	}	1398	}
1362	#endif	1399	#endif
1363	else	1400
		1401	if (bg >= 0 && !back_rendered)
1364	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1402	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1365		1403
1366	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1404	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1367	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1405	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1368	}	1406	}
…		…
1413		1451
1414	rxvt_font *	1452	rxvt_font *
1415	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1416	{	1454	{
1417	rxvt_font *f;	1455	rxvt_font *f;
1418		1456
1419	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1420	{	1458	{
1421	name = "";	1459	name = "";
1422	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1423	}	1461	}
…		…
1642	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1643	{	1681	{
1644	char fontname[4096];	1682	char fontname[4096];
1645	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1646		1684
1647	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1648	}	1686	}
1649		1687
1650	free (font);	1688	free (font);
1651	}	1689	}
1652	#endif	1690	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs. Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC