| … | |
… | |
| 232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
| 233 | { |
233 | { |
| 234 | dTermDisplay; |
234 | dTermDisplay; |
| 235 | dTermGC; |
235 | dTermGC; |
| 236 | |
236 | |
| 237 | if (color == Color_bg) |
237 | if (color == Color_bg || color == Color_transparent) |
| 238 | XClearArea (disp, d, x, y, w, h, false); |
238 | XClearArea (disp, d, x, y, w, h, false); |
| 239 | else if (color >= 0) |
239 | else if (color >= 0) |
| 240 | { |
240 | { |
| 241 | #if XFT |
241 | #if XFT |
| 242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
| … | |
… | |
| 441 | *chrs = cc->c2; |
441 | *chrs = cc->c2; |
| 442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
| 443 | ? f1 |
443 | ? f1 |
| 444 | : (*fs)[fs->find_font (cc->c2)]; |
444 | : (*fs)[fs->find_font (cc->c2)]; |
| 445 | |
445 | |
| 446 | f2->draw (d, x, y, chrs, width, fg, -1); |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
| 447 | } |
447 | } |
| 448 | } |
448 | } |
| 449 | #endif |
449 | #endif |
| 450 | else |
450 | else |
| 451 | switch (t) |
451 | switch (t) |
| … | |
… | |
| 1272 | dTermGC; |
1272 | dTermGC; |
| 1273 | |
1273 | |
| 1274 | int w = term->fwidth * len; |
1274 | int w = term->fwidth * len; |
| 1275 | int h = term->fheight; |
1275 | int h = term->fheight; |
| 1276 | |
1276 | |
| 1277 | bool buffered = bg >= 0 // we don't use a transparent bg |
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1278 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1279 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1280 | */ |
|
|
1281 | bool buffered = true |
| 1278 | #ifndef FORCE_UNBUFFERED_XFT |
1282 | #ifdef FORCE_UNBUFFERED_XFT |
| 1279 | # if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
1283 | && bg >= 0 |
| 1280 | || !term->am_transparent // we aren't transparent |
|
|
| 1281 | || term->am_pixmap_trans // we have a pixmap |
|
|
| 1282 | # endif |
|
|
| 1283 | #endif |
1284 | #endif |
| 1284 | ; |
1285 | ; |
| 1285 | |
|
|
| 1286 | // cut trailing spaces |
1286 | // cut trailing spaces |
| 1287 | while (len && text [len - 1] == ' ') |
1287 | while (len && text [len - 1] == ' ') |
| 1288 | len--; |
1288 | len--; |
| 1289 | |
1289 | |
| 1290 | int x_ = buffered ? 0 : x; |
1290 | int x_ = buffered ? 0 : x; |
| … | |
… | |
| 1319 | if (buffered) |
1319 | if (buffered) |
| 1320 | { |
1320 | { |
| 1321 | if (ep != enc) |
1321 | if (ep != enc) |
| 1322 | { |
1322 | { |
| 1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1324 | bool back_rendered = false; |
| 1324 | |
1325 | |
| 1325 | if (0) |
1326 | #ifdef HAVE_BG_PIXMAP |
| 1326 | ; |
|
|
| 1327 | #ifdef TRANSPARENT |
|
|
| 1328 | else if (bg < 0 && term->am_pixmap_trans) |
|
|
| 1329 | XCopyArea (disp, term->pixmap, d2, gc, |
|
|
| 1330 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
| 1331 | w, h, 0, 0); |
|
|
| 1332 | #endif |
|
|
| 1333 | #ifdef XPM_BACKGROUND |
|
|
| 1334 | else if (bg < 0 && term->bgPixmap.pixmap) |
1327 | if (term->bgPixmap.pixmap) |
| 1335 | { |
1328 | { |
|
|
1329 | Picture dst = 0; |
|
|
1330 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1331 | dst = XftDrawPicture(d2); |
|
|
1332 | |
|
|
1333 | if (bg < 0 || dst != 0) |
|
|
1334 | { |
|
|
1335 | if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w |
|
|
1336 | && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) |
|
|
1337 | { |
|
|
1338 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1339 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
1340 | w, h, 0, 0); |
|
|
1341 | } |
|
|
1342 | else |
|
|
1343 | { |
| 1336 | XGCValues gcv; |
1344 | XGCValues gcv; |
| 1337 | |
1345 | |
| 1338 | gcv.fill_style = FillTiled; |
1346 | gcv.fill_style = FillTiled; |
| 1339 | gcv.tile = term->pixmap; |
1347 | gcv.tile = term->bgPixmap.pixmap; |
| 1340 | gcv.ts_x_origin = -x; |
1348 | gcv.ts_x_origin = -x; |
| 1341 | gcv.ts_y_origin = -y; |
1349 | gcv.ts_y_origin = -y; |
| 1342 | |
1350 | |
|
|
1351 | #if 0 |
| 1343 | GC gc2 = XCreateGC (disp, d2, |
1352 | GC gc2 = XCreateGC (disp, d2, |
|
|
1353 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1354 | &gcv); |
|
|
1355 | #endif |
|
|
1356 | XChangeGC (disp, gc, |
| 1344 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1357 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
| 1345 | &gcv); |
1358 | &gcv); |
| 1346 | |
1359 | |
| 1347 | XFillRectangle (disp, d2, gc2, 0, 0, w, h); |
1360 | XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); |
| 1348 | |
1361 | |
|
|
1362 | gcv.fill_style = FillSolid; |
|
|
1363 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1349 | XFreeGC (disp, gc2); |
1364 | /* XFreeGC (disp, gc2); */ |
|
|
1365 | |
|
|
1366 | } |
|
|
1367 | if (bg >= 0) |
|
|
1368 | { |
|
|
1369 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1370 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1371 | } |
|
|
1372 | back_rendered = true; |
|
|
1373 | } |
| 1350 | } |
1374 | } |
| 1351 | #endif |
1375 | #endif |
| 1352 | else |
1376 | |
|
|
1377 | if(bg >= 0 && !back_rendered) |
| 1353 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1378 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
| 1354 | |
1379 | |
| 1355 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1380 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1356 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1381 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1357 | } |
1382 | } |
