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.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.103 by root, Sun Aug 27 10:10:25 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 131# endif
132#endif 132#endif
133 133
134 // generic font fallback
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 136#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 141
145 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 144#endif
148 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
149 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
150}; 151};
151 152
152// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
157 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
158}; 159};
159 160
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161 162
162#define dTermDisplay Display *disp = term->xdisp 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164
165/////////////////////////////////////////////////////////////////////////////
166
167#if XFT
168rxvt_drawable::~rxvt_drawable ()
169{
170 if (xftdrawable)
171 XftDrawDestroy (xftdrawable);
172}
173
174rxvt_drawable::operator XftDraw *()
175{
176 if (!xftdrawable)
177 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179 return xftdrawable;
180}
181#endif
182 165
183///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
184 167
185static const char * 168static const char *
186enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
249rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
250{ 233{
251 dTermDisplay; 234 dTermDisplay;
252 dTermGC; 235 dTermGC;
253 236
254 if (color == Color_bg) 237 if (color < 0 || color == Color_bg)
255 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
256 else if (color >= 0) 239 else
257 { 240 {
258#if XFT 241#if XFT
259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
260#else 243#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
… …
287 p.slant = rxvt_fontprop::roman; 270 p.slant = rxvt_fontprop::roman;
288 271
289 return p; 272 return p;
290 } 273 }
291 274
292 bool load (const rxvt_fontprop &prop) 275 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 276 {
294 width = 1; height = 1; 277 width = 1; height = 1;
295 ascent = 1; descent = 0; 278 ascent = 1; descent = 0;
296 279
297 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
… …
488 471
489 void clear (); 472 void clear ();
490 473
491 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
492 475
493 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
494 477
495 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496 479
497 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 481 const text_t *text, int len,
… …
513rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const 496rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
514{ 497{
515 unsigned long value; 498 unsigned long value;
516 499
517 if (XGetFontProperty (f, property, &value)) 500 if (XGetFontProperty (f, property, &value))
518 return XGetAtomName (term->xdisp, value); 501 return XGetAtomName (term->dpy, value);
519 else 502 else
520 return rxvt_strdup (repl); 503 return rxvt_strdup (repl);
521} 504}
522 505
523rxvt_fontprop 506rxvt_fontprop
… …
546rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547{ 530{
548 unsigned long height; 531 unsigned long height;
549 532
550#if 0 533#if 0
551 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552 return false; 535 return false;
553#else 536#else
554 height = f->ascent + f->descent; 537 height = f->ascent + f->descent;
555#endif 538#endif
556 539
… …
644 return false; 627 return false;
645 } 628 }
646} 629}
647 630
648bool 631bool
649rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650{ 633{
651 dTermDisplay; 634 dTermDisplay;
652 635
653 clear (); 636 clear ();
654 637
655 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
656 639
657 // first morph the font if required 640 // first morph the font if required
658 if (prop.weight != rxvt_fontprop::unset 641 if (force_prop)
659 || prop.slant != rxvt_fontprop::unset)
660 { 642 {
661 char fname[1024]; 643 char fname[1024];
662 644
663 if (name[0] != '-') 645 if (name[0] != '-')
664 { 646 {
… …
861 843
862 XCharStruct g; 844 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 845 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 846 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 847
848 int wcw = WCWIDTH (*t);
866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 849 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867 850
868 if (width < g.width) width = g.width; 851 if (width < g.width) width = g.width;
869 } 852 }
870 853
871 if (cs == CS_UNKNOWN) 854 if (cs == CS_UNKNOWN)
… …
890void 873void
891rxvt_font_x11::clear () 874rxvt_font_x11::clear ()
892{ 875{
893 if (f) 876 if (f)
894 { 877 {
895 XFreeFont (term->xdisp, f); 878 XFreeFont (term->dpy, f);
896 f = 0; 879 f = 0;
897 } 880 }
898} 881}
899 882
900bool 883bool
… …
945 if (!prop || prop->width == rxvt_fontprop::unset) 928 if (!prop || prop->width == rxvt_fontprop::unset)
946 return true; 929 return true;
947 930
948 // check wether character overlaps previous/next character 931 // check wether character overlaps previous/next character
949 int w = xcs->rbearing - xcs->lbearing; 932 int w = xcs->rbearing - xcs->lbearing;
950 int wcw = WCWIDTH (unicode); 933 int wcw = max (WCWIDTH (unicode), 1);
951 934
952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 935 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953 936
954 if (careful && !OVERLAP_OK (w, wcw, prop)) 937 if (careful && !OVERLAP_OK (w, wcw, prop))
955 return false; 938 return false;
… …
1055 1038
1056 void clear (); 1039 void clear ();
1057 1040
1058 rxvt_fontprop properties (); 1041 rxvt_fontprop properties ();
1059 1042
1060 bool load (const rxvt_fontprop &prop); 1043 bool load (const rxvt_fontprop &prop, bool force_prop);
1061 1044
1062 void draw (rxvt_drawable &d, int x, int y, 1045 void draw (rxvt_drawable &d, int x, int y,
1063 const text_t *text, int len, 1046 const text_t *text, int len,
1064 int fg, int bg); 1047 int fg, int bg);
1065 1048
… …
1072void 1055void
1073rxvt_font_xft::clear () 1056rxvt_font_xft::clear ()
1074{ 1057{
1075 if (f) 1058 if (f)
1076 { 1059 {
1077 XftFontClose (term->xdisp, f); 1060 XftFontClose (term->dpy, f);
1078 f = 0; 1061 f = 0;
1079 } 1062 }
1080} 1063}
1081 1064
1082rxvt_fontprop 1065rxvt_fontprop
… …
1098 1081
1099 return p; 1082 return p;
1100} 1083}
1101 1084
1102bool 1085bool
1103rxvt_font_xft::load (const rxvt_fontprop &prop) 1086rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104{ 1087{
1105 dTermDisplay; 1088 dTermDisplay;
1106 1089
1107 clear (); 1090 clear ();
1108 1091
… …
1117 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1100 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1101 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1102 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120 1103
1121 if (prop.weight != rxvt_fontprop::unset 1104 if (prop.weight != rxvt_fontprop::unset
1122 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1105 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1106 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124 1107
1125 if (prop.slant != rxvt_fontprop::unset 1108 if (prop.slant != rxvt_fontprop::unset
1126 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1109 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1110 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128 1111
1129#if 0 // clipping unfortunately destroys our precious double-width-characters 1112#if 0 // clipping unfortunately destroys our precious double-width-characters
1130 // clip width, we can't do better, or can we? 1113 // clip width, we can't do better, or can we?
1131 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1114 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1249bool 1232bool
1250rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1233rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251{ 1234{
1252 careful = false; 1235 careful = false;
1253 1236
1254 if (!XftCharExists (term->xdisp, f, unicode)) 1237 if (!XftCharExists (term->dpy, f, unicode))
1255 return false; 1238 return false;
1256 1239
1257 if (!prop || prop->width == rxvt_fontprop::unset) 1240 if (!prop || prop->width == rxvt_fontprop::unset)
1258 return true; 1241 return true;
1259 1242
1260 // check character against base font bounding box 1243 // check character against base font bounding box
1261 FcChar32 ch = unicode; 1244 FcChar32 ch = unicode;
1262 XGlyphInfo g; 1245 XGlyphInfo g;
1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1246 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264 1247
1265 int w = g.width - g.x; 1248 int w = g.width - g.x;
1266 int wcw = WCWIDTH (unicode); 1249 int wcw = max (WCWIDTH (unicode), 1);
1267 1250
1268 careful = g.x > 0 || w > prop->width * wcw; 1251 careful = g.x > 0 || w > prop->width * wcw;
1269 1252
1270 if (careful && !OVERLAP_OK (w, wcw, prop)) 1253 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false; 1254 return false;
… …
1280void 1263void
1281rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282 const text_t *text, int len, 1265 const text_t *text, int len,
1283 int fg, int bg) 1266 int fg, int bg)
1284{ 1267{
1285 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287 XGlyphInfo extents; 1268 XGlyphInfo extents;
1288 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1269 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1289 XftGlyphSpec *ep = enc; 1270 XftGlyphSpec *ep = enc;
1290 1271
1291 dTermDisplay; 1272 dTermDisplay;
1292 dTermGC; 1273 dTermGC;
1293 1274
1275 int w = term->fwidth * len;
1276 int h = term->fheight;
1277
1278 bool buffered = bg >= 0 // we don't use a transparent bg
1279#ifndef FORCE_UNBUFFERED_XFT
1280# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1281 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap
1283# endif
1284#endif
1285 ;
1286
1294 // cut trailing spaces 1287 // cut trailing spaces
1295 while (len && text [len - 1] == ' ') 1288 while (len && text [len - 1] == ' ')
1296 len--; 1289 len--;
1290
1291 int x_ = buffered ? 0 : x;
1292 int y_ = buffered ? 0 : y;
1297 1293
1298 while (len) 1294 while (len)
1299 { 1295 {
1300 int cwidth = term->fwidth; 1296 int cwidth = term->fwidth;
1301 FcChar32 fc = *text++; len--; 1297 FcChar32 fc = *text++; len--;
… …
1306 if (fc != ' ') // skip spaces 1302 if (fc != ' ') // skip spaces
1307 { 1303 {
1308 FT_UInt glyph = XftCharIndex (disp, f, fc); 1304 FT_UInt glyph = XftCharIndex (disp, f, fc);
1309 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1305 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310 1306
1311
1312 ep->glyph = glyph; 1307 ep->glyph = glyph;
1313 ep->x = x + (cwidth - extents.xOff >> 1); 1308 ep->x = x_ + (cwidth - extents.xOff >> 1);
1314 ep->y = y + ascent; 1309 ep->y = y_ + ascent;
1315 1310
1316 if (extents.xOff == 0) 1311 if (extents.xOff == 0)
1317 ep->x = x + cwidth; 1312 ep->x = x_ + cwidth;
1318 1313
1319 ep++; 1314 ep++;
1320 } 1315 }
1321 1316
1322 x += cwidth; 1317 x_ += cwidth;
1318 }
1319
1320 if (buffered)
1323 } 1321 {
1324
1325 if (ep != enc) 1322 if (ep != enc)
1323 {
1324 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1325
1326 if (0)
1327 ;
1328#ifdef TRANSPARENT
1329 else if (bg < 0 && term->am_pixmap_trans)
1330 XCopyArea (disp, term->pixmap, d2, gc,
1331 x + term->window_vt_x, y + term->window_vt_y,
1332 w, h, 0, 0);
1333#endif
1334#ifdef XPM_BACKGROUND
1335 else if (bg < 0 && term->bgPixmap.pixmap)
1336 {
1337 XGCValues gcv;
1338
1339 gcv.fill_style = FillTiled;
1340 gcv.tile = term->pixmap;
1341 gcv.ts_x_origin = -x;
1342 gcv.ts_y_origin = -y;
1343
1344 GC gc2 = XCreateGC (disp, d2,
1345 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1346 &gcv);
1347
1348 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1349
1350 XFreeGC (disp, gc2);
1351 }
1352#endif
1353 else
1354 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1355
1356 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358 }
1359 else
1360 clear_rect (d, x, y, w, h, bg);
1361 }
1362 else
1363 {
1364 clear_rect (d, x, y, w, h, bg);
1326 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1365 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1366 }
1327} 1367}
1368
1328#endif 1369#endif
1329 1370
1330///////////////////////////////////////////////////////////////////////////// 1371/////////////////////////////////////////////////////////////////////////////
1331 1372
1332rxvt_fontset::rxvt_fontset (rxvt_term *term) 1373rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1343void 1384void
1344rxvt_fontset::clear () 1385rxvt_fontset::clear ()
1345{ 1386{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1387 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1388 = rxvt_fontprop::unset;
1389 force_prop = false;
1348 1390
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1391 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1392 FONT_UNREF (*i);
1351 1393
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1394 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1464 if (fonts[i]->loaded) 1506 if (fonts[i]->loaded)
1465 return true; 1507 return true;
1466 1508
1467 fonts[i]->loaded = true; 1509 fonts[i]->loaded = true;
1468 1510
1469 if (!fonts[i]->load (prop)) 1511 if (!fonts[i]->load (prop, force_prop))
1470 { 1512 {
1471 fonts[i]->cs = CS_UNKNOWN; 1513 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1514 return false;
1473 } 1515 }
1474 1516
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1617 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1618 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1619 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1620
1579 XftResult result; 1621 XftResult result;
1580 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1622 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1623
1582 FcPatternDestroy (p); 1624 FcPatternDestroy (p);
1583 1625
1584 if (match) 1626 if (match)
1585 { 1627 {

Diff Legend

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