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.97 by root, Sun Feb 19 16:34:36 2006 UTC vs.
Revision 1.102 by root, Fri Mar 17 18:29:29 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 *
1274 dTermGC; 1274 dTermGC;
1275 1275
1276 int w = term->fwidth * len; 1276 int w = term->fwidth * len;
1277 int h = term->fheight; 1277 int h = term->fheight;
1278 1278
1279 bool buffered = 0 1279 bool buffered = bg >= 0 // we don't use a transparent bg
1280#ifndef FORCE_UNBUFFERED_XFT
1280#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1281# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1281 || !term->am_transparent // we aren't transparent 1282 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap 1283 || term->am_pixmap_trans // we have a pixmap
1283#endif 1284# endif
1284 || bg >= 0; // we don't use a transparent bg 1285#endif
1286 ;
1285 1287
1286 // cut trailing spaces 1288 // cut trailing spaces
1287 while (len && text [len - 1] == ' ') 1289 while (len && text [len - 1] == ' ')
1288 len--; 1290 len--;
1289 1291
1320 { 1322 {
1321 if (ep != enc) 1323 if (ep != enc)
1322 { 1324 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1325 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 1326
1325#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1327 if (0)
1328 ;
1329#ifdef TRANSPARENT
1326 if (bg < 0 && term->am_pixmap_trans) 1330 else if (bg < 0 && term->am_pixmap_trans)
1327 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0); 1331 XCopyArea (disp, term->pixmap, d2, gc,
1332 x + term->window_vt_x, y + term->window_vt_y,
1333 w, h, 0, 0);
1334#endif
1335#ifdef XPM_BACKGROUND
1328 else if (bg < 0 && term->bgPixmap.pixmap) 1336 else if (bg < 0 && term->bgPixmap.pixmap)
1329 { 1337 {
1330 XGCValues gcv; 1338 XGCValues gcv;
1331 1339
1332 gcv.fill_style = FillTiled; 1340 gcv.fill_style = FillTiled;
1340 1348
1341 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1349 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1342 1350
1343 XFreeGC (disp, gc2); 1351 XFreeGC (disp, gc2);
1344 } 1352 }
1353#endif
1345 else 1354 else
1346#endif
1347 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1355 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1348 1356
1349 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1357 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1350 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1358 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1351 } 1359 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines