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.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.176 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

… …
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
… …
1215 int ftheight = 0; 1218 int ftheight = 0;
1216 bool success = true; 1219 bool success = true;
1217 1220
1218 for (;;) 1221 for (;;)
1219 { 1222 {
1223 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1224 f = XftFontOpenPattern (disp, p);
1221 1225
1222 if (!f) 1226 if (!f)
1223 { 1227 {
1228 FcPatternDestroy (p);
1224 success = false; 1229 success = false;
1225 break; 1230 break;
1226 } 1231 }
1227 1232
1228 FT_Face face = XftLockFace (f); 1233 FT_Face face = XftLockFace (f);
… …
1236 1241
1237 XftUnlockFace (f); 1242 XftUnlockFace (f);
1238 1243
1239 int glheight = height; 1244 int glheight = height;
1240 1245
1241 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1246 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1242 { 1247 {
1243 FcChar16 ch = *t; 1248 FcChar16 ch = *t;
1244 1249
1245 if (cs != CS_UNICODE 1250 if (cs != CS_UNICODE
1246 && ch > 0x100 1251 && ch > 0x100
… …
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1407
1403#ifdef HAVE_BG_PIXMAP 1408#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1410
1406 if (term->bgPixmap.pixmap 1411 if (term->bg_pixmap
1407 && (bg == Color_transparent || bg == Color_bg 1412 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1414 {
1410 int src_x = x, src_y = y; 1415 int src_x = x, src_y = y;
1411 1416
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1417 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1418 {
1414 src_x += term->window_vt_x; 1419 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1420 src_y += term->window_vt_y;
1416 } 1421 }
1417 1422
1418 if (term->bgPixmap.pmap_width >= src_x + w 1423 if (term->bg_pmap_width >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1424 && term->bg_pmap_height >= src_y + h)
1420 { 1425 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1426 XCopyArea (disp, term->bg_pixmap, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1427 src_x, src_y, w, h, 0, 0);
1423 } 1428 }
1424 else 1429 else
1425 { 1430 {
1426 XGCValues gcv; 1431 XGCValues gcv;
1427 1432
1428 gcv.fill_style = FillTiled; 1433 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1434 gcv.tile = term->bg_pixmap;
1430 gcv.ts_x_origin = -src_x; 1435 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1436 gcv.ts_y_origin = -src_y;
1432 1437
1433 XChangeGC (disp, gc, 1438 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1609 buf[end - desc] = 0; 1614 buf[end - desc] = 0;
1610 1615
1611 push_font (new_font (buf, cs)); 1616 push_font (new_font (buf, cs));
1612 } 1617 }
1613 else 1618 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1619 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1620
1616 desc = end + 1; 1621 desc = end + 1;
1617 } 1622 }
1618 while (*end); 1623 while (*end);
1619 } 1624 }

Diff Legend

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