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.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.71 by root, Sat Jun 18 10:02:35 2005 UTC

… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 "rxvtutil.h" 24#include "rxvtutil.h"
… …
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 134#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 137 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 139
140 // FreeMono is usually uglier than x fonts, so try last only. 140 // FreeMono is usually uglier than x fonts, so try last only.
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 141 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 142#endif
143 143
… …
716 716
717 int diff = 0; 717 int diff = 0;
718 718
719 if (replace_field (fname, list[i], 6, '0', field_str)) 719 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 720 diff += 10; // slightly penalize scalable fonts
721 else if (replace_field (fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns
721 723
722 if (!set_properties (p, fname)) 724 if (!set_properties (p, fname))
723 continue; 725 continue;
724 726
725 if (prop.height != rxvt_fontprop::unset 727 if (prop.height != rxvt_fontprop::unset
… …
741 for (;;) 743 for (;;)
742 { 744 {
743 font_weight *best = fonts + count - 1; 745 font_weight *best = fonts + count - 1;
744 746
745 for (font_weight *w = best; w-- > fonts; ) 747 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff) 748 if (w->diff <= best->diff)
747 best = w; 749 best = w;
748 750
749 if (!best->name 751 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 752 || !(f = XLoadQueryFont (disp, best->name)))
751 break; 753 break;
… …
1096 return false; 1098 return false;
1097 1099
1098 FcValue v; 1100 FcValue v;
1099 1101
1100 if (prop.height != rxvt_fontprop::unset 1102 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1103 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1104 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1105 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1106
1105 if (prop.weight != rxvt_fontprop::unset 1107 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1108 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1252 1254
1253 XGlyphInfo extents; 1255 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
1255 FcChar32 *ep = enc; 1257 FcChar32 *ep = enc;
1256 int ewidth = 0; 1258 int ewidth = 0;
1257 int xoff = 0;
1258 1259
1259 while (len) 1260 while (len)
1260 { 1261 {
1261 int cwidth = r->TermWin.fwidth; 1262 int cwidth = r->TermWin.fwidth;
1262 FcChar32 fc = *text++; len--; 1263 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1264
1265 while (len && *text == NOCHAR) 1265 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1266 text++, len--, cwidth += r->TermWin.fwidth;
1267 1267
1268 gl = XftCharIndex (d.display->display, f, fc);
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270
1271 if (extents.xOff != cwidth && ep != enc)
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 }
1283
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1268 if (fc == ' ' && ep == enc) // skip leading spaces
1285 {
1286 x += cwidth; 1269 x += cwidth;
1287 continue;
1288 }
1289
1290 else 1270 else
1291 { 1271 {
1272 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1273 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1274
1275 if (extents.xOff != cwidth)
1276 {
1277 if (ewidth)
1278 {
1279 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1280 x, y + base, enc, ep - enc);
1281 x += ewidth;
1282
1283 ep = enc;
1284 ewidth = 0;
1285 }
1286
1287 if (extents.xOff > cwidth)
1288 extents.xOff = cwidth;
1289
1290 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1291 x + (cwidth - extents.xOff >> 1),
1292 y + base, &gl, 1);
1293 x += cwidth;
1294 }
1295 else
1296 {
1292 *ep++ = gl; 1297 *ep++ = gl;
1293 ewidth += cwidth; 1298 ewidth += cwidth;
1294 xoff += extents.xOff; 1299 }
1295 } 1300 }
1296 } 1301 }
1297 1302
1298 if (ep != enc) 1303 if (ep != enc)
1299 {
1300 if (xoff > ewidth) xoff = ewidth;
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1304 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc); 1305 x, y + base, enc, ep - enc);
1304 }
1305} 1306}
1306#endif 1307#endif
1307 1308
1308///////////////////////////////////////////////////////////////////////////// 1309/////////////////////////////////////////////////////////////////////////////
1309 1310

Diff Legend

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