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.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.176 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

… …
241 { 241 {
242#if XFT 242#if XFT
243 Picture dst; 243 Picture dst;
244 244
245# ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
246 if (term->bgPixmap.pixmap 246 if (term->bg_pixmap
247 && !term->pix_colors[color].is_opaque () 247 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d)))) 248 && ((dst = XftDrawPicture (d))))
249 { 249 {
250 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
251 251
… …
718 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
719 719
720 if (!f) 720 if (!f)
721 return false; 721 return false;
722 722
723 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
724 724
725 if (new_name) 725 if (new_name)
726 set_name (new_name); 726 set_name (new_name);
727 else 727 else
728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
729 729
730 XFreeFont (disp, f); 730 XFreeFont (disp, f);
731 f = 0; 731 f = 0;
732 } 732 }
733 733
… …
790 free (fname); 790 free (fname);
791 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 } 793 }
794 794
795 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);
796 continue; 801 continue;
797 802 }
798 if (prop.height != rxvt_fontprop::unset
799 && p.height > prop.height) // weed out too large fonts
800 continue;
801 803
802 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;
803 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);
804 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);
805 //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);
… …
862 free (registry); 864 free (registry);
863 free (encoding); 865 free (encoding);
864 866
865 if (cs == CS_UNKNOWN) 867 if (cs == CS_UNKNOWN)
866 { 868 {
867 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
868 871
869 if (!charset) 872 if (!charset)
870 charset = name; 873 charset = name;
871 874
872 int count = 13; 875 int count = 13;
… …
875 break; 878 break;
876 879
877 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
878 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
879 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);
880 } 885 }
881 886
882 if (cs == CS_UNKNOWN) 887 if (cs == CS_UNKNOWN)
883 { 888 {
884 clear (); 889 clear ();
… …
1213 int ftheight = 0; 1218 int ftheight = 0;
1214 bool success = true; 1219 bool success = true;
1215 1220
1216 for (;;) 1221 for (;;)
1217 { 1222 {
1223 p = FcPatternDuplicate (match);
1218 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1224 f = XftFontOpenPattern (disp, p);
1219 1225
1220 if (!f) 1226 if (!f)
1221 { 1227 {
1228 FcPatternDestroy (p);
1222 success = false; 1229 success = false;
1223 break; 1230 break;
1224 } 1231 }
1225 1232
1226 FT_Face face = XftLockFace (f); 1233 FT_Face face = XftLockFace (f);
… …
1399 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1400 1407
1401#ifdef HAVE_BG_PIXMAP 1408#ifdef HAVE_BG_PIXMAP
1402 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
1403 1410
1404 if (term->bgPixmap.pixmap 1411 if (term->bg_pixmap
1405 && (bg == Color_transparent || bg == Color_bg 1412 && (bg == Color_transparent || bg == Color_bg
1406 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1407 { 1414 {
1408 int src_x = x, src_y = y; 1415 int src_x = x, src_y = y;
1409 1416
1410 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1417 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1411 { 1418 {
1412 src_x += term->window_vt_x; 1419 src_x += term->window_vt_x;
1413 src_y += term->window_vt_y; 1420 src_y += term->window_vt_y;
1414 } 1421 }
1415 1422
1416 if (term->bgPixmap.pmap_width >= src_x + w 1423 if (term->bg_pmap_width >= src_x + w
1417 && term->bgPixmap.pmap_height >= src_y + h) 1424 && term->bg_pmap_height >= src_y + h)
1418 { 1425 {
1419 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1426 XCopyArea (disp, term->bg_pixmap, d2, gc,
1420 src_x, src_y, w, h, 0, 0); 1427 src_x, src_y, w, h, 0, 0);
1421 } 1428 }
1422 else 1429 else
1423 { 1430 {
1424 XGCValues gcv; 1431 XGCValues gcv;
1425 1432
1426 gcv.fill_style = FillTiled; 1433 gcv.fill_style = FillTiled;
1427 gcv.tile = term->bgPixmap.pixmap; 1434 gcv.tile = term->bg_pixmap;
1428 gcv.ts_x_origin = -src_x; 1435 gcv.ts_x_origin = -src_x;
1429 gcv.ts_y_origin = -src_y; 1436 gcv.ts_y_origin = -src_y;
1430 1437
1431 XChangeGC (disp, gc, 1438 XChangeGC (disp, gc,
1432 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1607 buf[end - desc] = 0; 1614 buf[end - desc] = 0;
1608 1615
1609 push_font (new_font (buf, cs)); 1616 push_font (new_font (buf, cs));
1610 } 1617 }
1611 else 1618 else
1612 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1619 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1613 1620
1614 desc = end + 1; 1621 desc = end + 1;
1615 } 1622 }
1616 while (*end); 1623 while (*end);
1617 } 1624 }

Diff Legend

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