1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: defaultfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
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 2 of the License, or |
… | |
… | |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * GNU General Public License for more details. |
15 | * GNU General Public License for more details. |
16 | * |
16 | * |
17 | * You should have received a copy of the GNU General Public License |
17 | * You should have received a copy of the GNU General Public License |
18 | * along with this program; if not, write to the Free Software |
18 | * along with this program; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
|
|
24 | #include "rxvtlib.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
26 | |
27 | |
27 | #include <cstdlib> |
28 | #include <cstdlib> |
28 | #include <wchar.h> |
29 | |
29 | #include <inttypes.h> |
30 | #include <inttypes.h> |
30 | |
31 | |
31 | #define DISPLAY r->display->display |
|
|
32 | #define TGC r->TermWin.gc |
|
|
33 | |
|
|
34 | #define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width |
32 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
|
|
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
|
|
34 | |
|
|
35 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
|
|
36 | (prop)->slant >= rxvt_fontprop::italic \ |
|
|
37 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
|
|
38 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
|
|
39 | )) |
35 | |
40 | |
36 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
37 | codeset cs; |
42 | codeset cs; |
38 | const char *name; |
43 | const char *name; |
39 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
40 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
41 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
42 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
43 | |
48 | |
44 | #if ENCODING_EU |
49 | #if ENCODING_EU |
45 | // cyrillic |
50 | // cyrillic |
46 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
47 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
48 | |
53 | |
49 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
50 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
51 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
52 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
53 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
59 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
60 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
61 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
62 | |
67 | |
63 | # if XFT |
68 | # if XFT |
64 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
65 | |
70 | |
66 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
67 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
68 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
69 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
70 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
71 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
72 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
73 | # endif |
78 | # endif |
74 | #endif |
79 | #endif |
75 | |
80 | |
76 | // japanese |
81 | // japanese |
77 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
78 | # if XFT |
83 | # if XFT |
79 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
80 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
81 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
82 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
83 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
84 | # endif |
89 | # endif |
85 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
86 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
87 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
89 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
94 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
90 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
95 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
91 | #endif |
96 | #endif |
92 | |
97 | |
93 | #if ENCODING_CN || ENCODING_CN_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
94 | # if XFT |
99 | # if XFT |
|
|
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
|
|
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
|
|
102 | { CS_GBK_0, "xft::lang=zh" }, |
95 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
96 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
97 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
98 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
99 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
100 | # endif |
108 | # endif |
|
|
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
101 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
102 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
103 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
|
|
113 | { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
104 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
114 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
105 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
115 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
106 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
116 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
107 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
117 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
108 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
118 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
… | |
… | |
115 | #if ENCODING_KR |
125 | #if ENCODING_KR |
116 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
117 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
118 | # if XFT |
128 | # if XFT |
119 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
120 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
121 | # endif |
131 | # endif |
122 | #endif |
132 | #endif |
123 | |
133 | |
124 | // generic font fallback |
|
|
125 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
134 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
126 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
135 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
127 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
128 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
129 | #if XFT |
136 | #if XFT |
130 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false"}, |
137 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
131 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
|
|
132 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, |
|
|
133 | { CS_UNICODE, "xft:Courier New:antialias=false" }, |
138 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
|
|
139 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
|
|
140 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
134 | |
141 | |
135 | // FreeMono is usually uglier than x fonts, so try last only. |
142 | // FreeMono is usually uglier than x fonts, so try after the others |
136 | { CS_UNICODE, "xft:FreeMono" }, |
143 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
137 | #endif |
144 | #endif |
138 | |
145 | |
|
|
146 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
147 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
148 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
149 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
139 | { CS_UNKNOWN, 0 } |
150 | { CS_UNKNOWN, 0 } |
140 | }; |
151 | }; |
141 | |
152 | |
142 | // these characters are used to guess the font height and width |
153 | // these characters are used to guess the font height and width |
143 | // pango uses a similar algorithm and eosn't trust the font either. |
154 | // pango uses a similar algorithm and doesn't trust the font either. |
144 | static uint16_t extent_test_chars[] = { |
155 | static uint16_t extent_test_chars[] = { |
145 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
156 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
146 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
157 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
147 | 0x304c, 0x672c, // が本 |
158 | 0x304c, 0x672c, // が本 |
148 | }; |
159 | }; |
149 | |
160 | |
150 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
151 | |
162 | |
|
|
163 | #define dTermDisplay Display *disp = term->dpy |
|
|
164 | #define dTermGC GC gc = term->gc |
|
|
165 | |
152 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
153 | |
|
|
154 | #if XFT |
|
|
155 | rxvt_drawable::~rxvt_drawable () |
|
|
156 | { |
|
|
157 | if (xftdrawable) |
|
|
158 | XftDrawDestroy (xftdrawable); |
|
|
159 | } |
|
|
160 | |
|
|
161 | rxvt_drawable::operator XftDraw *() |
|
|
162 | { |
|
|
163 | if (!xftdrawable) |
|
|
164 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
165 | |
|
|
166 | return xftdrawable; |
|
|
167 | } |
|
|
168 | #endif |
|
|
169 | |
|
|
170 | ///////////////////////////////////////////////////////////////////////////// |
|
|
171 | |
|
|
172 | static void *enc_buf; |
|
|
173 | static uint32_t enc_len; |
|
|
174 | |
|
|
175 | static inline void * |
|
|
176 | get_enc_buf (uint32_t len) |
|
|
177 | { |
|
|
178 | if (len > enc_len) |
|
|
179 | { |
|
|
180 | free (enc_buf); |
|
|
181 | enc_buf = malloc (len); |
|
|
182 | enc_len = len; |
|
|
183 | } |
|
|
184 | |
|
|
185 | return enc_buf; |
|
|
186 | } |
|
|
187 | |
167 | |
188 | static const char * |
168 | static const char * |
189 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
169 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
190 | { |
170 | { |
191 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
171 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
172 | uint8_t *res = buf; |
192 | |
173 | |
193 | while (len--) |
174 | while (len--) |
194 | { |
175 | { |
195 | uint32_t c = FROM_UNICODE (cs, *text++); |
176 | uint32_t c = FROM_UNICODE (cs, *text++); |
196 | |
177 | |
… | |
… | |
201 | } |
182 | } |
202 | |
183 | |
203 | *buf++ = c; |
184 | *buf++ = c; |
204 | } |
185 | } |
205 | |
186 | |
206 | return (const char *)enc_buf; |
187 | return (const char *)res; |
207 | } |
188 | } |
208 | |
189 | |
209 | static const XChar2b * |
190 | static const XChar2b * |
210 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
191 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
211 | { |
192 | { |
212 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
193 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
194 | XChar2b *res = buf; |
213 | |
195 | |
214 | while (len--) |
196 | while (len--) |
215 | { |
197 | { |
216 | uint32_t c = FROM_UNICODE (cs, *text++); |
198 | uint32_t c = FROM_UNICODE (cs, *text++); |
217 | |
199 | |
… | |
… | |
224 | buf->byte1 = c >> 8; |
206 | buf->byte1 = c >> 8; |
225 | buf->byte2 = c; |
207 | buf->byte2 = c; |
226 | buf++; |
208 | buf++; |
227 | } |
209 | } |
228 | |
210 | |
229 | return (XChar2b *)enc_buf; |
211 | return res; |
230 | } |
212 | } |
231 | |
213 | |
232 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
|
|
215 | |
|
|
216 | rxvt_font::rxvt_font () |
|
|
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
218 | { |
|
|
219 | } |
233 | |
220 | |
234 | void |
221 | void |
235 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name) |
236 | { |
223 | { |
237 | if (this->name == name) |
224 | if (this->name == name) |
… | |
… | |
240 | if (this->name) free (this->name); // let the compiler optimize |
227 | if (this->name) free (this->name); // let the compiler optimize |
241 | this->name = name; |
228 | this->name = name; |
242 | } |
229 | } |
243 | |
230 | |
244 | void |
231 | void |
245 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
246 | { |
233 | { |
247 | if (color == Color_bg) |
234 | dTermDisplay; |
248 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
235 | dTermGC; |
|
|
236 | |
|
|
237 | if (color == Color_bg || color == Color_transparent) |
|
|
238 | XClearArea (disp, d, x, y, w, h, false); |
249 | else if (color >= 0) |
239 | else if (color >= 0) |
250 | { |
240 | { |
251 | #if XFT |
241 | #if XFT |
|
|
242 | bool done = false; |
|
|
243 | #ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) |
|
|
245 | { |
|
|
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | if (dst != 0) |
|
|
248 | { |
|
|
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
251 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
252 | done = true; |
|
|
253 | } |
|
|
254 | } |
|
|
255 | #endif |
|
|
256 | if (!done) |
252 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
253 | #else |
258 | #else |
254 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
255 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
256 | #endif |
261 | #endif |
257 | } |
262 | } |
258 | } |
263 | } |
259 | |
264 | |
260 | #include "table/linedraw.h" |
265 | ///////////////////////////////////////////////////////////////////////////// |
261 | |
266 | |
262 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font { |
263 | struct rxvt_fontset *fs; |
268 | struct rxvt_fontset *fs; |
264 | |
269 | |
265 | rxvt_font_default (rxvt_fontset *fs) |
270 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
271 | rxvt_fontprop properties () |
276 | rxvt_fontprop properties () |
272 | { |
277 | { |
273 | rxvt_fontprop p; |
278 | rxvt_fontprop p; |
274 | |
279 | |
275 | p.width = p.height = 1; |
280 | p.width = p.height = 1; |
|
|
281 | p.ascent = rxvt_fontprop::unset; |
276 | p.weight = rxvt_fontprop::medium; |
282 | p.weight = rxvt_fontprop::medium; |
277 | p.slant = rxvt_fontprop::roman; |
283 | p.slant = rxvt_fontprop::roman; |
278 | |
284 | |
279 | return p; |
285 | return p; |
280 | } |
286 | } |
281 | |
287 | |
282 | bool load (const rxvt_fontprop &prop) |
288 | bool load (const rxvt_fontprop &prop, bool force_prop) |
283 | { |
289 | { |
284 | width = 1; height = 1; |
290 | width = 1; height = 1; |
285 | ascent = 1; descent = 0; |
291 | ascent = 1; descent = 0; |
286 | |
292 | |
287 | set_name (strdup ("built-in support font")); |
293 | set_name (strdup ("built-in support font")); |
288 | |
294 | |
289 | return true; |
295 | return true; |
290 | } |
296 | } |
291 | |
297 | |
292 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
298 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
293 | { |
299 | { |
294 | careful = false; |
300 | careful = false; |
295 | |
301 | |
296 | if (unicode <= 0x001f) |
302 | if (unicode <= 0x001f) |
297 | return true; |
303 | return true; |
… | |
… | |
300 | return false; |
306 | return false; |
301 | |
307 | |
302 | if (unicode <= 0x009f) |
308 | if (unicode <= 0x009f) |
303 | return true; |
309 | return true; |
304 | |
310 | |
|
|
311 | #ifdef BUILTIN_GLYPHS |
305 | if (unicode >= 0x2500 && unicode <= 0x259f) |
312 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
313 | !term->option (Opt_skipBuiltinGlyphs)) |
306 | return true; |
314 | return true; |
|
|
315 | #endif |
307 | |
316 | |
308 | if (IS_COMPOSE (unicode)) |
317 | if (IS_COMPOSE (unicode)) |
309 | return true; |
318 | return true; |
310 | |
319 | |
311 | switch (unicode) |
320 | switch (unicode) |
… | |
… | |
326 | void |
335 | void |
327 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
336 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
328 | const text_t *text, int len, |
337 | const text_t *text, int len, |
329 | int fg, int bg) |
338 | int fg, int bg) |
330 | { |
339 | { |
|
|
340 | dTermDisplay; |
|
|
341 | dTermGC; |
|
|
342 | |
331 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
343 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
332 | |
344 | |
333 | XSetForeground (d.display->display, TGC, r->pix_colors[fg]); |
345 | XSetForeground (disp, gc, term->pix_colors[fg]); |
334 | |
346 | |
335 | while (len--) |
347 | while (len) |
336 | { |
348 | { |
337 | #if ENABLE_COMBINING |
349 | #if ENABLE_COMBINING |
338 | compose_char *cc; |
350 | compose_char *cc; |
339 | #endif |
351 | #endif |
|
|
352 | const text_t *tp = text; |
340 | text_t t = *text++; |
353 | text_t t = *tp; |
341 | |
354 | |
|
|
355 | while (++text, --len && *text == NOCHAR) |
|
|
356 | ; |
|
|
357 | |
|
|
358 | int width = text - tp; |
|
|
359 | int fwidth = term->fwidth * width; |
|
|
360 | |
|
|
361 | #ifdef BUILTIN_GLYPHS |
342 | if (0x2500 <= t && t <= 0x259f) |
362 | if (0x2500 <= t && t <= 0x259f) |
343 | { |
363 | { |
|
|
364 | # include "table/linedraw.h" |
344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
345 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
346 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
347 | |
368 | |
348 | int W = r->TermWin.fwidth; |
369 | int W = fwidth; |
349 | int H = r->TermWin.fheight; |
370 | int H = term->fheight; |
350 | |
371 | |
351 | int x_[16]; |
372 | int x_[16]; |
352 | int y_[16]; |
373 | int y_[16]; |
353 | |
374 | |
354 | for (int i = 0; i <= 8; i++) |
375 | for (int i = 0; i <= 8; i++) |
… | |
… | |
362 | |
383 | |
363 | XGCValues gcv; |
384 | XGCValues gcv; |
364 | |
385 | |
365 | gcv.cap_style = CapButt; |
386 | gcv.cap_style = CapButt; |
366 | gcv.line_width = 0; |
387 | gcv.line_width = 0; |
367 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
388 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
368 | |
389 | |
369 | while (a < b) |
390 | while (a < b) |
370 | { |
391 | { |
371 | uint32_t command = *a++; |
392 | uint32_t command = *a++; |
372 | |
393 | |
… | |
… | |
379 | int y2 = y_[(command >> 0) & 15]; |
400 | int y2 = y_[(command >> 0) & 15]; |
380 | |
401 | |
381 | switch (op) |
402 | switch (op) |
382 | { |
403 | { |
383 | case 0: // line |
404 | case 0: // line |
384 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
405 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
385 | break; |
406 | break; |
386 | |
407 | |
387 | case 1: // rectangle, possibly stippled |
408 | case 1: // rectangle, possibly stippled |
388 | if (a) |
409 | if (a) |
389 | { |
410 | { |
390 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
391 | |
412 | |
392 | gcv.fill_style = FillStippled; |
413 | gcv.fill_style = FillStippled; |
393 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
394 | gcv.ts_x_origin = x; |
415 | gcv.ts_x_origin = x; |
395 | gcv.ts_y_origin = y; |
416 | gcv.ts_y_origin = y; |
396 | |
417 | |
397 | XChangeGC (d.display->display, TGC, |
418 | XChangeGC (disp, gc, |
398 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
419 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
399 | &gcv); |
420 | &gcv); |
400 | } |
421 | } |
401 | |
422 | |
402 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
423 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
403 | |
424 | |
404 | if (a) |
425 | if (a) |
405 | { |
426 | { |
406 | XFreePixmap (d.display->display, gcv.stipple); |
427 | XFreePixmap (disp, gcv.stipple); |
407 | gcv.stipple = 0; |
428 | gcv.stipple = 0; |
408 | gcv.fill_style = FillSolid; |
429 | gcv.fill_style = FillSolid; |
409 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
430 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
410 | } |
431 | } |
411 | break; |
432 | break; |
412 | case 2: // arc |
433 | case 2: // arc |
413 | XDrawArc (d.display->display, d, TGC, |
434 | XDrawArc (disp, d, gc, |
414 | x1 - W/2, y1 - H/2, W-1, H-1, |
435 | x1 - W/2, y1 - H/2, W-1, H-1, |
415 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
416 | break; |
437 | break; |
417 | } |
438 | } |
418 | } |
439 | } |
419 | } |
440 | } |
|
|
441 | #else |
|
|
442 | if (0) |
|
|
443 | ; |
|
|
444 | #endif |
420 | #if ENABLE_COMBINING |
445 | #if ENABLE_COMBINING |
421 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
446 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
422 | { |
447 | { |
|
|
448 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
449 | |
|
|
450 | text_t chrs[2]; |
|
|
451 | chrs [1] = NOCHAR; |
|
|
452 | |
|
|
453 | *chrs = cc->c1; |
423 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
424 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
455 | f1->draw (d, x, y, chrs, width, fg, bg); |
|
|
456 | |
425 | if (cc->c2 != NOCHAR) |
457 | if (cc->c2 != NOCHAR) |
426 | { |
458 | { |
|
|
459 | bool careful; |
|
|
460 | |
427 | // prefer font of first character, for no good reasons |
461 | // prefer font of first character, for no good reasons |
428 | bool careful; |
462 | *chrs = cc->c2; |
429 | rxvt_font *f2 = f1->has_char (cc->c2, 0, careful) |
463 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
430 | ? f1 |
464 | ? f1 |
431 | : (*fs)[fs->find_font (cc->c2)]; |
465 | : (*fs)[fs->find_font (cc->c2)]; |
432 | |
466 | |
433 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
434 | } |
468 | } |
435 | } |
469 | } |
436 | #endif |
470 | #endif |
437 | else |
471 | else |
438 | switch (t) |
472 | switch (t) |
… | |
… | |
441 | case ZERO_WIDTH_CHAR: |
475 | case ZERO_WIDTH_CHAR: |
442 | case NOCHAR: |
476 | case NOCHAR: |
443 | break; |
477 | break; |
444 | |
478 | |
445 | default: |
479 | default: |
446 | int w = 0; |
|
|
447 | while (len > 0 && *text == NOCHAR) |
|
|
448 | { |
|
|
449 | ++text; |
|
|
450 | --len; |
|
|
451 | w += r->TermWin.fwidth; |
|
|
452 | } |
|
|
453 | |
|
|
454 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
480 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
455 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
481 | fwidth - 4, term->fheight - 4); |
456 | x += w; |
|
|
457 | } |
482 | } |
458 | |
483 | |
459 | x += r->TermWin.fwidth; |
484 | x += fwidth; |
460 | } |
485 | } |
461 | } |
486 | } |
462 | |
487 | |
463 | ///////////////////////////////////////////////////////////////////////////// |
488 | ///////////////////////////////////////////////////////////////////////////// |
464 | |
489 | |
… | |
… | |
467 | |
492 | |
468 | void clear (); |
493 | void clear (); |
469 | |
494 | |
470 | rxvt_fontprop properties (); |
495 | rxvt_fontprop properties (); |
471 | |
496 | |
472 | bool load (const rxvt_fontprop &prop); |
497 | bool load (const rxvt_fontprop &prop, bool force_prop); |
473 | |
498 | |
474 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
499 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
475 | |
500 | |
476 | void draw (rxvt_drawable &d, int x, int y, |
501 | void draw (rxvt_drawable &d, int x, int y, |
477 | const text_t *text, int len, |
502 | const text_t *text, int len, |
478 | int fg, int bg); |
503 | int fg, int bg); |
479 | |
504 | |
480 | bool slow; // wether this is a proportional font or has other funny characteristics |
505 | bool slow; // wether this is a proportional font or has other funny characteristics |
481 | XFontStruct *f; |
506 | XFontStruct *f; |
482 | codeset cs; |
|
|
483 | bool enc2b, encm; |
507 | bool enc2b, encm; |
484 | |
508 | |
485 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
509 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
486 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
510 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
487 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
511 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
488 | bool set_properties (rxvt_fontprop &p, const char *name); |
512 | bool set_properties (rxvt_fontprop &p, const char *name); |
489 | }; |
513 | }; |
490 | |
514 | |
491 | char * |
515 | char * |
492 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
516 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
493 | { |
517 | { |
494 | unsigned long value; |
518 | unsigned long value; |
495 | |
519 | |
496 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
520 | if (XGetFontProperty (f, property, &value)) |
497 | return XGetAtomName (DISPLAY, value); |
521 | return XGetAtomName (term->dpy, value); |
498 | else |
522 | else |
499 | return rxvt_strdup (repl); |
523 | return repl ? strdup (repl) : 0; |
500 | } |
524 | } |
501 | |
525 | |
502 | rxvt_fontprop |
526 | rxvt_fontprop |
503 | rxvt_font_x11::properties () |
527 | rxvt_font_x11::properties () |
504 | { |
528 | { |
… | |
… | |
508 | } |
532 | } |
509 | |
533 | |
510 | bool |
534 | bool |
511 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
535 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
512 | { |
536 | { |
513 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
537 | p.width = width != rxvt_fontprop::unset ? width |
|
|
538 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
539 | : (height + 1) / 2; |
514 | p.height = height; |
540 | p.height = height; |
|
|
541 | p.ascent = rxvt_fontprop::unset; |
515 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
542 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
516 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
543 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
517 | |
544 | |
518 | return true; |
545 | return true; |
519 | } |
546 | } |
520 | |
547 | |
521 | bool |
548 | bool |
522 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
549 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
523 | { |
550 | { |
524 | unsigned long height; |
551 | unsigned long height; |
|
|
552 | |
|
|
553 | #if 0 |
525 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
554 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
526 | return false; |
555 | return false; |
|
|
556 | #else |
|
|
557 | height = f->ascent + f->descent; |
|
|
558 | #endif |
527 | |
559 | |
528 | unsigned long avgwidth; |
560 | unsigned long avgwidth; |
529 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
561 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
530 | avgwidth = 0; |
562 | avgwidth = 0; |
531 | |
563 | |
532 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
564 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
533 | char *slant = get_property (f, "SLANT", "r"); |
565 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
534 | |
566 | |
535 | set_properties (p, height, weight, slant, avgwidth); |
567 | set_properties (p, height, weight, slant, avgwidth); |
536 | |
568 | |
537 | free (weight); |
569 | free (weight); |
538 | free (slant); |
570 | free (slant); |
539 | |
571 | |
|
|
572 | p.ascent = f->ascent; |
|
|
573 | |
540 | return true; |
574 | return true; |
541 | } |
575 | } |
542 | |
576 | |
543 | bool |
577 | bool |
544 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
578 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
545 | { |
579 | { |
|
|
580 | dTermDisplay; |
546 | int slashes = 0; |
581 | int slashes = 0; |
547 | const char *comp[13]; |
582 | const char *comp[13]; |
548 | |
583 | |
549 | for (const char *c = name; *c; c++) |
584 | for (const char *c = name; *c; c++) |
550 | if (*c == '-') |
585 | if (*c == '-') |
… | |
… | |
558 | if (slashes >= 13 |
593 | if (slashes >= 13 |
559 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
594 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
560 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
595 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
561 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
596 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
562 | |
597 | |
563 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
598 | XFontStruct *f = XLoadQueryFont (disp, name); |
564 | |
599 | |
565 | if (f) |
600 | if (f) |
566 | { |
601 | { |
567 | // the font should really exist now. if not, we have a problem |
602 | // the font should really exist now. if not, we have a problem |
568 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
603 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
569 | // in that case, just return garbage. |
604 | // in that case, just return garbage. |
570 | bool ret = set_properties (p, f); |
605 | bool ret = set_properties (p, f); |
571 | XFreeFont (DISPLAY, f); |
606 | XFreeFont (disp, f); |
572 | return ret; |
607 | return ret; |
573 | } |
608 | } |
574 | else |
609 | else |
575 | return false; |
610 | return false; |
576 | } |
611 | } |
577 | |
612 | |
578 | // fix the size of scalable fonts |
613 | // fix the size of scalable fonts |
579 | static bool |
614 | static bool |
580 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
615 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
581 | { |
616 | { |
582 | int slashes = 0; |
617 | int slashes = 0; |
583 | const char *field, *end; |
618 | const char *field, *end; |
584 | |
619 | |
585 | for (const char *c = name; *c; c++) |
620 | for (const char *c = name; *c; c++) |
… | |
… | |
595 | break; |
630 | break; |
596 | } |
631 | } |
597 | |
632 | |
598 | if (slashes >= 13 && (!old || *field == old)) |
633 | if (slashes >= 13 && (!old || *field == old)) |
599 | { |
634 | { |
600 | // TODO: check for overflow in font-name |
635 | size_t len = field - name; |
|
|
636 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
601 | strncpy (buf, name, field - name); |
637 | strncpy (*ptr, name, len); |
602 | buf += field - name; |
|
|
603 | strcpy (buf, replace); |
638 | strcpy (*ptr + len, replace); |
604 | strcat (buf, end); |
639 | strcat (*ptr, end); |
605 | |
640 | |
606 | return true; |
641 | return true; |
607 | } |
642 | } |
608 | else |
643 | else |
609 | { |
644 | { |
610 | strcpy (buf, name); |
645 | *ptr = strdup (name); |
611 | |
646 | |
612 | return false; |
647 | return false; |
613 | } |
648 | } |
614 | } |
649 | } |
615 | |
650 | |
616 | bool |
651 | bool |
617 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
652 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
618 | { |
653 | { |
|
|
654 | dTermDisplay; |
|
|
655 | |
619 | clear (); |
656 | clear (); |
620 | |
657 | |
621 | char field_str[64]; // enough for 128 bits |
658 | char field_str[64]; // enough for 128 bits |
622 | |
659 | |
623 | // first morph the font if required |
660 | // first morph the font if required |
624 | if (prop.weight != rxvt_fontprop::unset |
661 | if (force_prop) |
625 | || prop.slant != rxvt_fontprop::unset) |
|
|
626 | { |
662 | { |
627 | char fname[1024]; |
663 | char *fname; |
628 | |
664 | |
629 | if (name[0] != '-') |
665 | if (name[0] != '-') |
630 | { |
666 | { |
631 | f = XLoadQueryFont (DISPLAY, name); |
667 | f = XLoadQueryFont (disp, name); |
632 | |
668 | |
633 | if (!f) |
669 | if (!f) |
634 | return false; |
670 | return false; |
635 | |
671 | |
636 | char *new_name = get_property (f, "FONT", name); |
672 | char *new_name = get_property (f, XA_FONT, name); |
637 | |
673 | |
638 | if (new_name) |
674 | if (new_name) |
639 | set_name (new_name); |
675 | set_name (new_name); |
640 | else |
676 | else |
641 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
677 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
642 | |
678 | |
643 | XFreeFont (DISPLAY, f); |
679 | XFreeFont (disp, f); |
644 | f = 0; |
680 | f = 0; |
645 | } |
681 | } |
646 | |
682 | |
647 | if (prop.weight != rxvt_fontprop::unset) |
683 | if (prop.weight != rxvt_fontprop::unset) |
648 | { |
684 | { |
649 | replace_field (fname, name, 2, 0, |
685 | replace_field (&fname, name, 2, 0, |
650 | prop.weight < rxvt_fontprop::bold |
686 | prop.weight < rxvt_fontprop::bold |
651 | ? "medium" : "bold"); |
687 | ? "medium" : "bold"); |
652 | set_name (strdup (fname)); |
688 | set_name (fname); |
653 | } |
689 | } |
654 | |
690 | |
655 | if (prop.slant != rxvt_fontprop::unset) |
691 | if (prop.slant != rxvt_fontprop::unset) |
656 | { |
692 | { |
657 | replace_field (fname, name, 3, 0, |
693 | replace_field (&fname, name, 3, 0, |
658 | prop.slant < rxvt_fontprop::italic |
694 | prop.slant < rxvt_fontprop::italic |
659 | ? "r" : "i"); // TODO: handle "o"blique, too |
695 | ? "r" : "i"); // TODO: handle "o"blique, too |
660 | set_name (strdup (fname)); |
696 | set_name (fname); |
661 | } |
697 | } |
|
|
698 | } |
|
|
699 | |
|
|
700 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
|
|
701 | ? 0 : prop.height); |
|
|
702 | |
|
|
703 | struct font_weight { |
|
|
704 | char *name; |
|
|
705 | int diff; |
|
|
706 | |
|
|
707 | void clear () |
662 | } |
708 | { |
|
|
709 | name = 0; |
|
|
710 | diff = 0x7fffffff; |
|
|
711 | } |
|
|
712 | |
|
|
713 | font_weight () { clear (); } |
|
|
714 | ~font_weight () { free (name); } |
|
|
715 | }; |
663 | |
716 | |
664 | char **list; |
717 | char **list; |
665 | int count; |
718 | int count; |
666 | list = XListFonts (DISPLAY, name, 1024, &count); |
719 | list = XListFonts (disp, name, 4000, &count); |
667 | |
720 | |
668 | set_name (0); |
721 | set_name (0); |
669 | |
722 | |
670 | if (!list) |
723 | if (!list) |
671 | return false; |
724 | return false; |
672 | |
725 | |
673 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
726 | font_weight *fonts = new font_weight[count]; |
674 | ? 0 : prop.height); |
|
|
675 | |
727 | |
676 | int bestdiff = 0x7fffffff; |
|
|
677 | for (int i = 0; i < count; i++) |
728 | for (int i = 0; i < count; i++) |
678 | { |
729 | { |
679 | rxvt_fontprop p; |
730 | rxvt_fontprop p; |
680 | char fname[1024]; |
731 | char *fname; |
681 | |
732 | |
682 | int diff = 0; |
733 | int diff = 0; |
683 | |
734 | |
684 | if (replace_field (fname, list[i], 6, '0', field_str)) |
735 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
685 | diff += 10; // slightly penalize scalable fonts |
736 | diff += 10; // slightly penalize scalable fonts |
|
|
737 | else |
|
|
738 | { |
|
|
739 | free (fname); |
|
|
740 | if (replace_field (&fname, list[i], 11, '0', "0")) |
|
|
741 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
742 | } |
686 | |
743 | |
687 | if (!set_properties (p, fname)) |
744 | if (!set_properties (p, fname)) |
688 | continue; |
745 | continue; |
689 | |
746 | |
690 | if (prop.height != rxvt_fontprop::unset |
747 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
694 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
751 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
695 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
752 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
696 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
753 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
697 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
754 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
698 | |
755 | |
699 | if (!name // compare against best found so far |
756 | fonts[i].name = fname; |
700 | || diff < bestdiff) |
757 | fonts[i].diff = diff; |
701 | { |
|
|
702 | set_name (strdup (fname)); |
|
|
703 | bestdiff = diff; |
|
|
704 | } |
|
|
705 | } |
758 | } |
706 | |
759 | |
707 | XFreeFontNames (list); |
760 | XFreeFontNames (list); |
708 | |
761 | |
709 | if (!name) |
762 | // this loop only iterates when the guessed font-size is too small |
710 | return false; |
763 | for (;;) |
|
|
764 | { |
|
|
765 | font_weight *best = fonts + count - 1; |
711 | |
766 | |
712 | f = XLoadQueryFont (DISPLAY, name); |
767 | for (font_weight *w = best; w-- > fonts; ) |
|
|
768 | if (w->diff <= best->diff) |
|
|
769 | best = w; |
|
|
770 | |
|
|
771 | if (!best->name |
|
|
772 | || !(f = XLoadQueryFont (disp, best->name))) |
|
|
773 | break; |
|
|
774 | |
|
|
775 | set_name (best->name); |
|
|
776 | best->clear (); |
|
|
777 | |
|
|
778 | ascent = f->ascent; |
|
|
779 | descent = f->descent; |
|
|
780 | height = ascent + descent; |
|
|
781 | |
|
|
782 | if (prop.height == rxvt_fontprop::unset |
|
|
783 | || height <= prop.height) |
|
|
784 | break; // font is ready for use |
|
|
785 | |
|
|
786 | // PIXEL_SIZE small enough, but real height too large |
|
|
787 | clear (); |
|
|
788 | } |
|
|
789 | |
|
|
790 | delete [] fonts; |
713 | |
791 | |
714 | if (!f) |
792 | if (!f) |
715 | return false; |
793 | return false; |
716 | |
794 | |
717 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
795 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
718 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
796 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
719 | |
797 | |
720 | if (registry && encoding) |
798 | if (registry && encoding) |
721 | { |
799 | { |
722 | char charset[64]; |
800 | char charset[64]; |
723 | snprintf (charset, 64, "%s-%s", registry, encoding); |
801 | snprintf (charset, 64, "%s-%s", registry, encoding); |
724 | |
802 | |
725 | cs = codeset_from_name (charset); |
803 | cs = codeset_from_name (charset); |
726 | } |
804 | } |
727 | else |
805 | else |
728 | { |
806 | { |
729 | const char *charset = get_property (f, "FONT", 0); |
807 | const char *charset = get_property (f, XA_FONT, 0); |
730 | |
808 | |
731 | if (!charset) |
809 | if (!charset) |
732 | charset = name; |
810 | charset = name; |
733 | |
811 | |
734 | int count = 13; |
812 | int count = 13; |
… | |
… | |
746 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
824 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
747 | |
825 | |
748 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
826 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
749 | enc2b = encm || f->max_char_or_byte2 > 255; |
827 | enc2b = encm || f->max_char_or_byte2 > 255; |
750 | |
828 | |
751 | ascent = f->ascent; |
|
|
752 | descent = f->descent; |
|
|
753 | height = ascent + descent; |
|
|
754 | |
|
|
755 | slow = false; |
829 | slow = false; |
756 | |
830 | |
757 | #if 1 // only used for slow detection, TODO optimize |
831 | #if 1 // only used for slow detection, TODO optimize |
758 | if (f->min_bounds.width == f->max_bounds.width) |
832 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
759 | width = f->min_bounds.width; |
|
|
760 | else if (f->per_char == NULL) |
|
|
761 | width = f->max_bounds.width; |
833 | width = f->max_bounds.width; |
762 | else |
834 | else |
763 | { |
835 | { |
764 | slow = true; |
836 | slow = true; |
765 | |
837 | |
766 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
838 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
767 | |
839 | |
768 | if (encm) |
840 | if (encm) |
769 | N += (f->max_byte1 - f->min_byte1) |
841 | N += (f->max_byte1 - f->min_byte1) |
770 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
842 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
771 | |
843 | |
772 | while (N) |
844 | while (N) |
773 | { |
845 | { |
774 | if (f->per_char[N].width > width) |
846 | if (f->per_char[N].width > width) |
775 | width = f->per_char[N].width; |
847 | width = f->per_char[N].width; |
776 | |
848 | |
… | |
… | |
781 | |
853 | |
782 | width = 1; |
854 | width = 1; |
783 | |
855 | |
784 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
856 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
785 | { |
857 | { |
786 | if (cs != CS_UNICODE |
|
|
787 | && *t > 0x100 |
|
|
788 | && FROM_UNICODE (cs, *t) == NOCHAR) |
858 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
789 | continue; |
859 | continue; |
790 | |
860 | |
791 | // ignore characters we wouldn't use anyways |
861 | // ignore characters we wouldn't use anyways |
792 | bool careful; |
862 | bool careful; |
793 | if (!has_char (*t, &prop, careful)) |
863 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
797 | |
867 | |
798 | XCharStruct g; |
868 | XCharStruct g; |
799 | int dir_ret, asc_ret, des_ret; |
869 | int dir_ret, asc_ret, des_ret; |
800 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
870 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
801 | |
871 | |
802 | int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; |
872 | int wcw = WCWIDTH (*t); |
|
|
873 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
803 | |
874 | |
804 | if (width < g.width) width = g.width; |
875 | if (width < g.width) width = g.width; |
805 | } |
876 | } |
806 | |
877 | |
807 | if (cs == CS_UNKNOWN) |
878 | if (cs == CS_UNKNOWN) |
808 | { |
879 | { |
809 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
880 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
826 | void |
897 | void |
827 | rxvt_font_x11::clear () |
898 | rxvt_font_x11::clear () |
828 | { |
899 | { |
829 | if (f) |
900 | if (f) |
830 | { |
901 | { |
831 | XFreeFont (DISPLAY, f); |
902 | XFreeFont (term->dpy, f); |
832 | f = 0; |
903 | f = 0; |
833 | } |
904 | } |
834 | } |
905 | } |
835 | |
906 | |
836 | bool |
907 | bool |
837 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
908 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
838 | { |
909 | { |
839 | uint32_t ch = FROM_UNICODE (cs, unicode); |
910 | uint32_t ch = FROM_UNICODE (cs, unicode); |
840 | |
911 | |
841 | if (ch == NOCHAR) |
912 | if (ch == NOCHAR) |
842 | return false; |
913 | return false; |
… | |
… | |
879 | return false; |
950 | return false; |
880 | |
951 | |
881 | if (!prop || prop->width == rxvt_fontprop::unset) |
952 | if (!prop || prop->width == rxvt_fontprop::unset) |
882 | return true; |
953 | return true; |
883 | |
954 | |
884 | // check character against base font bounding box |
955 | // check wether character overlaps previous/next character |
885 | int w = xcs->width; |
956 | int w = xcs->rbearing - xcs->lbearing; |
886 | int wcw = wcwidth (unicode); |
957 | int wcw = max (WCWIDTH (unicode), 1); |
887 | if (wcw > 0) w /= wcw; |
|
|
888 | |
958 | |
889 | careful = w > prop->width; |
959 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
890 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
960 | |
|
|
961 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
891 | return false; |
962 | return false; |
892 | |
963 | |
893 | return true; |
964 | return true; |
894 | } |
965 | } |
895 | |
966 | |
… | |
… | |
901 | // this looks like a mess /. |
972 | // this looks like a mess /. |
902 | // and it is a mess /. |
973 | // and it is a mess /. |
903 | // yet we are trying to be perfect /. |
974 | // yet we are trying to be perfect /. |
904 | // but the result still isn't perfect /. |
975 | // but the result still isn't perfect /. |
905 | |
976 | |
|
|
977 | dTermDisplay; |
|
|
978 | dTermGC; |
|
|
979 | |
906 | bool slow = this->slow |
980 | bool slow = this->slow |
907 | || width != r->TermWin.fwidth |
981 | || width != term->fwidth |
908 | || height != r->TermWin.fheight; |
982 | || height != term->fheight; |
909 | |
983 | |
910 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
984 | int base = ascent; // sorry, incorrect: term->fbase; |
911 | |
985 | |
912 | XGCValues v; |
986 | XGCValues v; |
913 | v.foreground = r->pix_colors[fg]; |
987 | v.foreground = term->pix_colors[fg]; |
914 | v.font = f->fid; |
988 | v.font = f->fid; |
915 | |
989 | |
916 | if (enc2b) |
990 | if (enc2b) |
917 | { |
991 | { |
918 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
992 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
919 | |
993 | |
920 | if (bg == Color_bg && !slow) |
994 | if (bg == Color_bg && !slow) |
921 | { |
995 | { |
922 | v.background = r->pix_colors[bg]; |
996 | v.background = term->pix_colors[bg]; |
923 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
997 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
924 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
998 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
925 | } |
999 | } |
926 | else |
1000 | else |
927 | { |
1001 | { |
928 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1002 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
929 | |
1003 | |
930 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1004 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
931 | |
1005 | |
932 | if (slow) |
1006 | if (slow) |
933 | { |
1007 | { |
934 | do |
1008 | do |
935 | { |
1009 | { |
936 | if (xc->byte1 || xc->byte2) |
1010 | if (xc->byte1 || xc->byte2) |
937 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
1011 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
938 | |
1012 | |
939 | x += r->TermWin.fwidth; |
1013 | x += term->fwidth; |
940 | xc++; len--; |
1014 | xc++; len--; |
941 | } |
1015 | } |
942 | while (len); |
1016 | while (len); |
943 | } |
1017 | } |
944 | else |
1018 | else |
945 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1019 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
946 | } |
1020 | } |
947 | } |
1021 | } |
948 | else |
1022 | else |
949 | { |
1023 | { |
950 | const char *xc = enc_char (text, len, cs, slow); |
1024 | const char *xc = enc_char (text, len, cs, slow); |
951 | |
1025 | |
952 | if (bg == Color_bg && !slow) |
1026 | if (bg == Color_bg && !slow) |
953 | { |
1027 | { |
954 | v.background = r->pix_colors[bg]; |
1028 | v.background = term->pix_colors[bg]; |
955 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1029 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
956 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1030 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
957 | } |
1031 | } |
958 | else |
1032 | else |
959 | { |
1033 | { |
960 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1034 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
961 | |
1035 | |
962 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1036 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
963 | |
1037 | |
964 | if (slow) |
1038 | if (slow) |
965 | { |
1039 | { |
966 | do |
1040 | do |
967 | { |
1041 | { |
968 | if (*xc) |
1042 | if (*xc) |
969 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1043 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
970 | |
1044 | |
971 | x += r->TermWin.fwidth; |
1045 | x += term->fwidth; |
972 | xc++; len--; |
1046 | xc++; len--; |
973 | } |
1047 | } |
974 | while (len); |
1048 | while (len); |
975 | } |
1049 | } |
976 | else |
1050 | else |
977 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1051 | XDrawString (disp, d, gc, x, y + base, xc, len); |
978 | } |
1052 | } |
979 | } |
1053 | } |
980 | } |
1054 | } |
981 | |
1055 | |
982 | ///////////////////////////////////////////////////////////////////////////// |
1056 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
988 | |
1062 | |
989 | void clear (); |
1063 | void clear (); |
990 | |
1064 | |
991 | rxvt_fontprop properties (); |
1065 | rxvt_fontprop properties (); |
992 | |
1066 | |
993 | bool load (const rxvt_fontprop &prop); |
1067 | bool load (const rxvt_fontprop &prop, bool force_prop); |
994 | |
1068 | |
995 | void draw (rxvt_drawable &d, int x, int y, |
1069 | void draw (rxvt_drawable &d, int x, int y, |
996 | const text_t *text, int len, |
1070 | const text_t *text, int len, |
997 | int fg, int bg); |
1071 | int fg, int bg); |
998 | |
1072 | |
999 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1073 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1000 | |
1074 | |
1001 | protected: |
1075 | protected: |
1002 | XftFont *f; |
1076 | XftFont *f; |
1003 | }; |
1077 | }; |
1004 | |
1078 | |
1005 | void |
1079 | void |
1006 | rxvt_font_xft::clear () |
1080 | rxvt_font_xft::clear () |
1007 | { |
1081 | { |
1008 | if (f) |
1082 | if (f) |
1009 | { |
1083 | { |
1010 | XftFontClose (DISPLAY, f); |
1084 | XftFontClose (term->dpy, f); |
1011 | f = 0; |
1085 | f = 0; |
1012 | } |
1086 | } |
1013 | } |
1087 | } |
1014 | |
1088 | |
1015 | rxvt_fontprop |
1089 | rxvt_fontprop |
… | |
… | |
1019 | |
1093 | |
1020 | FT_Face face = XftLockFace (f); |
1094 | FT_Face face = XftLockFace (f); |
1021 | |
1095 | |
1022 | p.width = width; |
1096 | p.width = width; |
1023 | p.height = height; |
1097 | p.height = height; |
|
|
1098 | p.ascent = ascent; |
1024 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1099 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1025 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1100 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1026 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1101 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1027 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1102 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1028 | |
1103 | |
… | |
… | |
1030 | |
1105 | |
1031 | return p; |
1106 | return p; |
1032 | } |
1107 | } |
1033 | |
1108 | |
1034 | bool |
1109 | bool |
1035 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1110 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1036 | { |
1111 | { |
|
|
1112 | dTermDisplay; |
|
|
1113 | |
1037 | clear (); |
1114 | clear (); |
1038 | |
1115 | |
1039 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1116 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1040 | |
1117 | |
1041 | if (!p) |
1118 | if (!p) |
1042 | return false; |
1119 | return false; |
1043 | |
1120 | |
1044 | FcValue v; |
1121 | FcValue v; |
1045 | |
1122 | |
1046 | if (prop.height != rxvt_fontprop::unset |
1123 | if (prop.height != rxvt_fontprop::unset |
1047 | && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
1124 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
|
|
1125 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1048 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1126 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1049 | |
1127 | |
1050 | if (prop.weight != rxvt_fontprop::unset |
1128 | if (prop.weight != rxvt_fontprop::unset |
1051 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1129 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1052 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1130 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1053 | |
1131 | |
1054 | if (prop.slant != rxvt_fontprop::unset |
1132 | if (prop.slant != rxvt_fontprop::unset |
1055 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1133 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1056 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1134 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1057 | |
1135 | |
1058 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1136 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1059 | // clip width, we can't do better, or can we? |
1137 | // clip width, we can't do better, or can we? |
1060 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1138 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1066 | |
1144 | |
1067 | // store generated name so iso14755 view gives better results |
1145 | // store generated name so iso14755 view gives better results |
1068 | set_name ((char *)FcNameUnparse (p)); |
1146 | set_name ((char *)FcNameUnparse (p)); |
1069 | |
1147 | |
1070 | XftResult result; |
1148 | XftResult result; |
1071 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1149 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1072 | |
1150 | |
1073 | FcPatternDestroy (p); |
1151 | FcPatternDestroy (p); |
1074 | |
1152 | |
1075 | if (!match) |
1153 | if (!match) |
1076 | return false; |
1154 | return false; |
… | |
… | |
1078 | int ftheight = 0; |
1156 | int ftheight = 0; |
1079 | bool success = true; |
1157 | bool success = true; |
1080 | |
1158 | |
1081 | for (;;) |
1159 | for (;;) |
1082 | { |
1160 | { |
1083 | f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); |
1161 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1084 | |
1162 | |
1085 | if (!f) |
1163 | if (!f) |
1086 | { |
1164 | { |
1087 | success = false; |
1165 | success = false; |
1088 | break; |
1166 | break; |
… | |
… | |
1097 | |
1175 | |
1098 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1176 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1099 | |
1177 | |
1100 | XftUnlockFace (f); |
1178 | XftUnlockFace (f); |
1101 | |
1179 | |
|
|
1180 | int glheight = height; |
|
|
1181 | |
1102 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1182 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1103 | { |
1183 | { |
1104 | FcChar16 ch = *t; |
1184 | FcChar16 ch = *t; |
1105 | |
1185 | |
1106 | if (cs != CS_UNICODE |
1186 | if (cs != CS_UNICODE |
… | |
… | |
1112 | bool careful; |
1192 | bool careful; |
1113 | if (!has_char (*t, &prop, careful)) |
1193 | if (!has_char (*t, &prop, careful)) |
1114 | continue; |
1194 | continue; |
1115 | |
1195 | |
1116 | XGlyphInfo g; |
1196 | XGlyphInfo g; |
1117 | XftTextExtents16 (DISPLAY, f, &ch, 1, &g); |
1197 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1118 | |
1198 | |
|
|
1199 | g.width -= g.x; |
|
|
1200 | |
1119 | int wcw = wcwidth (ch); |
1201 | int wcw = WCWIDTH (ch); |
1120 | if (wcw > 0) g.width = g.width / wcw; |
1202 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1121 | |
1203 | |
1122 | if (width < g.width) width = g.width; |
1204 | if (width < g.width ) width = g.width; |
1123 | if (height < g.height) height = g.height; |
1205 | if (height < g.height ) height = g.height; |
|
|
1206 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1207 | } |
|
|
1208 | |
|
|
1209 | if (!width) |
|
|
1210 | { |
|
|
1211 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1212 | |
|
|
1213 | XftFontClose (disp, f); |
|
|
1214 | f = 0; |
|
|
1215 | |
|
|
1216 | success = false; |
|
|
1217 | break; |
1124 | } |
1218 | } |
1125 | |
1219 | |
1126 | if (prop.height == rxvt_fontprop::unset |
1220 | if (prop.height == rxvt_fontprop::unset |
1127 | || height <= prop.height |
1221 | || (height <= prop.height && glheight <= prop.height) |
1128 | || height <= 2 |
1222 | || height <= 2 |
1129 | || !scalable) |
1223 | || !scalable) |
1130 | break; |
1224 | break; |
1131 | |
1225 | |
1132 | if (ftheight) |
1226 | if (ftheight) |
… | |
… | |
1139 | ftheight -= height - prop.height; |
1233 | ftheight -= height - prop.height; |
1140 | } |
1234 | } |
1141 | else |
1235 | else |
1142 | ftheight = prop.height - 1; |
1236 | ftheight = prop.height - 1; |
1143 | |
1237 | |
1144 | XftFontClose (DISPLAY, f); |
1238 | XftFontClose (disp, f); |
1145 | FcPatternDel (match, FC_PIXEL_SIZE); |
1239 | FcPatternDel (match, FC_PIXEL_SIZE); |
1146 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1240 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1147 | } |
1241 | } |
1148 | |
1242 | |
1149 | FcPatternDestroy (match); |
1243 | FcPatternDestroy (match); |
1150 | |
1244 | |
1151 | #if 0 // do it per-character |
1245 | #if 0 // do it per-character |
… | |
… | |
1158 | |
1252 | |
1159 | return success; |
1253 | return success; |
1160 | } |
1254 | } |
1161 | |
1255 | |
1162 | bool |
1256 | bool |
1163 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1257 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1164 | { |
1258 | { |
1165 | careful = false; |
1259 | careful = false; |
1166 | |
1260 | |
1167 | if (!XftCharExists (DISPLAY, f, unicode)) |
1261 | if (!XftCharExists (term->dpy, f, unicode)) |
1168 | return false; |
1262 | return false; |
1169 | |
1263 | |
1170 | if (!prop || prop->width == rxvt_fontprop::unset) |
1264 | if (!prop || prop->width == rxvt_fontprop::unset) |
1171 | return true; |
1265 | return true; |
1172 | |
1266 | |
1173 | // check character against base font bounding box |
1267 | // check character against base font bounding box |
1174 | FcChar32 ch = unicode; |
1268 | FcChar32 ch = unicode; |
1175 | XGlyphInfo g; |
1269 | XGlyphInfo g; |
1176 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1270 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1177 | |
1271 | |
1178 | int w = g.width; |
1272 | int w = g.width - g.x; |
1179 | int wcw = wcwidth (unicode); |
1273 | int wcw = max (WCWIDTH (unicode), 1); |
1180 | if (wcw > 0) w /= wcw; |
|
|
1181 | |
1274 | |
1182 | careful = w > prop->width; |
1275 | careful = g.x > 0 || w > prop->width * wcw; |
1183 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1276 | |
|
|
1277 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1278 | return false; |
|
|
1279 | |
|
|
1280 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1281 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1184 | return false; |
1282 | return false; |
1185 | |
1283 | |
1186 | return true; |
1284 | return true; |
1187 | } |
1285 | } |
1188 | |
1286 | |
1189 | void |
1287 | void |
1190 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1288 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1191 | const text_t *text, int len, |
1289 | const text_t *text, int len, |
1192 | int fg, int bg) |
1290 | int fg, int bg) |
1193 | { |
1291 | { |
1194 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
|
|
1195 | |
|
|
1196 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1197 | |
|
|
1198 | XGlyphInfo extents; |
1292 | XGlyphInfo extents; |
1199 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1293 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1200 | FcChar32 *ep = enc; |
1294 | XftGlyphSpec *ep = enc; |
1201 | int ewidth = 0; |
1295 | |
1202 | int xoff = 0; |
1296 | dTermDisplay; |
|
|
1297 | dTermGC; |
|
|
1298 | |
|
|
1299 | int w = term->fwidth * len; |
|
|
1300 | int h = term->fheight; |
|
|
1301 | |
|
|
1302 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1303 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1304 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1305 | */ |
|
|
1306 | bool buffered = true |
|
|
1307 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1308 | && bg >= 0 |
|
|
1309 | #endif |
|
|
1310 | ; |
|
|
1311 | // cut trailing spaces |
|
|
1312 | while (len && text [len - 1] == ' ') |
|
|
1313 | len--; |
|
|
1314 | |
|
|
1315 | int x_ = buffered ? 0 : x; |
|
|
1316 | int y_ = buffered ? 0 : y; |
1203 | |
1317 | |
1204 | while (len) |
1318 | while (len) |
1205 | { |
1319 | { |
1206 | int cwidth = r->TermWin.fwidth; |
1320 | int cwidth = term->fwidth; |
1207 | FcChar32 fc = *text++; len--; |
1321 | FcChar32 fc = *text++; len--; |
1208 | FT_UInt gl; |
|
|
1209 | |
1322 | |
1210 | while (len && *text == NOCHAR) |
1323 | while (len && *text == NOCHAR) |
1211 | text++, len--, cwidth += r->TermWin.fwidth; |
1324 | text++, len--, cwidth += term->fwidth; |
1212 | |
|
|
1213 | gl = XftCharIndex (d.display->display, f, fc); |
|
|
1214 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1215 | |
1325 | |
1216 | if (extents.xOff != cwidth && ep != enc) |
1326 | if (fc != ' ') // skip spaces |
1217 | { |
|
|
1218 | if (xoff > ewidth) xoff = ewidth; |
|
|
1219 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1220 | x + (ewidth - xoff >> 1), |
|
|
1221 | y + base, enc, ep - enc); |
|
|
1222 | x += ewidth; |
|
|
1223 | |
|
|
1224 | ep = enc; |
|
|
1225 | ewidth = 0; |
|
|
1226 | xoff = 0; |
|
|
1227 | } |
1327 | { |
|
|
1328 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1329 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1228 | |
1330 | |
1229 | if (fc == ' ' && ep == enc) // skip leading spaces |
1331 | ep->glyph = glyph; |
|
|
1332 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
|
|
1333 | ep->y = y_ + ascent; |
|
|
1334 | |
|
|
1335 | if (extents.xOff == 0) |
|
|
1336 | ep->x = x_ + cwidth; |
|
|
1337 | |
|
|
1338 | ep++; |
1230 | { |
1339 | } |
|
|
1340 | |
1231 | x += cwidth; |
1341 | x_ += cwidth; |
1232 | continue; |
1342 | } |
|
|
1343 | |
|
|
1344 | if (buffered) |
|
|
1345 | { |
|
|
1346 | bool back_rendered = false; |
|
|
1347 | if (ep != enc) |
1233 | } |
1348 | { |
|
|
1349 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1234 | |
1350 | |
|
|
1351 | #ifdef HAVE_BG_PIXMAP |
|
|
1352 | if (term->bgPixmap.pixmap) |
|
|
1353 | { |
|
|
1354 | Picture dst = 0; |
|
|
1355 | |
|
|
1356 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1357 | dst = XftDrawPicture (d2); |
|
|
1358 | |
|
|
1359 | if (bg < 0 || dst != 0) |
|
|
1360 | { |
|
|
1361 | int src_x = x, src_y = y ; |
|
|
1362 | |
|
|
1363 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1364 | { |
|
|
1365 | src_x += term->window_vt_x; |
|
|
1366 | src_y += term->window_vt_y; |
|
|
1367 | } |
|
|
1368 | |
|
|
1369 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1370 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1371 | { |
|
|
1372 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1373 | src_x, src_y, w, h, 0, 0); |
|
|
1374 | } |
|
|
1375 | else |
|
|
1376 | { |
|
|
1377 | XGCValues gcv; |
|
|
1378 | |
|
|
1379 | gcv.fill_style = FillTiled; |
|
|
1380 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1381 | gcv.ts_x_origin = -src_x; |
|
|
1382 | gcv.ts_y_origin = -src_y; |
|
|
1383 | |
|
|
1384 | XChangeGC (disp, gc, |
|
|
1385 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1386 | &gcv); |
|
|
1387 | |
|
|
1388 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1389 | |
|
|
1390 | gcv.fill_style = FillSolid; |
|
|
1391 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1392 | } |
|
|
1393 | |
|
|
1394 | if (bg >= 0) |
|
|
1395 | { |
|
|
1396 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1397 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1398 | } |
|
|
1399 | |
|
|
1400 | back_rendered = true; |
|
|
1401 | } |
|
|
1402 | } |
|
|
1403 | #endif |
|
|
1404 | |
|
|
1405 | if (bg >= 0 && !back_rendered) |
|
|
1406 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1407 | |
|
|
1408 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1409 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1410 | } |
1235 | else |
1411 | else |
1236 | { |
1412 | clear_rect (d, x, y, w, h, bg); |
1237 | *ep++ = gl; |
|
|
1238 | ewidth += cwidth; |
|
|
1239 | xoff += extents.xOff; |
|
|
1240 | } |
|
|
1241 | } |
|
|
1242 | |
|
|
1243 | if (ep != enc) |
|
|
1244 | { |
1413 | } |
1245 | if (xoff > ewidth) xoff = ewidth; |
1414 | else |
1246 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1247 | x + (ewidth - xoff >> 1), |
|
|
1248 | y + base, enc, ep - enc); |
|
|
1249 | } |
1415 | { |
|
|
1416 | clear_rect (d, x, y, w, h, bg); |
|
|
1417 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1418 | } |
1250 | } |
1419 | } |
|
|
1420 | |
1251 | #endif |
1421 | #endif |
1252 | |
1422 | |
1253 | ///////////////////////////////////////////////////////////////////////////// |
1423 | ///////////////////////////////////////////////////////////////////////////// |
1254 | |
1424 | |
1255 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1425 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1256 | : r (r), fontdesc (0) |
1426 | : fontdesc (0), term (term) |
1257 | { |
1427 | { |
1258 | clear (); |
1428 | clear (); |
1259 | } |
1429 | } |
1260 | |
1430 | |
1261 | rxvt_fontset::~rxvt_fontset () |
1431 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1264 | } |
1434 | } |
1265 | |
1435 | |
1266 | void |
1436 | void |
1267 | rxvt_fontset::clear () |
1437 | rxvt_fontset::clear () |
1268 | { |
1438 | { |
|
|
1439 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
|
|
1440 | = rxvt_fontprop::unset; |
|
|
1441 | force_prop = false; |
|
|
1442 | |
1269 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1443 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1270 | FONT_UNREF (*i); |
1444 | FONT_UNREF (*i); |
1271 | |
1445 | |
1272 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1446 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1273 | delete *p; |
1447 | delete *p; |
… | |
… | |
1281 | |
1455 | |
1282 | rxvt_font * |
1456 | rxvt_font * |
1283 | rxvt_fontset::new_font (const char *name, codeset cs) |
1457 | rxvt_fontset::new_font (const char *name, codeset cs) |
1284 | { |
1458 | { |
1285 | rxvt_font *f; |
1459 | rxvt_font *f; |
1286 | |
1460 | |
1287 | if (!name || !*name) |
1461 | if (!name || !*name) |
1288 | { |
1462 | { |
1289 | name = ""; |
1463 | name = ""; |
1290 | f = new rxvt_font_default (this); |
1464 | f = new rxvt_font_default (this); |
1291 | } |
1465 | } |
… | |
… | |
1302 | f = new rxvt_font_x11; |
1476 | f = new rxvt_font_x11; |
1303 | } |
1477 | } |
1304 | else |
1478 | else |
1305 | f = new rxvt_font_x11; |
1479 | f = new rxvt_font_x11; |
1306 | |
1480 | |
1307 | f->set_term (r); |
1481 | f->set_term (term); |
1308 | f->set_name (strdup (name)); |
1482 | f->set_name (strdup (name)); |
1309 | |
1483 | |
1310 | f->cs = cs; |
1484 | f->cs = cs; |
1311 | f->loaded = false; |
1485 | f->loaded = false; |
1312 | |
1486 | |
… | |
… | |
1323 | char buf[512]; |
1497 | char buf[512]; |
1324 | const char *end; |
1498 | const char *end; |
1325 | |
1499 | |
1326 | do |
1500 | do |
1327 | { |
1501 | { |
1328 | while (*desc <= ' ') desc++; |
1502 | while (*desc && *desc <= ' ') |
|
|
1503 | desc++; |
1329 | |
1504 | |
1330 | codeset cs = CS_UNICODE; |
1505 | codeset cs = CS_UNICODE; |
1331 | |
1506 | |
1332 | if (*desc == '[') |
1507 | if (*desc == '[') |
1333 | { |
1508 | { |
… | |
… | |
1383 | if (fonts[i]->loaded) |
1558 | if (fonts[i]->loaded) |
1384 | return true; |
1559 | return true; |
1385 | |
1560 | |
1386 | fonts[i]->loaded = true; |
1561 | fonts[i]->loaded = true; |
1387 | |
1562 | |
1388 | if (!fonts[i]->load (prop)) |
1563 | if (!fonts[i]->load (prop, force_prop)) |
1389 | { |
1564 | { |
1390 | fonts[i]->cs = CS_UNKNOWN; |
1565 | fonts[i]->cs = CS_UNKNOWN; |
1391 | return false; |
1566 | return false; |
1392 | } |
1567 | } |
1393 | |
1568 | |
1394 | return true; |
1569 | return true; |
1395 | } |
1570 | } |
1396 | |
1571 | |
1397 | bool |
1572 | bool |
1398 | rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) |
1573 | rxvt_fontset::populate (const char *desc) |
1399 | { |
1574 | { |
1400 | clear (); |
1575 | clear (); |
1401 | |
1576 | |
1402 | fontdesc = strdup (desc); |
1577 | fontdesc = strdup (desc); |
1403 | |
1578 | |
1404 | fonts.push_back (new_font (0, CS_UNICODE)); |
1579 | fonts.push_back (new_font (0, CS_UNICODE)); |
1405 | realize_font (0); |
1580 | realize_font (0); |
1406 | |
|
|
1407 | this->prop = prop; |
|
|
1408 | |
1581 | |
1409 | add_fonts (desc); |
1582 | add_fonts (desc); |
1410 | |
1583 | |
1411 | return true; |
1584 | return true; |
1412 | } |
1585 | } |
… | |
… | |
1445 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1618 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1446 | goto next_font; |
1619 | goto next_font; |
1447 | |
1620 | |
1448 | if (!realize_font (i)) |
1621 | if (!realize_font (i)) |
1449 | goto next_font; |
1622 | goto next_font; |
|
|
1623 | |
|
|
1624 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1625 | max_it (f->ascent, prop.ascent); |
1450 | } |
1626 | } |
1451 | |
1627 | |
1452 | if (f->cs == CS_UNKNOWN) |
1628 | if (f->cs == CS_UNKNOWN) |
1453 | goto next_font; |
1629 | goto next_font; |
1454 | |
1630 | |
… | |
… | |
1493 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1669 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1494 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1670 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1495 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1671 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1496 | |
1672 | |
1497 | XftResult result; |
1673 | XftResult result; |
1498 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1674 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1499 | |
1675 | |
1500 | FcPatternDestroy (p); |
1676 | FcPatternDestroy (p); |
1501 | |
1677 | |
1502 | if (match) |
1678 | if (match) |
1503 | { |
1679 | { |
… | |
… | |
1508 | if (find_font (font) < 0) |
1684 | if (find_font (font) < 0) |
1509 | { |
1685 | { |
1510 | char fontname[4096]; |
1686 | char fontname[4096]; |
1511 | sprintf (fontname, "xft:%-.4090s", font); |
1687 | sprintf (fontname, "xft:%-.4090s", font); |
1512 | |
1688 | |
1513 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1689 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1514 | } |
1690 | } |
1515 | |
1691 | |
1516 | free (font); |
1692 | free (font); |
1517 | } |
1693 | } |
1518 | #endif |
1694 | #endif |