| … | |
… | |
| 631 | |
631 | |
| 632 | if (slashes >= 13 && (!old || *field == old)) |
632 | if (slashes >= 13 && (!old || *field == old)) |
| 633 | { |
633 | { |
| 634 | size_t len = field - name; |
634 | size_t len = field - name; |
| 635 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
635 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
| 636 | strncpy (*ptr, name, len); |
636 | memcpy (*ptr, name, len); |
| 637 | strcpy (*ptr + len, replace); |
637 | strcpy (*ptr + len, replace); |
| 638 | strcat (*ptr, end); |
638 | strcat (*ptr, end); |
| 639 | |
639 | |
| 640 | return true; |
640 | return true; |
| 641 | } |
641 | } |
| … | |
… | |
| 1296 | dTermGC; |
1296 | dTermGC; |
| 1297 | |
1297 | |
| 1298 | int w = term->fwidth * len; |
1298 | int w = term->fwidth * len; |
| 1299 | int h = term->fheight; |
1299 | int h = term->fheight; |
| 1300 | |
1300 | |
| 1301 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1301 | /* |
| 1302 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1302 | * 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. |
1303 | * good idea from the perspective of packaging for wide variety of user configs. |
| 1304 | */ |
1304 | */ |
| 1305 | bool buffered = true |
1305 | bool buffered = bg >= 0; |
| 1306 | #ifdef FORCE_UNBUFFERED_XFT |
1306 | #ifdef FORCE_UNBUFFERED_XFT |
| 1307 | && bg >= 0 |
1307 | buffered = false; |
| 1308 | #endif |
1308 | #endif |
| 1309 | ; |
1309 | |
| 1310 | // cut trailing spaces |
1310 | // cut trailing spaces |
| 1311 | while (len && text [len - 1] == ' ') |
1311 | while (len && text [len - 1] == ' ') |
| 1312 | len--; |
1312 | len--; |
| 1313 | |
1313 | |
| 1314 | int x_ = buffered ? 0 : x; |
1314 | int x_ = buffered ? 0 : x; |
| … | |
… | |
| 1340 | x_ += cwidth; |
1340 | x_ += cwidth; |
| 1341 | } |
1341 | } |
| 1342 | |
1342 | |
| 1343 | if (buffered) |
1343 | if (buffered) |
| 1344 | { |
1344 | { |
| 1345 | bool back_rendered = false; |
|
|
| 1346 | if (ep != enc) |
1345 | if (ep != enc) |
| 1347 | { |
1346 | { |
|
|
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 | if (term->bgPixmap.pixmap) |
1351 | if (term->bgPixmap.pixmap) |
| 1352 | { |
1352 | { |
| 1353 | Picture dst = 0; |
1353 | Picture dst = 0; |
| 1354 | |
1354 | |
| 1355 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1355 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0xff00) |
| 1356 | dst = XftDrawPicture (d2); |
1356 | dst = XftDrawPicture (d2); |
| 1357 | |
1357 | |
| 1358 | if (bg < 0 || dst != 0) |
1358 | if (bg < 0 || dst != 0) |
| 1359 | { |
1359 | { |
| 1360 | int src_x = x, src_y = y ; |
1360 | int src_x = x, src_y = y ; |
| … | |
… | |
| 1388 | |
1388 | |
| 1389 | gcv.fill_style = FillSolid; |
1389 | gcv.fill_style = FillSolid; |
| 1390 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1390 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1391 | } |
1391 | } |
| 1392 | |
1392 | |
| 1393 | if (bg >= 0) |
|
|
| 1394 | { |
|
|
| 1395 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1393 | 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); |
1394 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
| 1397 | } |
|
|
| 1398 | |
1395 | |
| 1399 | back_rendered = true; |
1396 | back_rendered = true; |
| 1400 | } |
1397 | } |
| 1401 | } |
1398 | } |
| 1402 | #endif |
1399 | #endif |
| 1403 | |
1400 | |
| 1404 | if (bg >= 0 && !back_rendered) |
1401 | if (!back_rendered) |
| 1405 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1402 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
| 1406 | |
1403 | |
| 1407 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1404 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1408 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1405 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1409 | } |
1406 | } |
| … | |
… | |
| 1532 | if (!end) |
1529 | if (!end) |
| 1533 | end = desc + strlen (desc); |
1530 | end = desc + strlen (desc); |
| 1534 | |
1531 | |
| 1535 | if (end - desc < 511) |
1532 | if (end - desc < 511) |
| 1536 | { |
1533 | { |
| 1537 | strncpy (buf, desc, end - desc); |
1534 | memcpy (buf, desc, end - desc); |
| 1538 | buf[end - desc] = 0; |
1535 | buf[end - desc] = 0; |
| 1539 | |
1536 | |
| 1540 | fonts.push_back (new_font (buf, cs)); |
1537 | fonts.push_back (new_font (buf, cs)); |
| 1541 | } |
1538 | } |
| 1542 | else |
1539 | else |
