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.137 by root, Wed Jan 23 10:57:19 2008 UTC vs.
Revision 1.149 by ayin, Thu Feb 21 13:45:28 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
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1134
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1139#endif
1140 1140
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1142 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1143
… …
1296 dTermGC; 1296 dTermGC;
1297 1297
1298 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1299 int h = term->fheight; 1299 int h = term->fheight;
1300 1300
1301 /*
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.
1304 */
1305 bool buffered = bg >= Color_transparent; 1301 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1302 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1303
1310 // cut trailing spaces 1304 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1305 while (len && text [len - 1] == ' ')
1312 len--; 1306 len--;
1313 1307
… …
1342 1336
1343 if (buffered) 1337 if (buffered)
1344 { 1338 {
1345 if (ep != enc) 1339 if (ep != enc)
1346 { 1340 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1341 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1342
1350#ifdef HAVE_BG_PIXMAP 1343#ifdef HAVE_BG_PIXMAP
1344 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1345
1352 if (term->bgPixmap.pixmap 1346 if (term->bgPixmap.pixmap
1353 && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) 1347 && (bg == Color_transparent || bg == Color_bg
1348 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1354 { 1349 {
1355 Picture dst = XftDrawPicture (d2);
1356
1357 int src_x = x, src_y = y; 1350 int src_x = x, src_y = y;
1358 1351
1359 if (term->bgPixmap.is_parentOrigin ()) 1352 if (term->bgPixmap.is_parentOrigin ())
1360 { 1353 {
1361 src_x += term->window_vt_x; 1354 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1355 src_y += term->window_vt_y;
1363 } 1356 }
1364 1357
1365 if (term->bgPixmap.pmap_width >= src_x+w 1358 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1359 && term->bgPixmap.pmap_height >= src_y + h)
1367 { 1360 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1361 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1362 src_x, src_y, w, h, 0, 0);
1370 } 1363 }
1371 else 1364 else
… …
1385 1378
1386 gcv.fill_style = FillSolid; 1379 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1380 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1381 }
1389 1382
1390 if (bg >= 0 && dst) // colour must be (and is) non-opaque here 1383 if (dst)
1391 { 1384 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1385 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1386
1387 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1388 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 } 1389 }
1395
1396 back_rendered = true;
1397 } 1390 }
1391 else
1398#endif 1392#endif
1399
1400 if (!back_rendered)
1401 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1393 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1402 1394
1403 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1395 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1404 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1396 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1405 } 1397 }
1406 else 1398 else

Diff Legend

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