ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.132 by root, Wed Jan 23 06:05:54 2008 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 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
40const struct rxvt_fallback_font { 44static 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" },
… …
79 83
80 // japanese 84 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 86# if XFT
83 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 92# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
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
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 218{
218} 219}
219 220
220void 221void
221rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
222{ 223{
223 if (this->name == name) 224 if (name == name_)
224 return; 225 return;
225 226
226 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
227 this->name = name; 228 name = name_;
228} 229}
229 230
230void 231void
231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232{ 233{
… …
236 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 239 else if (color >= 0)
239 { 240 {
240#if XFT 241#if XFT
241 bool done = false; 242 Picture dst;
242#ifdef HAVE_BG_PIXMAP 243
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
244 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
245 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
246 if (dst != 0)
247 { 248 {
248 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 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);
251 done = true;
252 } 253 }
253 } 254 else
254#endif 255# endif
255 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
257#else 258#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 261#endif
261 } 262 }
… …
448 449
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
497struct rxvt_font_overflow : rxvt_font {
498 struct rxvt_fontset *fs;
499
500 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font ()
502 {
503 this->fs = fs;
504 }
505
506 rxvt_fontprop properties ()
507 {
508 rxvt_fontprop p;
509
510 p.width = p.height = 1;
511 p.ascent = rxvt_fontprop::unset;
512 p.weight = rxvt_fontprop::medium;
513 p.slant = rxvt_fontprop::roman;
514
515 return p;
516 }
517
518 bool load (const rxvt_fontprop &prop, bool force_prop)
519 {
520 width = 1; height = 1;
521 ascent = 1; descent = 0;
522
523 set_name (strdup ("built-in rendition overflow font"));
524
525 return true;
526 }
527
528 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
529 {
530 return false;
531 }
532
533 void draw (rxvt_drawable &d, int x, int y,
534 const text_t *text, int len,
535 int fg, int bg)
536 {
537 while (len)
538 {
539 int fid = fs->find_font_idx (*text);
540 int w = 1;
541 while (w < len && text[w] == NOCHAR)
542 w++;
543 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
544 text += w;
545 len -= w;
546 x += term->fwidth * w;
547 }
548 }
549};
550
487///////////////////////////////////////////////////////////////////////////// 551/////////////////////////////////////////////////////////////////////////////
488 552
489struct rxvt_font_x11 : rxvt_font { 553struct rxvt_font_x11 : rxvt_font {
490 rxvt_font_x11 () { f = 0; } 554 rxvt_font_x11 () { f = 0; }
491 555
… …
499 563
500 void draw (rxvt_drawable &d, int x, int y, 564 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 565 const text_t *text, int len,
502 int fg, int bg); 566 int fg, int bg);
503 567
504 bool slow; // wether this is a proportional font or has other funny characteristics 568 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 569 XFontStruct *f;
506 bool enc2b, encm; 570 bool enc2b, encm;
507 571
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 572 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); 573 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 730 f = XLoadQueryFont (disp, name);
667 731
668 if (!f) 732 if (!f)
669 return false; 733 return false;
670 734
671 char *new_name = get_property (f, XA_FONT, name); 735 char *new_name = get_property (f, XA_FONT, 0);
672 736
673 if (new_name) 737 if (new_name)
674 set_name (new_name); 738 set_name (new_name);
675 else 739 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 740 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 741
678 XFreeFont (disp, f); 742 XFreeFont (disp, f);
679 f = 0; 743 f = 0;
680 } 744 }
681 745
… …
738 free (fname); 802 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 803 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 804 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 805 }
742 806
743 if (!set_properties (p, fname)) 807 if (!set_properties (p, fname)
808 // also weed out too large fonts
809 || (prop.height != rxvt_fontprop::unset
810 && p.height > prop.height))
811 {
812 free (fname);
744 continue; 813 continue;
745 814 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 815
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 816 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); 817 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); 818 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); 819 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 825 XFreeFontNames (list);
760 826
761 // this loop only iterates when the guessed font-size is too small 827 // this loop only iterates when the guessed font-size is too small
762 for (;;) 828 for (;;)
763 { 829 {
764 font_weight *best = fonts + count - 1; 830 font_weight *best = fonts;
765 831
766 for (font_weight *w = best; w-- > fonts; ) 832 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 833 if (w->diff < best->diff)
768 best = w; 834 best = w;
769 835
770 if (!best->name 836 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 837 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 838 break;
… …
792 return false; 858 return false;
793 859
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 860 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 861 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 862
863 cs = CS_UNKNOWN;
864
797 if (registry && encoding) 865 if (registry && encoding)
798 { 866 {
799 char charset[64]; 867 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 868 snprintf (charset, 64, "%s-%s", registry, encoding);
801 869
802 cs = codeset_from_name (charset); 870 cs = codeset_from_name (charset);
803 } 871
804 else 872 if (cs == CS_UNKNOWN)
873 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 874 }
875
876 free (registry);
877 free (encoding);
878
879 if (cs == CS_UNKNOWN)
880 {
806 const char *charset = get_property (f, XA_FONT, 0); 881 char *value = get_property (f, XA_FONT, 0);
882 const char *charset = value;
807 883
808 if (!charset) 884 if (!charset)
809 charset = name; 885 charset = name;
810 886
811 int count = 13; 887 int count = 13;
812 while (*charset) 888 while (*charset)
813 if (*charset++ == '-' && !--count) 889 if (*charset++ == '-' && !--count)
814 break; 890 break;
815 891
816 cs = codeset_from_name (charset); 892 cs = codeset_from_name (charset);
893 if (cs == CS_UNKNOWN)
894 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
895
896 free (value);
897 }
898
899 if (cs == CS_UNKNOWN)
817 } 900 {
818 901 clear ();
819 free (registry); 902 return false;
820 free (encoding); 903 }
821 904
822 if (cs == CS_UNICODE) 905 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 906 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 907
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 908 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 933 }
851#endif 934#endif
852 935
853 width = 1; 936 width = 1;
854 937
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 938 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
856 { 939 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 940 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 941 continue;
859 942
860 // ignore characters we wouldn't use anyways 943 // ignore characters we wouldn't use anyways
861 bool careful; 944 bool careful;
862 if (!has_char (*t, &prop, careful)) 945 if (!has_char (*t, &prop, careful))
863 continue; 946 continue;
864 947
865 XChar2b ch = { *t >> 8, *t }; 948 // the casts are needed in C++11 (see 8.5.1)
949 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
866 950
867 XCharStruct g; 951 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 952 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 953 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 954
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 956 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 957
874 if (width < g.width) width = g.width; 958 if (width < g.width) width = g.width;
875 } 959 }
876 960
877 if (cs == CS_UNKNOWN) 961#if 0 // do it per-character
962 if (prop && width > prop->width)
878 { 963 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 964 clear ();
882 return false; 965 return false;
883 } 966 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 967#endif
892 968
893 return true; 969 return true;
894} 970}
895 971
… …
904} 980}
905 981
906bool 982bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 983rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 984{
985 careful = false;
986
909 uint32_t ch = FROM_UNICODE (cs, unicode); 987 uint32_t ch = FROM_UNICODE (cs, unicode);
910 988
911 if (ch == NOCHAR) 989 if (ch == NOCHAR)
912 return false; 990 return false;
913 991
914 /* check wether the character exists in _this_ font. horrible. */ 992 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 993 XCharStruct *xcs;
916 994
917 if (encm) 995 if (encm)
918 { 996 {
919 unsigned char byte1 = ch >> 8; 997 unsigned char byte1 = ch >> 8;
… …
949 return false; 1027 return false;
950 1028
951 if (!prop || prop->width == rxvt_fontprop::unset) 1029 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1030 return true;
953 1031
954 // check wether character overlaps previous/next character 1032 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1033 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1034 int wcw = max (WCWIDTH (unicode), 1);
957 1035
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1036 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1037
… …
976 dTermDisplay; 1054 dTermDisplay;
977 dTermGC; 1055 dTermGC;
978 1056
979 bool slow = this->slow 1057 bool slow = this->slow
980 || width != term->fwidth 1058 || width != term->fwidth
981 || height != term->fheight; 1059 || height != term->fheight
1060 || ascent != f->ascent;
982 1061
983 int base = ascent; // sorry, incorrect: term->fbase; 1062 int base = ascent; // sorry, incorrect: term->fbase;
984 1063
985 XGCValues v; 1064 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1065 v.foreground = term->pix_colors[fg];
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1212 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1213
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1214#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1215 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1216 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1217 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1218#endif
1140 1219
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1220 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1221 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1222
… …
1155 int ftheight = 0; 1234 int ftheight = 0;
1156 bool success = true; 1235 bool success = true;
1157 1236
1158 for (;;) 1237 for (;;)
1159 { 1238 {
1239 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1240 f = XftFontOpenPattern (disp, p);
1161 1241
1162 if (!f) 1242 if (!f)
1163 { 1243 {
1244 FcPatternDestroy (p);
1164 success = false; 1245 success = false;
1165 break; 1246 break;
1166 } 1247 }
1167 1248
1168 FT_Face face = XftLockFace (f); 1249 FT_Face face = XftLockFace (f);
… …
1176 1257
1177 XftUnlockFace (f); 1258 XftUnlockFace (f);
1178 1259
1179 int glheight = height; 1260 int glheight = height;
1180 1261
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1262 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1263 {
1183 FcChar16 ch = *t; 1264 FcChar16 ch = *t;
1184 1265
1185 if (cs != CS_UNICODE 1266 if (cs != CS_UNICODE
1186 && ch > 0x100 1267 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1369 const text_t *text, int len,
1289 int fg, int bg) 1370 int fg, int bg)
1290{ 1371{
1291 XGlyphInfo extents; 1372 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1374 XftGlyphSpec *ep = enc;
1294 1375
1295 dTermDisplay; 1376 dTermDisplay;
1296 dTermGC; 1377 dTermGC;
1297 1378
1298 int w = term->fwidth * len; 1379 int w = term->fwidth * len;
1299 int h = term->fheight; 1380 int h = term->fheight;
1300 1381
1301 /*
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.
1304 */
1305 bool buffered = bg >= Color_transparent; 1382 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1383 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1384
1310 // cut trailing spaces 1385 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1386 while (len && text [len - 1] == ' ')
1312 len--; 1387 len--;
1313 1388
… …
1342 1417
1343 if (buffered) 1418 if (buffered)
1344 { 1419 {
1345 if (ep != enc) 1420 if (ep != enc)
1346 { 1421 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1422 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1423
1350#ifdef HAVE_BG_PIXMAP 1424#ifdef HAVE_IMG
1425 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1426
1351 if (term->bgPixmap.pixmap) 1427 if (term->bg_img
1428 && (bg == Color_transparent || bg == Color_bg
1429 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1430 {
1353 Picture dst = 0; 1431 int src_x = x, src_y = y;
1354 1432
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1433 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1356 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1434 {
1435 src_x += term->window_vt_x;
1436 src_y += term->window_vt_y;
1437 }
1438
1439 if (term->bg_img->w >= src_x + w
1440 && term->bg_img->h >= src_y + h)
1441 {
1442 XCopyArea (disp, term->bg_img->pm, d2, gc,
1443 src_x, src_y, w, h, 0, 0);
1444 }
1357 else 1445 else
1358 dst = XftDrawPicture (d2); 1446 {
1447 XGCValues gcv;
1448
1449 gcv.fill_style = FillTiled;
1450 gcv.tile = term->bg_img->pm;
1451 gcv.ts_x_origin = -src_x;
1452 gcv.ts_y_origin = -src_y;
1453
1454 XChangeGC (disp, gc,
1455 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1456 &gcv);
1457
1458 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1459
1460 gcv.fill_style = FillSolid;
1461 XChangeGC (disp, gc, GCFillStyle, &gcv);
1462 }
1359 1463
1360 if (dst) 1464 if (dst)
1361 { 1465 {
1362 int src_x = x, src_y = y;
1363
1364 if (term->bgPixmap.is_parentOrigin ())
1365 {
1366 src_x += term->window_vt_x;
1367 src_y += term->window_vt_y;
1368 }
1369
1370 if (term->bgPixmap.pmap_width >= src_x+w
1371 && term->bgPixmap.pmap_height >= src_y+h)
1372 {
1373 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1374 src_x, src_y, w, h, 0, 0);
1375 }
1376 else
1377 {
1378 XGCValues gcv;
1379
1380 gcv.fill_style = FillTiled;
1381 gcv.tile = term->bgPixmap.pixmap;
1382 gcv.ts_x_origin = -src_x;
1383 gcv.ts_y_origin = -src_y;
1384
1385 XChangeGC (disp, gc,
1386 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1387 &gcv);
1388
1389 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1390
1391 gcv.fill_style = FillSolid;
1392 XChangeGC (disp, gc, GCFillStyle, &gcv);
1393 }
1394
1395 if (bg >= 0)
1396 {
1397 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1466 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1467
1468 // dst can only be set when bg >= 0
1398 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1469 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1399 }
1400
1401 back_rendered = true;
1402 } 1470 }
1403 } 1471 }
1472 else
1404#endif 1473#endif
1405
1406 if (!back_rendered)
1407 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1474 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1408 1475
1409 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1476 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1410 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1477 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1411 } 1478 }
1412 else 1479 else
… …
1440 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1507 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1441 = rxvt_fontprop::unset; 1508 = rxvt_fontprop::unset;
1442 force_prop = false; 1509 force_prop = false;
1443 1510
1444 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1511 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1445 FONT_UNREF (*i); 1512 (*i)->unref ();
1446 1513
1447 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1514 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1448 delete *p; 1515 delete *p;
1449 1516
1450 free (fontdesc); fontdesc = 0; 1517 free (fontdesc); fontdesc = 0;
… …
1452 fonts.clear (); 1519 fonts.clear ();
1453 1520
1454 fallback = fallback_fonts; 1521 fallback = fallback_fonts;
1455} 1522}
1456 1523
1524void
1525rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1526{
1527 font->set_term (term);
1528
1529 font->cs = cs;
1530 font->loaded = false;
1531}
1532
1457rxvt_font * 1533rxvt_font *
1458rxvt_fontset::new_font (const char *name, codeset cs) 1534rxvt_fontset::new_font (const char *name, codeset cs)
1459{ 1535{
1460 rxvt_font *f; 1536 rxvt_font *f;
1461 1537
… …
1477 f = new rxvt_font_x11; 1553 f = new rxvt_font_x11;
1478 } 1554 }
1479 else 1555 else
1480 f = new rxvt_font_x11; 1556 f = new rxvt_font_x11;
1481 1557
1482 f->set_term (term);
1483 f->set_name (strdup (name)); 1558 f->set_name (strdup (name));
1484 1559 prepare_font (f, cs);
1485 f->cs = cs;
1486 f->loaded = false;
1487 1560
1488 return f; 1561 return f;
1489} 1562}
1490 1563
1491///////////////////////////////////////////////////////////////////////////// 1564/////////////////////////////////////////////////////////////////////////////
1565
1566void
1567rxvt_fontset::push_font (rxvt_font *font)
1568{
1569 // the fontCount index is reserved for the overflow font, it is only
1570 // necessary when we get fontCount or more fonts, as they cannot be
1571 // represented in the rendition.
1572 if (fonts.size () == fontCount)
1573 {
1574 rxvt_font *f = new rxvt_font_overflow (this);
1575
1576 prepare_font (f, CS_UNICODE);
1577 fonts.push_back (f);
1578 }
1579
1580 fonts.push_back (font);
1581}
1492 1582
1493void 1583void
1494rxvt_fontset::add_fonts (const char *desc) 1584rxvt_fontset::add_fonts (const char *desc)
1495{ 1585{
1496 if (desc) 1586 if (desc)
… …
1525 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1615 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1526 else 1616 else
1527 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1617 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1528 1618
1529 desc++; 1619 desc++;
1530 while (*desc <= ' ') desc++; 1620 while (*desc <= ' ' && *desc) desc++;
1531 } 1621 }
1532 1622
1533 end = strchr (desc, ','); 1623 end = strchr (desc, ',');
1534 if (!end) 1624 if (!end)
1535 end = desc + strlen (desc); 1625 end = desc + strlen (desc);
… …
1537 if (end - desc < 511) 1627 if (end - desc < 511)
1538 { 1628 {
1539 memcpy (buf, desc, end - desc); 1629 memcpy (buf, desc, end - desc);
1540 buf[end - desc] = 0; 1630 buf[end - desc] = 0;
1541 1631
1542 fonts.push_back (new_font (buf, cs)); 1632 push_font (new_font (buf, cs));
1543 } 1633 }
1544 else 1634 else
1545 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1635 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1546 1636
1547 desc = end + 1; 1637 desc = end + 1;
1548 } 1638 }
1549 while (*end); 1639 while (*end);
1550 } 1640 }
… …
1575{ 1665{
1576 clear (); 1666 clear ();
1577 1667
1578 fontdesc = strdup (desc); 1668 fontdesc = strdup (desc);
1579 1669
1580 fonts.push_back (new_font (0, CS_UNICODE)); 1670 push_font (new_font (0, CS_UNICODE));
1581 realize_font (0); 1671 realize_font (0);
1582 1672
1583 add_fonts (desc); 1673 add_fonts (desc);
1584 1674
1585 return true; 1675 return true;
… …
1594 1684
1595 return -1; 1685 return -1;
1596} 1686}
1597 1687
1598int 1688int
1599rxvt_fontset::find_font (unicode_t unicode) 1689rxvt_fontset::find_font_idx (unicode_t unicode)
1600{ 1690{
1601 if (unicode >= 1<<20) 1691 if (unicode >= 1<<20)
1602 return 0; 1692 return 0;
1603 1693
1604 unicode_t hi = unicode >> 8; 1694 unicode_t hi = unicode >> 8;
… …
1630 goto next_font; 1720 goto next_font;
1631 1721
1632 bool careful; 1722 bool careful;
1633 if (f->has_char (unicode, &prop, careful)) 1723 if (f->has_char (unicode, &prop, careful))
1634 { 1724 {
1635 if (careful) 1725 i = (i << 1) | careful;
1636 i |= 128;
1637 1726
1638 goto found; 1727 goto found;
1639 } 1728 }
1640 1729
1641 next_font: 1730 next_font:
1642 if (i == fonts.size () - 1) 1731 if (i == fonts.size () - 1)
1643 { 1732 {
1644 if (fallback->name) 1733 if (fallback->name)
1645 { 1734 {
1646 // search through the fallback list 1735 // search through the fallback list
1647 fonts.push_back (new_font (fallback->name, fallback->cs)); 1736 push_font (new_font (fallback->name, fallback->cs));
1648 fallback++; 1737 fallback++;
1649 } 1738 }
1650 else 1739 else
1651 { 1740 {
1652 // try to find a new font. 1741 // try to find a new font.
… …
1654 // way to configure this and xft is easier to hack in, 1743 // way to configure this and xft is easier to hack in,
1655 // while x11 has more framework in place already. 1744 // while x11 has more framework in place already.
1656 // TODO: this is a real resource hog, xft takes ages(?) 1745 // TODO: this is a real resource hog, xft takes ages(?)
1657#if XFT && USE_SLOW_LOOKUP 1746#if XFT && USE_SLOW_LOOKUP
1658 // grab the first xft font that seems suitable 1747 // grab the first xft font that seems suitable
1748 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1659 FcPattern *p = FcPatternCreate (); 1749 FcPattern *p = FcPatternCreate ();
1660 1750
1661 FcCharSet *s = FcCharSetCreate (); 1751 FcCharSet *s = FcCharSetCreate ();
1662 FcCharSetAddChar (s, unicode); 1752 FcCharSetAddChar (s, unicode);
1663 FcPatternAddCharSet (p, FC_CHARSET, s); 1753 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1683 FcPatternDestroy (match); 1773 FcPatternDestroy (match);
1684 1774
1685 if (find_font (font) < 0) 1775 if (find_font (font) < 0)
1686 { 1776 {
1687 char fontname[4096]; 1777 char fontname[4096];
1688 sprintf (fontname, "xft:%-.4090s", font); 1778 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1689 1779
1690 fonts.push_back (new_font (fontname, CS_UNICODE)); 1780 push_font (new_font (fontname, CS_UNICODE));
1691 } 1781 }
1692 1782
1693 free (font); 1783 free (font);
1694 } 1784 }
1695#endif 1785#endif
… …
1707 while (hi >= fmap.size ()) 1797 while (hi >= fmap.size ())
1708 fmap.push_back (0); 1798 fmap.push_back (0);
1709 1799
1710 if (!fmap[hi]) 1800 if (!fmap[hi])
1711 { 1801 {
1712 fmap[hi] = (pagemap *)new pagemap; 1802 fmap[hi] = new pagemap;
1713 memset (fmap[hi], 0xff, sizeof (pagemap)); 1803 memset (fmap[hi], 0xff, sizeof (pagemap));
1714 } 1804 }
1715 1805
1716 (*fmap[hi])[unicode & 0xff] = i; 1806 (*fmap[hi])[unicode & 0xff] = i;
1717 } 1807 }
1718 1808
1719 return i; 1809 return i;
1720} 1810}
1721 1811
1722
1723

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines