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 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
30 | |
34 | |
31 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
32 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
33 | |
37 | |
34 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
35 | (prop)->slant >= rxvt_fontprop::italic \ |
39 | (prop)->slant >= rxvt_fontprop::italic \ |
36 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
37 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
38 | )) |
42 | )) |
39 | |
43 | |
40 | const struct rxvt_fallback_font { |
44 | static const struct rxvt_fallback_font { |
41 | codeset cs; |
45 | codeset cs; |
42 | const char *name; |
46 | const char *name; |
43 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
… | |
… | |
128 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
130 | # endif |
134 | # endif |
131 | #endif |
135 | #endif |
132 | |
136 | |
133 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
134 | //{ 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. |
135 | #if XFT |
138 | #if XFT |
136 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
… | |
… | |
155 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
158 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
156 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
159 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
157 | 0x304c, 0x672c, // が本 |
160 | 0x304c, 0x672c, // が本 |
158 | }; |
161 | }; |
159 | |
162 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
164 | #define dTermGC GC gc = term->gc |
164 | |
165 | |
165 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
166 | |
167 | |
… | |
… | |
238 | else if (color >= 0) |
239 | else if (color >= 0) |
239 | { |
240 | { |
240 | #if XFT |
241 | #if XFT |
241 | Picture dst; |
242 | Picture dst; |
242 | |
243 | |
243 | # ifdef HAVE_BG_PIXMAP |
244 | # ifdef HAVE_IMG |
244 | if (term->bgPixmap.pixmap |
245 | if (term->bg_img |
245 | && !term->pix_colors[color].is_opaque () |
246 | && !term->pix_colors[color].is_opaque () |
246 | && ((dst = XftDrawPicture (d)))) |
247 | && ((dst = XftDrawPicture (d)))) |
247 | { |
248 | { |
248 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
249 | |
250 | |
… | |
… | |
261 | } |
262 | } |
262 | } |
263 | } |
263 | |
264 | |
264 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
265 | |
266 | |
266 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
267 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
268 | |
270 | |
269 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
270 | : rxvt_font () |
272 | : rxvt_font () |
271 | { |
273 | { |
… | |
… | |
311 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
312 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
313 | return true; |
315 | return true; |
314 | #endif |
316 | #endif |
315 | |
317 | |
316 | if (IS_COMPOSE (unicode)) |
318 | // we do not check for IS_COMPOSE here, as this would |
317 | return true; |
319 | // rob other fonts from taking over. |
318 | |
320 | |
319 | switch (unicode) |
321 | switch (unicode) |
320 | { |
322 | { |
321 | case ZERO_WIDTH_CHAR: |
323 | case ZERO_WIDTH_CHAR: |
322 | case NOCHAR: |
324 | case NOCHAR: |
… | |
… | |
343 | |
345 | |
344 | XSetForeground (disp, gc, term->pix_colors[fg]); |
346 | XSetForeground (disp, gc, term->pix_colors[fg]); |
345 | |
347 | |
346 | while (len) |
348 | while (len) |
347 | { |
349 | { |
|
|
350 | const text_t *tp = text; |
|
|
351 | text_t t = *tp; |
|
|
352 | |
|
|
353 | while (++text, --len && *text == NOCHAR) |
|
|
354 | ; |
|
|
355 | |
348 | #if ENABLE_COMBINING |
356 | #if ENABLE_COMBINING |
349 | compose_char *cc; |
357 | compose_char *cc; |
350 | #endif |
358 | #endif |
351 | const text_t *tp = text; |
|
|
352 | text_t t = *tp; |
|
|
353 | |
|
|
354 | while (++text, --len && *text == NOCHAR) |
|
|
355 | ; |
|
|
356 | |
|
|
357 | int width = text - tp; |
359 | int width = text - tp; |
358 | int fwidth = term->fwidth * width; |
360 | int fwidth = term->fwidth * width; |
359 | |
361 | |
360 | #ifdef BUILTIN_GLYPHS |
362 | #ifdef BUILTIN_GLYPHS |
361 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
… | |
… | |
443 | #endif |
445 | #endif |
444 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
445 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
446 | { |
448 | { |
447 | min_it (width, 2); // we only support wcwidth up to 2 |
449 | min_it (width, 2); // we only support wcwidth up to 2 |
448 | |
|
|
449 | text_t chrs[2]; |
450 | text_t chrs[2]; |
450 | chrs [1] = NOCHAR; |
451 | chrs [1] = NOCHAR; |
451 | |
452 | |
452 | *chrs = cc->c1; |
453 | *chrs = cc->c1; |
453 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | |
456 | |
456 | if (cc->c2 != NOCHAR) |
457 | if (cc->c2 != NOCHAR) |
457 | { |
458 | { |
458 | bool careful; |
459 | bool careful; |
459 | |
460 | |
460 | // prefer font of first character, for no good reasons |
461 | // prefer font of first character, for no good reasons |
461 | *chrs = cc->c2; |
462 | *chrs = cc->c2; |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | ? f1 |
464 | ? f1 |
464 | : (*fs)[fs->find_font (cc->c2)]; |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
465 | |
466 | |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | } |
468 | } |
468 | } |
469 | } |
469 | #endif |
470 | #endif |
… | |
… | |
473 | case '\t': |
474 | case '\t': |
474 | case ZERO_WIDTH_CHAR: |
475 | case ZERO_WIDTH_CHAR: |
475 | case NOCHAR: |
476 | case NOCHAR: |
476 | break; |
477 | break; |
477 | |
478 | |
|
|
479 | /* |
|
|
480 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
481 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
482 | * decided against that until more data is available. |
|
|
483 | */ |
|
|
484 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
485 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
486 | break; |
|
|
487 | |
478 | default: |
488 | default: |
479 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
489 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
480 | fwidth - 4, term->fheight - 4); |
490 | fwidth - 4, term->fheight - 4); |
481 | } |
491 | } |
482 | |
492 | |
483 | x += fwidth; |
493 | x += fwidth; |
484 | } |
494 | } |
485 | } |
495 | } |
486 | |
496 | |
|
|
497 | struct rxvt_font_overflow : rxvt_font |
|
|
498 | { |
|
|
499 | struct rxvt_fontset *fs; |
|
|
500 | |
|
|
501 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
502 | : rxvt_font () |
|
|
503 | { |
|
|
504 | this->fs = fs; |
|
|
505 | } |
|
|
506 | |
|
|
507 | rxvt_fontprop properties () |
|
|
508 | { |
|
|
509 | rxvt_fontprop p; |
|
|
510 | |
|
|
511 | p.width = p.height = 1; |
|
|
512 | p.ascent = rxvt_fontprop::unset; |
|
|
513 | p.weight = rxvt_fontprop::medium; |
|
|
514 | p.slant = rxvt_fontprop::roman; |
|
|
515 | |
|
|
516 | return p; |
|
|
517 | } |
|
|
518 | |
|
|
519 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
520 | { |
|
|
521 | width = 1; height = 1; |
|
|
522 | ascent = 1; descent = 0; |
|
|
523 | |
|
|
524 | set_name (strdup ("built-in rendition overflow font")); |
|
|
525 | |
|
|
526 | return true; |
|
|
527 | } |
|
|
528 | |
|
|
529 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
530 | { |
|
|
531 | return false; |
|
|
532 | } |
|
|
533 | |
|
|
534 | void draw (rxvt_drawable &d, int x, int y, |
|
|
535 | const text_t *text, int len, |
|
|
536 | int fg, int bg) |
|
|
537 | { |
|
|
538 | while (len) |
|
|
539 | { |
|
|
540 | int fid = fs->find_font_idx (*text); |
|
|
541 | int w = 1; |
|
|
542 | while (w < len && text[w] == NOCHAR) |
|
|
543 | w++; |
|
|
544 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
545 | text += w; |
|
|
546 | len -= w; |
|
|
547 | x += term->fwidth * w; |
|
|
548 | } |
|
|
549 | } |
|
|
550 | }; |
|
|
551 | |
487 | ///////////////////////////////////////////////////////////////////////////// |
552 | ///////////////////////////////////////////////////////////////////////////// |
488 | |
553 | |
489 | struct rxvt_font_x11 : rxvt_font { |
554 | struct rxvt_font_x11 : rxvt_font |
|
|
555 | { |
490 | rxvt_font_x11 () { f = 0; } |
556 | rxvt_font_x11 () { f = 0; } |
491 | |
557 | |
492 | void clear (); |
558 | void clear (); |
493 | |
559 | |
494 | rxvt_fontprop properties (); |
560 | rxvt_fontprop properties (); |
… | |
… | |
499 | |
565 | |
500 | void draw (rxvt_drawable &d, int x, int y, |
566 | void draw (rxvt_drawable &d, int x, int y, |
501 | const text_t *text, int len, |
567 | const text_t *text, int len, |
502 | int fg, int bg); |
568 | int fg, int bg); |
503 | |
569 | |
504 | bool slow; // wether this is a proportional font or has other funny characteristics |
570 | bool slow; // whether this is a proportional font or has other funny characteristics |
505 | XFontStruct *f; |
571 | XFontStruct *f; |
506 | bool enc2b, encm; |
572 | bool enc2b, encm; |
507 | |
573 | |
508 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
574 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
509 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
575 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
666 | f = XLoadQueryFont (disp, name); |
732 | f = XLoadQueryFont (disp, name); |
667 | |
733 | |
668 | if (!f) |
734 | if (!f) |
669 | return false; |
735 | return false; |
670 | |
736 | |
671 | char *new_name = get_property (f, XA_FONT, name); |
737 | char *new_name = get_property (f, XA_FONT, 0); |
672 | |
738 | |
673 | if (new_name) |
739 | if (new_name) |
674 | set_name (new_name); |
740 | set_name (new_name); |
675 | else |
741 | else |
676 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
742 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
677 | |
743 | |
678 | XFreeFont (disp, f); |
744 | XFreeFont (disp, f); |
679 | f = 0; |
745 | f = 0; |
680 | } |
746 | } |
681 | |
747 | |
… | |
… | |
738 | free (fname); |
804 | free (fname); |
739 | if (replace_field (&fname, list[i], 11, '0', "0")) |
805 | if (replace_field (&fname, list[i], 11, '0', "0")) |
740 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
806 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
741 | } |
807 | } |
742 | |
808 | |
743 | if (!set_properties (p, fname)) |
809 | if (!set_properties (p, fname) |
|
|
810 | // also weed out too large fonts |
|
|
811 | || (prop.height != rxvt_fontprop::unset |
|
|
812 | && p.height > prop.height)) |
|
|
813 | { |
|
|
814 | free (fname); |
744 | continue; |
815 | continue; |
745 | |
816 | } |
746 | if (prop.height != rxvt_fontprop::unset |
|
|
747 | && p.height > prop.height) // weed out too large fonts |
|
|
748 | continue; |
|
|
749 | |
817 | |
750 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
818 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
751 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
819 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
752 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
820 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
753 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
821 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
759 | XFreeFontNames (list); |
827 | XFreeFontNames (list); |
760 | |
828 | |
761 | // this loop only iterates when the guessed font-size is too small |
829 | // this loop only iterates when the guessed font-size is too small |
762 | for (;;) |
830 | for (;;) |
763 | { |
831 | { |
764 | font_weight *best = fonts + count - 1; |
832 | font_weight *best = fonts; |
765 | |
833 | |
766 | for (font_weight *w = best; w-- > fonts; ) |
834 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
767 | if (w->diff <= best->diff) |
835 | if (w->diff < best->diff) |
768 | best = w; |
836 | best = w; |
769 | |
837 | |
770 | if (!best->name |
838 | if (!best->name |
771 | || !(f = XLoadQueryFont (disp, best->name))) |
839 | || !(f = XLoadQueryFont (disp, best->name))) |
772 | break; |
840 | break; |
… | |
… | |
810 | free (registry); |
878 | free (registry); |
811 | free (encoding); |
879 | free (encoding); |
812 | |
880 | |
813 | if (cs == CS_UNKNOWN) |
881 | if (cs == CS_UNKNOWN) |
814 | { |
882 | { |
815 | const char *charset = get_property (f, XA_FONT, 0); |
883 | char *value = get_property (f, XA_FONT, 0); |
|
|
884 | const char *charset = value; |
816 | |
885 | |
817 | if (!charset) |
886 | if (!charset) |
818 | charset = name; |
887 | charset = name; |
819 | |
888 | |
820 | int count = 13; |
889 | int count = 13; |
… | |
… | |
823 | break; |
892 | break; |
824 | |
893 | |
825 | cs = codeset_from_name (charset); |
894 | cs = codeset_from_name (charset); |
826 | if (cs == CS_UNKNOWN) |
895 | if (cs == CS_UNKNOWN) |
827 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
896 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
897 | |
|
|
898 | free (value); |
828 | } |
899 | } |
829 | |
900 | |
830 | if (cs == CS_UNKNOWN) |
901 | if (cs == CS_UNKNOWN) |
831 | { |
902 | { |
832 | clear (); |
903 | clear (); |
… | |
… | |
864 | } |
935 | } |
865 | #endif |
936 | #endif |
866 | |
937 | |
867 | width = 1; |
938 | width = 1; |
868 | |
939 | |
869 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
940 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
870 | { |
941 | { |
871 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
942 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
872 | continue; |
943 | continue; |
873 | |
944 | |
874 | // ignore characters we wouldn't use anyways |
945 | // ignore characters we wouldn't use anyways |
875 | bool careful; |
946 | bool careful; |
876 | if (!has_char (*t, &prop, careful)) |
947 | if (!has_char (*t, &prop, careful)) |
877 | continue; |
948 | continue; |
878 | |
949 | |
879 | XChar2b ch = { *t >> 8, *t }; |
950 | // the casts are needed in C++11 (see 8.5.1) |
|
|
951 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
880 | |
952 | |
881 | XCharStruct g; |
953 | XCharStruct g; |
882 | int dir_ret, asc_ret, des_ret; |
954 | int dir_ret, asc_ret, des_ret; |
883 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
955 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
884 | |
956 | |
… | |
… | |
910 | } |
982 | } |
911 | |
983 | |
912 | bool |
984 | bool |
913 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
985 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
914 | { |
986 | { |
|
|
987 | careful = false; |
|
|
988 | |
915 | uint32_t ch = FROM_UNICODE (cs, unicode); |
989 | uint32_t ch = FROM_UNICODE (cs, unicode); |
916 | |
990 | |
917 | if (ch == NOCHAR) |
991 | if (ch == NOCHAR) |
918 | return false; |
992 | return false; |
919 | |
993 | |
920 | /* check wether the character exists in _this_ font. horrible. */ |
994 | /* check whether the character exists in _this_ font. horrible. */ |
921 | XCharStruct *xcs; |
995 | XCharStruct *xcs; |
922 | |
996 | |
923 | if (encm) |
997 | if (encm) |
924 | { |
998 | { |
925 | unsigned char byte1 = ch >> 8; |
999 | unsigned char byte1 = ch >> 8; |
… | |
… | |
955 | return false; |
1029 | return false; |
956 | |
1030 | |
957 | if (!prop || prop->width == rxvt_fontprop::unset) |
1031 | if (!prop || prop->width == rxvt_fontprop::unset) |
958 | return true; |
1032 | return true; |
959 | |
1033 | |
960 | // check wether character overlaps previous/next character |
1034 | // check whether character overlaps previous/next character |
961 | int w = xcs->rbearing - xcs->lbearing; |
1035 | int w = xcs->rbearing - xcs->lbearing; |
962 | int wcw = max (WCWIDTH (unicode), 1); |
1036 | int wcw = max (WCWIDTH (unicode), 1); |
963 | |
1037 | |
964 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1038 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
965 | |
1039 | |
… | |
… | |
982 | dTermDisplay; |
1056 | dTermDisplay; |
983 | dTermGC; |
1057 | dTermGC; |
984 | |
1058 | |
985 | bool slow = this->slow |
1059 | bool slow = this->slow |
986 | || width != term->fwidth |
1060 | || width != term->fwidth |
987 | || height != term->fheight; |
1061 | || height != term->fheight |
|
|
1062 | || ascent != f->ascent; |
988 | |
1063 | |
989 | int base = ascent; // sorry, incorrect: term->fbase; |
1064 | int base = ascent; // sorry, incorrect: term->fbase; |
990 | |
1065 | |
991 | XGCValues v; |
1066 | XGCValues v; |
992 | v.foreground = term->pix_colors[fg]; |
1067 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1060 | |
1135 | |
1061 | ///////////////////////////////////////////////////////////////////////////// |
1136 | ///////////////////////////////////////////////////////////////////////////// |
1062 | |
1137 | |
1063 | #if XFT |
1138 | #if XFT |
1064 | |
1139 | |
1065 | struct rxvt_font_xft : rxvt_font { |
1140 | struct rxvt_font_xft : rxvt_font |
|
|
1141 | { |
1066 | rxvt_font_xft () { f = 0; } |
1142 | rxvt_font_xft () |
|
|
1143 | { |
|
|
1144 | f = 0; |
|
|
1145 | } |
1067 | |
1146 | |
1068 | void clear (); |
1147 | void clear (); |
1069 | |
1148 | |
1070 | rxvt_fontprop properties (); |
1149 | rxvt_fontprop properties (); |
1071 | |
1150 | |
… | |
… | |
1161 | int ftheight = 0; |
1240 | int ftheight = 0; |
1162 | bool success = true; |
1241 | bool success = true; |
1163 | |
1242 | |
1164 | for (;;) |
1243 | for (;;) |
1165 | { |
1244 | { |
|
|
1245 | p = FcPatternDuplicate (match); |
1166 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1246 | f = XftFontOpenPattern (disp, p); |
1167 | |
1247 | |
1168 | if (!f) |
1248 | if (!f) |
1169 | { |
1249 | { |
|
|
1250 | FcPatternDestroy (p); |
1170 | success = false; |
1251 | success = false; |
1171 | break; |
1252 | break; |
1172 | } |
1253 | } |
1173 | |
1254 | |
1174 | FT_Face face = XftLockFace (f); |
1255 | FT_Face face = XftLockFace (f); |
… | |
… | |
1182 | |
1263 | |
1183 | XftUnlockFace (f); |
1264 | XftUnlockFace (f); |
1184 | |
1265 | |
1185 | int glheight = height; |
1266 | int glheight = height; |
1186 | |
1267 | |
1187 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1268 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1188 | { |
1269 | { |
1189 | FcChar16 ch = *t; |
1270 | FcChar16 ch = *t; |
1190 | |
1271 | |
1191 | if (cs != CS_UNICODE |
1272 | if (cs != CS_UNICODE |
1192 | && ch > 0x100 |
1273 | && ch > 0x100 |
… | |
… | |
1211 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1292 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1212 | } |
1293 | } |
1213 | |
1294 | |
1214 | if (!width) |
1295 | if (!width) |
1215 | { |
1296 | { |
1216 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
1297 | rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name); |
1217 | |
1298 | width = f->max_advance_width; |
1218 | XftFontClose (disp, f); |
|
|
1219 | f = 0; |
|
|
1220 | |
|
|
1221 | success = false; |
|
|
1222 | break; |
1299 | break; |
1223 | } |
1300 | } |
1224 | |
1301 | |
1225 | if (prop.height == rxvt_fontprop::unset |
1302 | if (prop.height == rxvt_fontprop::unset |
1226 | || (height <= prop.height && glheight <= prop.height) |
1303 | || (height <= prop.height && glheight <= prop.height) |
… | |
… | |
1261 | bool |
1338 | bool |
1262 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1339 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1263 | { |
1340 | { |
1264 | careful = false; |
1341 | careful = false; |
1265 | |
1342 | |
|
|
1343 | rxvt_compose_expand_static<FcChar32> exp; |
|
|
1344 | FcChar32 *chrs = exp (unicode); |
|
|
1345 | int nchrs = exp.length (chrs); |
|
|
1346 | |
|
|
1347 | // allm chars in sequence must be available |
|
|
1348 | for (int i = 0; i < nchrs; ++i) |
1266 | if (!XftCharExists (term->dpy, f, unicode)) |
1349 | if (!XftCharExists (term->dpy, f, chrs [i])) |
1267 | return false; |
1350 | return false; |
1268 | |
1351 | |
1269 | if (!prop || prop->width == rxvt_fontprop::unset) |
1352 | if (!prop || prop->width == rxvt_fontprop::unset) |
1270 | return true; |
1353 | return true; |
1271 | |
1354 | |
1272 | // check character against base font bounding box |
1355 | int wcw = max (WCWIDTH (chrs [0]), 1); |
1273 | FcChar32 ch = unicode; |
1356 | |
|
|
1357 | // we check against all glyph sizes. this is probably wrong, |
|
|
1358 | // due to the way ->draw positions these glyphs. |
|
|
1359 | for (int i = 0; i < nchrs; ++i) |
|
|
1360 | { |
1274 | XGlyphInfo g; |
1361 | XGlyphInfo g; |
1275 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1362 | XftTextExtents32 (term->dpy, f, chrs + i, 1, &g); |
1276 | |
1363 | |
1277 | int w = g.width - g.x; |
1364 | int w = g.width - g.x; |
1278 | int wcw = max (WCWIDTH (unicode), 1); |
|
|
1279 | |
1365 | |
1280 | careful = g.x > 0 || w > prop->width * wcw; |
1366 | careful = g.x > 0 || w > prop->width * wcw; |
1281 | |
1367 | |
1282 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1368 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1283 | return false; |
1369 | return false; |
1284 | |
1370 | |
1285 | // this weeds out _totally_ broken fonts, or glyphs |
1371 | // this weeds out _totally_ broken fonts, or glyphs |
1286 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1372 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1287 | return false; |
1373 | return false; |
|
|
1374 | } |
1288 | |
1375 | |
1289 | return true; |
1376 | return true; |
1290 | } |
1377 | } |
1291 | |
1378 | |
1292 | void |
1379 | void |
1293 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1380 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1294 | const text_t *text, int len, |
1381 | const text_t *text, int len, |
1295 | int fg, int bg) |
1382 | int fg, int bg) |
1296 | { |
1383 | { |
1297 | XGlyphInfo extents; |
|
|
1298 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1384 | //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D |
1299 | XftGlyphSpec *ep = enc; |
1385 | //XftGlyphSpec *ep = enc;//D |
|
|
1386 | static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow |
1300 | |
1387 | |
1301 | dTermDisplay; |
1388 | dTermDisplay; |
1302 | dTermGC; |
1389 | dTermGC; |
1303 | |
1390 | |
1304 | int w = term->fwidth * len; |
1391 | int w = term->fwidth * len; |
… | |
… | |
1315 | int y_ = buffered ? 0 : y; |
1402 | int y_ = buffered ? 0 : y; |
1316 | |
1403 | |
1317 | while (len) |
1404 | while (len) |
1318 | { |
1405 | { |
1319 | int cwidth = term->fwidth; |
1406 | int cwidth = term->fwidth; |
|
|
1407 | |
|
|
1408 | rxvt_compose_expand_static<FcChar32> exp; |
1320 | FcChar32 fc = *text++; len--; |
1409 | FcChar32 *chrs = exp (*text++); len--; |
|
|
1410 | int nchrs = exp.length (chrs); |
1321 | |
1411 | |
1322 | while (len && *text == NOCHAR) |
1412 | while (len && *text == NOCHAR) |
1323 | text++, len--, cwidth += term->fwidth; |
1413 | text++, len--, cwidth += term->fwidth; |
1324 | |
1414 | |
1325 | if (fc != ' ') // skip spaces |
1415 | if (chrs [0] != ' ') // skip spaces |
|
|
1416 | { |
|
|
1417 | #if 0 |
|
|
1418 | FT_UInt glyphs [decltype (exp)::max_size]; |
|
|
1419 | |
|
|
1420 | for (int i = 0; i < nchrs; ++i) |
|
|
1421 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
|
|
1422 | |
|
|
1423 | for (int i = 0; i < nchrs; ++i) |
1326 | { |
1424 | { |
|
|
1425 | XGlyphInfo ep; |
|
|
1426 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
|
|
1427 | printf ("gs %x g %x + %d,%d o %d,%d wh %d,%d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height); |
|
|
1428 | } |
|
|
1429 | #endif |
|
|
1430 | |
|
|
1431 | for (int i = 0; i < nchrs; ++i) |
|
|
1432 | { |
1327 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1433 | FT_UInt glyph = XftCharIndex (disp, f, chrs [i]); |
|
|
1434 | XGlyphInfo extents; |
1328 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1435 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1329 | |
1436 | |
1330 | ep->glyph = glyph; |
1437 | XftGlyphSpec ep; |
|
|
1438 | |
1331 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1439 | int cx = x_ + (cwidth - extents.xOff >> 1); |
1332 | ep->y = y_ + ascent; |
1440 | int cy = y_ + ascent; |
1333 | |
1441 | |
|
|
1442 | // lone combining char |
1334 | if (extents.xOff == 0) |
1443 | if (extents.xOff == 0) |
1335 | ep->x = x_ + cwidth; |
1444 | cx = x_ + cwidth; |
1336 | |
1445 | |
1337 | ep++; |
1446 | ep.glyph = glyph; |
|
|
1447 | ep.x = cx + extents.x; |
|
|
1448 | ep.y = cy; |
|
|
1449 | |
|
|
1450 | enc.push_back (ep); |
|
|
1451 | } |
1338 | } |
1452 | } |
1339 | |
1453 | |
1340 | x_ += cwidth; |
1454 | x_ += cwidth; |
1341 | } |
1455 | } |
1342 | |
1456 | |
1343 | if (buffered) |
1457 | if (buffered) |
1344 | { |
1458 | { |
1345 | if (ep != enc) |
1459 | if (!enc.empty ()) |
1346 | { |
1460 | { |
1347 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1461 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1348 | |
1462 | |
1349 | #ifdef HAVE_BG_PIXMAP |
1463 | #ifdef HAVE_IMG |
1350 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1464 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1351 | |
1465 | |
1352 | if (term->bgPixmap.pixmap |
1466 | if (term->bg_img |
1353 | && (bg == Color_transparent || bg == Color_bg |
1467 | && (bg == Color_transparent || bg == Color_bg |
1354 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1468 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1355 | { |
1469 | { |
1356 | int src_x = x, src_y = y; |
1470 | int src_x = x, src_y = y; |
1357 | |
1471 | |
1358 | if (term->bgPixmap.is_parentOrigin ()) |
1472 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1359 | { |
1473 | { |
1360 | src_x += term->window_vt_x; |
1474 | src_x += term->window_vt_x; |
1361 | src_y += term->window_vt_y; |
1475 | src_y += term->window_vt_y; |
1362 | } |
1476 | } |
1363 | |
1477 | |
1364 | if (term->bgPixmap.pmap_width >= src_x + w |
1478 | if (term->bg_img->w >= src_x + w |
1365 | && term->bgPixmap.pmap_height >= src_y + h) |
1479 | && term->bg_img->h >= src_y + h) |
1366 | { |
1480 | { |
1367 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1481 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1368 | src_x, src_y, w, h, 0, 0); |
1482 | src_x, src_y, w, h, 0, 0); |
1369 | } |
1483 | } |
1370 | else |
1484 | else |
1371 | { |
1485 | { |
1372 | XGCValues gcv; |
1486 | XGCValues gcv; |
1373 | |
1487 | |
1374 | gcv.fill_style = FillTiled; |
1488 | gcv.fill_style = FillTiled; |
1375 | gcv.tile = term->bgPixmap.pixmap; |
1489 | gcv.tile = term->bg_img->pm; |
1376 | gcv.ts_x_origin = -src_x; |
1490 | gcv.ts_x_origin = -src_x; |
1377 | gcv.ts_y_origin = -src_y; |
1491 | gcv.ts_y_origin = -src_y; |
1378 | |
1492 | |
1379 | XChangeGC (disp, gc, |
1493 | XChangeGC (disp, gc, |
1380 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1494 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1396 | } |
1510 | } |
1397 | else |
1511 | else |
1398 | #endif |
1512 | #endif |
1399 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1513 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1400 | |
1514 | |
1401 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1515 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1402 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1516 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1403 | } |
1517 | } |
1404 | else |
1518 | else |
1405 | clear_rect (d, x, y, w, h, bg); |
1519 | clear_rect (d, x, y, w, h, bg); |
1406 | } |
1520 | } |
1407 | else |
1521 | else |
1408 | { |
1522 | { |
1409 | clear_rect (d, x, y, w, h, bg); |
1523 | clear_rect (d, x, y, w, h, bg); |
1410 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1524 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1411 | } |
1525 | } |
1412 | } |
1526 | } |
1413 | |
1527 | |
1414 | #endif |
1528 | #endif |
1415 | |
1529 | |
… | |
… | |
1432 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1546 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1433 | = rxvt_fontprop::unset; |
1547 | = rxvt_fontprop::unset; |
1434 | force_prop = false; |
1548 | force_prop = false; |
1435 | |
1549 | |
1436 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1550 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1437 | FONT_UNREF (*i); |
1551 | (*i)->unref (); |
1438 | |
1552 | |
1439 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1553 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1440 | delete *p; |
1554 | delete *p; |
1441 | |
1555 | |
1442 | free (fontdesc); fontdesc = 0; |
1556 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1444 | fonts.clear (); |
1558 | fonts.clear (); |
1445 | |
1559 | |
1446 | fallback = fallback_fonts; |
1560 | fallback = fallback_fonts; |
1447 | } |
1561 | } |
1448 | |
1562 | |
|
|
1563 | void |
|
|
1564 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1565 | { |
|
|
1566 | font->set_term (term); |
|
|
1567 | |
|
|
1568 | font->cs = cs; |
|
|
1569 | font->loaded = false; |
|
|
1570 | } |
|
|
1571 | |
1449 | rxvt_font * |
1572 | rxvt_font * |
1450 | rxvt_fontset::new_font (const char *name, codeset cs) |
1573 | rxvt_fontset::new_font (const char *name, codeset cs) |
1451 | { |
1574 | { |
1452 | rxvt_font *f; |
1575 | rxvt_font *f; |
1453 | |
1576 | |
… | |
… | |
1469 | f = new rxvt_font_x11; |
1592 | f = new rxvt_font_x11; |
1470 | } |
1593 | } |
1471 | else |
1594 | else |
1472 | f = new rxvt_font_x11; |
1595 | f = new rxvt_font_x11; |
1473 | |
1596 | |
1474 | f->set_term (term); |
|
|
1475 | f->set_name (strdup (name)); |
1597 | f->set_name (strdup (name)); |
1476 | |
1598 | prepare_font (f, cs); |
1477 | f->cs = cs; |
|
|
1478 | f->loaded = false; |
|
|
1479 | |
1599 | |
1480 | return f; |
1600 | return f; |
1481 | } |
1601 | } |
1482 | |
1602 | |
1483 | ///////////////////////////////////////////////////////////////////////////// |
1603 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1604 | |
|
|
1605 | void |
|
|
1606 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1607 | { |
|
|
1608 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1609 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1610 | // represented in the rendition. |
|
|
1611 | if (fonts.size () == fontCount) |
|
|
1612 | { |
|
|
1613 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1614 | |
|
|
1615 | prepare_font (f, CS_UNICODE); |
|
|
1616 | fonts.push_back (f); |
|
|
1617 | } |
|
|
1618 | |
|
|
1619 | fonts.push_back (font); |
|
|
1620 | } |
1484 | |
1621 | |
1485 | void |
1622 | void |
1486 | rxvt_fontset::add_fonts (const char *desc) |
1623 | rxvt_fontset::add_fonts (const char *desc) |
1487 | { |
1624 | { |
1488 | if (desc) |
1625 | if (desc) |
… | |
… | |
1517 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1654 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1518 | else |
1655 | else |
1519 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1656 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1520 | |
1657 | |
1521 | desc++; |
1658 | desc++; |
1522 | while (*desc <= ' ') desc++; |
1659 | while (*desc <= ' ' && *desc) desc++; |
1523 | } |
1660 | } |
1524 | |
1661 | |
1525 | end = strchr (desc, ','); |
1662 | end = strchr (desc, ','); |
1526 | if (!end) |
1663 | if (!end) |
1527 | end = desc + strlen (desc); |
1664 | end = desc + strlen (desc); |
… | |
… | |
1529 | if (end - desc < 511) |
1666 | if (end - desc < 511) |
1530 | { |
1667 | { |
1531 | memcpy (buf, desc, end - desc); |
1668 | memcpy (buf, desc, end - desc); |
1532 | buf[end - desc] = 0; |
1669 | buf[end - desc] = 0; |
1533 | |
1670 | |
1534 | fonts.push_back (new_font (buf, cs)); |
1671 | push_font (new_font (buf, cs)); |
1535 | } |
1672 | } |
1536 | else |
1673 | else |
1537 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1674 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1538 | |
1675 | |
1539 | desc = end + 1; |
1676 | desc = end + 1; |
1540 | } |
1677 | } |
1541 | while (*end); |
1678 | while (*end); |
1542 | } |
1679 | } |
… | |
… | |
1567 | { |
1704 | { |
1568 | clear (); |
1705 | clear (); |
1569 | |
1706 | |
1570 | fontdesc = strdup (desc); |
1707 | fontdesc = strdup (desc); |
1571 | |
1708 | |
1572 | fonts.push_back (new_font (0, CS_UNICODE)); |
1709 | push_font (new_font (0, CS_UNICODE)); |
1573 | realize_font (0); |
1710 | realize_font (0); |
1574 | |
1711 | |
1575 | add_fonts (desc); |
1712 | add_fonts (desc); |
1576 | |
1713 | |
1577 | return true; |
1714 | return true; |
… | |
… | |
1586 | |
1723 | |
1587 | return -1; |
1724 | return -1; |
1588 | } |
1725 | } |
1589 | |
1726 | |
1590 | int |
1727 | int |
1591 | rxvt_fontset::find_font (unicode_t unicode) |
1728 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1592 | { |
1729 | { |
1593 | if (unicode >= 1<<20) |
1730 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
|
|
1731 | if (unicode > 0x1fffff) |
1594 | return 0; |
1732 | return 0; |
1595 | |
1733 | |
1596 | unicode_t hi = unicode >> 8; |
1734 | unicode_t hi = unicode >> 8; |
1597 | |
1735 | |
1598 | if (hi < fmap.size () |
1736 | if (hi < fmap.size ()) |
1599 | && fmap[hi] |
1737 | if (pagemap *pm = fmap[hi]) |
1600 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1738 | if ((*pm)[unicode & 0xff] != 0xff) |
1601 | return (*fmap[hi])[unicode & 0xff]; |
1739 | return (*pm)[unicode & 0xff]; |
1602 | |
1740 | |
1603 | unsigned int i; |
1741 | unsigned int i; |
1604 | |
1742 | |
1605 | for (i = 0; i < fonts.size (); i++) |
1743 | for (i = 0; i < fonts.size (); i++) |
1606 | { |
1744 | { |
… | |
… | |
1622 | goto next_font; |
1760 | goto next_font; |
1623 | |
1761 | |
1624 | bool careful; |
1762 | bool careful; |
1625 | if (f->has_char (unicode, &prop, careful)) |
1763 | if (f->has_char (unicode, &prop, careful)) |
1626 | { |
1764 | { |
1627 | if (careful) |
1765 | i = (i << 1) | careful; |
1628 | i |= 128; |
|
|
1629 | |
1766 | |
1630 | goto found; |
1767 | goto found; |
1631 | } |
1768 | } |
1632 | |
1769 | |
1633 | next_font: |
1770 | next_font: |
1634 | if (i == fonts.size () - 1) |
1771 | if (i == fonts.size () - 1) |
1635 | { |
1772 | { |
|
|
1773 | // compose characters are handled by the default font, unless another font takes over |
|
|
1774 | // we do not go via the fallback list for speed reasons. |
|
|
1775 | if (IS_COMPOSE (unicode)) |
|
|
1776 | return 0; |
|
|
1777 | |
1636 | if (fallback->name) |
1778 | if (fallback->name) |
1637 | { |
1779 | { |
1638 | // search through the fallback list |
1780 | // search through the fallback list |
1639 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1781 | push_font (new_font (fallback->name, fallback->cs)); |
1640 | fallback++; |
1782 | fallback++; |
1641 | } |
1783 | } |
1642 | else |
1784 | else |
1643 | { |
1785 | { |
1644 | // try to find a new font. |
1786 | // try to find a new font. |
… | |
… | |
1646 | // way to configure this and xft is easier to hack in, |
1788 | // way to configure this and xft is easier to hack in, |
1647 | // while x11 has more framework in place already. |
1789 | // while x11 has more framework in place already. |
1648 | // TODO: this is a real resource hog, xft takes ages(?) |
1790 | // TODO: this is a real resource hog, xft takes ages(?) |
1649 | #if XFT && USE_SLOW_LOOKUP |
1791 | #if XFT && USE_SLOW_LOOKUP |
1650 | // grab the first xft font that seems suitable |
1792 | // grab the first xft font that seems suitable |
|
|
1793 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1651 | FcPattern *p = FcPatternCreate (); |
1794 | FcPattern *p = FcPatternCreate (); |
1652 | |
1795 | |
1653 | FcCharSet *s = FcCharSetCreate (); |
1796 | FcCharSet *s = FcCharSetCreate (); |
1654 | FcCharSetAddChar (s, unicode); |
1797 | FcCharSetAddChar (s, unicode); |
1655 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1798 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1677 | if (find_font (font) < 0) |
1820 | if (find_font (font) < 0) |
1678 | { |
1821 | { |
1679 | char fontname[4096]; |
1822 | char fontname[4096]; |
1680 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1823 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1681 | |
1824 | |
1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1825 | push_font (new_font (fontname, CS_UNICODE)); |
1683 | } |
1826 | } |
1684 | |
1827 | |
1685 | free (font); |
1828 | free (font); |
1686 | } |
1829 | } |
1687 | #endif |
1830 | #endif |
… | |
… | |
1699 | while (hi >= fmap.size ()) |
1842 | while (hi >= fmap.size ()) |
1700 | fmap.push_back (0); |
1843 | fmap.push_back (0); |
1701 | |
1844 | |
1702 | if (!fmap[hi]) |
1845 | if (!fmap[hi]) |
1703 | { |
1846 | { |
1704 | fmap[hi] = (pagemap *)new pagemap; |
1847 | fmap[hi] = new pagemap; |
1705 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1848 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1706 | } |
1849 | } |
1707 | |
1850 | |
1708 | (*fmap[hi])[unicode & 0xff] = i; |
1851 | (*fmap[hi])[unicode & 0xff] = i; |
1709 | } |
1852 | } |