… | |
… | |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 3 of the License, or |
10 | * (at your option) any later version. |
10 | * (at your option) any later version. |
11 | * |
11 | * |
12 | * This program is distributed in the hope that it will be useful, |
12 | * This program is distributed in the hope that it will be useful, |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <stdlib.h> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
30 | |
30 | |
31 | #if XFT |
31 | #if XFT |
32 | # include <fontconfig/fontconfig.h> |
32 | # include <fontconfig/fontconfig.h> |
… | |
… | |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
134 | # endif |
134 | # endif |
135 | #endif |
135 | #endif |
136 | |
136 | |
137 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
138 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
137 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
139 | #if XFT |
138 | #if XFT |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
… | |
… | |
240 | else if (color >= 0) |
239 | else if (color >= 0) |
241 | { |
240 | { |
242 | #if XFT |
241 | #if XFT |
243 | Picture dst; |
242 | Picture dst; |
244 | |
243 | |
245 | # ifdef HAVE_BG_PIXMAP |
244 | # ifdef HAVE_IMG |
246 | if (term->bg_pixmap |
245 | if (term->bg_img |
247 | && !term->pix_colors[color].is_opaque () |
246 | && !term->pix_colors[color].is_opaque () |
248 | && ((dst = XftDrawPicture (d)))) |
247 | && ((dst = XftDrawPicture (d)))) |
249 | { |
248 | { |
250 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
251 | |
250 | |
… | |
… | |
263 | } |
262 | } |
264 | } |
263 | } |
265 | |
264 | |
266 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
267 | |
266 | |
268 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
269 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
270 | |
270 | |
271 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
272 | : rxvt_font () |
272 | : rxvt_font () |
273 | { |
273 | { |
… | |
… | |
475 | case '\t': |
475 | case '\t': |
476 | case ZERO_WIDTH_CHAR: |
476 | case ZERO_WIDTH_CHAR: |
477 | case NOCHAR: |
477 | case NOCHAR: |
478 | break; |
478 | break; |
479 | |
479 | |
|
|
480 | /* |
|
|
481 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
482 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
483 | * decided against that until more data is available. |
|
|
484 | */ |
|
|
485 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
486 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
487 | break; |
|
|
488 | |
480 | default: |
489 | default: |
481 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
490 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
482 | fwidth - 4, term->fheight - 4); |
491 | fwidth - 4, term->fheight - 4); |
483 | } |
492 | } |
484 | |
493 | |
485 | x += fwidth; |
494 | x += fwidth; |
486 | } |
495 | } |
487 | } |
496 | } |
488 | |
497 | |
489 | struct rxvt_font_overflow : rxvt_font { |
498 | struct rxvt_font_overflow : rxvt_font |
|
|
499 | { |
490 | struct rxvt_fontset *fs; |
500 | struct rxvt_fontset *fs; |
491 | |
501 | |
492 | rxvt_font_overflow (rxvt_fontset *fs) |
502 | rxvt_font_overflow (rxvt_fontset *fs) |
493 | : rxvt_font () |
503 | : rxvt_font () |
494 | { |
504 | { |
… | |
… | |
540 | } |
550 | } |
541 | }; |
551 | }; |
542 | |
552 | |
543 | ///////////////////////////////////////////////////////////////////////////// |
553 | ///////////////////////////////////////////////////////////////////////////// |
544 | |
554 | |
545 | struct rxvt_font_x11 : rxvt_font { |
555 | struct rxvt_font_x11 : rxvt_font |
|
|
556 | { |
546 | rxvt_font_x11 () { f = 0; } |
557 | rxvt_font_x11 () { f = 0; } |
547 | |
558 | |
548 | void clear (); |
559 | void clear (); |
549 | |
560 | |
550 | rxvt_fontprop properties (); |
561 | rxvt_fontprop properties (); |
… | |
… | |
817 | XFreeFontNames (list); |
828 | XFreeFontNames (list); |
818 | |
829 | |
819 | // this loop only iterates when the guessed font-size is too small |
830 | // this loop only iterates when the guessed font-size is too small |
820 | for (;;) |
831 | for (;;) |
821 | { |
832 | { |
822 | font_weight *best = fonts + count - 1; |
833 | font_weight *best = fonts; |
823 | |
834 | |
824 | for (font_weight *w = best; w-- > fonts; ) |
835 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
825 | if (w->diff <= best->diff) |
836 | if (w->diff < best->diff) |
826 | best = w; |
837 | best = w; |
827 | |
838 | |
828 | if (!best->name |
839 | if (!best->name |
829 | || !(f = XLoadQueryFont (disp, best->name))) |
840 | || !(f = XLoadQueryFont (disp, best->name))) |
830 | break; |
841 | break; |
… | |
… | |
925 | } |
936 | } |
926 | #endif |
937 | #endif |
927 | |
938 | |
928 | width = 1; |
939 | width = 1; |
929 | |
940 | |
930 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
941 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
931 | { |
942 | { |
932 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
943 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
933 | continue; |
944 | continue; |
934 | |
945 | |
935 | // ignore characters we wouldn't use anyways |
946 | // ignore characters we wouldn't use anyways |
936 | bool careful; |
947 | bool careful; |
937 | if (!has_char (*t, &prop, careful)) |
948 | if (!has_char (*t, &prop, careful)) |
938 | continue; |
949 | continue; |
939 | |
950 | |
940 | XChar2b ch = { *t >> 8, *t }; |
951 | // the casts are needed in C++11 (see 8.5.1) |
|
|
952 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
941 | |
953 | |
942 | XCharStruct g; |
954 | XCharStruct g; |
943 | int dir_ret, asc_ret, des_ret; |
955 | int dir_ret, asc_ret, des_ret; |
944 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
956 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
945 | |
957 | |
… | |
… | |
1045 | dTermDisplay; |
1057 | dTermDisplay; |
1046 | dTermGC; |
1058 | dTermGC; |
1047 | |
1059 | |
1048 | bool slow = this->slow |
1060 | bool slow = this->slow |
1049 | || width != term->fwidth |
1061 | || width != term->fwidth |
1050 | || height != term->fheight; |
1062 | || height != term->fheight |
|
|
1063 | || ascent != f->ascent; |
1051 | |
1064 | |
1052 | int base = ascent; // sorry, incorrect: term->fbase; |
1065 | int base = ascent; // sorry, incorrect: term->fbase; |
1053 | |
1066 | |
1054 | XGCValues v; |
1067 | XGCValues v; |
1055 | v.foreground = term->pix_colors[fg]; |
1068 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1123 | |
1136 | |
1124 | ///////////////////////////////////////////////////////////////////////////// |
1137 | ///////////////////////////////////////////////////////////////////////////// |
1125 | |
1138 | |
1126 | #if XFT |
1139 | #if XFT |
1127 | |
1140 | |
1128 | struct rxvt_font_xft : rxvt_font { |
1141 | struct rxvt_font_xft : rxvt_font |
|
|
1142 | { |
1129 | rxvt_font_xft () { f = 0; } |
1143 | rxvt_font_xft () |
|
|
1144 | { |
|
|
1145 | f = 0; |
|
|
1146 | } |
1130 | |
1147 | |
1131 | void clear (); |
1148 | void clear (); |
1132 | |
1149 | |
1133 | rxvt_fontprop properties (); |
1150 | rxvt_fontprop properties (); |
1134 | |
1151 | |
… | |
… | |
1247 | |
1264 | |
1248 | XftUnlockFace (f); |
1265 | XftUnlockFace (f); |
1249 | |
1266 | |
1250 | int glheight = height; |
1267 | int glheight = height; |
1251 | |
1268 | |
1252 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
1269 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1253 | { |
1270 | { |
1254 | FcChar16 ch = *t; |
1271 | FcChar16 ch = *t; |
1255 | |
1272 | |
1256 | if (cs != CS_UNICODE |
1273 | if (cs != CS_UNICODE |
1257 | && ch > 0x100 |
1274 | && ch > 0x100 |
… | |
… | |
1409 | { |
1426 | { |
1410 | if (ep != enc) |
1427 | if (ep != enc) |
1411 | { |
1428 | { |
1412 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1429 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1413 | |
1430 | |
1414 | #ifdef HAVE_BG_PIXMAP |
1431 | #ifdef HAVE_IMG |
1415 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1432 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1416 | |
1433 | |
1417 | if (term->bg_pixmap |
1434 | if (term->bg_img |
1418 | && (bg == Color_transparent || bg == Color_bg |
1435 | && (bg == Color_transparent || bg == Color_bg |
1419 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1436 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1420 | { |
1437 | { |
1421 | int src_x = x, src_y = y; |
1438 | int src_x = x, src_y = y; |
1422 | |
1439 | |
… | |
… | |
1424 | { |
1441 | { |
1425 | src_x += term->window_vt_x; |
1442 | src_x += term->window_vt_x; |
1426 | src_y += term->window_vt_y; |
1443 | src_y += term->window_vt_y; |
1427 | } |
1444 | } |
1428 | |
1445 | |
1429 | if (term->bg_pmap_width >= src_x + w |
1446 | if (term->bg_img->w >= src_x + w |
1430 | && term->bg_pmap_height >= src_y + h) |
1447 | && term->bg_img->h >= src_y + h) |
1431 | { |
1448 | { |
1432 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1449 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1433 | src_x, src_y, w, h, 0, 0); |
1450 | src_x, src_y, w, h, 0, 0); |
1434 | } |
1451 | } |
1435 | else |
1452 | else |
1436 | { |
1453 | { |
1437 | XGCValues gcv; |
1454 | XGCValues gcv; |
1438 | |
1455 | |
1439 | gcv.fill_style = FillTiled; |
1456 | gcv.fill_style = FillTiled; |
1440 | gcv.tile = term->bg_pixmap; |
1457 | gcv.tile = term->bg_img->pm; |
1441 | gcv.ts_x_origin = -src_x; |
1458 | gcv.ts_x_origin = -src_x; |
1442 | gcv.ts_y_origin = -src_y; |
1459 | gcv.ts_y_origin = -src_y; |
1443 | |
1460 | |
1444 | XChangeGC (disp, gc, |
1461 | XChangeGC (disp, gc, |
1445 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1462 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1605 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1622 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1606 | else |
1623 | else |
1607 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1624 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1608 | |
1625 | |
1609 | desc++; |
1626 | desc++; |
1610 | while (*desc <= ' ') desc++; |
1627 | while (*desc <= ' ' && *desc) desc++; |
1611 | } |
1628 | } |
1612 | |
1629 | |
1613 | end = strchr (desc, ','); |
1630 | end = strchr (desc, ','); |
1614 | if (!end) |
1631 | if (!end) |
1615 | end = desc + strlen (desc); |
1632 | end = desc + strlen (desc); |
… | |
… | |
1733 | // way to configure this and xft is easier to hack in, |
1750 | // way to configure this and xft is easier to hack in, |
1734 | // while x11 has more framework in place already. |
1751 | // while x11 has more framework in place already. |
1735 | // TODO: this is a real resource hog, xft takes ages(?) |
1752 | // TODO: this is a real resource hog, xft takes ages(?) |
1736 | #if XFT && USE_SLOW_LOOKUP |
1753 | #if XFT && USE_SLOW_LOOKUP |
1737 | // grab the first xft font that seems suitable |
1754 | // grab the first xft font that seems suitable |
|
|
1755 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1738 | FcPattern *p = FcPatternCreate (); |
1756 | FcPattern *p = FcPatternCreate (); |
1739 | |
1757 | |
1740 | FcCharSet *s = FcCharSetCreate (); |
1758 | FcCharSet *s = FcCharSetCreate (); |
1741 | FcCharSetAddChar (s, unicode); |
1759 | FcCharSetAddChar (s, unicode); |
1742 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1760 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1786 | while (hi >= fmap.size ()) |
1804 | while (hi >= fmap.size ()) |
1787 | fmap.push_back (0); |
1805 | fmap.push_back (0); |
1788 | |
1806 | |
1789 | if (!fmap[hi]) |
1807 | if (!fmap[hi]) |
1790 | { |
1808 | { |
1791 | fmap[hi] = (pagemap *)new pagemap; |
1809 | fmap[hi] = new pagemap; |
1792 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1810 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1793 | } |
1811 | } |
1794 | |
1812 | |
1795 | (*fmap[hi])[unicode & 0xff] = i; |
1813 | (*fmap[hi])[unicode & 0xff] = i; |
1796 | } |
1814 | } |