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.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.104 by root, Tue Oct 3 10:28:25 2006 UTC

… …
270 p.slant = rxvt_fontprop::roman; 270 p.slant = rxvt_fontprop::roman;
271 271
272 return p; 272 return p;
273 } 273 }
274 274
275 bool load (const rxvt_fontprop &prop) 275 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 276 {
277 width = 1; height = 1; 277 width = 1; height = 1;
278 ascent = 1; descent = 0; 278 ascent = 1; descent = 0;
279 279
280 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
… …
471 471
472 void clear (); 472 void clear ();
473 473
474 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
475 475
476 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
477 477
478 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;
479 479
480 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 481 const text_t *text, int len,
482 int fg, int bg); 482 int fg, int bg);
483 483
484 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 485 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 486 bool enc2b, encm;
488 487
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 488 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 490 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
627 return false; 626 return false;
628 } 627 }
629} 628}
630 629
631bool 630bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 631rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 632{
634 dTermDisplay; 633 dTermDisplay;
635 634
636 clear (); 635 clear ();
637 636
638 char field_str[64]; // enough for 128 bits 637 char field_str[64]; // enough for 128 bits
639 638
640 // first morph the font if required 639 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 640 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 641 {
644 char fname[1024]; 642 char fname[1024];
645 643
646 if (name[0] != '-') 644 if (name[0] != '-')
647 { 645 {
… …
1039 1037
1040 void clear (); 1038 void clear ();
1041 1039
1042 rxvt_fontprop properties (); 1040 rxvt_fontprop properties ();
1043 1041
1044 bool load (const rxvt_fontprop &prop); 1042 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1043
1046 void draw (rxvt_drawable &d, int x, int y, 1044 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1045 const text_t *text, int len,
1048 int fg, int bg); 1046 int fg, int bg);
1049 1047
… …
1082 1080
1083 return p; 1081 return p;
1084} 1082}
1085 1083
1086bool 1084bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1085rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1086{
1089 dTermDisplay; 1087 dTermDisplay;
1090 1088
1091 clear (); 1089 clear ();
1092 1090
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1099 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1100 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1101 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1102
1105 if (prop.weight != rxvt_fontprop::unset 1103 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1104 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1105 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1106
1109 if (prop.slant != rxvt_fontprop::unset 1107 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1108 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1109 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1110
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1111#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1112 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1274 dTermGC; 1272 dTermGC;
1275 1273
1276 int w = term->fwidth * len; 1274 int w = term->fwidth * len;
1277 int h = term->fheight; 1275 int h = term->fheight;
1278 1276
1279 bool buffered = 0 1277 bool buffered = bg >= 0 // we don't use a transparent bg
1278#ifndef FORCE_UNBUFFERED_XFT
1280#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1279# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1281 || !term->am_transparent // we aren't transparent 1280 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap 1281 || term->am_pixmap_trans // we have a pixmap
1283#endif 1282# endif
1284 || bg >= 0; // we don't use a transparent bg 1283#endif
1284 ;
1285 1285
1286 // cut trailing spaces 1286 // cut trailing spaces
1287 while (len && text [len - 1] == ' ') 1287 while (len && text [len - 1] == ' ')
1288 len--; 1288 len--;
1289 1289
… …
1320 { 1320 {
1321 if (ep != enc) 1321 if (ep != enc)
1322 { 1322 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 1324
1325#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1325 if (0)
1326 ;
1327#ifdef TRANSPARENT
1326 if (bg < 0 && term->am_pixmap_trans) 1328 else if (bg < 0 && term->am_pixmap_trans)
1327 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0); 1329 XCopyArea (disp, term->pixmap, d2, gc,
1330 x + term->window_vt_x, y + term->window_vt_y,
1331 w, h, 0, 0);
1332#endif
1333#ifdef XPM_BACKGROUND
1328 else if (bg < 0 && term->bgPixmap.pixmap) 1334 else if (bg < 0 && term->bgPixmap.pixmap)
1329 { 1335 {
1330 XGCValues gcv; 1336 XGCValues gcv;
1331 1337
1332 gcv.fill_style = FillTiled; 1338 gcv.fill_style = FillTiled;
… …
1340 1346
1341 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1347 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1342 1348
1343 XFreeGC (disp, gc2); 1349 XFreeGC (disp, gc2);
1344 } 1350 }
1351#endif
1345 else 1352 else
1346#endif
1347 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1353 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1348 1354
1349 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1355 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1350 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1356 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1351 } 1357 }
… …
1377void 1383void
1378rxvt_fontset::clear () 1384rxvt_fontset::clear ()
1379{ 1385{
1380 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1386 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1381 = rxvt_fontprop::unset; 1387 = rxvt_fontprop::unset;
1388 force_prop = false;
1382 1389
1383 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1390 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1384 FONT_UNREF (*i); 1391 FONT_UNREF (*i);
1385 1392
1386 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1393 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1498 if (fonts[i]->loaded) 1505 if (fonts[i]->loaded)
1499 return true; 1506 return true;
1500 1507
1501 fonts[i]->loaded = true; 1508 fonts[i]->loaded = true;
1502 1509
1503 if (!fonts[i]->load (prop)) 1510 if (!fonts[i]->load (prop, force_prop))
1504 { 1511 {
1505 fonts[i]->cs = CS_UNKNOWN; 1512 fonts[i]->cs = CS_UNKNOWN;
1506 return false; 1513 return false;
1507 } 1514 }
1508 1515

Diff Legend

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