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.138 by root, Wed Jan 23 13:34:20 2008 UTC vs.
Revision 1.159 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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
… …
79 79
80 // japanese 80 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 82# if XFT
83 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 88# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 217{
218} 218}
219 219
220void 220void
221rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
222{ 222{
223 if (this->name == name) 223 if (name == name_)
224 return; 224 return;
225 225
226 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
227 this->name = name; 227 name = name_;
228} 228}
229 229
230void 230void
231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232{ 232{
… …
499 499
500 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 501 const text_t *text, int len,
502 int fg, int bg); 502 int fg, int bg);
503 503
504 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 505 XFontStruct *f;
506 bool enc2b, encm; 506 bool enc2b, encm;
507 507
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
792 return false; 792 return false;
793 793
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 796
797 cs = CS_UNKNOWN;
798
797 if (registry && encoding) 799 if (registry && encoding)
798 { 800 {
799 char charset[64]; 801 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 802 snprintf (charset, 64, "%s-%s", registry, encoding);
801 803
802 cs = codeset_from_name (charset); 804 cs = codeset_from_name (charset);
805
806 if (cs == CS_UNKNOWN)
807 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
803 } 808 }
804 else 809
810 free (registry);
811 free (encoding);
812
813 if (cs == CS_UNKNOWN)
805 { 814 {
806 const char *charset = get_property (f, XA_FONT, 0); 815 const char *charset = get_property (f, XA_FONT, 0);
807 816
808 if (!charset) 817 if (!charset)
809 charset = name; 818 charset = name;
… …
812 while (*charset) 821 while (*charset)
813 if (*charset++ == '-' && !--count) 822 if (*charset++ == '-' && !--count)
814 break; 823 break;
815 824
816 cs = codeset_from_name (charset); 825 cs = codeset_from_name (charset);
826 if (cs == CS_UNKNOWN)
827 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
828 }
829
830 if (cs == CS_UNKNOWN)
817 } 831 {
818 832 clear ();
819 free (registry); 833 return false;
820 free (encoding); 834 }
821 835
822 if (cs == CS_UNICODE) 836 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 837 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 838
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 839 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 886 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 887
874 if (width < g.width) width = g.width; 888 if (width < g.width) width = g.width;
875 } 889 }
876 890
877 if (cs == CS_UNKNOWN) 891#if 0 // do it per-character
892 if (prop && width > prop->width)
878 { 893 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 894 clear ();
882 return false; 895 return false;
883 } 896 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 897#endif
892 898
893 return true; 899 return true;
894} 900}
895 901
… …
909 uint32_t ch = FROM_UNICODE (cs, unicode); 915 uint32_t ch = FROM_UNICODE (cs, unicode);
910 916
911 if (ch == NOCHAR) 917 if (ch == NOCHAR)
912 return false; 918 return false;
913 919
914 /* check wether the character exists in _this_ font. horrible. */ 920 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 921 XCharStruct *xcs;
916 922
917 if (encm) 923 if (encm)
918 { 924 {
919 unsigned char byte1 = ch >> 8; 925 unsigned char byte1 = ch >> 8;
… …
949 return false; 955 return false;
950 956
951 if (!prop || prop->width == rxvt_fontprop::unset) 957 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 958 return true;
953 959
954 // check wether character overlaps previous/next character 960 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 961 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 962 int wcw = max (WCWIDTH (unicode), 1);
957 963
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 964 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 965
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1139 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1140
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1141#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1142 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1143 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1144 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1145#endif
1140 1146
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1147 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1148 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1149
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1293rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1294 const text_t *text, int len,
1289 int fg, int bg) 1295 int fg, int bg)
1290{ 1296{
1291 XGlyphInfo extents; 1297 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1298 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1299 XftGlyphSpec *ep = enc;
1294 1300
1295 dTermDisplay; 1301 dTermDisplay;
1296 dTermGC; 1302 dTermGC;
1297 1303
1298 int w = term->fwidth * len; 1304 int w = term->fwidth * len;
1299 int h = term->fheight; 1305 int h = term->fheight;
1300 1306
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent; 1307 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1308 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1309
1310 // cut trailing spaces 1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1312 len--; 1312 len--;
1313 1313
… …
1345 if (ep != enc) 1345 if (ep != enc)
1346 { 1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348 1348
1349#ifdef HAVE_BG_PIXMAP 1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; 1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1351
1352 if (term->bgPixmap.pixmap 1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg 1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1355 {
… …
1388 1388
1389 if (dst) 1389 if (dst)
1390 { 1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392 1392
1393 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 } 1395 }
1395 } 1396 }
1396 else 1397 else
1397#endif 1398#endif
1398 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1399 1400
1400 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1401 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1402 } 1403 }
1403 else 1404 else
… …
1674 FcPatternDestroy (match); 1675 FcPatternDestroy (match);
1675 1676
1676 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1677 { 1678 {
1678 char fontname[4096]; 1679 char fontname[4096];
1679 sprintf (fontname, "xft:%-.4090s", font); 1680 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1680 1681
1681 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1682 } 1683 }
1683 1684
1684 free (font); 1685 free (font);
… …
1708 } 1709 }
1709 1710
1710 return i; 1711 return i;
1711} 1712}
1712 1713
1713
1714

Diff Legend

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