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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.142 by root, Wed Jan 23 14:54:52 2008 UTC

…		…
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	24	#include "rxvtutil.h"
26	#include "rxvtfont.h"	25	#include "rxvtfont.h"
27		26
28	#include <cstdlib>	27	#include <cstdlib>
29		28
…		…
237	if (color == Color_bg \|\| color == Color_transparent)	236	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
239	else if (color >= 0)	238	else if (color >= 0)
240	{	239	{
241	#if XFT	240	#if XFT
242	bool done = false;	241	Picture dst;
		242
243	#ifdef HAVE_BG_PIXMAP	243	# ifdef HAVE_BG_PIXMAP
244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)	244	if (term->bgPixmap.pixmap
245	{	245	&& !term->pix_colors[color].is_opaque ()
246	Picture dst = XftDrawPicture (d);	246	&& ((dst = XftDrawPicture (d))))
247	if (dst != 0)
248	{	247	{
249	XClearArea (disp, d, x, y, w, h, false);	248	XClearArea (disp, d, x, y, w, h, false);
		249
250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);	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);	251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252	done = true;
253	}	252	}
254	}	253	else
255	#endif	254	# endif
256	if (!done)
257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
258	#else	257	#else
259	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
260	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
261	#endif	260	#endif
262	}	261	}
…		…
306	return false;	305	return false;
307		306
308	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
309	return true;	308	return true;
310		309
		310	#ifdef BUILTIN_GLYPHS
311	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
312	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
313	return true;	313	return true;
		314	#endif
314		315
315	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
316	return true;	317	return true;
317		318
318	switch (unicode)	319	switch (unicode)
…		…
608	return false;	609	return false;
609	}	610	}
610		611
611	// fix the size of scalable fonts	612	// fix the size of scalable fonts
612	static bool	613	static bool
613	replace_field (char buf, const char name, int index, const char old, const char *replace)	614	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
614	{	615	{
615	int slashes = 0;	616	int slashes = 0;
616	const char field, end;	617	const char field, end;
617		618
618	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
628	break;	629	break;
629	}	630	}
630		631
631	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
632	{	633	{
633	// TODO: check for overflow in font-name	634	size_t len = field - name;
634	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	636	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
637	strcat (buf, end);	638	strcat (*ptr, end);
638		639
639	return true;	640	return true;
640	}	641	}
641	else	642	else
642	{	643	{
643	strcpy (buf, name);	644	*ptr = strdup (name);
644		645
645	return false;	646	return false;
646	}	647	}
647	}	648	}
648		649
…		…
656	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
657		658
658	// first morph the font if required	659	// first morph the font if required
659	if (force_prop)	660	if (force_prop)
660	{	661	{
661	char fname[1024];	662	char *fname;
662		663
663	if (name[0] != '-')	664	if (name[0] != '-')
664	{	665	{
665	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
666		667
…		…
678	f = 0;	679	f = 0;
679	}	680	}
680		681
681	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
682	{	683	{
683	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
684	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
685	? "medium" : "bold");	686	? "medium" : "bold");
686	set_name (strdup (fname));	687	set_name (fname);
687	}	688	}
688		689
689	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
690	{	691	{
691	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
692	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
693	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
694	set_name (strdup (fname));	695	set_name (fname);
695	}	696	}
696	}	697	}
697		698
698	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699	? 0 : prop.height);	700	? 0 : prop.height);
…		…
724	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
725		726
726	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
727	{	728	{
728	rxvt_fontprop p;	729	rxvt_fontprop p;
729	char fname[1024];	730	char *fname;
730		731
731	int diff = 0;	732	int diff = 0;
732		733
733	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
734	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
735	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
736	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
737		742
738	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
739	continue;	744	continue;
740		745
741	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
745	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	750	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
746	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	751	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
747	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	752	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	753	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749		754
750	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
751	fonts[i].diff = diff;	756	fonts[i].diff = diff;
752	}	757	}
753		758
754	XFreeFontNames (list);	759	XFreeFontNames (list);
755		760
…		…
1291	dTermGC;	1296	dTermGC;
1292		1297
1293	int w = term->fwidth * len;	1298	int w = term->fwidth * len;
1294	int h = term->fheight;	1299	int h = term->fheight;
1295		1300
1296	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.	1301	/*
1297	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a	1302	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1298	* good idea from the perspective of packaging for wide variety of user configs.	1303	* good idea from the perspective of packaging for wide variety of user configs.
1299	*/	1304	*/
1300	bool buffered = true	1305	bool buffered = bg >= Color_transparent;
1301	#ifdef FORCE_UNBUFFERED_XFT	1306	#ifdef FORCE_UNBUFFERED_XFT
1302	&& bg >= 0	1307	buffered = false;
1303	#endif	1308	#endif
1304	;	1309
1305	// cut trailing spaces	1310	// cut trailing spaces
1306	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1307	len--;	1312	len--;
1308		1313
1309	int x_ = buffered ? 0 : x;	1314	int x_ = buffered ? 0 : x;
…		…
1335	x_ += cwidth;	1340	x_ += cwidth;
1336	}	1341	}
1337		1342
1338	if (buffered)	1343	if (buffered)
1339	{	1344	{
1340	bool back_rendered = false;
1341	if (ep != enc)	1345	if (ep != enc)
1342	{	1346	{
1343	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344		1348
1345	#ifdef HAVE_BG_PIXMAP	1349	#ifdef HAVE_BG_PIXMAP
		1350	Picture dst = 0;
		1351
1346	if (term->bgPixmap.pixmap)	1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347	{	1355	{
1348	Picture dst = 0;	1356	int src_x = x, src_y = y;
1349		1357
1350	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)	1358	if (term->bgPixmap.is_parentOrigin ())
1351	dst = XftDrawPicture (d2);
1352
1353	if (bg < 0 \|\| dst != 0)
1354	{	1359	{
1355	int src_x = x, src_y = y ;
1356
1357	if (term->bgPixmap.is_parentOrigin ())
1358	{
1359	src_x += term->window_vt_x;	1360	src_x += term->window_vt_x;
1360	src_y += term->window_vt_y;	1361	src_y += term->window_vt_y;
1361	}	1362	}
1362		1363
1363	if (term->bgPixmap.pmap_width >= src_x+w	1364	if (term->bgPixmap.pmap_width >= src_x + w
1364	&& term->bgPixmap.pmap_height >= src_y+h)	1365	&& term->bgPixmap.pmap_height >= src_y + h)
1365	{	1366	{
1366	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,	1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1367	src_x, src_y, w, h, 0, 0);	1368	src_x, src_y, w, h, 0, 0);
1368	}	1369	}
1369	else	1370	else
1370	{	1371	{
1371	XGCValues gcv;	1372	XGCValues gcv;
1372		1373
1373	gcv.fill_style = FillTiled;	1374	gcv.fill_style = FillTiled;
1374	gcv.tile = term->bgPixmap.pixmap;	1375	gcv.tile = term->bgPixmap.pixmap;
1375	gcv.ts_x_origin = -src_x;	1376	gcv.ts_x_origin = -src_x;
1376	gcv.ts_y_origin = -src_y;	1377	gcv.ts_y_origin = -src_y;
1377		1378
1378	XChangeGC (disp, gc,	1379	XChangeGC (disp, gc,
1379	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1380	&gcv);	1381	&gcv);
1381		1382
1382	XFillRectangle (disp, d2, gc, 0, 0, w, h);	1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383		1384
1384	gcv.fill_style = FillSolid;	1385	gcv.fill_style = FillSolid;
1385	XChangeGC (disp, gc, GCFillStyle, &gcv);	1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
1386	}	1387	}
1387		1388
1388	if (bg >= 0)	1389	if (dst)
1389	{	1390	{
1390	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);	1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
1391	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);	1393	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392	}
1393
1394	back_rendered = true;
1395	}	1394	}
1396	}	1395	}
		1396	else
1397	#endif	1397	#endif
1398		1398	clear_rect (d2, 0, 0, w, h, bg);
1399	if (bg >= 0 && !back_rendered)
1400	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1401		1399
1402	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1400	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1401	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404	}	1402	}
1405	else	1403	else
…		…
1527	if (!end)	1525	if (!end)
1528	end = desc + strlen (desc);	1526	end = desc + strlen (desc);
1529		1527
1530	if (end - desc < 511)	1528	if (end - desc < 511)
1531	{	1529	{
1532	strncpy (buf, desc, end - desc);	1530	memcpy (buf, desc, end - desc);
1533	buf[end - desc] = 0;	1531	buf[end - desc] = 0;
1534		1532
1535	fonts.push_back (new_font (buf, cs));	1533	fonts.push_back (new_font (buf, cs));
1536	}	1534	}
1537	else	1535	else

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs. Revision 1.142 by root, Wed Jan 23 14:54:52 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.142 by root, Wed Jan 23 14:54:52 2008 UTC