| … | |
… | |
| 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 | } |
| … | |
… | |
| 610 | return false; |
612 | return false; |
| 611 | } |
613 | } |
| 612 | |
614 | |
| 613 | // fix the size of scalable fonts |
615 | // fix the size of scalable fonts |
| 614 | static bool |
616 | static bool |
| 615 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
617 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
| 616 | { |
618 | { |
| 617 | int slashes = 0; |
619 | int slashes = 0; |
| 618 | const char *field, *end; |
620 | const char *field, *end; |
| 619 | |
621 | |
| 620 | for (const char *c = name; *c; c++) |
622 | for (const char *c = name; *c; c++) |
| … | |
… | |
| 630 | break; |
632 | break; |
| 631 | } |
633 | } |
| 632 | |
634 | |
| 633 | if (slashes >= 13 && (!old || *field == old)) |
635 | if (slashes >= 13 && (!old || *field == old)) |
| 634 | { |
636 | { |
| 635 | // TODO: check for overflow in font-name |
637 | size_t len = field - name; |
| 636 | strncpy (buf, name, field - name); |
638 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
| 637 | buf += field - name; |
639 | memcpy (*ptr, name, len); |
| 638 | strcpy (buf, replace); |
640 | strcpy (*ptr + len, replace); |
| 639 | strcat (buf, end); |
641 | strcat (*ptr, end); |
| 640 | |
642 | |
| 641 | return true; |
643 | return true; |
| 642 | } |
644 | } |
| 643 | else |
645 | else |
| 644 | { |
646 | { |
| 645 | strcpy (buf, name); |
647 | *ptr = strdup (name); |
| 646 | |
648 | |
| 647 | return false; |
649 | return false; |
| 648 | } |
650 | } |
| 649 | } |
651 | } |
| 650 | |
652 | |
| … | |
… | |
| 658 | char field_str[64]; // enough for 128 bits |
660 | char field_str[64]; // enough for 128 bits |
| 659 | |
661 | |
| 660 | // first morph the font if required |
662 | // first morph the font if required |
| 661 | if (force_prop) |
663 | if (force_prop) |
| 662 | { |
664 | { |
| 663 | char fname[1024]; |
665 | char *fname; |
| 664 | |
666 | |
| 665 | if (name[0] != '-') |
667 | if (name[0] != '-') |
| 666 | { |
668 | { |
| 667 | f = XLoadQueryFont (disp, name); |
669 | f = XLoadQueryFont (disp, name); |
| 668 | |
670 | |
| … | |
… | |
| 680 | f = 0; |
682 | f = 0; |
| 681 | } |
683 | } |
| 682 | |
684 | |
| 683 | if (prop.weight != rxvt_fontprop::unset) |
685 | if (prop.weight != rxvt_fontprop::unset) |
| 684 | { |
686 | { |
| 685 | replace_field (fname, name, 2, 0, |
687 | replace_field (&fname, name, 2, 0, |
| 686 | prop.weight < rxvt_fontprop::bold |
688 | prop.weight < rxvt_fontprop::bold |
| 687 | ? "medium" : "bold"); |
689 | ? "medium" : "bold"); |
| 688 | set_name (strdup (fname)); |
690 | set_name (fname); |
| 689 | } |
691 | } |
| 690 | |
692 | |
| 691 | if (prop.slant != rxvt_fontprop::unset) |
693 | if (prop.slant != rxvt_fontprop::unset) |
| 692 | { |
694 | { |
| 693 | replace_field (fname, name, 3, 0, |
695 | replace_field (&fname, name, 3, 0, |
| 694 | prop.slant < rxvt_fontprop::italic |
696 | prop.slant < rxvt_fontprop::italic |
| 695 | ? "r" : "i"); // TODO: handle "o"blique, too |
697 | ? "r" : "i"); // TODO: handle "o"blique, too |
| 696 | set_name (strdup (fname)); |
698 | set_name (fname); |
| 697 | } |
699 | } |
| 698 | } |
700 | } |
| 699 | |
701 | |
| 700 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
702 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
| 701 | ? 0 : prop.height); |
703 | ? 0 : prop.height); |
| … | |
… | |
| 726 | font_weight *fonts = new font_weight[count]; |
728 | font_weight *fonts = new font_weight[count]; |
| 727 | |
729 | |
| 728 | for (int i = 0; i < count; i++) |
730 | for (int i = 0; i < count; i++) |
| 729 | { |
731 | { |
| 730 | rxvt_fontprop p; |
732 | rxvt_fontprop p; |
| 731 | char fname[1024]; |
733 | char *fname; |
| 732 | |
734 | |
| 733 | int diff = 0; |
735 | int diff = 0; |
| 734 | |
736 | |
| 735 | if (replace_field (fname, list[i], 6, '0', field_str)) |
737 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
| 736 | diff += 10; // slightly penalize scalable fonts |
738 | diff += 10; // slightly penalize scalable fonts |
|
|
739 | else |
|
|
740 | { |
|
|
741 | free (fname); |
| 737 | else if (replace_field (fname, list[i], 11, '0', "0")) |
742 | if (replace_field (&fname, list[i], 11, '0', "0")) |
| 738 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
743 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
744 | } |
| 739 | |
745 | |
| 740 | if (!set_properties (p, fname)) |
746 | if (!set_properties (p, fname)) |
| 741 | continue; |
747 | continue; |
| 742 | |
748 | |
| 743 | if (prop.height != rxvt_fontprop::unset |
749 | if (prop.height != rxvt_fontprop::unset |
| … | |
… | |
| 747 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
753 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
| 748 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
754 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
| 749 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
755 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
| 750 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
756 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
| 751 | |
757 | |
| 752 | fonts[i].name = strdup (fname); |
758 | fonts[i].name = fname; |
| 753 | fonts[i].diff = diff; |
759 | fonts[i].diff = diff; |
| 754 | } |
760 | } |
| 755 | |
761 | |
| 756 | XFreeFontNames (list); |
762 | XFreeFontNames (list); |
| 757 | |
763 | |
| … | |
… | |
| 1293 | dTermGC; |
1299 | dTermGC; |
| 1294 | |
1300 | |
| 1295 | int w = term->fwidth * len; |
1301 | int w = term->fwidth * len; |
| 1296 | int h = term->fheight; |
1302 | int h = term->fheight; |
| 1297 | |
1303 | |
| 1298 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1304 | /* |
| 1299 | * 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 |
| 1300 | * 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. |
| 1301 | */ |
1307 | */ |
| 1302 | bool buffered = true |
1308 | bool buffered = bg >= Color_transparent; |
| 1303 | #ifdef FORCE_UNBUFFERED_XFT |
1309 | #ifdef FORCE_UNBUFFERED_XFT |
| 1304 | && bg >= 0 |
1310 | buffered = false; |
| 1305 | #endif |
1311 | #endif |
| 1306 | ; |
1312 | |
| 1307 | // cut trailing spaces |
1313 | // cut trailing spaces |
| 1308 | while (len && text [len - 1] == ' ') |
1314 | while (len && text [len - 1] == ' ') |
| 1309 | len--; |
1315 | len--; |
| 1310 | |
1316 | |
| 1311 | int x_ = buffered ? 0 : x; |
1317 | int x_ = buffered ? 0 : x; |
| … | |
… | |
| 1337 | x_ += cwidth; |
1343 | x_ += cwidth; |
| 1338 | } |
1344 | } |
| 1339 | |
1345 | |
| 1340 | if (buffered) |
1346 | if (buffered) |
| 1341 | { |
1347 | { |
| 1342 | bool back_rendered = false; |
|
|
| 1343 | if (ep != enc) |
1348 | if (ep != enc) |
| 1344 | { |
1349 | { |
|
|
1350 | bool back_rendered = false; |
| 1345 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1346 | |
1352 | |
| 1347 | #ifdef HAVE_BG_PIXMAP |
1353 | #ifdef HAVE_BG_PIXMAP |
| 1348 | if (term->bgPixmap.pixmap) |
1354 | if (term->bgPixmap.pixmap) |
| 1349 | { |
1355 | { |
| 1350 | Picture dst = 0; |
1356 | Picture dst = 0; |
| 1351 | |
1357 | |
| 1352 | 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 |
| 1353 | dst = XftDrawPicture (d2); |
1361 | dst = XftDrawPicture (d2); |
| 1354 | |
1362 | |
| 1355 | if (bg < 0 || dst != 0) |
1363 | if (dst) |
| 1356 | { |
1364 | { |
| 1357 | int src_x = x, src_y = y ; |
1365 | int src_x = x, src_y = y; |
| 1358 | |
1366 | |
| 1359 | if (term->bgPixmap.is_parentOrigin ()) |
1367 | if (term->bgPixmap.is_parentOrigin ()) |
| 1360 | { |
1368 | { |
| 1361 | src_x += term->window_vt_x; |
1369 | src_x += term->window_vt_x; |
| 1362 | src_y += term->window_vt_y; |
1370 | src_y += term->window_vt_y; |
| … | |
… | |
| 1396 | back_rendered = true; |
1404 | back_rendered = true; |
| 1397 | } |
1405 | } |
| 1398 | } |
1406 | } |
| 1399 | #endif |
1407 | #endif |
| 1400 | |
1408 | |
| 1401 | if (bg >= 0 && !back_rendered) |
1409 | if (!back_rendered) |
| 1402 | 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); |
| 1403 | |
1411 | |
| 1404 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1405 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1406 | } |
1414 | } |
| 1407 | else |
1415 | else |
| … | |
… | |
| 1529 | if (!end) |
1537 | if (!end) |
| 1530 | end = desc + strlen (desc); |
1538 | end = desc + strlen (desc); |
| 1531 | |
1539 | |
| 1532 | if (end - desc < 511) |
1540 | if (end - desc < 511) |
| 1533 | { |
1541 | { |
| 1534 | strncpy (buf, desc, end - desc); |
1542 | memcpy (buf, desc, end - desc); |
| 1535 | buf[end - desc] = 0; |
1543 | buf[end - desc] = 0; |
| 1536 | |
1544 | |
| 1537 | fonts.push_back (new_font (buf, cs)); |
1545 | fonts.push_back (new_font (buf, cs)); |
| 1538 | } |
1546 | } |
| 1539 | else |
1547 | else |
