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.101 by root, Sat Mar 11 00:33:23 2006 UTC vs.
Revision 1.118 by sasha, Wed Sep 12 19:51:41 2007 UTC

… …
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 < 0 || 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 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
243#else 243#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
… …
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"));
… …
441 *chrs = cc->c2; 441 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 443 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 444 : (*fs)[fs->find_font (cc->c2)];
445 445
446 f2->draw (d, x, y, chrs, width, fg, -1); 446 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 447 }
448 } 448 }
449#endif 449#endif
450 else 450 else
451 switch (t) 451 switch (t)
… …
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 = bg >= 0 // we don't use a transparent bg 1277 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1278 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1279 * good idea from the perspective of packaging for wide variety of user configs.
1280 */
1281 bool buffered = true
1280#ifndef FORCE_UNBUFFERED_XFT 1282#ifdef FORCE_UNBUFFERED_XFT
1281# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1283 && bg >= 0
1282 || !term->am_transparent // we aren't transparent
1283 || term->am_pixmap_trans // we have a pixmap
1284# endif
1285#endif 1284#endif
1286 ; 1285 ;
1287
1288 // cut trailing spaces 1286 // cut trailing spaces
1289 while (len && text [len - 1] == ' ') 1287 while (len && text [len - 1] == ' ')
1290 len--; 1288 len--;
1291 1289
1292 int x_ = buffered ? 0 : x; 1290 int x_ = buffered ? 0 : x;
… …
1321 if (buffered) 1319 if (buffered)
1322 { 1320 {
1323 if (ep != enc) 1321 if (ep != enc)
1324 { 1322 {
1325 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 bool back_rendered = false;
1326 1325
1327#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1326#ifdef HAVE_BG_PIXMAP
1328 if (bg < 0 && term->am_pixmap_trans)
1329 XCopyArea (disp, term->pixmap, d2, gc,
1330 x + term->window_vt_x, y + term->window_vt_y,
1331 w, h, 0, 0);
1332 else if (bg < 0 && term->bgPixmap.pixmap) 1327 if (term->bgPixmap.pixmap)
1333 { 1328 {
1329 Picture dst = 0;
1330
1331 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1332 dst = XftDrawPicture (d2);
1333
1334 if (bg < 0 || dst != 0)
1335 {
1336 int src_x = x, src_y = y ;
1337
1338 if (term->bgPixmap.is_parentOrigin ())
1339 {
1340 src_x += term->window_vt_x;
1341 src_y += term->window_vt_y;
1342 }
1343
1344 if (term->bgPixmap.pmap_width >= src_x+w
1345 && term->bgPixmap.pmap_height >= src_y+h)
1346 {
1347 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1348 src_x, src_y, w, h, 0, 0);
1349 }
1350 else
1351 {
1334 XGCValues gcv; 1352 XGCValues gcv;
1335 1353
1336 gcv.fill_style = FillTiled; 1354 gcv.fill_style = FillTiled;
1337 gcv.tile = term->pixmap; 1355 gcv.tile = term->bgPixmap.pixmap;
1338 gcv.ts_x_origin = -x; 1356 gcv.ts_x_origin = -src_x;
1339 gcv.ts_y_origin = -y; 1357 gcv.ts_y_origin = -src_y;
1340 1358
1341 GC gc2 = XCreateGC (disp, d2, 1359 XChangeGC (disp, gc,
1342 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1360 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1343 &gcv); 1361 &gcv);
1344 1362
1345 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1363 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1346 1364
1347 XFreeGC (disp, gc2); 1365 gcv.fill_style = FillSolid;
1366 XChangeGC (disp, gc, GCFillStyle, &gcv);
1367 }
1368
1369 if (bg >= 0)
1370 {
1371 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1372 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1373 }
1374
1375 back_rendered = true;
1376 }
1348 } 1377 }
1349 else
1350#endif 1378#endif
1379
1380 if (bg >= 0 && !back_rendered)
1351 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1381 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1352 1382
1353 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1383 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1354 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1384 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1355 } 1385 }
… …
1381void 1411void
1382rxvt_fontset::clear () 1412rxvt_fontset::clear ()
1383{ 1413{
1384 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1414 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1385 = rxvt_fontprop::unset; 1415 = rxvt_fontprop::unset;
1416 force_prop = false;
1386 1417
1387 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1418 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1388 FONT_UNREF (*i); 1419 FONT_UNREF (*i);
1389 1420
1390 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1421 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1502 if (fonts[i]->loaded) 1533 if (fonts[i]->loaded)
1503 return true; 1534 return true;
1504 1535
1505 fonts[i]->loaded = true; 1536 fonts[i]->loaded = true;
1506 1537
1507 if (!fonts[i]->load (prop)) 1538 if (!fonts[i]->load (prop, force_prop))
1508 { 1539 {
1509 fonts[i]->cs = CS_UNKNOWN; 1540 fonts[i]->cs = CS_UNKNOWN;
1510 return false; 1541 return false;
1511 } 1542 }
1512 1543

Diff Legend

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