ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.167 by sf-exg, Mon Nov 29 12:33:22 2010 UTC vs.
Revision 1.178 by root, Mon Feb 21 07:41:03 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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
… …
39 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
42 )) 42 ))
43 43
44const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
45 codeset cs; 45 codeset cs;
46 const char *name; 46 const char *name;
47} fallback_fonts[] = { 47} fallback_fonts[] = {
48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
161 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
162}; 162};
163 163
164#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
165
166#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
167#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
168 166
169///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
170 168
… …
243 { 241 {
244#if XFT 242#if XFT
245 Picture dst; 243 Picture dst;
246 244
247# ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
248 if (term->bgPixmap.pixmap 246 if (term->bg_pixmap
249 && !term->pix_colors[color].is_opaque () 247 && !term->pix_colors[color].is_opaque ()
250 && ((dst = XftDrawPicture (d)))) 248 && ((dst = XftDrawPicture (d))))
251 { 249 {
252 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
253 251
… …
720 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
721 719
722 if (!f) 720 if (!f)
723 return false; 721 return false;
724 722
725 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
726 724
727 if (new_name) 725 if (new_name)
728 set_name (new_name); 726 set_name (new_name);
729 else 727 else
730 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
731 729
732 XFreeFont (disp, f); 730 XFreeFont (disp, f);
733 f = 0; 731 f = 0;
734 } 732 }
735 733
… …
792 free (fname); 790 free (fname);
793 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
794 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
795 } 793 }
796 794
797 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
798 continue; 801 continue;
799 802 }
800 if (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height) // weed out too large fonts
802 continue;
803 803
804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
864 free (registry); 864 free (registry);
865 free (encoding); 865 free (encoding);
866 866
867 if (cs == CS_UNKNOWN) 867 if (cs == CS_UNKNOWN)
868 { 868 {
869 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
870 871
871 if (!charset) 872 if (!charset)
872 charset = name; 873 charset = name;
873 874
874 int count = 13; 875 int count = 13;
… …
877 break; 878 break;
878 879
879 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
882 } 885 }
883 886
884 if (cs == CS_UNKNOWN) 887 if (cs == CS_UNKNOWN)
885 { 888 {
886 clear (); 889 clear ();
… …
918 } 921 }
919#endif 922#endif
920 923
921 width = 1; 924 width = 1;
922 925
923 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
924 { 927 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 929 continue;
927 930
928 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
964} 967}
965 968
966bool 969bool
967rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
968{ 971{
972 careful = false;
973
969 uint32_t ch = FROM_UNICODE (cs, unicode); 974 uint32_t ch = FROM_UNICODE (cs, unicode);
970 975
971 if (ch == NOCHAR) 976 if (ch == NOCHAR)
972 return false; 977 return false;
973 978
… …
1215 int ftheight = 0; 1220 int ftheight = 0;
1216 bool success = true; 1221 bool success = true;
1217 1222
1218 for (;;) 1223 for (;;)
1219 { 1224 {
1225 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1226 f = XftFontOpenPattern (disp, p);
1221 1227
1222 if (!f) 1228 if (!f)
1223 { 1229 {
1230 FcPatternDestroy (p);
1224 success = false; 1231 success = false;
1225 break; 1232 break;
1226 } 1233 }
1227 1234
1228 FT_Face face = XftLockFace (f); 1235 FT_Face face = XftLockFace (f);
… …
1236 1243
1237 XftUnlockFace (f); 1244 XftUnlockFace (f);
1238 1245
1239 int glheight = height; 1246 int glheight = height;
1240 1247
1241 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1248 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1242 { 1249 {
1243 FcChar16 ch = *t; 1250 FcChar16 ch = *t;
1244 1251
1245 if (cs != CS_UNICODE 1252 if (cs != CS_UNICODE
1246 && ch > 0x100 1253 && ch > 0x100
… …
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1409
1403#ifdef HAVE_BG_PIXMAP 1410#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1411 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1412
1406 if (term->bgPixmap.pixmap 1413 if (term->bg_pixmap
1407 && (bg == Color_transparent || bg == Color_bg 1414 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1416 {
1410 int src_x = x, src_y = y; 1417 int src_x = x, src_y = y;
1411 1418
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1419 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1420 {
1414 src_x += term->window_vt_x; 1421 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1422 src_y += term->window_vt_y;
1416 } 1423 }
1417 1424
1418 if (term->bgPixmap.pmap_width >= src_x + w 1425 if (term->bg_pmap_width >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1426 && term->bg_pmap_height >= src_y + h)
1420 { 1427 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1428 XCopyArea (disp, term->bg_pixmap, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1429 src_x, src_y, w, h, 0, 0);
1423 } 1430 }
1424 else 1431 else
1425 { 1432 {
1426 XGCValues gcv; 1433 XGCValues gcv;
1427 1434
1428 gcv.fill_style = FillTiled; 1435 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1436 gcv.tile = term->bg_pixmap;
1430 gcv.ts_x_origin = -src_x; 1437 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1438 gcv.ts_y_origin = -src_y;
1432 1439
1433 XChangeGC (disp, gc, 1440 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1609 buf[end - desc] = 0; 1616 buf[end - desc] = 0;
1610 1617
1611 push_font (new_font (buf, cs)); 1618 push_font (new_font (buf, cs));
1612 } 1619 }
1613 else 1620 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1621 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1622
1616 desc = end + 1; 1623 desc = end + 1;
1617 } 1624 }
1618 while (*end); 1625 while (*end);
1619 } 1626 }

Diff Legend

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