… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtlib.h" |
|
|
25 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
27 | |
26 | |
28 | #include <cstdlib> |
27 | #include <cstdlib> |
29 | |
28 | |
… | |
… | |
238 | XClearArea (disp, d, x, y, w, h, false); |
237 | XClearArea (disp, d, x, y, w, h, false); |
239 | else if (color >= 0) |
238 | else if (color >= 0) |
240 | { |
239 | { |
241 | #if XFT |
240 | #if XFT |
242 | bool done = false; |
241 | bool done = false; |
|
|
242 | |
243 | #ifdef HAVE_BG_PIXMAP |
243 | # ifdef HAVE_BG_PIXMAP |
244 | 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 ()) |
245 | { |
245 | { |
246 | Picture dst = XftDrawPicture (d); |
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | |
247 | if (dst != 0) |
248 | if (dst != 0) |
248 | { |
249 | { |
249 | XClearArea (disp, d, x, y, w, h, false); |
250 | XClearArea (disp, d, x, y, w, h, false); |
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
251 | 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); |
252 | done = true; |
253 | done = true; |
253 | } |
254 | } |
254 | } |
255 | } |
255 | #endif |
256 | # endif |
256 | if (!done) |
257 | if (!done) |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
259 | |
258 | #else |
260 | #else |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
263 | #endif |
262 | } |
264 | } |
… | |
… | |
632 | |
634 | |
633 | if (slashes >= 13 && (!old || *field == old)) |
635 | if (slashes >= 13 && (!old || *field == old)) |
634 | { |
636 | { |
635 | size_t len = field - name; |
637 | size_t len = field - name; |
636 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
638 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
637 | strncpy (*ptr, name, len); |
639 | memcpy (*ptr, name, len); |
638 | strcpy (*ptr + len, replace); |
640 | strcpy (*ptr + len, replace); |
639 | strcat (*ptr, end); |
641 | strcat (*ptr, end); |
640 | |
642 | |
641 | return true; |
643 | return true; |
642 | } |
644 | } |
… | |
… | |
1297 | dTermGC; |
1299 | dTermGC; |
1298 | |
1300 | |
1299 | int w = term->fwidth * len; |
1301 | int w = term->fwidth * len; |
1300 | int h = term->fheight; |
1302 | int h = term->fheight; |
1301 | |
1303 | |
1302 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1304 | /* |
1303 | * 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 |
1304 | * 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. |
1305 | */ |
1307 | */ |
1306 | bool buffered = true |
1308 | bool buffered = bg >= Color_transparent; |
1307 | #ifdef FORCE_UNBUFFERED_XFT |
1309 | #ifdef FORCE_UNBUFFERED_XFT |
1308 | && bg >= 0 |
1310 | buffered = false; |
1309 | #endif |
1311 | #endif |
1310 | ; |
1312 | |
1311 | // cut trailing spaces |
1313 | // cut trailing spaces |
1312 | while (len && text [len - 1] == ' ') |
1314 | while (len && text [len - 1] == ' ') |
1313 | len--; |
1315 | len--; |
1314 | |
1316 | |
1315 | int x_ = buffered ? 0 : x; |
1317 | int x_ = buffered ? 0 : x; |
… | |
… | |
1341 | x_ += cwidth; |
1343 | x_ += cwidth; |
1342 | } |
1344 | } |
1343 | |
1345 | |
1344 | if (buffered) |
1346 | if (buffered) |
1345 | { |
1347 | { |
1346 | bool back_rendered = false; |
|
|
1347 | if (ep != enc) |
1348 | if (ep != enc) |
1348 | { |
1349 | { |
|
|
1350 | bool back_rendered = false; |
1349 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1350 | |
1352 | |
1351 | #ifdef HAVE_BG_PIXMAP |
1353 | #ifdef HAVE_BG_PIXMAP |
1352 | if (term->bgPixmap.pixmap) |
1354 | if (term->bgPixmap.pixmap) |
1353 | { |
1355 | { |
1354 | Picture dst = 0; |
1356 | Picture dst = 0; |
1355 | |
1357 | |
1356 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
|
|
1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1360 | else |
1357 | dst = XftDrawPicture (d2); |
1361 | dst = XftDrawPicture (d2); |
1358 | |
1362 | |
1359 | if (bg < 0 || dst != 0) |
1363 | if (dst) |
1360 | { |
1364 | { |
1361 | int src_x = x, src_y = y ; |
1365 | int src_x = x, src_y = y; |
1362 | |
1366 | |
1363 | if (term->bgPixmap.is_parentOrigin ()) |
1367 | if (term->bgPixmap.is_parentOrigin ()) |
1364 | { |
1368 | { |
1365 | src_x += term->window_vt_x; |
1369 | src_x += term->window_vt_x; |
1366 | src_y += term->window_vt_y; |
1370 | src_y += term->window_vt_y; |
… | |
… | |
1400 | back_rendered = true; |
1404 | back_rendered = true; |
1401 | } |
1405 | } |
1402 | } |
1406 | } |
1403 | #endif |
1407 | #endif |
1404 | |
1408 | |
1405 | if (bg >= 0 && !back_rendered) |
1409 | if (!back_rendered) |
1406 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
1407 | |
1411 | |
1408 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1409 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1410 | } |
1414 | } |
1411 | else |
1415 | else |
… | |
… | |
1533 | if (!end) |
1537 | if (!end) |
1534 | end = desc + strlen (desc); |
1538 | end = desc + strlen (desc); |
1535 | |
1539 | |
1536 | if (end - desc < 511) |
1540 | if (end - desc < 511) |
1537 | { |
1541 | { |
1538 | strncpy (buf, desc, end - desc); |
1542 | memcpy (buf, desc, end - desc); |
1539 | buf[end - desc] = 0; |
1543 | buf[end - desc] = 0; |
1540 | |
1544 | |
1541 | fonts.push_back (new_font (buf, cs)); |
1545 | fonts.push_back (new_font (buf, cs)); |
1542 | } |
1546 | } |
1543 | else |
1547 | else |