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" }, |
… | |
… | |
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_ZH || ENCODING_ZH_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:autohint=true"}, |
137 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
131 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
132 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
139 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
133 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=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:autohint=true" }, |
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 | |
305 | if (unicode >= 0x2500 && unicode <= 0x259f) |
311 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
312 | !term->option (Opt_skipBuiltinGlyphs)) |
306 | return true; |
313 | return true; |
307 | |
314 | |
308 | if (IS_COMPOSE (unicode)) |
315 | if (IS_COMPOSE (unicode)) |
309 | return true; |
316 | return true; |
310 | |
317 | |
… | |
… | |
326 | void |
333 | void |
327 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
334 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
328 | const text_t *text, int len, |
335 | const text_t *text, int len, |
329 | int fg, int bg) |
336 | int fg, int bg) |
330 | { |
337 | { |
|
|
338 | dTermDisplay; |
|
|
339 | dTermGC; |
|
|
340 | |
331 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
341 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
332 | |
342 | |
333 | XSetForeground (d.display->display, TGC, r->pix_colors[fg]); |
343 | XSetForeground (disp, gc, term->pix_colors[fg]); |
334 | |
344 | |
335 | while (len--) |
345 | while (len) |
336 | { |
346 | { |
337 | #if ENABLE_COMBINING |
347 | #if ENABLE_COMBINING |
338 | compose_char *cc; |
348 | compose_char *cc; |
339 | #endif |
349 | #endif |
|
|
350 | const text_t *tp = text; |
340 | text_t t = *text++; |
351 | text_t t = *tp; |
341 | |
352 | |
|
|
353 | while (++text, --len && *text == NOCHAR) |
|
|
354 | ; |
|
|
355 | |
|
|
356 | int width = text - tp; |
|
|
357 | int fwidth = term->fwidth * width; |
|
|
358 | |
|
|
359 | #ifdef BUILTIN_GLYPHS |
342 | if (0x2500 <= t && t <= 0x259f) |
360 | if (0x2500 <= t && t <= 0x259f) |
343 | { |
361 | { |
|
|
362 | # include "table/linedraw.h" |
344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
345 | uint32_t *a = linedraw_command + (offs >> 4); |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
346 | uint32_t *b = a + (offs & 15); |
365 | uint32_t *b = a + (offs & 15); |
347 | |
366 | |
348 | int W = r->TermWin.fwidth; |
367 | int W = fwidth; |
349 | int H = r->TermWin.fheight; |
368 | int H = term->fheight; |
350 | |
369 | |
351 | int x_[16]; |
370 | int x_[16]; |
352 | int y_[16]; |
371 | int y_[16]; |
353 | |
372 | |
354 | for (int i = 0; i <= 8; i++) |
373 | for (int i = 0; i <= 8; i++) |
… | |
… | |
362 | |
381 | |
363 | XGCValues gcv; |
382 | XGCValues gcv; |
364 | |
383 | |
365 | gcv.cap_style = CapButt; |
384 | gcv.cap_style = CapButt; |
366 | gcv.line_width = 0; |
385 | gcv.line_width = 0; |
367 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
386 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
368 | |
387 | |
369 | while (a < b) |
388 | while (a < b) |
370 | { |
389 | { |
371 | uint32_t command = *a++; |
390 | uint32_t command = *a++; |
372 | |
391 | |
… | |
… | |
379 | int y2 = y_[(command >> 0) & 15]; |
398 | int y2 = y_[(command >> 0) & 15]; |
380 | |
399 | |
381 | switch (op) |
400 | switch (op) |
382 | { |
401 | { |
383 | case 0: // line |
402 | case 0: // line |
384 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
403 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
385 | break; |
404 | break; |
386 | |
405 | |
387 | case 1: // rectangle, possibly stippled |
406 | case 1: // rectangle, possibly stippled |
388 | if (a) |
407 | if (a) |
389 | { |
408 | { |
390 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
409 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
391 | |
410 | |
392 | gcv.fill_style = FillStippled; |
411 | gcv.fill_style = FillStippled; |
393 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
412 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
394 | gcv.ts_x_origin = x; |
413 | gcv.ts_x_origin = x; |
395 | gcv.ts_y_origin = y; |
414 | gcv.ts_y_origin = y; |
396 | |
415 | |
397 | XChangeGC (d.display->display, TGC, |
416 | XChangeGC (disp, gc, |
398 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
417 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
399 | &gcv); |
418 | &gcv); |
400 | } |
419 | } |
401 | |
420 | |
402 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
421 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
403 | |
422 | |
404 | if (a) |
423 | if (a) |
405 | { |
424 | { |
406 | XFreePixmap (d.display->display, gcv.stipple); |
425 | XFreePixmap (disp, gcv.stipple); |
407 | gcv.stipple = 0; |
426 | gcv.stipple = 0; |
408 | gcv.fill_style = FillSolid; |
427 | gcv.fill_style = FillSolid; |
409 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
428 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
410 | } |
429 | } |
411 | break; |
430 | break; |
412 | case 2: // arc |
431 | case 2: // arc |
413 | XDrawArc (d.display->display, d, TGC, |
432 | XDrawArc (disp, d, gc, |
414 | x1 - W/2, y1 - H/2, W-1, H-1, |
433 | x1 - W/2, y1 - H/2, W-1, H-1, |
415 | (a - 1) * 90*64, (b - 1) * 90*64); |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
416 | break; |
435 | break; |
417 | } |
436 | } |
418 | } |
437 | } |
419 | } |
438 | } |
|
|
439 | #else |
|
|
440 | if (0) |
|
|
441 | ; |
|
|
442 | #endif |
420 | #if ENABLE_COMBINING |
443 | #if ENABLE_COMBINING |
421 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
444 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
422 | { |
445 | { |
|
|
446 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
447 | |
423 | text_t c2[2]; |
448 | text_t chrs[2]; |
424 | int len2 = 1; |
449 | chrs [1] = NOCHAR; |
425 | |
|
|
426 | // support double-width (but not more) combining characters |
|
|
427 | if (len && *text == NOCHAR) |
|
|
428 | { |
|
|
429 | c2[1] = *text; // not text++ to get correct x-width |
|
|
430 | len2++; |
|
|
431 | } |
|
|
432 | |
450 | |
433 | c2[0] = cc->c1; |
451 | *chrs = cc->c1; |
434 | rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; |
452 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
435 | f1->draw (d, x, y, c2, len2, fg, bg); |
453 | f1->draw (d, x, y, chrs, width, fg, bg); |
436 | |
454 | |
437 | if (cc->c2 != NOCHAR) |
455 | if (cc->c2 != NOCHAR) |
438 | { |
456 | { |
439 | bool careful; |
457 | bool careful; |
440 | |
458 | |
441 | // prefer font of first character, for no good reasons |
459 | // prefer font of first character, for no good reasons |
442 | c2[0] = cc->c2; |
460 | *chrs = cc->c2; |
443 | rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) |
461 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
444 | ? f1 |
462 | ? f1 |
445 | : (*fs)[fs->find_font (c2[0])]; |
463 | : (*fs)[fs->find_font (cc->c2)]; |
446 | |
464 | |
447 | f2->draw (d, x, y, c2, len2, fg, -1); |
465 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
448 | } |
466 | } |
449 | } |
467 | } |
450 | #endif |
468 | #endif |
451 | else |
469 | else |
452 | switch (t) |
470 | switch (t) |
… | |
… | |
455 | case ZERO_WIDTH_CHAR: |
473 | case ZERO_WIDTH_CHAR: |
456 | case NOCHAR: |
474 | case NOCHAR: |
457 | break; |
475 | break; |
458 | |
476 | |
459 | default: |
477 | default: |
460 | int w = 0; |
|
|
461 | while (len > 0 && *text == NOCHAR) |
|
|
462 | { |
|
|
463 | ++text; |
|
|
464 | --len; |
|
|
465 | w += r->TermWin.fwidth; |
|
|
466 | } |
|
|
467 | |
|
|
468 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
478 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
469 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
479 | fwidth - 4, term->fheight - 4); |
470 | x += w; |
|
|
471 | } |
480 | } |
472 | |
481 | |
473 | x += r->TermWin.fwidth; |
482 | x += fwidth; |
474 | } |
483 | } |
475 | } |
484 | } |
476 | |
485 | |
477 | ///////////////////////////////////////////////////////////////////////////// |
486 | ///////////////////////////////////////////////////////////////////////////// |
478 | |
487 | |
… | |
… | |
481 | |
490 | |
482 | void clear (); |
491 | void clear (); |
483 | |
492 | |
484 | rxvt_fontprop properties (); |
493 | rxvt_fontprop properties (); |
485 | |
494 | |
486 | bool load (const rxvt_fontprop &prop); |
495 | bool load (const rxvt_fontprop &prop, bool force_prop); |
487 | |
496 | |
488 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
497 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
489 | |
498 | |
490 | void draw (rxvt_drawable &d, int x, int y, |
499 | void draw (rxvt_drawable &d, int x, int y, |
491 | const text_t *text, int len, |
500 | const text_t *text, int len, |
492 | int fg, int bg); |
501 | int fg, int bg); |
493 | |
502 | |
494 | bool slow; // wether this is a proportional font or has other funny characteristics |
503 | bool slow; // wether this is a proportional font or has other funny characteristics |
495 | XFontStruct *f; |
504 | XFontStruct *f; |
496 | codeset cs; |
|
|
497 | bool enc2b, encm; |
505 | bool enc2b, encm; |
498 | |
506 | |
499 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
507 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
500 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
508 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
501 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
509 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
502 | bool set_properties (rxvt_fontprop &p, const char *name); |
510 | bool set_properties (rxvt_fontprop &p, const char *name); |
503 | }; |
511 | }; |
504 | |
512 | |
505 | char * |
513 | char * |
506 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
514 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
507 | { |
515 | { |
508 | unsigned long value; |
516 | unsigned long value; |
509 | |
517 | |
510 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
518 | if (XGetFontProperty (f, property, &value)) |
511 | return XGetAtomName (DISPLAY, value); |
519 | return XGetAtomName (term->dpy, value); |
512 | else |
520 | else |
513 | return rxvt_strdup (repl); |
521 | return repl ? strdup (repl) : 0; |
514 | } |
522 | } |
515 | |
523 | |
516 | rxvt_fontprop |
524 | rxvt_fontprop |
517 | rxvt_font_x11::properties () |
525 | rxvt_font_x11::properties () |
518 | { |
526 | { |
… | |
… | |
522 | } |
530 | } |
523 | |
531 | |
524 | bool |
532 | bool |
525 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
533 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
526 | { |
534 | { |
527 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
535 | p.width = width != rxvt_fontprop::unset ? width |
|
|
536 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
537 | : (height + 1) / 2; |
528 | p.height = height; |
538 | p.height = height; |
|
|
539 | p.ascent = rxvt_fontprop::unset; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
540 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
530 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
541 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
531 | |
542 | |
532 | return true; |
543 | return true; |
533 | } |
544 | } |
534 | |
545 | |
535 | bool |
546 | bool |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
547 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
537 | { |
548 | { |
538 | unsigned long height; |
549 | unsigned long height; |
|
|
550 | |
|
|
551 | #if 0 |
539 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
552 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
540 | return false; |
553 | return false; |
|
|
554 | #else |
|
|
555 | height = f->ascent + f->descent; |
|
|
556 | #endif |
541 | |
557 | |
542 | unsigned long avgwidth; |
558 | unsigned long avgwidth; |
543 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
559 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
544 | avgwidth = 0; |
560 | avgwidth = 0; |
545 | |
561 | |
546 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
562 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
547 | char *slant = get_property (f, "SLANT", "r"); |
563 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
548 | |
564 | |
549 | set_properties (p, height, weight, slant, avgwidth); |
565 | set_properties (p, height, weight, slant, avgwidth); |
550 | |
566 | |
551 | free (weight); |
567 | free (weight); |
552 | free (slant); |
568 | free (slant); |
553 | |
569 | |
|
|
570 | p.ascent = f->ascent; |
|
|
571 | |
554 | return true; |
572 | return true; |
555 | } |
573 | } |
556 | |
574 | |
557 | bool |
575 | bool |
558 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
576 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
559 | { |
577 | { |
|
|
578 | dTermDisplay; |
560 | int slashes = 0; |
579 | int slashes = 0; |
561 | const char *comp[13]; |
580 | const char *comp[13]; |
562 | |
581 | |
563 | for (const char *c = name; *c; c++) |
582 | for (const char *c = name; *c; c++) |
564 | if (*c == '-') |
583 | if (*c == '-') |
… | |
… | |
572 | if (slashes >= 13 |
591 | if (slashes >= 13 |
573 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
592 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
574 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
593 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
575 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
594 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
576 | |
595 | |
577 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
596 | XFontStruct *f = XLoadQueryFont (disp, name); |
578 | |
597 | |
579 | if (f) |
598 | if (f) |
580 | { |
599 | { |
581 | // the font should really exist now. if not, we have a problem |
600 | // the font should really exist now. if not, we have a problem |
582 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
601 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
583 | // in that case, just return garbage. |
602 | // in that case, just return garbage. |
584 | bool ret = set_properties (p, f); |
603 | bool ret = set_properties (p, f); |
585 | XFreeFont (DISPLAY, f); |
604 | XFreeFont (disp, f); |
586 | return ret; |
605 | return ret; |
587 | } |
606 | } |
588 | else |
607 | else |
589 | return false; |
608 | return false; |
590 | } |
609 | } |
… | |
… | |
626 | return false; |
645 | return false; |
627 | } |
646 | } |
628 | } |
647 | } |
629 | |
648 | |
630 | bool |
649 | bool |
631 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
650 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
632 | { |
651 | { |
|
|
652 | dTermDisplay; |
|
|
653 | |
633 | clear (); |
654 | clear (); |
634 | |
655 | |
635 | char field_str[64]; // enough for 128 bits |
656 | char field_str[64]; // enough for 128 bits |
636 | |
657 | |
637 | // first morph the font if required |
658 | // first morph the font if required |
638 | if (prop.weight != rxvt_fontprop::unset |
659 | if (force_prop) |
639 | || prop.slant != rxvt_fontprop::unset) |
|
|
640 | { |
660 | { |
641 | char fname[1024]; |
661 | char fname[1024]; |
642 | |
662 | |
643 | if (name[0] != '-') |
663 | if (name[0] != '-') |
644 | { |
664 | { |
645 | f = XLoadQueryFont (DISPLAY, name); |
665 | f = XLoadQueryFont (disp, name); |
646 | |
666 | |
647 | if (!f) |
667 | if (!f) |
648 | return false; |
668 | return false; |
649 | |
669 | |
650 | char *new_name = get_property (f, "FONT", name); |
670 | char *new_name = get_property (f, XA_FONT, name); |
651 | |
671 | |
652 | if (new_name) |
672 | if (new_name) |
653 | set_name (new_name); |
673 | set_name (new_name); |
654 | else |
674 | else |
655 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
675 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
656 | |
676 | |
657 | XFreeFont (DISPLAY, f); |
677 | XFreeFont (disp, f); |
658 | f = 0; |
678 | f = 0; |
659 | } |
679 | } |
660 | |
680 | |
661 | if (prop.weight != rxvt_fontprop::unset) |
681 | if (prop.weight != rxvt_fontprop::unset) |
662 | { |
682 | { |
663 | replace_field (fname, name, 2, 0, |
683 | replace_field (fname, name, 2, 0, |
664 | prop.weight < rxvt_fontprop::bold |
684 | prop.weight < rxvt_fontprop::bold |
665 | ? "medium" : "bold"); |
685 | ? "medium" : "bold"); |
666 | set_name (strdup (fname)); |
686 | set_name (strdup (fname)); |
667 | } |
687 | } |
668 | |
688 | |
… | |
… | |
673 | ? "r" : "i"); // TODO: handle "o"blique, too |
693 | ? "r" : "i"); // TODO: handle "o"blique, too |
674 | set_name (strdup (fname)); |
694 | set_name (strdup (fname)); |
675 | } |
695 | } |
676 | } |
696 | } |
677 | |
697 | |
|
|
698 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
|
|
699 | ? 0 : prop.height); |
|
|
700 | |
|
|
701 | struct font_weight { |
|
|
702 | char *name; |
|
|
703 | int diff; |
|
|
704 | |
|
|
705 | void clear () |
|
|
706 | { |
|
|
707 | name = 0; |
|
|
708 | diff = 0x7fffffff; |
|
|
709 | } |
|
|
710 | |
|
|
711 | font_weight () { clear (); } |
|
|
712 | ~font_weight () { free (name); } |
|
|
713 | }; |
|
|
714 | |
678 | char **list; |
715 | char **list; |
679 | int count; |
716 | int count; |
680 | list = XListFonts (DISPLAY, name, 1024, &count); |
717 | list = XListFonts (disp, name, 4000, &count); |
681 | |
718 | |
682 | set_name (0); |
719 | set_name (0); |
683 | |
720 | |
684 | if (!list) |
721 | if (!list) |
685 | return false; |
722 | return false; |
686 | |
723 | |
687 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
724 | font_weight *fonts = new font_weight[count]; |
688 | ? 0 : prop.height); |
|
|
689 | |
725 | |
690 | int bestdiff = 0x7fffffff; |
|
|
691 | for (int i = 0; i < count; i++) |
726 | for (int i = 0; i < count; i++) |
692 | { |
727 | { |
693 | rxvt_fontprop p; |
728 | rxvt_fontprop p; |
694 | char fname[1024]; |
729 | char fname[1024]; |
695 | |
730 | |
696 | int diff = 0; |
731 | int diff = 0; |
697 | |
732 | |
698 | if (replace_field (fname, list[i], 6, '0', field_str)) |
733 | if (replace_field (fname, list[i], 6, '0', field_str)) |
699 | diff += 10; // slightly penalize scalable fonts |
734 | diff += 10; // slightly penalize scalable fonts |
|
|
735 | else if (replace_field (fname, list[i], 11, '0', "0")) |
|
|
736 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
700 | |
737 | |
701 | if (!set_properties (p, fname)) |
738 | if (!set_properties (p, fname)) |
702 | continue; |
739 | continue; |
703 | |
740 | |
704 | if (prop.height != rxvt_fontprop::unset |
741 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
708 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
745 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
709 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
746 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
710 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
747 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
711 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
748 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
712 | |
749 | |
713 | if (!name // compare against best found so far |
750 | fonts[i].name = strdup (fname); |
714 | || diff < bestdiff) |
751 | fonts[i].diff = diff; |
715 | { |
|
|
716 | set_name (strdup (fname)); |
|
|
717 | bestdiff = diff; |
|
|
718 | } |
|
|
719 | } |
752 | } |
720 | |
753 | |
721 | XFreeFontNames (list); |
754 | XFreeFontNames (list); |
722 | |
755 | |
723 | if (!name) |
756 | // this loop only iterates when the guessed font-size is too small |
724 | return false; |
757 | for (;;) |
|
|
758 | { |
|
|
759 | font_weight *best = fonts + count - 1; |
725 | |
760 | |
726 | f = XLoadQueryFont (DISPLAY, name); |
761 | for (font_weight *w = best; w-- > fonts; ) |
|
|
762 | if (w->diff <= best->diff) |
|
|
763 | best = w; |
|
|
764 | |
|
|
765 | if (!best->name |
|
|
766 | || !(f = XLoadQueryFont (disp, best->name))) |
|
|
767 | break; |
|
|
768 | |
|
|
769 | set_name (best->name); |
|
|
770 | best->clear (); |
|
|
771 | |
|
|
772 | ascent = f->ascent; |
|
|
773 | descent = f->descent; |
|
|
774 | height = ascent + descent; |
|
|
775 | |
|
|
776 | if (prop.height == rxvt_fontprop::unset |
|
|
777 | || height <= prop.height) |
|
|
778 | break; // font is ready for use |
|
|
779 | |
|
|
780 | // PIXEL_SIZE small enough, but real height too large |
|
|
781 | clear (); |
|
|
782 | } |
|
|
783 | |
|
|
784 | delete [] fonts; |
727 | |
785 | |
728 | if (!f) |
786 | if (!f) |
729 | return false; |
787 | return false; |
730 | |
788 | |
731 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
789 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
732 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
790 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
733 | |
791 | |
734 | if (registry && encoding) |
792 | if (registry && encoding) |
735 | { |
793 | { |
736 | char charset[64]; |
794 | char charset[64]; |
737 | snprintf (charset, 64, "%s-%s", registry, encoding); |
795 | snprintf (charset, 64, "%s-%s", registry, encoding); |
738 | |
796 | |
739 | cs = codeset_from_name (charset); |
797 | cs = codeset_from_name (charset); |
740 | } |
798 | } |
741 | else |
799 | else |
742 | { |
800 | { |
743 | const char *charset = get_property (f, "FONT", 0); |
801 | const char *charset = get_property (f, XA_FONT, 0); |
744 | |
802 | |
745 | if (!charset) |
803 | if (!charset) |
746 | charset = name; |
804 | charset = name; |
747 | |
805 | |
748 | int count = 13; |
806 | int count = 13; |
… | |
… | |
760 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
818 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
761 | |
819 | |
762 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
820 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
763 | enc2b = encm || f->max_char_or_byte2 > 255; |
821 | enc2b = encm || f->max_char_or_byte2 > 255; |
764 | |
822 | |
765 | ascent = f->ascent; |
|
|
766 | descent = f->descent; |
|
|
767 | height = ascent + descent; |
|
|
768 | |
|
|
769 | slow = false; |
823 | slow = false; |
770 | |
824 | |
771 | #if 1 // only used for slow detection, TODO optimize |
825 | #if 1 // only used for slow detection, TODO optimize |
772 | if (f->min_bounds.width == f->max_bounds.width) |
826 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
773 | width = f->min_bounds.width; |
|
|
774 | else if (f->per_char == NULL) |
|
|
775 | width = f->max_bounds.width; |
827 | width = f->max_bounds.width; |
776 | else |
828 | else |
777 | { |
829 | { |
778 | slow = true; |
830 | slow = true; |
779 | |
831 | |
780 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
832 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
781 | |
833 | |
782 | if (encm) |
834 | if (encm) |
783 | N += (f->max_byte1 - f->min_byte1) |
835 | N += (f->max_byte1 - f->min_byte1) |
784 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
836 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
785 | |
837 | |
786 | while (N) |
838 | while (N) |
787 | { |
839 | { |
788 | if (f->per_char[N].width > width) |
840 | if (f->per_char[N].width > width) |
789 | width = f->per_char[N].width; |
841 | width = f->per_char[N].width; |
790 | |
842 | |
… | |
… | |
795 | |
847 | |
796 | width = 1; |
848 | width = 1; |
797 | |
849 | |
798 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
850 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
799 | { |
851 | { |
800 | if (cs != CS_UNICODE |
|
|
801 | && *t > 0x100 |
|
|
802 | && FROM_UNICODE (cs, *t) == NOCHAR) |
852 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
803 | continue; |
853 | continue; |
804 | |
854 | |
805 | // ignore characters we wouldn't use anyways |
855 | // ignore characters we wouldn't use anyways |
806 | bool careful; |
856 | bool careful; |
807 | if (!has_char (*t, &prop, careful)) |
857 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
811 | |
861 | |
812 | XCharStruct g; |
862 | XCharStruct g; |
813 | int dir_ret, asc_ret, des_ret; |
863 | int dir_ret, asc_ret, des_ret; |
814 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
864 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
815 | |
865 | |
816 | int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; |
866 | int wcw = WCWIDTH (*t); |
|
|
867 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
817 | |
868 | |
818 | if (width < g.width) width = g.width; |
869 | if (width < g.width) width = g.width; |
819 | } |
870 | } |
820 | |
871 | |
821 | if (cs == CS_UNKNOWN) |
872 | if (cs == CS_UNKNOWN) |
822 | { |
873 | { |
823 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
874 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
840 | void |
891 | void |
841 | rxvt_font_x11::clear () |
892 | rxvt_font_x11::clear () |
842 | { |
893 | { |
843 | if (f) |
894 | if (f) |
844 | { |
895 | { |
845 | XFreeFont (DISPLAY, f); |
896 | XFreeFont (term->dpy, f); |
846 | f = 0; |
897 | f = 0; |
847 | } |
898 | } |
848 | } |
899 | } |
849 | |
900 | |
850 | bool |
901 | bool |
851 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
902 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
852 | { |
903 | { |
853 | uint32_t ch = FROM_UNICODE (cs, unicode); |
904 | uint32_t ch = FROM_UNICODE (cs, unicode); |
854 | |
905 | |
855 | if (ch == NOCHAR) |
906 | if (ch == NOCHAR) |
856 | return false; |
907 | return false; |
… | |
… | |
893 | return false; |
944 | return false; |
894 | |
945 | |
895 | if (!prop || prop->width == rxvt_fontprop::unset) |
946 | if (!prop || prop->width == rxvt_fontprop::unset) |
896 | return true; |
947 | return true; |
897 | |
948 | |
898 | // check character against base font bounding box |
949 | // check wether character overlaps previous/next character |
899 | int w = xcs->width; |
950 | int w = xcs->rbearing - xcs->lbearing; |
900 | int wcw = wcwidth (unicode); |
951 | int wcw = max (WCWIDTH (unicode), 1); |
901 | if (wcw > 0) w /= wcw; |
|
|
902 | |
952 | |
903 | careful = w > prop->width; |
953 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
904 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
954 | |
|
|
955 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
905 | return false; |
956 | return false; |
906 | |
957 | |
907 | return true; |
958 | return true; |
908 | } |
959 | } |
909 | |
960 | |
… | |
… | |
915 | // this looks like a mess /. |
966 | // this looks like a mess /. |
916 | // and it is a mess /. |
967 | // and it is a mess /. |
917 | // yet we are trying to be perfect /. |
968 | // yet we are trying to be perfect /. |
918 | // but the result still isn't perfect /. |
969 | // but the result still isn't perfect /. |
919 | |
970 | |
|
|
971 | dTermDisplay; |
|
|
972 | dTermGC; |
|
|
973 | |
920 | bool slow = this->slow |
974 | bool slow = this->slow |
921 | || width != r->TermWin.fwidth |
975 | || width != term->fwidth |
922 | || height != r->TermWin.fheight; |
976 | || height != term->fheight; |
923 | |
977 | |
924 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
978 | int base = ascent; // sorry, incorrect: term->fbase; |
925 | |
979 | |
926 | XGCValues v; |
980 | XGCValues v; |
927 | v.foreground = r->pix_colors[fg]; |
981 | v.foreground = term->pix_colors[fg]; |
928 | v.font = f->fid; |
982 | v.font = f->fid; |
929 | |
983 | |
930 | if (enc2b) |
984 | if (enc2b) |
931 | { |
985 | { |
932 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
986 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
933 | |
987 | |
934 | if (bg == Color_bg && !slow) |
988 | if (bg == Color_bg && !slow) |
935 | { |
989 | { |
936 | v.background = r->pix_colors[bg]; |
990 | v.background = term->pix_colors[bg]; |
937 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
991 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
938 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
992 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
939 | } |
993 | } |
940 | else |
994 | else |
941 | { |
995 | { |
942 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
996 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
943 | |
997 | |
944 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
998 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
945 | |
999 | |
946 | if (slow) |
1000 | if (slow) |
947 | { |
1001 | { |
948 | do |
1002 | do |
949 | { |
1003 | { |
950 | if (xc->byte1 || xc->byte2) |
1004 | if (xc->byte1 || xc->byte2) |
951 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
1005 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
952 | |
1006 | |
953 | x += r->TermWin.fwidth; |
1007 | x += term->fwidth; |
954 | xc++; len--; |
1008 | xc++; len--; |
955 | } |
1009 | } |
956 | while (len); |
1010 | while (len); |
957 | } |
1011 | } |
958 | else |
1012 | else |
959 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1013 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
960 | } |
1014 | } |
961 | } |
1015 | } |
962 | else |
1016 | else |
963 | { |
1017 | { |
964 | const char *xc = enc_char (text, len, cs, slow); |
1018 | const char *xc = enc_char (text, len, cs, slow); |
965 | |
1019 | |
966 | if (bg == Color_bg && !slow) |
1020 | if (bg == Color_bg && !slow) |
967 | { |
1021 | { |
968 | v.background = r->pix_colors[bg]; |
1022 | v.background = term->pix_colors[bg]; |
969 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1023 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
970 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1024 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
971 | } |
1025 | } |
972 | else |
1026 | else |
973 | { |
1027 | { |
974 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1028 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
975 | |
1029 | |
976 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1030 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
977 | |
1031 | |
978 | if (slow) |
1032 | if (slow) |
979 | { |
1033 | { |
980 | do |
1034 | do |
981 | { |
1035 | { |
982 | if (*xc) |
1036 | if (*xc) |
983 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1037 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
984 | |
1038 | |
985 | x += r->TermWin.fwidth; |
1039 | x += term->fwidth; |
986 | xc++; len--; |
1040 | xc++; len--; |
987 | } |
1041 | } |
988 | while (len); |
1042 | while (len); |
989 | } |
1043 | } |
990 | else |
1044 | else |
991 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1045 | XDrawString (disp, d, gc, x, y + base, xc, len); |
992 | } |
1046 | } |
993 | } |
1047 | } |
994 | } |
1048 | } |
995 | |
1049 | |
996 | ///////////////////////////////////////////////////////////////////////////// |
1050 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1002 | |
1056 | |
1003 | void clear (); |
1057 | void clear (); |
1004 | |
1058 | |
1005 | rxvt_fontprop properties (); |
1059 | rxvt_fontprop properties (); |
1006 | |
1060 | |
1007 | bool load (const rxvt_fontprop &prop); |
1061 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1008 | |
1062 | |
1009 | void draw (rxvt_drawable &d, int x, int y, |
1063 | void draw (rxvt_drawable &d, int x, int y, |
1010 | const text_t *text, int len, |
1064 | const text_t *text, int len, |
1011 | int fg, int bg); |
1065 | int fg, int bg); |
1012 | |
1066 | |
1013 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1067 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1014 | |
1068 | |
1015 | protected: |
1069 | protected: |
1016 | XftFont *f; |
1070 | XftFont *f; |
1017 | }; |
1071 | }; |
1018 | |
1072 | |
1019 | void |
1073 | void |
1020 | rxvt_font_xft::clear () |
1074 | rxvt_font_xft::clear () |
1021 | { |
1075 | { |
1022 | if (f) |
1076 | if (f) |
1023 | { |
1077 | { |
1024 | XftFontClose (DISPLAY, f); |
1078 | XftFontClose (term->dpy, f); |
1025 | f = 0; |
1079 | f = 0; |
1026 | } |
1080 | } |
1027 | } |
1081 | } |
1028 | |
1082 | |
1029 | rxvt_fontprop |
1083 | rxvt_fontprop |
… | |
… | |
1033 | |
1087 | |
1034 | FT_Face face = XftLockFace (f); |
1088 | FT_Face face = XftLockFace (f); |
1035 | |
1089 | |
1036 | p.width = width; |
1090 | p.width = width; |
1037 | p.height = height; |
1091 | p.height = height; |
|
|
1092 | p.ascent = ascent; |
1038 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1093 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1039 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1094 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1040 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1095 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1041 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1096 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1042 | |
1097 | |
… | |
… | |
1044 | |
1099 | |
1045 | return p; |
1100 | return p; |
1046 | } |
1101 | } |
1047 | |
1102 | |
1048 | bool |
1103 | bool |
1049 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1104 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1050 | { |
1105 | { |
|
|
1106 | dTermDisplay; |
|
|
1107 | |
1051 | clear (); |
1108 | clear (); |
1052 | |
1109 | |
1053 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1110 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1054 | |
1111 | |
1055 | if (!p) |
1112 | if (!p) |
1056 | return false; |
1113 | return false; |
1057 | |
1114 | |
1058 | FcValue v; |
1115 | FcValue v; |
1059 | |
1116 | |
1060 | if (prop.height != rxvt_fontprop::unset |
1117 | if (prop.height != rxvt_fontprop::unset |
1061 | || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
1118 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
|
|
1119 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1062 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1120 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1063 | |
1121 | |
1064 | if (prop.weight != rxvt_fontprop::unset |
1122 | if (prop.weight != rxvt_fontprop::unset |
1065 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1123 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1066 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1124 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1067 | |
1125 | |
1068 | if (prop.slant != rxvt_fontprop::unset |
1126 | if (prop.slant != rxvt_fontprop::unset |
1069 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1127 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1070 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1128 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1071 | |
1129 | |
1072 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1130 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1073 | // clip width, we can't do better, or can we? |
1131 | // clip width, we can't do better, or can we? |
1074 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1132 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1080 | |
1138 | |
1081 | // store generated name so iso14755 view gives better results |
1139 | // store generated name so iso14755 view gives better results |
1082 | set_name ((char *)FcNameUnparse (p)); |
1140 | set_name ((char *)FcNameUnparse (p)); |
1083 | |
1141 | |
1084 | XftResult result; |
1142 | XftResult result; |
1085 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1143 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1086 | |
1144 | |
1087 | FcPatternDestroy (p); |
1145 | FcPatternDestroy (p); |
1088 | |
1146 | |
1089 | if (!match) |
1147 | if (!match) |
1090 | return false; |
1148 | return false; |
… | |
… | |
1092 | int ftheight = 0; |
1150 | int ftheight = 0; |
1093 | bool success = true; |
1151 | bool success = true; |
1094 | |
1152 | |
1095 | for (;;) |
1153 | for (;;) |
1096 | { |
1154 | { |
1097 | f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); |
1155 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1098 | |
1156 | |
1099 | if (!f) |
1157 | if (!f) |
1100 | { |
1158 | { |
1101 | success = false; |
1159 | success = false; |
1102 | break; |
1160 | break; |
… | |
… | |
1111 | |
1169 | |
1112 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1170 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1113 | |
1171 | |
1114 | XftUnlockFace (f); |
1172 | XftUnlockFace (f); |
1115 | |
1173 | |
|
|
1174 | int glheight = height; |
|
|
1175 | |
1116 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1176 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1117 | { |
1177 | { |
1118 | FcChar16 ch = *t; |
1178 | FcChar16 ch = *t; |
1119 | |
1179 | |
1120 | if (cs != CS_UNICODE |
1180 | if (cs != CS_UNICODE |
… | |
… | |
1126 | bool careful; |
1186 | bool careful; |
1127 | if (!has_char (*t, &prop, careful)) |
1187 | if (!has_char (*t, &prop, careful)) |
1128 | continue; |
1188 | continue; |
1129 | |
1189 | |
1130 | XGlyphInfo g; |
1190 | XGlyphInfo g; |
1131 | XftTextExtents16 (DISPLAY, f, &ch, 1, &g); |
1191 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1132 | |
1192 | |
|
|
1193 | g.width -= g.x; |
|
|
1194 | |
1133 | int wcw = wcwidth (ch); |
1195 | int wcw = WCWIDTH (ch); |
1134 | if (wcw > 0) g.width = g.width / wcw; |
1196 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1135 | |
1197 | |
1136 | if (width < g.width) width = g.width; |
1198 | if (width < g.width ) width = g.width; |
1137 | if (height < g.height) height = g.height; |
1199 | if (height < g.height ) height = g.height; |
|
|
1200 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1201 | } |
|
|
1202 | |
|
|
1203 | if (!width) |
|
|
1204 | { |
|
|
1205 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1206 | |
|
|
1207 | XftFontClose (disp, f); |
|
|
1208 | f = 0; |
|
|
1209 | |
|
|
1210 | success = false; |
|
|
1211 | break; |
1138 | } |
1212 | } |
1139 | |
1213 | |
1140 | if (prop.height == rxvt_fontprop::unset |
1214 | if (prop.height == rxvt_fontprop::unset |
1141 | || height <= prop.height |
1215 | || (height <= prop.height && glheight <= prop.height) |
1142 | || height <= 2 |
1216 | || height <= 2 |
1143 | || !scalable) |
1217 | || !scalable) |
1144 | break; |
1218 | break; |
1145 | |
1219 | |
1146 | if (ftheight) |
1220 | if (ftheight) |
… | |
… | |
1153 | ftheight -= height - prop.height; |
1227 | ftheight -= height - prop.height; |
1154 | } |
1228 | } |
1155 | else |
1229 | else |
1156 | ftheight = prop.height - 1; |
1230 | ftheight = prop.height - 1; |
1157 | |
1231 | |
1158 | XftFontClose (DISPLAY, f); |
1232 | XftFontClose (disp, f); |
1159 | FcPatternDel (match, FC_PIXEL_SIZE); |
1233 | FcPatternDel (match, FC_PIXEL_SIZE); |
1160 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1234 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1161 | } |
1235 | } |
1162 | |
1236 | |
1163 | FcPatternDestroy (match); |
1237 | FcPatternDestroy (match); |
1164 | |
1238 | |
1165 | #if 0 // do it per-character |
1239 | #if 0 // do it per-character |
… | |
… | |
1172 | |
1246 | |
1173 | return success; |
1247 | return success; |
1174 | } |
1248 | } |
1175 | |
1249 | |
1176 | bool |
1250 | bool |
1177 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1251 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1178 | { |
1252 | { |
1179 | careful = false; |
1253 | careful = false; |
1180 | |
1254 | |
1181 | if (!XftCharExists (DISPLAY, f, unicode)) |
1255 | if (!XftCharExists (term->dpy, f, unicode)) |
1182 | return false; |
1256 | return false; |
1183 | |
1257 | |
1184 | if (!prop || prop->width == rxvt_fontprop::unset) |
1258 | if (!prop || prop->width == rxvt_fontprop::unset) |
1185 | return true; |
1259 | return true; |
1186 | |
1260 | |
1187 | // check character against base font bounding box |
1261 | // check character against base font bounding box |
1188 | FcChar32 ch = unicode; |
1262 | FcChar32 ch = unicode; |
1189 | XGlyphInfo g; |
1263 | XGlyphInfo g; |
1190 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1264 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1191 | |
1265 | |
1192 | int w = g.width; |
1266 | int w = g.width - g.x; |
1193 | int wcw = wcwidth (unicode); |
1267 | int wcw = max (WCWIDTH (unicode), 1); |
1194 | if (wcw > 0) w /= wcw; |
|
|
1195 | |
1268 | |
1196 | careful = w > prop->width; |
1269 | careful = g.x > 0 || w > prop->width * wcw; |
1197 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1270 | |
|
|
1271 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1272 | return false; |
|
|
1273 | |
|
|
1274 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1275 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1198 | return false; |
1276 | return false; |
1199 | |
1277 | |
1200 | return true; |
1278 | return true; |
1201 | } |
1279 | } |
1202 | |
1280 | |
1203 | void |
1281 | void |
1204 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1282 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1205 | const text_t *text, int len, |
1283 | const text_t *text, int len, |
1206 | int fg, int bg) |
1284 | int fg, int bg) |
1207 | { |
1285 | { |
1208 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
|
|
1209 | |
|
|
1210 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1211 | |
|
|
1212 | XGlyphInfo extents; |
1286 | XGlyphInfo extents; |
1213 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1287 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1214 | FcChar32 *ep = enc; |
1288 | XftGlyphSpec *ep = enc; |
1215 | int ewidth = 0; |
1289 | |
1216 | int xoff = 0; |
1290 | dTermDisplay; |
|
|
1291 | dTermGC; |
|
|
1292 | |
|
|
1293 | int w = term->fwidth * len; |
|
|
1294 | int h = term->fheight; |
|
|
1295 | |
|
|
1296 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1297 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1298 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1299 | */ |
|
|
1300 | bool buffered = true |
|
|
1301 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1302 | && bg >= 0 |
|
|
1303 | #endif |
|
|
1304 | ; |
|
|
1305 | // cut trailing spaces |
|
|
1306 | while (len && text [len - 1] == ' ') |
|
|
1307 | len--; |
|
|
1308 | |
|
|
1309 | int x_ = buffered ? 0 : x; |
|
|
1310 | int y_ = buffered ? 0 : y; |
1217 | |
1311 | |
1218 | while (len) |
1312 | while (len) |
1219 | { |
1313 | { |
1220 | int cwidth = r->TermWin.fwidth; |
1314 | int cwidth = term->fwidth; |
1221 | FcChar32 fc = *text++; len--; |
1315 | FcChar32 fc = *text++; len--; |
1222 | FT_UInt gl; |
|
|
1223 | |
1316 | |
1224 | while (len && *text == NOCHAR) |
1317 | while (len && *text == NOCHAR) |
1225 | text++, len--, cwidth += r->TermWin.fwidth; |
1318 | text++, len--, cwidth += term->fwidth; |
1226 | |
|
|
1227 | gl = XftCharIndex (d.display->display, f, fc); |
|
|
1228 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1229 | |
1319 | |
1230 | if (extents.xOff != cwidth && ep != enc) |
1320 | if (fc != ' ') // skip spaces |
1231 | { |
|
|
1232 | if (xoff > ewidth) xoff = ewidth; |
|
|
1233 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1234 | x + (ewidth - xoff >> 1), |
|
|
1235 | y + base, enc, ep - enc); |
|
|
1236 | x += ewidth; |
|
|
1237 | |
|
|
1238 | ep = enc; |
|
|
1239 | ewidth = 0; |
|
|
1240 | xoff = 0; |
|
|
1241 | } |
1321 | { |
|
|
1322 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1323 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1242 | |
1324 | |
1243 | if (fc == ' ' && ep == enc) // skip leading spaces |
1325 | ep->glyph = glyph; |
|
|
1326 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
|
|
1327 | ep->y = y_ + ascent; |
|
|
1328 | |
|
|
1329 | if (extents.xOff == 0) |
|
|
1330 | ep->x = x_ + cwidth; |
|
|
1331 | |
|
|
1332 | ep++; |
1244 | { |
1333 | } |
|
|
1334 | |
1245 | x += cwidth; |
1335 | x_ += cwidth; |
1246 | continue; |
1336 | } |
|
|
1337 | |
|
|
1338 | if (buffered) |
|
|
1339 | { |
|
|
1340 | bool back_rendered = false; |
|
|
1341 | if (ep != enc) |
1247 | } |
1342 | { |
|
|
1343 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1248 | |
1344 | |
|
|
1345 | #ifdef HAVE_BG_PIXMAP |
|
|
1346 | if (term->bgPixmap.pixmap) |
|
|
1347 | { |
|
|
1348 | Picture dst = 0; |
|
|
1349 | |
|
|
1350 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1351 | dst = XftDrawPicture (d2); |
|
|
1352 | |
|
|
1353 | if (bg < 0 || dst != 0) |
|
|
1354 | { |
|
|
1355 | int src_x = x, src_y = y ; |
|
|
1356 | |
|
|
1357 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1358 | { |
|
|
1359 | src_x += term->window_vt_x; |
|
|
1360 | src_y += term->window_vt_y; |
|
|
1361 | } |
|
|
1362 | |
|
|
1363 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1364 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1365 | { |
|
|
1366 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1367 | src_x, src_y, w, h, 0, 0); |
|
|
1368 | } |
|
|
1369 | else |
|
|
1370 | { |
|
|
1371 | XGCValues gcv; |
|
|
1372 | |
|
|
1373 | gcv.fill_style = FillTiled; |
|
|
1374 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1375 | gcv.ts_x_origin = -src_x; |
|
|
1376 | gcv.ts_y_origin = -src_y; |
|
|
1377 | |
|
|
1378 | XChangeGC (disp, gc, |
|
|
1379 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1380 | &gcv); |
|
|
1381 | |
|
|
1382 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1383 | |
|
|
1384 | gcv.fill_style = FillSolid; |
|
|
1385 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1386 | } |
|
|
1387 | |
|
|
1388 | if (bg >= 0) |
|
|
1389 | { |
|
|
1390 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1391 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1392 | } |
|
|
1393 | |
|
|
1394 | back_rendered = true; |
|
|
1395 | } |
|
|
1396 | } |
|
|
1397 | #endif |
|
|
1398 | |
|
|
1399 | if (bg >= 0 && !back_rendered) |
|
|
1400 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1401 | |
|
|
1402 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1403 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1404 | } |
1249 | else |
1405 | else |
1250 | { |
1406 | clear_rect (d, x, y, w, h, bg); |
1251 | *ep++ = gl; |
|
|
1252 | ewidth += cwidth; |
|
|
1253 | xoff += extents.xOff; |
|
|
1254 | } |
|
|
1255 | } |
|
|
1256 | |
|
|
1257 | if (ep != enc) |
|
|
1258 | { |
1407 | } |
1259 | if (xoff > ewidth) xoff = ewidth; |
1408 | else |
1260 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1261 | x + (ewidth - xoff >> 1), |
|
|
1262 | y + base, enc, ep - enc); |
|
|
1263 | } |
1409 | { |
|
|
1410 | clear_rect (d, x, y, w, h, bg); |
|
|
1411 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1412 | } |
1264 | } |
1413 | } |
|
|
1414 | |
1265 | #endif |
1415 | #endif |
1266 | |
1416 | |
1267 | ///////////////////////////////////////////////////////////////////////////// |
1417 | ///////////////////////////////////////////////////////////////////////////// |
1268 | |
1418 | |
1269 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1419 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1270 | : r (r), fontdesc (0) |
1420 | : fontdesc (0), term (term) |
1271 | { |
1421 | { |
1272 | clear (); |
1422 | clear (); |
1273 | } |
1423 | } |
1274 | |
1424 | |
1275 | rxvt_fontset::~rxvt_fontset () |
1425 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1278 | } |
1428 | } |
1279 | |
1429 | |
1280 | void |
1430 | void |
1281 | rxvt_fontset::clear () |
1431 | rxvt_fontset::clear () |
1282 | { |
1432 | { |
1283 | prop.width = prop.height = prop.weight = prop.slant |
1433 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1284 | = rxvt_fontprop::unset; |
1434 | = rxvt_fontprop::unset; |
|
|
1435 | force_prop = false; |
1285 | |
1436 | |
1286 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1437 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1287 | FONT_UNREF (*i); |
1438 | FONT_UNREF (*i); |
1288 | |
1439 | |
1289 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1440 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1298 | |
1449 | |
1299 | rxvt_font * |
1450 | rxvt_font * |
1300 | rxvt_fontset::new_font (const char *name, codeset cs) |
1451 | rxvt_fontset::new_font (const char *name, codeset cs) |
1301 | { |
1452 | { |
1302 | rxvt_font *f; |
1453 | rxvt_font *f; |
1303 | |
1454 | |
1304 | if (!name || !*name) |
1455 | if (!name || !*name) |
1305 | { |
1456 | { |
1306 | name = ""; |
1457 | name = ""; |
1307 | f = new rxvt_font_default (this); |
1458 | f = new rxvt_font_default (this); |
1308 | } |
1459 | } |
… | |
… | |
1319 | f = new rxvt_font_x11; |
1470 | f = new rxvt_font_x11; |
1320 | } |
1471 | } |
1321 | else |
1472 | else |
1322 | f = new rxvt_font_x11; |
1473 | f = new rxvt_font_x11; |
1323 | |
1474 | |
1324 | f->set_term (r); |
1475 | f->set_term (term); |
1325 | f->set_name (strdup (name)); |
1476 | f->set_name (strdup (name)); |
1326 | |
1477 | |
1327 | f->cs = cs; |
1478 | f->cs = cs; |
1328 | f->loaded = false; |
1479 | f->loaded = false; |
1329 | |
1480 | |
… | |
… | |
1340 | char buf[512]; |
1491 | char buf[512]; |
1341 | const char *end; |
1492 | const char *end; |
1342 | |
1493 | |
1343 | do |
1494 | do |
1344 | { |
1495 | { |
1345 | while (*desc <= ' ') desc++; |
1496 | while (*desc && *desc <= ' ') |
|
|
1497 | desc++; |
1346 | |
1498 | |
1347 | codeset cs = CS_UNICODE; |
1499 | codeset cs = CS_UNICODE; |
1348 | |
1500 | |
1349 | if (*desc == '[') |
1501 | if (*desc == '[') |
1350 | { |
1502 | { |
… | |
… | |
1400 | if (fonts[i]->loaded) |
1552 | if (fonts[i]->loaded) |
1401 | return true; |
1553 | return true; |
1402 | |
1554 | |
1403 | fonts[i]->loaded = true; |
1555 | fonts[i]->loaded = true; |
1404 | |
1556 | |
1405 | if (!fonts[i]->load (prop)) |
1557 | if (!fonts[i]->load (prop, force_prop)) |
1406 | { |
1558 | { |
1407 | fonts[i]->cs = CS_UNKNOWN; |
1559 | fonts[i]->cs = CS_UNKNOWN; |
1408 | return false; |
1560 | return false; |
1409 | } |
1561 | } |
1410 | |
1562 | |
… | |
… | |
1460 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1612 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1461 | goto next_font; |
1613 | goto next_font; |
1462 | |
1614 | |
1463 | if (!realize_font (i)) |
1615 | if (!realize_font (i)) |
1464 | goto next_font; |
1616 | goto next_font; |
|
|
1617 | |
|
|
1618 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1619 | max_it (f->ascent, prop.ascent); |
1465 | } |
1620 | } |
1466 | |
1621 | |
1467 | if (f->cs == CS_UNKNOWN) |
1622 | if (f->cs == CS_UNKNOWN) |
1468 | goto next_font; |
1623 | goto next_font; |
1469 | |
1624 | |
… | |
… | |
1508 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1663 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1509 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1664 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1510 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1665 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1511 | |
1666 | |
1512 | XftResult result; |
1667 | XftResult result; |
1513 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1668 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1514 | |
1669 | |
1515 | FcPatternDestroy (p); |
1670 | FcPatternDestroy (p); |
1516 | |
1671 | |
1517 | if (match) |
1672 | if (match) |
1518 | { |
1673 | { |
… | |
… | |
1523 | if (find_font (font) < 0) |
1678 | if (find_font (font) < 0) |
1524 | { |
1679 | { |
1525 | char fontname[4096]; |
1680 | char fontname[4096]; |
1526 | sprintf (fontname, "xft:%-.4090s", font); |
1681 | sprintf (fontname, "xft:%-.4090s", font); |
1527 | |
1682 | |
1528 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1683 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1529 | } |
1684 | } |
1530 | |
1685 | |
1531 | free (font); |
1686 | free (font); |
1532 | } |
1687 | } |
1533 | #endif |
1688 | #endif |