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.95 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.119 by sasha, Thu Sep 20 15:32:34 2007 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 *
… …
232rxvt_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
233{ 233{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
237 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 }
254 }
255#endif
256 if (!done)
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
243#else 258#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 261#endif
247 } 262 }
… …
270 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
271 286
272 return p; 287 return p;
273 } 288 }
274 289
275 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 291 {
277 width = 1; height = 1; 292 width = 1; height = 1;
278 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
279 294
280 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
… …
441 *chrs = cc->c2; 456 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 458 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 459 : (*fs)[fs->find_font (cc->c2)];
445 460
446 f2->draw (d, x, y, chrs, width, fg, -1); 461 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 462 }
448 } 463 }
449#endif 464#endif
450 else 465 else
451 switch (t) 466 switch (t)
… …
471 486
472 void clear (); 487 void clear ();
473 488
474 rxvt_fontprop properties (); 489 rxvt_fontprop properties ();
475 490
476 bool load (const rxvt_fontprop &prop); 491 bool load (const rxvt_fontprop &prop, bool force_prop);
477 492
478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479 494
480 void draw (rxvt_drawable &d, int x, int y, 495 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 496 const text_t *text, int len,
482 int fg, int bg); 497 int fg, int bg);
483 498
484 bool slow; // wether this is a proportional font or has other funny characteristics 499 bool slow; // wether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 500 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 501 bool enc2b, encm;
488 502
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 503 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); 504 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); 505 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
627 return false; 641 return false;
628 } 642 }
629} 643}
630 644
631bool 645bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 646rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 647{
634 dTermDisplay; 648 dTermDisplay;
635 649
636 clear (); 650 clear ();
637 651
638 char field_str[64]; // enough for 128 bits 652 char field_str[64]; // enough for 128 bits
639 653
640 // first morph the font if required 654 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 655 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 656 {
644 char fname[1024]; 657 char fname[1024];
645 658
646 if (name[0] != '-') 659 if (name[0] != '-')
647 { 660 {
… …
1039 1052
1040 void clear (); 1053 void clear ();
1041 1054
1042 rxvt_fontprop properties (); 1055 rxvt_fontprop properties ();
1043 1056
1044 bool load (const rxvt_fontprop &prop); 1057 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1058
1046 void draw (rxvt_drawable &d, int x, int y, 1059 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1060 const text_t *text, int len,
1048 int fg, int bg); 1061 int fg, int bg);
1049 1062
… …
1082 1095
1083 return p; 1096 return p;
1084} 1097}
1085 1098
1086bool 1099bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1100rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1101{
1089 dTermDisplay; 1102 dTermDisplay;
1090 1103
1091 clear (); 1104 clear ();
1092 1105
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1114 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1115 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1116 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1117
1105 if (prop.weight != rxvt_fontprop::unset 1118 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1119 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1120 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1121
1109 if (prop.slant != rxvt_fontprop::unset 1122 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1123 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1124 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1125
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1126#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1127 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1274 dTermGC; 1287 dTermGC;
1275 1288
1276 int w = term->fwidth * len; 1289 int w = term->fwidth * len;
1277 int h = term->fheight; 1290 int h = term->fheight;
1278 1291
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1294 * good idea from the perspective of packaging for wide variety of user configs.
1295 */
1279 bool buffered = false; 1296 bool buffered = true
1280 1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1281 // cut trailing spaces 1301 // cut trailing spaces
1282 while (len && text [len - 1] == ' ') 1302 while (len && text [len - 1] == ' ')
1283 len--; 1303 len--;
1284 1304
1285 int x_ = buffered ? 0 : x; 1305 int x_ = buffered ? 0 : x;
… …
1311 x_ += cwidth; 1331 x_ += cwidth;
1312 } 1332 }
1313 1333
1314 if (buffered) 1334 if (buffered)
1315 { 1335 {
1336 bool back_rendered = false;
1316 if (ep != enc) 1337 if (ep != enc)
1317 { 1338 {
1318 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1319 1340
1341#ifdef HAVE_BG_PIXMAP
1342 if (term->bgPixmap.pixmap)
1343 {
1344 Picture dst = 0;
1345
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y;
1357 }
1358
1359 if (term->bgPixmap.pmap_width >= src_x+w
1360 && term->bgPixmap.pmap_height >= src_y+h)
1361 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0);
1364 }
1365 else
1366 {
1367 XGCValues gcv;
1368
1369 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap;
1371 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y;
1373
1374 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv);
1377
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379
1380 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 }
1383
1384 if (bg >= 0)
1385 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 }
1392 }
1393#endif
1394
1395 if (bg >= 0 && !back_rendered)
1320 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1321 1397
1322 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1323 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1324 } 1400 }
1325 else 1401 else
… …
1350void 1426void
1351rxvt_fontset::clear () 1427rxvt_fontset::clear ()
1352{ 1428{
1353 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1354 = rxvt_fontprop::unset; 1430 = rxvt_fontprop::unset;
1431 force_prop = false;
1355 1432
1356 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1357 FONT_UNREF (*i); 1434 FONT_UNREF (*i);
1358 1435
1359 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1471 if (fonts[i]->loaded) 1548 if (fonts[i]->loaded)
1472 return true; 1549 return true;
1473 1550
1474 fonts[i]->loaded = true; 1551 fonts[i]->loaded = true;
1475 1552
1476 if (!fonts[i]->load (prop)) 1553 if (!fonts[i]->load (prop, force_prop))
1477 { 1554 {
1478 fonts[i]->cs = CS_UNKNOWN; 1555 fonts[i]->cs = CS_UNKNOWN;
1479 return false; 1556 return false;
1480 } 1557 }
1481 1558

Diff Legend

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