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.132 by root, Wed Jan 23 06:05:54 2008 UTC vs.
Revision 1.140 by root, Wed Jan 23 14:18:19 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 }
… …
1304 */ 1304 */
1305 bool buffered = bg >= Color_transparent; 1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT 1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false; 1307 buffered = false;
1308#endif 1308#endif
1309 buffered=false;//D
1309 1310
1310 // cut trailing spaces 1311 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1312 while (len && text [len - 1] == ' ')
1312 len--; 1313 len--;
1313 1314
… …
1342 1343
1343 if (buffered) 1344 if (buffered)
1344 { 1345 {
1345 if (ep != enc) 1346 if (ep != enc)
1346 { 1347 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1349
1350#ifdef HAVE_BG_PIXMAP 1350#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0;
1352
1351 if (term->bgPixmap.pixmap) 1353 if (term->bgPixmap.pixmap
1354 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1356 {
1353 Picture dst = 0; 1357 int src_x = x, src_y = y;
1354 1358
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1359 if (term->bgPixmap.is_parentOrigin ())
1356 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1360 {
1361 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y;
1363 }
1364
1365 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y + h)
1367 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0);
1370 }
1357 else 1371 else
1358 dst = XftDrawPicture (d2); 1372 {
1373 XGCValues gcv;
1374
1375 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y;
1379
1380 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv);
1383
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385
1386 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 }
1359 1389
1360 if (dst) 1390 if (dst)
1361 { 1391 {
1362 int src_x = x, src_y = y;
1363
1364 if (term->bgPixmap.is_parentOrigin ())
1365 {
1366 src_x += term->window_vt_x;
1367 src_y += term->window_vt_y;
1368 }
1369
1370 if (term->bgPixmap.pmap_width >= src_x+w
1371 && term->bgPixmap.pmap_height >= src_y+h)
1372 {
1373 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1374 src_x, src_y, w, h, 0, 0);
1375 }
1376 else
1377 {
1378 XGCValues gcv;
1379
1380 gcv.fill_style = FillTiled;
1381 gcv.tile = term->bgPixmap.pixmap;
1382 gcv.ts_x_origin = -src_x;
1383 gcv.ts_y_origin = -src_y;
1384
1385 XChangeGC (disp, gc,
1386 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1387 &gcv);
1388
1389 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1390
1391 gcv.fill_style = FillSolid;
1392 XChangeGC (disp, gc, GCFillStyle, &gcv);
1393 }
1394
1395 if (bg >= 0)
1396 {
1397 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393
1398 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);
1399 }
1400
1401 back_rendered = true;
1402 } 1395 }
1403 } 1396 }
1397 else
1404#endif 1398#endif
1405 1399 clear_rect (d, x, y, w, h, bg);
1406 if (!back_rendered)
1407 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1408 1400
1409 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1410 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1411 } 1403 }
1412 else 1404 else

Diff Legend

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