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.103 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.116 by root, Tue Aug 28 17:33:46 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]);
… …
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)
… …
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);
… …
1273 dTermGC; 1272 dTermGC;
1274 1273
1275 int w = term->fwidth * len; 1274 int w = term->fwidth * len;
1276 int h = term->fheight; 1275 int h = term->fheight;
1277 1276
1278 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
1279#ifndef FORCE_UNBUFFERED_XFT 1282#ifdef FORCE_UNBUFFERED_XFT
1280# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1283 && bg >= 0
1281 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap
1283# endif
1284#endif 1284#endif
1285 ; 1285 ;
1286
1287 // cut trailing spaces 1286 // cut trailing spaces
1288 while (len && text [len - 1] == ' ') 1287 while (len && text [len - 1] == ' ')
1289 len--; 1288 len--;
1290 1289
1291 int x_ = buffered ? 0 : x; 1290 int x_ = buffered ? 0 : x;
… …
1320 if (buffered) 1319 if (buffered)
1321 { 1320 {
1322 if (ep != enc) 1321 if (ep != enc)
1323 { 1322 {
1324 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 bool back_rendered = false;
1325 1325
1326 if (0) 1326#ifdef HAVE_BG_PIXMAP
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) 1327 if (term->bgPixmap.pixmap)
1336 { 1328 {
1329 Picture dst = 0;
1330 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1331 dst = XftDrawPicture (d2);
1332
1333 if (bg < 0 || dst != 0)
1334 {
1335 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
1336 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
1337 {
1338 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1339 x + term->window_vt_x, y + term->window_vt_y,
1340 w, h, 0, 0);
1341 }
1342 else
1343 {
1337 XGCValues gcv; 1344 XGCValues gcv;
1338 1345
1339 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1340 gcv.tile = term->pixmap; 1347 gcv.tile = term->bgPixmap.pixmap;
1341 gcv.ts_x_origin = -x; 1348 gcv.ts_x_origin = -x;
1342 gcv.ts_y_origin = -y; 1349 gcv.ts_y_origin = -y;
1343 1350
1344 GC gc2 = XCreateGC (disp, d2, 1351 XChangeGC (disp, gc,
1345 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1352 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1346 &gcv); 1353 &gcv);
1347 1354
1348 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1355 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1349 1356
1350 XFreeGC (disp, gc2); 1357 gcv.fill_style = FillSolid;
1358 XChangeGC (disp, gc, GCFillStyle, &gcv);
1359 }
1360
1361 if (bg >= 0)
1362 {
1363 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1364 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1365 }
1366
1367 back_rendered = true;
1368 }
1351 } 1369 }
1352#endif 1370#endif
1353 else 1371
1372 if (bg >= 0 && !back_rendered)
1354 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1373 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1355 1374
1356 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1375 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1376 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358 } 1377 }

Diff Legend

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