1 | /*----------------------------------------------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
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" }, |
… | |
… | |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
158 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
159 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
161 | 0x304c, 0x672c, // が本 |
160 | 0x304c, 0x672c, // が本 |
162 | }; |
161 | }; |
163 | |
162 | |
164 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
165 | |
|
|
166 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermDisplay Display *disp = term->dpy |
167 | #define dTermGC GC gc = term->gc |
164 | #define dTermGC GC gc = term->gc |
168 | |
165 | |
169 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
170 | |
167 | |
… | |
… | |
242 | else if (color >= 0) |
239 | else if (color >= 0) |
243 | { |
240 | { |
244 | #if XFT |
241 | #if XFT |
245 | Picture dst; |
242 | Picture dst; |
246 | |
243 | |
247 | # ifdef HAVE_BG_PIXMAP |
244 | # ifdef HAVE_IMG |
248 | if (term->bgPixmap.pixmap |
245 | if (term->bg_img |
249 | && !term->pix_colors[color].is_opaque () |
246 | && !term->pix_colors[color].is_opaque () |
250 | && ((dst = XftDrawPicture (d)))) |
247 | && ((dst = XftDrawPicture (d)))) |
251 | { |
248 | { |
252 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
253 | |
250 | |
… | |
… | |
265 | } |
262 | } |
266 | } |
263 | } |
267 | |
264 | |
268 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
269 | |
266 | |
270 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
271 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
272 | |
270 | |
273 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
274 | : rxvt_font () |
272 | : rxvt_font () |
275 | { |
273 | { |
… | |
… | |
477 | case '\t': |
475 | case '\t': |
478 | case ZERO_WIDTH_CHAR: |
476 | case ZERO_WIDTH_CHAR: |
479 | case NOCHAR: |
477 | case NOCHAR: |
480 | break; |
478 | break; |
481 | |
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 | |
482 | default: |
489 | default: |
483 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
490 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
484 | fwidth - 4, term->fheight - 4); |
491 | fwidth - 4, term->fheight - 4); |
485 | } |
492 | } |
486 | |
493 | |
487 | x += fwidth; |
494 | x += fwidth; |
488 | } |
495 | } |
489 | } |
496 | } |
490 | |
497 | |
491 | struct rxvt_font_overflow : rxvt_font { |
498 | struct rxvt_font_overflow : rxvt_font |
|
|
499 | { |
492 | struct rxvt_fontset *fs; |
500 | struct rxvt_fontset *fs; |
493 | |
501 | |
494 | rxvt_font_overflow (rxvt_fontset *fs) |
502 | rxvt_font_overflow (rxvt_fontset *fs) |
495 | : rxvt_font () |
503 | : rxvt_font () |
496 | { |
504 | { |
… | |
… | |
526 | |
534 | |
527 | void draw (rxvt_drawable &d, int x, int y, |
535 | void draw (rxvt_drawable &d, int x, int y, |
528 | const text_t *text, int len, |
536 | const text_t *text, int len, |
529 | int fg, int bg) |
537 | int fg, int bg) |
530 | { |
538 | { |
531 | while (len--) |
539 | while (len) |
532 | { |
540 | { |
533 | int fid = fs->find_font_idx (*text); |
541 | int fid = fs->find_font_idx (*text); |
|
|
542 | int w = 1; |
|
|
543 | while (w < len && text[w] == NOCHAR) |
|
|
544 | w++; |
534 | (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); |
545 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
535 | ++text; |
546 | text += w; |
|
|
547 | len -= w; |
536 | x += term->fwidth; |
548 | x += term->fwidth * w; |
537 | } |
549 | } |
538 | } |
550 | } |
539 | }; |
551 | }; |
540 | |
552 | |
541 | ///////////////////////////////////////////////////////////////////////////// |
553 | ///////////////////////////////////////////////////////////////////////////// |
542 | |
554 | |
543 | struct rxvt_font_x11 : rxvt_font { |
555 | struct rxvt_font_x11 : rxvt_font |
|
|
556 | { |
544 | rxvt_font_x11 () { f = 0; } |
557 | rxvt_font_x11 () { f = 0; } |
545 | |
558 | |
546 | void clear (); |
559 | void clear (); |
547 | |
560 | |
548 | rxvt_fontprop properties (); |
561 | rxvt_fontprop properties (); |
… | |
… | |
720 | f = XLoadQueryFont (disp, name); |
733 | f = XLoadQueryFont (disp, name); |
721 | |
734 | |
722 | if (!f) |
735 | if (!f) |
723 | return false; |
736 | return false; |
724 | |
737 | |
725 | char *new_name = get_property (f, XA_FONT, name); |
738 | char *new_name = get_property (f, XA_FONT, 0); |
726 | |
739 | |
727 | if (new_name) |
740 | if (new_name) |
728 | set_name (new_name); |
741 | set_name (new_name); |
729 | else |
742 | else |
730 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
743 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
731 | |
744 | |
732 | XFreeFont (disp, f); |
745 | XFreeFont (disp, f); |
733 | f = 0; |
746 | f = 0; |
734 | } |
747 | } |
735 | |
748 | |
… | |
… | |
792 | free (fname); |
805 | free (fname); |
793 | if (replace_field (&fname, list[i], 11, '0', "0")) |
806 | if (replace_field (&fname, list[i], 11, '0', "0")) |
794 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
807 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
795 | } |
808 | } |
796 | |
809 | |
797 | if (!set_properties (p, fname)) |
810 | if (!set_properties (p, fname) |
|
|
811 | // also weed out too large fonts |
|
|
812 | || (prop.height != rxvt_fontprop::unset |
|
|
813 | && p.height > prop.height)) |
|
|
814 | { |
|
|
815 | free (fname); |
798 | continue; |
816 | continue; |
799 | |
817 | } |
800 | if (prop.height != rxvt_fontprop::unset |
|
|
801 | && p.height > prop.height) // weed out too large fonts |
|
|
802 | continue; |
|
|
803 | |
818 | |
804 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
819 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
805 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
820 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
806 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
821 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
807 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
822 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
813 | XFreeFontNames (list); |
828 | XFreeFontNames (list); |
814 | |
829 | |
815 | // 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 |
816 | for (;;) |
831 | for (;;) |
817 | { |
832 | { |
818 | font_weight *best = fonts + count - 1; |
833 | font_weight *best = fonts; |
819 | |
834 | |
820 | for (font_weight *w = best; w-- > fonts; ) |
835 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
821 | if (w->diff <= best->diff) |
836 | if (w->diff < best->diff) |
822 | best = w; |
837 | best = w; |
823 | |
838 | |
824 | if (!best->name |
839 | if (!best->name |
825 | || !(f = XLoadQueryFont (disp, best->name))) |
840 | || !(f = XLoadQueryFont (disp, best->name))) |
826 | break; |
841 | break; |
… | |
… | |
864 | free (registry); |
879 | free (registry); |
865 | free (encoding); |
880 | free (encoding); |
866 | |
881 | |
867 | if (cs == CS_UNKNOWN) |
882 | if (cs == CS_UNKNOWN) |
868 | { |
883 | { |
869 | const char *charset = get_property (f, XA_FONT, 0); |
884 | char *value = get_property (f, XA_FONT, 0); |
|
|
885 | const char *charset = value; |
870 | |
886 | |
871 | if (!charset) |
887 | if (!charset) |
872 | charset = name; |
888 | charset = name; |
873 | |
889 | |
874 | int count = 13; |
890 | int count = 13; |
… | |
… | |
877 | break; |
893 | break; |
878 | |
894 | |
879 | cs = codeset_from_name (charset); |
895 | cs = codeset_from_name (charset); |
880 | if (cs == CS_UNKNOWN) |
896 | if (cs == CS_UNKNOWN) |
881 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
897 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
898 | |
|
|
899 | free (value); |
882 | } |
900 | } |
883 | |
901 | |
884 | if (cs == CS_UNKNOWN) |
902 | if (cs == CS_UNKNOWN) |
885 | { |
903 | { |
886 | clear (); |
904 | clear (); |
… | |
… | |
918 | } |
936 | } |
919 | #endif |
937 | #endif |
920 | |
938 | |
921 | width = 1; |
939 | width = 1; |
922 | |
940 | |
923 | for (uint16_t *t = extent_test_chars + NUM_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++) |
924 | { |
942 | { |
925 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
943 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
926 | continue; |
944 | continue; |
927 | |
945 | |
928 | // ignore characters we wouldn't use anyways |
946 | // ignore characters we wouldn't use anyways |
929 | bool careful; |
947 | bool careful; |
930 | if (!has_char (*t, &prop, careful)) |
948 | if (!has_char (*t, &prop, careful)) |
931 | continue; |
949 | continue; |
932 | |
950 | |
933 | 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 }; |
934 | |
953 | |
935 | XCharStruct g; |
954 | XCharStruct g; |
936 | int dir_ret, asc_ret, des_ret; |
955 | int dir_ret, asc_ret, des_ret; |
937 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
956 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
938 | |
957 | |
… | |
… | |
964 | } |
983 | } |
965 | |
984 | |
966 | bool |
985 | bool |
967 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
986 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
968 | { |
987 | { |
|
|
988 | careful = false; |
|
|
989 | |
969 | uint32_t ch = FROM_UNICODE (cs, unicode); |
990 | uint32_t ch = FROM_UNICODE (cs, unicode); |
970 | |
991 | |
971 | if (ch == NOCHAR) |
992 | if (ch == NOCHAR) |
972 | return false; |
993 | return false; |
973 | |
994 | |
… | |
… | |
1036 | dTermDisplay; |
1057 | dTermDisplay; |
1037 | dTermGC; |
1058 | dTermGC; |
1038 | |
1059 | |
1039 | bool slow = this->slow |
1060 | bool slow = this->slow |
1040 | || width != term->fwidth |
1061 | || width != term->fwidth |
1041 | || height != term->fheight; |
1062 | || height != term->fheight |
|
|
1063 | || ascent != f->ascent; |
1042 | |
1064 | |
1043 | int base = ascent; // sorry, incorrect: term->fbase; |
1065 | int base = ascent; // sorry, incorrect: term->fbase; |
1044 | |
1066 | |
1045 | XGCValues v; |
1067 | XGCValues v; |
1046 | v.foreground = term->pix_colors[fg]; |
1068 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1114 | |
1136 | |
1115 | ///////////////////////////////////////////////////////////////////////////// |
1137 | ///////////////////////////////////////////////////////////////////////////// |
1116 | |
1138 | |
1117 | #if XFT |
1139 | #if XFT |
1118 | |
1140 | |
1119 | struct rxvt_font_xft : rxvt_font { |
1141 | struct rxvt_font_xft : rxvt_font |
|
|
1142 | { |
1120 | rxvt_font_xft () { f = 0; } |
1143 | rxvt_font_xft () |
|
|
1144 | { |
|
|
1145 | f = 0; |
|
|
1146 | } |
1121 | |
1147 | |
1122 | void clear (); |
1148 | void clear (); |
1123 | |
1149 | |
1124 | rxvt_fontprop properties (); |
1150 | rxvt_fontprop properties (); |
1125 | |
1151 | |
… | |
… | |
1215 | int ftheight = 0; |
1241 | int ftheight = 0; |
1216 | bool success = true; |
1242 | bool success = true; |
1217 | |
1243 | |
1218 | for (;;) |
1244 | for (;;) |
1219 | { |
1245 | { |
|
|
1246 | p = FcPatternDuplicate (match); |
1220 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1247 | f = XftFontOpenPattern (disp, p); |
1221 | |
1248 | |
1222 | if (!f) |
1249 | if (!f) |
1223 | { |
1250 | { |
|
|
1251 | FcPatternDestroy (p); |
1224 | success = false; |
1252 | success = false; |
1225 | break; |
1253 | break; |
1226 | } |
1254 | } |
1227 | |
1255 | |
1228 | FT_Face face = XftLockFace (f); |
1256 | FT_Face face = XftLockFace (f); |
… | |
… | |
1236 | |
1264 | |
1237 | XftUnlockFace (f); |
1265 | XftUnlockFace (f); |
1238 | |
1266 | |
1239 | int glheight = height; |
1267 | int glheight = height; |
1240 | |
1268 | |
1241 | for (uint16_t *t = extent_test_chars + NUM_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++) |
1242 | { |
1270 | { |
1243 | FcChar16 ch = *t; |
1271 | FcChar16 ch = *t; |
1244 | |
1272 | |
1245 | if (cs != CS_UNICODE |
1273 | if (cs != CS_UNICODE |
1246 | && ch > 0x100 |
1274 | && ch > 0x100 |
… | |
… | |
1398 | { |
1426 | { |
1399 | if (ep != enc) |
1427 | if (ep != enc) |
1400 | { |
1428 | { |
1401 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1429 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1402 | |
1430 | |
1403 | #ifdef HAVE_BG_PIXMAP |
1431 | #ifdef HAVE_IMG |
1404 | 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 |
1405 | |
1433 | |
1406 | if (term->bgPixmap.pixmap |
1434 | if (term->bg_img |
1407 | && (bg == Color_transparent || bg == Color_bg |
1435 | && (bg == Color_transparent || bg == Color_bg |
1408 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1436 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1409 | { |
1437 | { |
1410 | int src_x = x, src_y = y; |
1438 | int src_x = x, src_y = y; |
1411 | |
1439 | |
1412 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1440 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1413 | { |
1441 | { |
1414 | src_x += term->window_vt_x; |
1442 | src_x += term->window_vt_x; |
1415 | src_y += term->window_vt_y; |
1443 | src_y += term->window_vt_y; |
1416 | } |
1444 | } |
1417 | |
1445 | |
1418 | if (term->bgPixmap.pmap_width >= src_x + w |
1446 | if (term->bg_img->w >= src_x + w |
1419 | && term->bgPixmap.pmap_height >= src_y + h) |
1447 | && term->bg_img->h >= src_y + h) |
1420 | { |
1448 | { |
1421 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1449 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1422 | src_x, src_y, w, h, 0, 0); |
1450 | src_x, src_y, w, h, 0, 0); |
1423 | } |
1451 | } |
1424 | else |
1452 | else |
1425 | { |
1453 | { |
1426 | XGCValues gcv; |
1454 | XGCValues gcv; |
1427 | |
1455 | |
1428 | gcv.fill_style = FillTiled; |
1456 | gcv.fill_style = FillTiled; |
1429 | gcv.tile = term->bgPixmap.pixmap; |
1457 | gcv.tile = term->bg_img->pm; |
1430 | gcv.ts_x_origin = -src_x; |
1458 | gcv.ts_x_origin = -src_x; |
1431 | gcv.ts_y_origin = -src_y; |
1459 | gcv.ts_y_origin = -src_y; |
1432 | |
1460 | |
1433 | XChangeGC (disp, gc, |
1461 | XChangeGC (disp, gc, |
1434 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1462 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1594 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1622 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1595 | else |
1623 | else |
1596 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1624 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1597 | |
1625 | |
1598 | desc++; |
1626 | desc++; |
1599 | while (*desc <= ' ') desc++; |
1627 | while (*desc <= ' ' && *desc) desc++; |
1600 | } |
1628 | } |
1601 | |
1629 | |
1602 | end = strchr (desc, ','); |
1630 | end = strchr (desc, ','); |
1603 | if (!end) |
1631 | if (!end) |
1604 | end = desc + strlen (desc); |
1632 | end = desc + strlen (desc); |
… | |
… | |
1609 | buf[end - desc] = 0; |
1637 | buf[end - desc] = 0; |
1610 | |
1638 | |
1611 | push_font (new_font (buf, cs)); |
1639 | push_font (new_font (buf, cs)); |
1612 | } |
1640 | } |
1613 | else |
1641 | else |
1614 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1642 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1615 | |
1643 | |
1616 | desc = end + 1; |
1644 | desc = end + 1; |
1617 | } |
1645 | } |
1618 | while (*end); |
1646 | while (*end); |
1619 | } |
1647 | } |
… | |
… | |
1722 | // way to configure this and xft is easier to hack in, |
1750 | // way to configure this and xft is easier to hack in, |
1723 | // while x11 has more framework in place already. |
1751 | // while x11 has more framework in place already. |
1724 | // TODO: this is a real resource hog, xft takes ages(?) |
1752 | // TODO: this is a real resource hog, xft takes ages(?) |
1725 | #if XFT && USE_SLOW_LOOKUP |
1753 | #if XFT && USE_SLOW_LOOKUP |
1726 | // 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 |
1727 | FcPattern *p = FcPatternCreate (); |
1756 | FcPattern *p = FcPatternCreate (); |
1728 | |
1757 | |
1729 | FcCharSet *s = FcCharSetCreate (); |
1758 | FcCharSet *s = FcCharSetCreate (); |
1730 | FcCharSetAddChar (s, unicode); |
1759 | FcCharSetAddChar (s, unicode); |
1731 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1760 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1775 | while (hi >= fmap.size ()) |
1804 | while (hi >= fmap.size ()) |
1776 | fmap.push_back (0); |
1805 | fmap.push_back (0); |
1777 | |
1806 | |
1778 | if (!fmap[hi]) |
1807 | if (!fmap[hi]) |
1779 | { |
1808 | { |
1780 | fmap[hi] = (pagemap *)new pagemap; |
1809 | fmap[hi] = new pagemap; |
1781 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1810 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1782 | } |
1811 | } |
1783 | |
1812 | |
1784 | (*fmap[hi])[unicode & 0xff] = i; |
1813 | (*fmap[hi])[unicode & 0xff] = i; |
1785 | } |
1814 | } |