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.131 by root, Wed Jan 23 06:00:53 2008 UTC vs.
Revision 1.146 by ayin, Sat Jan 26 14:24:43 2008 UTC

1/*----------------------------------------------------------------------* 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-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
236 if (color == Color_bg || color == Color_transparent) 236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 238 else if (color >= 0)
239 { 239 {
240#if XFT 240#if XFT
241 bool done = false; 241 Picture dst;
242
242#ifdef HAVE_BG_PIXMAP 243# ifdef HAVE_BG_PIXMAP
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244 if (term->bgPixmap.pixmap
244 { 245 && !term->pix_colors[color].is_opaque ()
245 Picture dst = XftDrawPicture (d); 246 && ((dst = XftDrawPicture (d))))
246 if (dst != 0)
247 { 247 {
248 XClearArea (disp, d, x, y, w, h, false); 248 XClearArea (disp, d, x, y, w, h, false);
249
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true;
252 } 252 }
253 } 253 else
254#endif 254# endif
255 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
257#else 257#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 260#endif
261 } 261 }
… …
1300 1300
1301 /* 1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs. 1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */ 1304 */
1305 bool buffered = bg >= Color_transparent; 1305 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1306 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1307
1310 // cut trailing spaces 1308 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1309 while (len && text [len - 1] == ' ')
1312 len--; 1310 len--;
1313 1311
… …
1342 1340
1343 if (buffered) 1341 if (buffered)
1344 { 1342 {
1345 if (ep != enc) 1343 if (ep != enc)
1346 { 1344 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1346
1350#ifdef HAVE_BG_PIXMAP 1347#ifdef HAVE_BG_PIXMAP
1348 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1349
1351 if (term->bgPixmap.pixmap) 1350 if (term->bgPixmap.pixmap
1351 && (bg == Color_transparent || bg == Color_bg
1352 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1353 {
1353 Picture dst = 0; 1354 int src_x = x, src_y = y;
1354 1355
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1356 if (term->bgPixmap.is_parentOrigin ())
1356 dst = XftDrawPicture (d2); 1357 {
1358 src_x += term->window_vt_x;
1359 src_y += term->window_vt_y;
1360 }
1361
1362 if (term->bgPixmap.pmap_width >= src_x + w
1363 && term->bgPixmap.pmap_height >= src_y + h)
1364 {
1365 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1366 src_x, src_y, w, h, 0, 0);
1367 }
1368 else
1369 {
1370 XGCValues gcv;
1371
1372 gcv.fill_style = FillTiled;
1373 gcv.tile = term->bgPixmap.pixmap;
1374 gcv.ts_x_origin = -src_x;
1375 gcv.ts_y_origin = -src_y;
1376
1377 XChangeGC (disp, gc,
1378 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1379 &gcv);
1380
1381 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1382
1383 gcv.fill_style = FillSolid;
1384 XChangeGC (disp, gc, GCFillStyle, &gcv);
1385 }
1357 1386
1358 if (dst) 1387 if (dst)
1359 { 1388 {
1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y;
1366 }
1367
1368 if (term->bgPixmap.pmap_width >= src_x+w
1369 && term->bgPixmap.pmap_height >= src_y+h)
1370 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0);
1373 }
1374 else
1375 {
1376 XGCValues gcv;
1377
1378 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y;
1382
1383 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv);
1386
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 }
1392
1393 if (bg >= 0)
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1389 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1390
1391 // dst can only be set when bg >= 0
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1392 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 } 1393 }
1401 } 1394 }
1395 else
1402#endif 1396#endif
1403
1404 if (!back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1397 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1406 1398
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1399 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1400 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 } 1401 }
1410 else 1402 else

Diff Legend

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