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.144 by root, Fri Jan 25 10:54:54 2008 UTC

… …
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 }
… …
1342 1342
1343 if (buffered) 1343 if (buffered)
1344 { 1344 {
1345 if (ep != enc) 1345 if (ep != enc)
1346 { 1346 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1348
1350#ifdef HAVE_BG_PIXMAP 1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1351 if (term->bgPixmap.pixmap) 1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1355 {
1353 Picture dst = 0; 1356 int src_x = x, src_y = y;
1354 1357
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1358 if (term->bgPixmap.is_parentOrigin ())
1356 dst = XftDrawPicture (d2); 1359 {
1360 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y;
1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1373
1374 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1381 &gcv);
1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1357 1388
1358 if (dst) 1389 if (dst)
1359 { 1390 {
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); 1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // 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); 1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 } 1395 }
1401 } 1396 }
1397 else
1402#endif 1398#endif
1403
1404 if (!back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1406 1400
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 } 1403 }
1410 else 1404 else

Diff Legend

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