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.127 by ayin, Mon Jan 7 12:41:31 2008 UTC vs.
Revision 1.134 by root, Wed Jan 23 09:42:02 2008 UTC

… …
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 bool done = false;
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 && color >= 0 && !term->pix_colors[color].is_opaque ())
244 { 245 {
245 Picture dst = XftDrawPicture (d); 246 Picture dst = XftDrawPicture (d);
247
246 if (dst != 0) 248 if (dst != 0)
247 { 249 {
248 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 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); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true; 253 done = true;
252 } 254 }
253 } 255 }
254#endif 256# endif
255 if (!done) 257 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259
257#else 260#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 261 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 262 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 263#endif
261 } 264 }
… …
1296 dTermGC; 1299 dTermGC;
1297 1300
1298 int w = term->fwidth * len; 1301 int w = term->fwidth * len;
1299 int h = term->fheight; 1302 int h = term->fheight;
1300 1303
1301 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1304 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1305 * 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. 1306 * good idea from the perspective of packaging for wide variety of user configs.
1304 */ 1307 */
1305 bool buffered = true 1308 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT 1309#ifdef FORCE_UNBUFFERED_XFT
1307 && bg >= 0 1310 buffered = false;
1308#endif 1311#endif
1309 ; 1312
1310 // cut trailing spaces 1313 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1314 while (len && text [len - 1] == ' ')
1312 len--; 1315 len--;
1313 1316
1314 int x_ = buffered ? 0 : x; 1317 int x_ = buffered ? 0 : x;
… …
1340 x_ += cwidth; 1343 x_ += cwidth;
1341 } 1344 }
1342 1345
1343 if (buffered) 1346 if (buffered)
1344 { 1347 {
1345 bool back_rendered = false;
1346 if (ep != enc) 1348 if (ep != enc)
1347 { 1349 {
1350 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1352
1350#ifdef HAVE_BG_PIXMAP 1353#ifdef HAVE_BG_PIXMAP
1354
1351 if (term->bgPixmap.pixmap) 1355 if (term->bgPixmap.pixmap
1356 && !(bg >= 0 && term->pix_colors[bg].is_opaque ()))
1352 { 1357 {
1353 Picture dst = 0;
1354
1355 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1356 dst = XftDrawPicture (d2); 1358 Picture dst = XftDrawPicture (d2);
1357 1359
1358 if (bg < 0 || dst != 0) 1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1359 { 1363 {
1360 int src_x = x, src_y = y ;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x; 1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 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);
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 } 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 && dst) // colour must be (and is) non-opaque here
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1401 } 1400 }
1402#endif 1401#endif
1403 1402
1404 if (bg >= 0 && !back_rendered) 1403 if (!back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1404 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1406 1405
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1406 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1407 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 } 1408 }
1410 else 1409 else

Diff Legend

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