1 | /*--------------------------------*-C-*---------------------------------*; |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: defaultfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
24 | #include "defaultfont.h" |
24 | #include "defaultfont.h" |
25 | |
25 | |
26 | #include <cstdlib> |
26 | #include <cstdlib> |
27 | |
27 | |
28 | #define DISPLAY r->display->display |
28 | #define DISPLAY r->display->display |
29 | #define DRAWABLE r->TermWin.vt |
|
|
30 | #define GC r->TermWin.gc |
29 | #define TGC r->TermWin.gc |
31 | |
30 | |
32 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
33 | codeset cs; |
32 | codeset cs; |
34 | const char *name; |
33 | const char *name; |
35 | } fallback_fonts[] = { |
34 | } fallback_fonts[] = { |
36 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
35 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
37 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
36 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
38 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
37 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
39 | |
38 | |
40 | #if ENCODING_EU |
39 | #if ENCODING_EU |
41 | // cyrillic |
40 | // cyrillic |
42 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
41 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
43 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
42 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
44 | |
43 | |
45 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
44 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
46 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
45 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
47 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
46 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
48 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
47 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
49 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
48 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
50 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
49 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
51 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
50 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
52 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
51 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
53 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
52 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
54 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
53 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
55 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
54 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
56 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
55 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
57 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
56 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
58 | #endif |
57 | #endif |
59 | |
58 | |
60 | // japanese |
59 | // japanese |
61 | #if ENCODING_JP || ENCODING_JP_EXT |
60 | #if ENCODING_JP || ENCODING_JP_EXT |
62 | # if XFT |
61 | # if XFT |
63 | // prefer xft for complex scripts |
62 | // prefer xft for complex scripts |
64 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
65 | # endif |
64 | # endif |
66 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
67 | { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
68 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
|
|
68 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
|
|
69 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
|
|
70 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
69 | #endif |
71 | #endif |
70 | |
72 | |
71 | #if ENCODING_CN || ENCODING_CN_EXT |
73 | #if ENCODING_CN || ENCODING_CN_EXT |
72 | # if XFT |
74 | # if XFT |
73 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
75 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
74 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
76 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
75 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
77 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
76 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
78 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
77 | # endif |
79 | # endif |
|
|
80 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
|
|
81 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
|
|
82 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
78 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
83 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
79 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
84 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
80 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
85 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
81 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
86 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
82 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
87 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
83 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
88 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
84 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
89 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
85 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
90 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
86 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
91 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
87 | #endif |
92 | #endif |
88 | |
93 | |
89 | #if XFT |
94 | #if XFT |
90 | { CS_UNICODE, "xft:Andale Mono" }, |
95 | { CS_UNICODE, "xft:Andale Mono" }, |
91 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
96 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
92 | #endif |
97 | #endif |
93 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
98 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
94 | { CS_UNICODE, "xft:FreeMono" }, |
|
|
95 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
96 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
100 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
97 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
101 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
102 | #if XFT |
|
|
103 | // FreeMono is usually uglier than x fonts, so try last only. |
|
|
104 | //{ CS_UNICODE, "xft:FreeMono" }, |
|
|
105 | #endif |
98 | |
106 | |
99 | { CS_UNKNOWN, 0 } |
107 | { CS_UNKNOWN, 0 } |
100 | }; |
108 | }; |
101 | |
109 | |
102 | ///////////////////////////////////////////////////////////////////////////// |
110 | ///////////////////////////////////////////////////////////////////////////// |
103 | |
111 | |
|
|
112 | #if XFT |
|
|
113 | rxvt_drawable::~rxvt_drawable () |
|
|
114 | { |
|
|
115 | if (xftdrawable) |
|
|
116 | XftDrawDestroy (xftdrawable); |
|
|
117 | } |
|
|
118 | |
|
|
119 | rxvt_drawable::operator XftDraw *() |
|
|
120 | { |
|
|
121 | if (!xftdrawable) |
|
|
122 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
123 | |
|
|
124 | return xftdrawable; |
|
|
125 | } |
|
|
126 | #endif |
|
|
127 | |
|
|
128 | ///////////////////////////////////////////////////////////////////////////// |
|
|
129 | |
104 | static void *enc_buf; |
130 | static void *enc_buf; |
105 | static uint32_t enc_len; |
131 | static uint32_t enc_len; |
106 | |
132 | |
107 | static inline void * |
133 | static inline void * |
108 | get_enc_buf (uint32_t len) |
134 | get_enc_buf (uint32_t len) |
109 | { |
135 | { |
110 | if (len > enc_len) |
136 | if (len > enc_len) |
111 | { |
137 | { |
112 | free (enc_buf); |
138 | free (enc_buf); |
113 | enc_buf = malloc (len); |
139 | enc_buf = malloc (len); |
|
|
140 | enc_len = len; |
114 | } |
141 | } |
115 | |
142 | |
116 | return enc_buf; |
143 | return enc_buf; |
117 | } |
144 | } |
118 | |
145 | |
… | |
… | |
161 | } |
188 | } |
162 | |
189 | |
163 | ///////////////////////////////////////////////////////////////////////////// |
190 | ///////////////////////////////////////////////////////////////////////////// |
164 | |
191 | |
165 | void |
192 | void |
166 | rxvt_font::clear_rect (int x, int y, int w, int h, int color) |
193 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
167 | { |
194 | { |
168 | if (color == Color_bg) |
195 | if (color == Color_bg) |
169 | XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); |
196 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
170 | else if (color >= 0) |
197 | else if (color >= 0) |
171 | { |
198 | { |
|
|
199 | #if XFT |
|
|
200 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
|
|
201 | #else |
172 | XSetForeground (DISPLAY, GC, r->PixColors[color]); |
202 | XSetForeground (d.display->display, TGC, r->PixColors[color]); |
173 | XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); |
203 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
|
|
204 | #endif |
174 | } |
205 | } |
175 | } |
206 | } |
176 | |
207 | |
177 | static const char *linedraw_cmds[128] = { |
208 | #include "table/linedraw.h" |
178 | "1hH", "2hH", "1vV", "2vV", |
|
|
179 | 0, 0, 0, 0, |
|
|
180 | 0, 0, 0, 0, |
|
|
181 | "1HV", "2H1V", "1H2V", "2HV", |
|
|
182 | |
|
|
183 | // 2510 |
|
|
184 | "1hV", "2h1V", "1h2V", "2hV", |
|
|
185 | "1Hv", "2H1v", "1H2v", "2Hv", |
|
|
186 | "1hv", "2h1v", "1h2v", "2hv", |
|
|
187 | "1HvV", "2H1vV", "1HV2v", "1Hv2V", |
|
|
188 | |
|
|
189 | // 2520 |
|
|
190 | "1H2vV", "2Hv1V", "2HV1v", "2HvV", |
|
|
191 | "1hvV", "2h1vV", "1hV2v", "1hv2V", |
|
|
192 | "1h2vV", "2hv1V", "1v2hV", "2hvV", |
|
|
193 | "1hHV", "2h1HV", "2H1hV", "2hH1V", |
|
|
194 | |
|
|
195 | // 2530 |
|
|
196 | "1hH2V", "2hV1H", "1h2HV", "2hHV", |
|
|
197 | "1hHv", "1vH2h", "1hv2H", "1v2hH", |
|
|
198 | "1hH2v", "1H2hv", "1h2Hv", "2hHv", |
|
|
199 | "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", |
|
|
200 | |
|
|
201 | // 2540 |
|
|
202 | "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", |
|
|
203 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", |
|
|
204 | "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", |
|
|
205 | 0, 0, 0, 0, |
|
|
206 | |
|
|
207 | // 2550 |
|
|
208 | 0, 0, 0, 0, |
|
|
209 | 0, 0, 0, 0, |
|
|
210 | 0, 0, 0, 0, |
|
|
211 | 0, 0, 0, 0, |
|
|
212 | |
|
|
213 | // 2560 |
|
|
214 | 0, 0, 0, 0, |
|
|
215 | 0, 0, 0, 0, |
|
|
216 | 0, 0, 0, 0, |
|
|
217 | 0, 0, 0, 0, |
|
|
218 | |
|
|
219 | // 2570 |
|
|
220 | 0, "1a", "1b", "1ab", |
|
|
221 | "1h", "1v", "1H", "1V", |
|
|
222 | "2h", "2v", "2H", "2V", |
|
|
223 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
224 | |
|
|
225 | // to be done |
|
|
226 | }; |
|
|
227 | |
209 | |
228 | struct rxvt_font_default : rxvt_font { |
210 | struct rxvt_font_default : rxvt_font { |
|
|
211 | |
229 | rxvt_fontprop properties () |
212 | rxvt_fontprop properties () |
230 | { |
213 | { |
231 | rxvt_fontprop p; |
214 | rxvt_fontprop p; |
232 | |
215 | |
233 | p.width = p.height = 1; |
216 | p.width = p.height = 1; |
… | |
… | |
240 | bool load (const rxvt_fontprop &prop) |
223 | bool load (const rxvt_fontprop &prop) |
241 | { |
224 | { |
242 | width = 1; height = 1; |
225 | width = 1; height = 1; |
243 | ascent = 1; descent = 0; |
226 | ascent = 1; descent = 0; |
244 | |
227 | |
|
|
228 | set_name (strdup ("built-in pseudofont")); |
|
|
229 | |
245 | return true; |
230 | return true; |
246 | } |
231 | } |
247 | |
232 | |
248 | bool has_codepoint (uint32_t unicode) |
233 | bool has_codepoint (unicode_t unicode) |
249 | { |
234 | { |
250 | if (unicode <= 0x001f) |
235 | if (unicode <= 0x001f) |
251 | return true; |
236 | return true; |
252 | if (unicode >= 0x0080 && unicode <= 0x009f) |
237 | |
|
|
238 | if (unicode <= 0x007f) |
|
|
239 | return false; |
|
|
240 | |
|
|
241 | if (unicode <= 0x009f) |
253 | return true; |
242 | return true; |
254 | |
243 | |
255 | if (unicode >= 0x2500 && unicode <= 0x257f |
244 | if (unicode >= 0x2500 && unicode <= 0x259f) |
256 | && linedraw_cmds[unicode - 0x2500]) |
245 | return true; |
|
|
246 | |
|
|
247 | if (IS_COMPOSE (unicode)) |
257 | return true; |
248 | return true; |
258 | |
249 | |
259 | switch (unicode) |
250 | switch (unicode) |
260 | { |
251 | { |
261 | case ZERO_WIDTH_CHAR: |
252 | case ZERO_WIDTH_CHAR: |
… | |
… | |
263 | } |
254 | } |
264 | |
255 | |
265 | return false; |
256 | return false; |
266 | } |
257 | } |
267 | |
258 | |
268 | void draw (int x, int y, |
259 | void draw (rxvt_drawable &d, int x, int y, |
269 | const text_t *text, int len, |
260 | const text_t *text, int len, |
270 | int fg, int bg); |
261 | int fg, int bg); |
271 | }; |
262 | }; |
272 | |
263 | |
273 | void |
264 | void |
274 | rxvt_font_default::draw (int x, int y, |
265 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
275 | const text_t *text, int len, |
266 | const text_t *text, int len, |
276 | int fg, int bg) |
267 | int fg, int bg) |
277 | { |
268 | { |
278 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
269 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
279 | |
270 | |
280 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
271 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
281 | |
272 | |
282 | while (len--) |
273 | while (len--) |
283 | { |
274 | { |
|
|
275 | #if ENABLE_COMBINING |
|
|
276 | compose_char *cc; |
|
|
277 | #endif |
284 | text_t t = *text++; |
278 | text_t t = *text++; |
285 | |
279 | |
286 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
280 | if (0x2500 <= t && t <= 0x259f) |
|
|
281 | { |
|
|
282 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
283 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
284 | uint32_t *b = a + (offs & 15); |
|
|
285 | |
|
|
286 | int W = r->TermWin.fwidth; |
|
|
287 | int H = r->TermWin.fheight; |
|
|
288 | |
|
|
289 | int x_[16]; |
|
|
290 | int y_[16]; |
|
|
291 | |
|
|
292 | for (int i = 0; i <= 8; i++) |
287 | { |
293 | { |
288 | const char *p = linedraw_cmds[t - 0x2500]; |
294 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
295 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
296 | } |
289 | |
297 | |
290 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; |
298 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
291 | int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; |
299 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
292 | |
300 | |
293 | XGCValues gcv; |
301 | XGCValues gcv; |
294 | |
302 | |
|
|
303 | gcv.cap_style = CapButt; |
|
|
304 | gcv.line_width = 0; |
|
|
305 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
|
|
306 | |
295 | while (*p) |
307 | while (a < b) |
296 | { |
308 | { |
|
|
309 | uint32_t command = *a++; |
|
|
310 | |
|
|
311 | int op = (command >> 24) & 255; |
|
|
312 | int a = (command >> 20) & 15; |
|
|
313 | int b = (command >> 16) & 15; |
|
|
314 | int x1 = x_[(command >> 12) & 15]; |
|
|
315 | int y1 = y_[(command >> 8) & 15]; |
|
|
316 | int x2 = x_[(command >> 4) & 15]; |
|
|
317 | int y2 = y_[(command >> 0) & 15]; |
|
|
318 | |
297 | switch (*p++) |
319 | switch (op) |
298 | { |
320 | { |
299 | case '1': |
321 | case 0: // line |
300 | gcv.line_width = 0; |
322 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
301 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
|
|
302 | break; |
323 | break; |
303 | |
324 | |
304 | case '2': |
325 | case 1: // rectangle, possibly stippled |
|
|
326 | if (a) |
|
|
327 | { |
|
|
328 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
329 | |
|
|
330 | gcv.fill_style = FillStippled; |
|
|
331 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
332 | gcv.ts_x_origin = x; |
|
|
333 | gcv.ts_y_origin = y; |
|
|
334 | |
|
|
335 | XChangeGC (d.display->display, TGC, |
|
|
336 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
337 | &gcv); |
|
|
338 | } |
|
|
339 | |
|
|
340 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
341 | |
|
|
342 | if (a) |
|
|
343 | { |
|
|
344 | XFreePixmap (d.display->display, gcv.stipple); |
305 | gcv.line_width = 2; |
345 | gcv.stipple = 0; |
306 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
346 | gcv.fill_style = FillSolid; |
|
|
347 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
348 | } |
307 | break; |
349 | break; |
308 | |
350 | case 2: // arc |
309 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
351 | XDrawArc (d.display->display, d, TGC, |
310 | case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; |
352 | x1 - W/2, y1 - H/2, W-1, H-1, |
311 | case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; |
353 | (a - 1) * 90*64, (b - 1) * 90*64); |
312 | case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; |
354 | break; |
313 | case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; |
|
|
314 | case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; |
|
|
315 | } |
355 | } |
316 | } |
356 | } |
317 | |
357 | } |
318 | gcv.line_width = 0; |
358 | #if ENABLE_COMBINING |
319 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
359 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
320 | } |
360 | { |
|
|
361 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
362 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
363 | if (cc->c2 != NOCHAR) |
|
|
364 | { |
|
|
365 | // prefer font of first character, for no good reasons |
|
|
366 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
367 | ? f1 |
|
|
368 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
369 | |
|
|
370 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
371 | } |
|
|
372 | } |
|
|
373 | #endif |
321 | else |
374 | else |
322 | switch (*text++) |
375 | switch (t) |
323 | { |
376 | { |
324 | case NOCHAR: |
|
|
325 | case ZERO_WIDTH_CHAR: |
377 | case ZERO_WIDTH_CHAR: |
326 | break; |
378 | break; |
|
|
379 | |
327 | default: |
380 | default: |
328 | XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
381 | int w = 0; |
|
|
382 | while (len > 0 && *text == NOCHAR) |
|
|
383 | { |
|
|
384 | ++text; |
|
|
385 | --len; |
|
|
386 | w += r->TermWin.fwidth; |
|
|
387 | } |
|
|
388 | |
|
|
389 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
|
|
390 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
|
|
391 | x += w; |
329 | } |
392 | } |
330 | |
393 | |
331 | x += r->TermWin.fwidth; |
394 | x += r->TermWin.fwidth; |
332 | } |
395 | } |
333 | } |
396 | } |
… | |
… | |
341 | |
404 | |
342 | rxvt_fontprop properties (); |
405 | rxvt_fontprop properties (); |
343 | |
406 | |
344 | bool load (const rxvt_fontprop &prop); |
407 | bool load (const rxvt_fontprop &prop); |
345 | |
408 | |
346 | bool has_codepoint (uint32_t unicode); |
409 | bool has_codepoint (unicode_t unicode); |
347 | |
410 | |
348 | void draw (int x, int y, |
411 | void draw (rxvt_drawable &d, int x, int y, |
349 | const text_t *text, int len, |
412 | const text_t *text, int len, |
350 | int fg, int bg); |
413 | int fg, int bg); |
351 | |
414 | |
352 | XFontStruct *f; |
415 | XFontStruct *f; |
353 | codeset cs; |
416 | codeset cs; |
354 | bool enc2b, encm; |
417 | bool enc2b, encm; |
355 | |
418 | |
356 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
419 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
357 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
420 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
358 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
421 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
359 | bool set_properties (rxvt_fontprop &p, const char *name); |
422 | bool set_properties (rxvt_fontprop &p, const char *name); |
360 | }; |
423 | }; |
361 | |
424 | |
362 | const char * |
425 | char * |
363 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
426 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
364 | { |
427 | { |
365 | unsigned long value; |
428 | unsigned long value; |
366 | |
429 | |
367 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
430 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
368 | return XGetAtomName (DISPLAY, value); |
431 | return XGetAtomName (DISPLAY, value); |
369 | else |
432 | else |
370 | return repl; |
433 | return rxvt_strdup (repl); |
371 | } |
434 | } |
372 | |
435 | |
373 | rxvt_fontprop |
436 | rxvt_fontprop |
374 | rxvt_font_x11::properties () |
437 | rxvt_font_x11::properties () |
375 | { |
438 | { |
… | |
… | |
390 | } |
453 | } |
391 | |
454 | |
392 | bool |
455 | bool |
393 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
456 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
394 | { |
457 | { |
395 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
396 | const char *slant = get_property (f, "SLANT", "r"); |
|
|
397 | |
|
|
398 | unsigned long height; |
458 | unsigned long height; |
399 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
459 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
400 | return false; |
460 | return false; |
401 | |
461 | |
402 | unsigned long avgwidth; |
462 | unsigned long avgwidth; |
403 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
463 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
404 | avgwidth = 0; |
464 | avgwidth = 0; |
405 | |
465 | |
|
|
466 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
467 | char *slant = get_property (f, "SLANT", "r"); |
|
|
468 | |
406 | return set_properties (p, height, weight, slant, avgwidth); |
469 | set_properties (p, height, weight, slant, avgwidth); |
|
|
470 | |
|
|
471 | free (weight); |
|
|
472 | free (slant); |
|
|
473 | |
|
|
474 | return true; |
407 | } |
475 | } |
408 | |
476 | |
409 | bool |
477 | bool |
410 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
478 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
411 | { |
479 | { |
412 | int slashes = 0; |
480 | int slashes = 0; |
413 | const char *comp[12]; |
481 | const char *comp[13]; |
414 | |
482 | |
415 | for (const char *c = name; *c; c++) |
483 | for (const char *c = name; *c; c++) |
416 | if (*c == '-') |
484 | if (*c == '-') |
417 | { |
485 | { |
418 | comp[slashes++] = c + 1; |
486 | comp[slashes++] = c + 1; |
… | |
… | |
474 | { |
542 | { |
475 | clear (); |
543 | clear (); |
476 | |
544 | |
477 | char **list; |
545 | char **list; |
478 | int count; |
546 | int count; |
479 | list = XListFonts (DISPLAY, name, 512, &count); |
547 | list = XListFonts (DISPLAY, name, 1024, &count); |
480 | set_name (0); |
548 | set_name (0); |
481 | |
549 | |
482 | if (!list) |
550 | if (!list) |
483 | return false; |
551 | return false; |
484 | |
552 | |
… | |
… | |
515 | f = XLoadQueryFont (DISPLAY, name); |
583 | f = XLoadQueryFont (DISPLAY, name); |
516 | |
584 | |
517 | if (!f) |
585 | if (!f) |
518 | return false; |
586 | return false; |
519 | |
587 | |
520 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
588 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
521 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
589 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
522 | |
590 | |
523 | if (registry && encoding) |
591 | if (registry && encoding) |
524 | { |
592 | { |
525 | char charset[64]; |
593 | char charset[64]; |
526 | snprintf (charset, 64, "%s-%s", registry, encoding); |
594 | snprintf (charset, 64, "%s-%s", registry, encoding); |
… | |
… | |
539 | if (*charset++ == '-' && !--count) |
607 | if (*charset++ == '-' && !--count) |
540 | break; |
608 | break; |
541 | |
609 | |
542 | cs = codeset_from_name (charset); |
610 | cs = codeset_from_name (charset); |
543 | } |
611 | } |
|
|
612 | |
|
|
613 | free (registry); |
|
|
614 | free (encoding); |
544 | |
615 | |
545 | if (cs == CS_UNICODE) |
616 | if (cs == CS_UNICODE) |
546 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
617 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
547 | |
618 | |
548 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
619 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
598 | f = 0; |
669 | f = 0; |
599 | } |
670 | } |
600 | } |
671 | } |
601 | |
672 | |
602 | bool |
673 | bool |
603 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
674 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
604 | { |
675 | { |
605 | uint32_t ch = FROM_UNICODE (cs, unicode); |
676 | uint32_t ch = FROM_UNICODE (cs, unicode); |
606 | |
677 | |
607 | if (ch == NOCHAR) |
678 | if (ch == NOCHAR) |
608 | return false; |
679 | return false; |
… | |
… | |
644 | |
715 | |
645 | return true; |
716 | return true; |
646 | } |
717 | } |
647 | |
718 | |
648 | void |
719 | void |
649 | rxvt_font_x11::draw (int x, int y, |
720 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
650 | const text_t *text, int len, |
721 | const text_t *text, int len, |
651 | int fg, int bg) |
722 | int fg, int bg) |
652 | { |
723 | { |
653 | // this looks like a mess /. |
724 | // this looks like a mess /. |
654 | // and it is a mess /. |
725 | // and it is a mess /. |
… | |
… | |
661 | |
732 | |
662 | int base = r->TermWin.fbase; |
733 | int base = r->TermWin.fbase; |
663 | |
734 | |
664 | XGCValues v; |
735 | XGCValues v; |
665 | v.foreground = r->PixColors[fg]; |
736 | v.foreground = r->PixColors[fg]; |
666 | v.background = r->PixColors[bg]; |
|
|
667 | v.font = f->fid; |
737 | v.font = f->fid; |
668 | |
738 | |
669 | if (enc2b) |
739 | if (enc2b) |
670 | { |
740 | { |
671 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
741 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
672 | |
742 | |
673 | if (bg == Color_bg && !slow) |
743 | if (bg == Color_bg && !slow) |
674 | { |
744 | { |
|
|
745 | v.background = r->PixColors[bg]; |
675 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
746 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
676 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
747 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
677 | } |
748 | } |
678 | else |
749 | else |
679 | { |
750 | { |
680 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
751 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
681 | |
752 | |
682 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
753 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
683 | |
754 | |
684 | if (slow) |
755 | if (slow) |
685 | { |
756 | { |
686 | do |
757 | do |
687 | { |
758 | { |
688 | if (xc->byte1 || xc->byte2) |
759 | if (xc->byte1 || xc->byte2) |
689 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
760 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
690 | |
761 | |
691 | x += r->TermWin.fwidth; |
762 | x += r->TermWin.fwidth; |
692 | xc++; len--; |
763 | xc++; len--; |
693 | } |
764 | } |
694 | while (len); |
765 | while (len); |
695 | } |
766 | } |
696 | else |
767 | else |
697 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
768 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
698 | } |
769 | } |
699 | } |
770 | } |
700 | else |
771 | else |
701 | { |
772 | { |
702 | const char *xc = enc_char (text, len, cs, slow); |
773 | const char *xc = enc_char (text, len, cs, slow); |
703 | |
774 | |
704 | if (bg == Color_bg && !slow) |
775 | if (bg == Color_bg && !slow) |
705 | { |
776 | { |
|
|
777 | v.background = r->PixColors[bg]; |
706 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
778 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
707 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
779 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
708 | } |
780 | } |
709 | else |
781 | else |
710 | { |
782 | { |
711 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
783 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
712 | |
784 | |
713 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
785 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
714 | |
786 | |
715 | if (slow) |
787 | if (slow) |
716 | { |
788 | { |
717 | do |
789 | do |
718 | { |
790 | { |
719 | if (*xc) |
791 | if (*xc) |
720 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
792 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
721 | |
793 | |
722 | x += r->TermWin.fwidth; |
794 | x += r->TermWin.fwidth; |
723 | xc++; len--; |
795 | xc++; len--; |
724 | } |
796 | } |
725 | while (len); |
797 | while (len); |
726 | } |
798 | } |
727 | else |
799 | else |
728 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
800 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
729 | } |
801 | } |
730 | } |
802 | } |
731 | } |
803 | } |
732 | |
804 | |
733 | ///////////////////////////////////////////////////////////////////////////// |
805 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
738 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
810 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
739 | #define SWATHBITS 8 |
811 | #define SWATHBITS 8 |
740 | #endif |
812 | #endif |
741 | |
813 | |
742 | struct rxvt_font_xft : rxvt_font { |
814 | struct rxvt_font_xft : rxvt_font { |
743 | rxvt_font_xft () { f = 0; d = 0; } |
815 | rxvt_font_xft () { f = 0; } |
744 | |
816 | |
745 | void clear (); |
817 | void clear (); |
746 | |
818 | |
747 | rxvt_fontprop properties (); |
819 | rxvt_fontprop properties (); |
748 | |
820 | |
749 | bool load (const rxvt_fontprop &prop); |
821 | bool load (const rxvt_fontprop &prop); |
750 | |
822 | |
751 | void draw (int x, int y, |
823 | void draw (rxvt_drawable &d, int x, int y, |
752 | const text_t *text, int len, |
824 | const text_t *text, int len, |
753 | int fg, int bg); |
825 | int fg, int bg); |
754 | |
826 | |
755 | bool has_codepoint (uint32_t unicode); |
827 | bool has_codepoint (unicode_t unicode); |
756 | |
828 | |
757 | protected: |
829 | protected: |
758 | XftFont *f; |
830 | XftFont *f; |
759 | XftDraw *d; |
|
|
760 | }; |
831 | }; |
761 | |
832 | |
762 | void |
833 | void |
763 | rxvt_font_xft::clear () |
834 | rxvt_font_xft::clear () |
764 | { |
835 | { |
765 | if (d) |
|
|
766 | { |
|
|
767 | XftDrawDestroy (d); |
|
|
768 | d = 0; |
|
|
769 | } |
|
|
770 | |
|
|
771 | if (f) |
836 | if (f) |
772 | { |
837 | { |
773 | XftFontClose (DISPLAY, f); |
838 | XftFontClose (DISPLAY, f); |
774 | f = 0; |
839 | f = 0; |
775 | } |
840 | } |
… | |
… | |
780 | { |
845 | { |
781 | rxvt_fontprop p; |
846 | rxvt_fontprop p; |
782 | |
847 | |
783 | FT_Face face = XftLockFace (f); |
848 | FT_Face face = XftLockFace (f); |
784 | |
849 | |
785 | p.width = width; p.height = height; |
850 | p.width = width; |
786 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
851 | p.height = height; |
787 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
852 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
|
|
853 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
854 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
|
|
855 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
788 | |
856 | |
789 | XftUnlockFace (f); |
857 | XftUnlockFace (f); |
790 | |
858 | |
791 | return p; |
859 | return p; |
792 | } |
860 | } |
… | |
… | |
806 | if (!p) |
874 | if (!p) |
807 | return false; |
875 | return false; |
808 | |
876 | |
809 | FcValue v; |
877 | FcValue v; |
810 | |
878 | |
|
|
879 | if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
|
|
880 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
|
|
881 | |
811 | if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
882 | if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
812 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
883 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
813 | |
884 | |
814 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
885 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
815 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
886 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
|
|
887 | |
|
|
888 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
|
|
889 | FcPatternAddBool (p, FC_MINSPACE, 1); |
816 | |
890 | |
817 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
891 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
818 | // clip width, we can't do better, or can we? |
892 | // clip width, we can't do better, or can we? |
819 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
893 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
820 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
894 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
821 | #endif |
895 | #endif |
822 | |
896 | |
823 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
|
|
824 | |
|
|
825 | XftResult result; |
897 | XftResult result; |
826 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
898 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
827 | |
899 | |
828 | FcPatternDestroy (p); |
900 | FcPatternDestroy (p); |
829 | |
901 | |
… | |
… | |
880 | |
952 | |
881 | return true; |
953 | return true; |
882 | } |
954 | } |
883 | |
955 | |
884 | bool |
956 | bool |
885 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
957 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
886 | { |
958 | { |
887 | return XftCharExists (DISPLAY, f, unicode); |
959 | return XftCharExists (DISPLAY, f, unicode); |
888 | } |
960 | } |
889 | |
961 | |
890 | void |
962 | void |
891 | rxvt_font_xft::draw (int x, int y, |
963 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
892 | const text_t *text, int len, |
964 | const text_t *text, int len, |
893 | int fg, int bg) |
965 | int fg, int bg) |
894 | { |
966 | { |
895 | d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap); |
|
|
896 | |
|
|
897 | if (bg >= 0 && bg != Color_bg) |
|
|
898 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
899 | else |
|
|
900 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
967 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
901 | |
968 | |
902 | if (!slow && width == r->TermWin.fwidth && 0) |
969 | if (!slow && width == r->TermWin.fwidth && 0) |
903 | { |
970 | { |
904 | if (sizeof (text_t) == sizeof (FcChar16)) |
971 | if (sizeof (text_t) == sizeof (FcChar16)) |
905 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
972 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
… | |
… | |
917 | fwidth *= 2; |
984 | fwidth *= 2; |
918 | |
985 | |
919 | XGlyphInfo extents; |
986 | XGlyphInfo extents; |
920 | if (sizeof (text_t) == sizeof (FcChar16)) |
987 | if (sizeof (text_t) == sizeof (FcChar16)) |
921 | { |
988 | { |
922 | XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); |
989 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
923 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
990 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
924 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
991 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
925 | } |
992 | } |
926 | else |
993 | else |
927 | { |
994 | { |
928 | XGlyphInfo extents; |
995 | XGlyphInfo extents; |
929 | XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); |
996 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
930 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
997 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
931 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
998 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
932 | } |
999 | } |
933 | } |
1000 | } |
934 | |
1001 | |
… | |
… | |
941 | #endif |
1008 | #endif |
942 | |
1009 | |
943 | ///////////////////////////////////////////////////////////////////////////// |
1010 | ///////////////////////////////////////////////////////////////////////////// |
944 | |
1011 | |
945 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1012 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
946 | : r (r) |
1013 | : r (r), fontdesc (0) |
947 | { |
1014 | { |
948 | clear (); |
1015 | clear (); |
949 | } |
1016 | } |
950 | |
1017 | |
951 | rxvt_fontset::~rxvt_fontset () |
1018 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
956 | void |
1023 | void |
957 | rxvt_fontset::clear () |
1024 | rxvt_fontset::clear () |
958 | { |
1025 | { |
959 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1026 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
960 | FONT_UNREF (*i); |
1027 | FONT_UNREF (*i); |
|
|
1028 | |
|
|
1029 | free (fontdesc); fontdesc = 0; |
961 | |
1030 | |
962 | fonts.clear (); |
1031 | fonts.clear (); |
963 | base_id = 0; |
1032 | base_id = 0; |
964 | base_prop.height = 0x7fffffff; |
1033 | base_prop.height = 0x7fffffff; |
965 | base_prop.weight = rxvt_fontprop::medium; |
1034 | base_prop.weight = rxvt_fontprop::medium; |
… | |
… | |
991 | f = new rxvt_font_x11; |
1060 | f = new rxvt_font_x11; |
992 | } |
1061 | } |
993 | else |
1062 | else |
994 | f = new rxvt_font_x11; |
1063 | f = new rxvt_font_x11; |
995 | |
1064 | |
|
|
1065 | f->fs = this; |
996 | f->set_term (r); |
1066 | f->set_term (r); |
997 | f->set_name (strdup (name)); |
1067 | f->set_name (strdup (name)); |
998 | |
1068 | |
999 | f->cs = cs; |
1069 | f->cs = cs; |
1000 | f->loaded = false; |
1070 | f->loaded = false; |
… | |
… | |
1072 | bool |
1142 | bool |
1073 | rxvt_fontset::populate (const char *desc) |
1143 | rxvt_fontset::populate (const char *desc) |
1074 | { |
1144 | { |
1075 | clear (); |
1145 | clear (); |
1076 | |
1146 | |
|
|
1147 | fontdesc = strdup (desc); |
|
|
1148 | |
1077 | fonts.push_back (new_font (0, CS_UNICODE)); |
1149 | fonts.push_back (new_font (0, CS_UNICODE)); |
1078 | realize_font (0); |
1150 | realize_font (0); |
1079 | |
1151 | |
1080 | add_fonts (desc); |
1152 | add_fonts (desc); |
1081 | |
1153 | |
… | |
… | |
1097 | |
1169 | |
1098 | return true; |
1170 | return true; |
1099 | } |
1171 | } |
1100 | |
1172 | |
1101 | int |
1173 | int |
1102 | rxvt_fontset::find_font (uint32_t unicode) |
1174 | rxvt_fontset::find_font (const char *name) const |
1103 | { |
1175 | { |
1104 | for (unsigned int i = 0; i < fonts.size (); i++) |
1176 | for (rxvt_font *const *f = fonts.begin (); f < fonts.end (); f++) |
|
|
1177 | if ((*f)->name && !strcmp ((*f)->name, name)) |
|
|
1178 | return f - fonts.begin (); |
|
|
1179 | |
|
|
1180 | return -1; |
|
|
1181 | } |
|
|
1182 | |
|
|
1183 | int |
|
|
1184 | rxvt_fontset::find_font (unicode_t unicode, bool bold) |
|
|
1185 | { |
|
|
1186 | |
|
|
1187 | for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii |
|
|
1188 | i < fonts.size (); |
|
|
1189 | i++) |
1105 | { |
1190 | { |
1106 | rxvt_font *f = fonts[i]; |
1191 | rxvt_font *f = fonts[i]; |
1107 | |
1192 | |
1108 | if (!f->loaded) |
1193 | if (!f->loaded) |
1109 | { |
1194 | { |
… | |
… | |
1112 | |
1197 | |
1113 | if (!realize_font (i)) |
1198 | if (!realize_font (i)) |
1114 | goto next_font; |
1199 | goto next_font; |
1115 | } |
1200 | } |
1116 | |
1201 | |
|
|
1202 | if (f->cs == CS_UNKNOWN) |
|
|
1203 | goto next_font; |
|
|
1204 | |
|
|
1205 | if (bold && f->properties ().weight < rxvt_fontprop::bold) |
|
|
1206 | goto next_font; |
|
|
1207 | |
1117 | if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) |
1208 | if (f->has_codepoint (unicode)) |
1118 | return i; |
1209 | return i; |
1119 | |
1210 | |
1120 | next_font: |
1211 | next_font: |
1121 | if (i == fonts.size () - 1 && fallback->name) |
1212 | if (i == fonts.size () - 1) |
|
|
1213 | { |
|
|
1214 | if (fallback->name) |
1122 | { |
1215 | { |
|
|
1216 | // search through the fallback list |
1123 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1217 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1124 | fallback++; |
1218 | fallback++; |
1125 | i = 0; |
|
|
1126 | } |
1219 | } |
|
|
1220 | else |
|
|
1221 | { |
|
|
1222 | // try to find a new font. |
|
|
1223 | // only xft currently supported, as there is no |
|
|
1224 | // way to configure this and xft is easier to hack in, |
|
|
1225 | // while x11 has more framework in place already. |
|
|
1226 | #if XFT |
|
|
1227 | // grab the first xft font that seems suitable |
|
|
1228 | FcPattern *p = FcPatternCreate (); |
|
|
1229 | |
|
|
1230 | FcCharSet *s = FcCharSetCreate (); |
|
|
1231 | FcCharSetAddChar (s, unicode); |
|
|
1232 | FcPatternAddCharSet (p, FC_CHARSET, s); |
|
|
1233 | // charsets don't help that much, as xft might return |
|
|
1234 | // a non-matching font even if a better font is available :/ |
|
|
1235 | |
|
|
1236 | FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); |
|
|
1237 | FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); |
|
|
1238 | FcPatternAddInteger (p, FC_SLANT, base_prop.slant); |
|
|
1239 | FcPatternAddBool (p, FC_MINSPACE, 1); |
|
|
1240 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
|
|
1241 | |
|
|
1242 | XftResult result; |
|
|
1243 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
|
|
1244 | |
|
|
1245 | FcPatternDestroy (p); |
|
|
1246 | |
|
|
1247 | if (match) |
|
|
1248 | { |
|
|
1249 | FcPatternDel (match, FC_CHARSET); |
|
|
1250 | char *font = (char *)FcNameUnparse (match); |
|
|
1251 | FcPatternDestroy (match); |
|
|
1252 | |
|
|
1253 | if (find_font (font) < 0) |
|
|
1254 | { |
|
|
1255 | char fontname[4096]; |
|
|
1256 | sprintf (fontname, "xft:%-.4090s", font); |
|
|
1257 | |
|
|
1258 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
|
|
1259 | } |
|
|
1260 | |
|
|
1261 | free (font); |
|
|
1262 | } |
|
|
1263 | #endif |
|
|
1264 | } |
|
|
1265 | } |
1127 | } |
1266 | } |
|
|
1267 | |
|
|
1268 | // if no bold font found, use a regular one |
|
|
1269 | if (bold) |
|
|
1270 | return find_font (unicode); |
1128 | |
1271 | |
1129 | return 0; /* we must return SOME font */ |
1272 | return 0; /* we must return SOME font */ |
1130 | } |
1273 | } |
1131 | |
1274 | |
1132 | |
1275 | |