1 | /*--------------------------------*-C-*---------------------------------*; |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: defaultfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> |
4 | * Copyright (c) 2003-2004 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 |
… | |
… | |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "defaultfont.h" |
24 | #include "defaultfont.h" |
25 | |
25 | |
|
|
26 | #include <cstdlib> |
|
|
27 | |
26 | #define DISPLAY r->Xdisplay |
28 | #define DISPLAY r->display->display |
27 | #define DRAWABLE r->TermWin.vt |
|
|
28 | #define GC r->TermWin.gc |
29 | #define TGC r->TermWin.gc |
29 | |
30 | |
30 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
31 | codeset cs; |
32 | codeset cs; |
32 | const char *name; |
33 | const char *name; |
33 | } fallback_fonts[] = { |
34 | } fallback_fonts[] = { |
34 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
35 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
35 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
36 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
36 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
37 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
37 | |
38 | |
38 | #if ENCODING_EU |
39 | #if ENCODING_EU |
39 | // cyrillic |
40 | // cyrillic |
40 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
41 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
41 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
42 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
42 | |
43 | |
43 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
44 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
44 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
45 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
45 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
46 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
46 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
47 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
47 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
48 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
48 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
49 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
49 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
50 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
50 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
51 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
51 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
52 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
52 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
53 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
53 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
54 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
54 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
55 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
55 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
56 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
56 | #endif |
57 | #endif |
57 | |
58 | |
58 | // japanese |
59 | // japanese |
59 | #if ENCODING_JP || ENCODING_JP_EXT |
60 | #if ENCODING_JP || ENCODING_JP_EXT |
60 | # if XFT |
61 | # if XFT |
61 | // prefer xft for complex scripts |
62 | // prefer xft for complex scripts |
62 | { CS_UNICODE, "xft:Kochi Gothic" }, |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
63 | # endif |
64 | # endif |
64 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
65 | { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { 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" }, |
67 | #endif |
71 | #endif |
68 | |
72 | |
69 | #if ENCODING_CN || ENCODING_CN_EXT |
73 | #if ENCODING_CN || ENCODING_CN_EXT |
70 | # if XFT |
74 | # if XFT |
71 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
75 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
72 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
76 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
73 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
77 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
74 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
78 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
75 | # endif |
79 | # endif |
|
|
80 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
|
|
81 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
|
|
82 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
|
|
83 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
76 | { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, |
84 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
77 | { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, |
85 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
78 | { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, |
86 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
79 | { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, |
87 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
80 | { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, |
88 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
81 | { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, |
89 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
82 | { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, |
90 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
83 | { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, |
91 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
84 | #endif |
92 | #endif |
85 | |
93 | |
86 | #if XFT |
94 | #if XFT |
87 | { CS_UNICODE, "xft:Andale Mono" }, |
95 | { CS_UNICODE, "xft:Andale Mono" }, |
88 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
96 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
|
|
97 | { CS_UNICODE, "xft:FreeMono" }, |
89 | #endif |
98 | #endif |
90 | { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
100 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
101 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
91 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
102 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
92 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
103 | |
93 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
104 | #if UNICODE_3 && XFT |
|
|
105 | { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters |
|
|
106 | #endif |
94 | |
107 | |
95 | { CS_UNKNOWN, 0 } |
108 | { CS_UNKNOWN, 0 } |
96 | }; |
109 | }; |
97 | |
110 | |
98 | ///////////////////////////////////////////////////////////////////////////// |
111 | ///////////////////////////////////////////////////////////////////////////// |
99 | |
112 | |
|
|
113 | #if XFT |
|
|
114 | rxvt_drawable::~rxvt_drawable () |
|
|
115 | { |
|
|
116 | if (xftdrawable) |
|
|
117 | XftDrawDestroy (xftdrawable); |
|
|
118 | } |
|
|
119 | |
|
|
120 | rxvt_drawable::operator XftDraw *() |
|
|
121 | { |
|
|
122 | if (!xftdrawable) |
|
|
123 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
124 | |
|
|
125 | return xftdrawable; |
|
|
126 | } |
|
|
127 | #endif |
|
|
128 | |
|
|
129 | ///////////////////////////////////////////////////////////////////////////// |
|
|
130 | |
100 | static void *enc_buf; |
131 | static void *enc_buf; |
101 | static uint32_t enc_len; |
132 | static uint32_t enc_len; |
102 | |
133 | |
103 | static inline void * |
134 | static inline void * |
104 | get_enc_buf (int len) |
135 | get_enc_buf (uint32_t len) |
105 | { |
136 | { |
106 | if (len > enc_len) |
137 | if (len > enc_len) |
107 | { |
138 | { |
108 | free (enc_buf); |
139 | free (enc_buf); |
109 | enc_buf = malloc (len); |
140 | enc_buf = malloc (len); |
… | |
… | |
111 | |
142 | |
112 | return enc_buf; |
143 | return enc_buf; |
113 | } |
144 | } |
114 | |
145 | |
115 | static const char * |
146 | static const char * |
116 | enc_char (const text_t *text, int len, codeset cs, bool &zero) |
147 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
117 | { |
148 | { |
118 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
149 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
119 | |
150 | |
120 | while (len--) |
151 | while (len--) |
121 | { |
152 | { |
… | |
… | |
132 | |
163 | |
133 | return (const char *)enc_buf; |
164 | return (const char *)enc_buf; |
134 | } |
165 | } |
135 | |
166 | |
136 | static const XChar2b * |
167 | static const XChar2b * |
137 | enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) |
168 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
138 | { |
169 | { |
139 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
170 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
140 | |
171 | |
141 | while (len--) |
172 | while (len--) |
142 | { |
173 | { |
… | |
… | |
157 | } |
188 | } |
158 | |
189 | |
159 | ///////////////////////////////////////////////////////////////////////////// |
190 | ///////////////////////////////////////////////////////////////////////////// |
160 | |
191 | |
161 | void |
192 | void |
162 | 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) |
163 | { |
194 | { |
164 | if (color == Color_bg) |
195 | if (color == Color_bg) |
165 | XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); |
196 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
166 | else if (color >= 0) |
197 | else if (color >= 0) |
167 | { |
198 | { |
|
|
199 | #if XFT |
|
|
200 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
|
|
201 | #else |
168 | XSetForeground (DISPLAY, GC, r->PixColors[color]); |
202 | XSetForeground (d.display->display, TGC, r->PixColors[color]); |
169 | XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); |
203 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
|
|
204 | #endif |
170 | } |
205 | } |
171 | } |
206 | } |
172 | |
207 | |
173 | static const char *linedraw_cmds[128] = { |
208 | #include "table/linedraw.h" |
174 | "1hH", "2hH", "1vV", "2vV", |
|
|
175 | 0, 0, 0, 0, |
|
|
176 | 0, 0, 0, 0, |
|
|
177 | "1HV", "2H1V", "1H2V", "2HV", |
|
|
178 | |
|
|
179 | // 2510 |
|
|
180 | "1hV", "2h1V", "1h2V", "2hV", |
|
|
181 | "1Hv", "2H1v", "1H2v", "2Hv", |
|
|
182 | "1hv", "2h1v", "1h2v", "2hv", |
|
|
183 | "1HvV", "2H1vV", "1HV2v", "1Hv2V", |
|
|
184 | |
|
|
185 | // 2520 |
|
|
186 | "1H2vV", "2Hv1V", "2HV1v", "2HvV", |
|
|
187 | "1hvV", "2h1vV", "1hV2v", "1hv2V", |
|
|
188 | "1h2vV", "2hv1V", "1v2hV", "2hvV", |
|
|
189 | "1hHV", "2h1HV", "2H1hV", "2hH1V", |
|
|
190 | |
|
|
191 | // 2530 |
|
|
192 | "1hH2V", "2hV1H", "1h2HV", "2hHV", |
|
|
193 | "1hHv", "1vH2h", "1hv2H", "1v2hH", |
|
|
194 | "1hH2v", "1H2hv", "1h2Hv", "2hHv", |
|
|
195 | "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", |
|
|
196 | |
|
|
197 | // 2540 |
|
|
198 | "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", |
|
|
199 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", |
|
|
200 | "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", |
|
|
201 | 0, 0, 0, 0, |
|
|
202 | |
|
|
203 | // 2550 |
|
|
204 | 0, 0, 0, 0, |
|
|
205 | 0, 0, 0, 0, |
|
|
206 | 0, 0, 0, 0, |
|
|
207 | 0, 0, 0, 0, |
|
|
208 | |
|
|
209 | // 2560 |
|
|
210 | 0, 0, 0, 0, |
|
|
211 | 0, 0, 0, 0, |
|
|
212 | 0, 0, 0, 0, |
|
|
213 | 0, 0, 0, 0, |
|
|
214 | |
|
|
215 | // 2570 |
|
|
216 | 0, "1a", "1b", "1ab", |
|
|
217 | "1h", "1v", "1H", "1V", |
|
|
218 | "2h", "2v", "2H", "2V", |
|
|
219 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
220 | |
|
|
221 | // to be done |
|
|
222 | }; |
|
|
223 | |
209 | |
224 | struct rxvt_font_default : rxvt_font { |
210 | struct rxvt_font_default : rxvt_font { |
225 | bool load (int maxheight) |
211 | |
|
|
212 | rxvt_fontprop properties () |
|
|
213 | { |
|
|
214 | rxvt_fontprop p; |
|
|
215 | |
|
|
216 | p.width = p.height = 1; |
|
|
217 | p.weight = rxvt_fontprop::medium; |
|
|
218 | p.slant = rxvt_fontprop::roman; |
|
|
219 | |
|
|
220 | return p; |
|
|
221 | } |
|
|
222 | |
|
|
223 | bool load (const rxvt_fontprop &prop) |
226 | { |
224 | { |
227 | width = 1; height = 1; |
225 | width = 1; height = 1; |
228 | ascent = 1; descent = 0; |
226 | ascent = 1; descent = 0; |
229 | |
227 | |
|
|
228 | set_name (strdup ("built-in pseudofont")); |
|
|
229 | |
230 | return true; |
230 | return true; |
231 | } |
231 | } |
232 | |
232 | |
233 | bool has_codepoint (uint32_t unicode) |
233 | bool has_codepoint (unicode_t unicode) |
234 | { |
234 | { |
235 | if (unicode <= 0x001f) |
235 | if (unicode <= 0x001f) |
236 | return true; |
236 | return true; |
237 | if (unicode >= 0x0080 && unicode <= 0x009f) |
237 | |
|
|
238 | if (unicode <= 0x007f) |
|
|
239 | return false; |
|
|
240 | |
|
|
241 | if (unicode <= 0x009f) |
238 | return true; |
242 | return true; |
239 | |
243 | |
240 | if (unicode >= 0x2500 && unicode <= 0x257f |
244 | if (unicode >= 0x2500 && unicode <= 0x259f) |
241 | && linedraw_cmds[unicode - 0x2500]) |
245 | return true; |
|
|
246 | |
|
|
247 | if (IS_COMPOSE (unicode)) |
242 | return true; |
248 | return true; |
243 | |
249 | |
244 | switch (unicode) |
250 | switch (unicode) |
245 | { |
251 | { |
246 | case ZERO_WIDTH_CHAR: |
252 | case ZERO_WIDTH_CHAR: |
… | |
… | |
248 | } |
254 | } |
249 | |
255 | |
250 | return false; |
256 | return false; |
251 | } |
257 | } |
252 | |
258 | |
253 | void draw (int x, int y, |
259 | void draw (rxvt_drawable &d, int x, int y, |
254 | const text_t *text, int len, |
260 | const text_t *text, int len, |
255 | int fg, int bg); |
261 | int fg, int bg); |
256 | }; |
262 | }; |
257 | |
263 | |
258 | void |
264 | void |
259 | rxvt_font_default::draw (int x, int y, |
265 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
260 | const text_t *text, int len, |
266 | const text_t *text, int len, |
261 | int fg, int bg) |
267 | int fg, int bg) |
262 | { |
268 | { |
263 | 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); |
264 | |
270 | |
265 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
271 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
266 | |
272 | |
267 | while (len--) |
273 | while (len--) |
268 | { |
274 | { |
|
|
275 | #if ENABLE_COMBINING |
|
|
276 | compose_char *cc; |
|
|
277 | #endif |
269 | text_t t = *text++; |
278 | text_t t = *text++; |
270 | |
279 | |
271 | 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++) |
272 | { |
293 | { |
273 | 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 | } |
274 | |
297 | |
275 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
298 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
276 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
299 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
277 | |
300 | |
278 | XGCValues gcv; |
301 | XGCValues gcv; |
279 | |
302 | |
280 | gcv.cap_style = CapButt; |
303 | gcv.cap_style = CapButt; |
281 | XChangeGC (DISPLAY, GC, GCCapStyle, &gcv); |
304 | gcv.line_width = 0; |
|
|
305 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
282 | |
306 | |
283 | while (*p) |
307 | while (a < b) |
284 | { |
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 | |
285 | switch (*p++) |
319 | switch (op) |
286 | { |
320 | { |
287 | case '1': |
321 | case 0: // line |
288 | gcv.line_width = 0; |
322 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
289 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
|
|
290 | break; |
323 | break; |
291 | |
324 | |
292 | 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); |
293 | gcv.line_width = 2; |
345 | gcv.stipple = 0; |
294 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
346 | gcv.fill_style = FillSolid; |
|
|
347 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
348 | } |
295 | break; |
349 | break; |
296 | |
350 | case 2: // arc |
297 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
351 | XDrawArc (d.display->display, d, TGC, |
298 | case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; |
352 | x1 - W/2, y1 - H/2, W-1, H-1, |
299 | case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; |
353 | (a - 1) * 90*64, (b - 1) * 90*64); |
300 | case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; |
354 | break; |
301 | case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; |
|
|
302 | case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; |
|
|
303 | } |
355 | } |
304 | } |
356 | } |
305 | |
357 | } |
306 | gcv.line_width = 0; |
358 | #if ENABLE_COMBINING |
307 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
359 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
308 | } |
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 |
309 | else |
374 | else |
310 | switch (*text++) |
375 | switch (t) |
311 | { |
376 | { |
312 | case NOCHAR: |
|
|
313 | case ZERO_WIDTH_CHAR: |
377 | case ZERO_WIDTH_CHAR: |
314 | break; |
378 | break; |
|
|
379 | |
315 | default: |
380 | default: |
316 | 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; |
317 | } |
392 | } |
318 | |
393 | |
319 | x += r->TermWin.fwidth; |
394 | x += r->TermWin.fwidth; |
320 | } |
395 | } |
321 | } |
396 | } |
… | |
… | |
325 | struct rxvt_font_x11 : rxvt_font { |
400 | struct rxvt_font_x11 : rxvt_font { |
326 | rxvt_font_x11 () { f = 0; } |
401 | rxvt_font_x11 () { f = 0; } |
327 | |
402 | |
328 | void clear (); |
403 | void clear (); |
329 | |
404 | |
330 | bool load (int maxheight); |
405 | rxvt_fontprop properties (); |
331 | |
406 | |
|
|
407 | bool load (const rxvt_fontprop &prop); |
|
|
408 | |
332 | bool has_codepoint (uint32_t unicode); |
409 | bool has_codepoint (unicode_t unicode); |
333 | |
410 | |
334 | void draw (int x, int y, |
411 | void draw (rxvt_drawable &d, int x, int y, |
335 | const text_t *text, int len, |
412 | const text_t *text, int len, |
336 | int fg, int bg); |
413 | int fg, int bg); |
337 | |
414 | |
338 | XFontStruct *f; |
415 | XFontStruct *f; |
339 | codeset cs; |
416 | codeset cs; |
340 | bool enc2b, encm; |
417 | bool enc2b, encm; |
341 | |
418 | |
342 | const char *get_property (const char *property, const char *repl) const; |
419 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
|
|
420 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
|
|
421 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
|
|
422 | bool set_properties (rxvt_fontprop &p, const char *name); |
343 | }; |
423 | }; |
344 | |
424 | |
345 | const char * |
425 | char * |
346 | rxvt_font_x11::get_property (const char *property, const char *repl) const |
426 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
347 | { |
427 | { |
348 | unsigned long value; |
428 | unsigned long value; |
349 | |
429 | |
350 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
430 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
351 | return XGetAtomName (DISPLAY, value); |
431 | return XGetAtomName (DISPLAY, value); |
352 | else |
432 | else |
|
|
433 | return rxvt_strdup (repl); |
|
|
434 | } |
|
|
435 | |
|
|
436 | rxvt_fontprop |
|
|
437 | rxvt_font_x11::properties () |
|
|
438 | { |
|
|
439 | rxvt_fontprop p; |
|
|
440 | set_properties (p, f); |
353 | return repl; |
441 | return p; |
354 | } |
442 | } |
355 | |
443 | |
356 | bool |
444 | bool |
357 | rxvt_font_x11::load (int maxheight) |
445 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
|
|
446 | { |
|
|
447 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
|
|
448 | p.height = height; |
|
|
449 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
450 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
451 | |
|
|
452 | return true; |
|
|
453 | } |
|
|
454 | |
|
|
455 | bool |
|
|
456 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
|
|
457 | { |
|
|
458 | unsigned long height; |
|
|
459 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
|
|
460 | return false; |
|
|
461 | |
|
|
462 | unsigned long avgwidth; |
|
|
463 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
|
|
464 | avgwidth = 0; |
|
|
465 | |
|
|
466 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
467 | char *slant = get_property (f, "SLANT", "r"); |
|
|
468 | |
|
|
469 | set_properties (p, height, weight, slant, avgwidth); |
|
|
470 | |
|
|
471 | free (weight); |
|
|
472 | free (slant); |
|
|
473 | |
|
|
474 | return true; |
|
|
475 | } |
|
|
476 | |
|
|
477 | bool |
|
|
478 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
|
|
479 | { |
|
|
480 | int slashes = 0; |
|
|
481 | const char *comp[13]; |
|
|
482 | |
|
|
483 | for (const char *c = name; *c; c++) |
|
|
484 | if (*c == '-') |
|
|
485 | { |
|
|
486 | comp[slashes++] = c + 1; |
|
|
487 | if (slashes >= 13) |
|
|
488 | break; |
|
|
489 | } |
|
|
490 | |
|
|
491 | /* can we short-circuit the costly XLoadQueryFont? */ |
|
|
492 | if (slashes >= 13 |
|
|
493 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
|
|
494 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
|
|
495 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
|
|
496 | |
|
|
497 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
|
|
498 | |
|
|
499 | if (f) |
|
|
500 | { |
|
|
501 | // the font should really exist now. if not, we have a problem |
|
|
502 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
|
|
503 | // in that case, just return garbage. |
|
|
504 | bool ret = set_properties (p, f); |
|
|
505 | XFreeFont (DISPLAY, f); |
|
|
506 | return ret; |
|
|
507 | } |
|
|
508 | else |
|
|
509 | return false; |
|
|
510 | } |
|
|
511 | |
|
|
512 | // fix the size of scalable fonts |
|
|
513 | static void |
|
|
514 | fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) |
|
|
515 | { |
|
|
516 | int slashes = 0; |
|
|
517 | const char *size; |
|
|
518 | |
|
|
519 | for (const char *c = name; *c; c++) |
|
|
520 | if (*c == '-') |
|
|
521 | { |
|
|
522 | if (slashes == 6) |
|
|
523 | size = c + 1; |
|
|
524 | |
|
|
525 | if (++slashes >= 13) |
|
|
526 | break; |
|
|
527 | } |
|
|
528 | |
|
|
529 | if (slashes >= 13 && size[0] == '0') |
|
|
530 | { |
|
|
531 | strncpy (buf, name, size - name); |
|
|
532 | buf += size - name; |
|
|
533 | buf += sprintf (buf, "%d", prop.height); |
|
|
534 | strcpy (buf, size + 1); |
|
|
535 | } |
|
|
536 | else |
|
|
537 | strcpy (buf, name); |
|
|
538 | } |
|
|
539 | |
|
|
540 | bool |
|
|
541 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
358 | { |
542 | { |
359 | clear (); |
543 | clear (); |
|
|
544 | |
|
|
545 | char **list; |
|
|
546 | int count; |
|
|
547 | list = XListFonts (DISPLAY, name, 512, &count); |
|
|
548 | set_name (0); |
|
|
549 | |
|
|
550 | if (!list) |
|
|
551 | return false; |
|
|
552 | |
|
|
553 | int bestdiff = 0x7fffffff; |
|
|
554 | for (int i = 0; i < count; i++) |
|
|
555 | { |
|
|
556 | rxvt_fontprop p; |
|
|
557 | char fname[1024]; |
|
|
558 | fix_scalable (fname, list[i], prop); |
|
|
559 | |
|
|
560 | if (!set_properties (p, fname)) |
|
|
561 | continue; |
|
|
562 | |
|
|
563 | if (p.height > prop.height) // weed out too large fonts |
|
|
564 | continue; |
|
|
565 | |
|
|
566 | int diff = (prop.height - p.height) * 32 |
|
|
567 | + abs (prop.weight - p.weight) |
|
|
568 | + abs (prop.slant - p.slant ); |
|
|
569 | |
|
|
570 | if (!name // compare against best found so far |
|
|
571 | || diff < bestdiff) |
|
|
572 | { |
|
|
573 | set_name (strdup (fname)); |
|
|
574 | bestdiff = diff; |
|
|
575 | } |
|
|
576 | } |
|
|
577 | |
|
|
578 | XFreeFontNames (list); |
|
|
579 | |
|
|
580 | if (!name) |
|
|
581 | return false; |
360 | |
582 | |
361 | f = XLoadQueryFont (DISPLAY, name); |
583 | f = XLoadQueryFont (DISPLAY, name); |
362 | |
584 | |
363 | if (!f) |
585 | if (!f) |
364 | return false; |
586 | return false; |
365 | |
587 | |
366 | unsigned long value; |
|
|
367 | |
|
|
368 | const char *registry = get_property ("CHARSET_REGISTRY", 0); |
588 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
369 | const char *encoding = get_property ("CHARSET_ENCODING", 0); |
589 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
370 | |
590 | |
371 | if (registry && encoding) |
591 | if (registry && encoding) |
372 | { |
592 | { |
373 | char charset[64]; |
593 | char charset[64]; |
374 | snprintf (charset, 64, "%s-%s", registry, encoding); |
594 | snprintf (charset, 64, "%s-%s", registry, encoding); |
375 | |
595 | |
376 | cs = codeset_from_name (charset); |
596 | cs = codeset_from_name (charset); |
377 | } |
597 | } |
378 | else |
598 | else |
379 | { |
599 | { |
380 | const char *charset = get_property ("FONT", 0); |
600 | const char *charset = get_property (f, "FONT", 0); |
381 | |
601 | |
382 | if (!charset) |
602 | if (!charset) |
383 | charset = name; |
603 | charset = name; |
384 | |
604 | |
385 | int count = 13; |
605 | int count = 13; |
… | |
… | |
388 | break; |
608 | break; |
389 | |
609 | |
390 | cs = codeset_from_name (charset); |
610 | cs = codeset_from_name (charset); |
391 | } |
611 | } |
392 | |
612 | |
|
|
613 | free (registry); |
|
|
614 | free (encoding); |
|
|
615 | |
393 | if (cs == CS_UNICODE) |
616 | if (cs == CS_UNICODE) |
394 | 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 |
395 | |
618 | |
396 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
619 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
397 | enc2b = encm || f->max_char_or_byte2 > 255; |
620 | enc2b = encm || f->max_char_or_byte2 > 255; |
398 | |
621 | |
399 | ascent = f->ascent; |
622 | ascent = f->ascent; |
400 | descent = f->descent; |
623 | descent = f->descent; |
401 | height = ascent + descent; |
624 | height = ascent + descent; |
402 | |
625 | |
403 | prop = false; |
626 | slow = false; |
404 | |
627 | |
405 | if (f->min_bounds.width == f->max_bounds.width) |
628 | if (f->min_bounds.width == f->max_bounds.width) |
406 | width = f->min_bounds.width; |
629 | width = f->min_bounds.width; |
407 | else if (f->per_char == NULL) |
630 | else if (f->per_char == NULL) |
408 | width = f->max_bounds.width; |
631 | width = f->max_bounds.width; |
409 | else |
632 | else |
410 | { |
633 | { |
411 | prop = true; |
634 | slow = true; |
412 | |
635 | |
413 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
636 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
414 | |
637 | |
415 | if (encm) |
638 | if (encm) |
416 | N += (f->max_byte1 - f->min_byte1) |
639 | N += (f->max_byte1 - f->min_byte1) |
… | |
… | |
446 | f = 0; |
669 | f = 0; |
447 | } |
670 | } |
448 | } |
671 | } |
449 | |
672 | |
450 | bool |
673 | bool |
451 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
674 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
452 | { |
675 | { |
453 | uint32_t ch = FROM_UNICODE (cs, unicode); |
676 | uint32_t ch = FROM_UNICODE (cs, unicode); |
454 | |
677 | |
455 | if (ch == NOCHAR) |
678 | if (ch == NOCHAR) |
456 | return false; |
679 | return false; |
… | |
… | |
458 | /* check wether the character exists in _this_ font. horrible. */ |
681 | /* check wether the character exists in _this_ font. horrible. */ |
459 | XCharStruct *xcs; |
682 | XCharStruct *xcs; |
460 | |
683 | |
461 | if (encm) |
684 | if (encm) |
462 | { |
685 | { |
463 | int byte1 = ch >> 8; |
686 | unsigned char byte1 = ch >> 8; |
464 | int byte2 = ch & 255; |
687 | unsigned char byte2 = ch & 255; |
465 | |
688 | |
466 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
689 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
467 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
690 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
468 | return false; |
691 | return false; |
469 | |
692 | |
… | |
… | |
492 | |
715 | |
493 | return true; |
716 | return true; |
494 | } |
717 | } |
495 | |
718 | |
496 | void |
719 | void |
497 | rxvt_font_x11::draw (int x, int y, |
720 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
498 | const text_t *text, int len, |
721 | const text_t *text, int len, |
499 | int fg, int bg) |
722 | int fg, int bg) |
500 | { |
723 | { |
501 | // this looks like a mess /. |
724 | // this looks like a mess /. |
502 | // and it is a mess /. |
725 | // and it is a mess /. |
503 | // yet we are trying to be perfect /. |
726 | // yet we are trying to be perfect /. |
504 | // but the result still isn't perfect /. |
727 | // but the result still isn't perfect /. |
505 | |
728 | |
506 | bool slow = prop |
729 | bool slow = this->slow |
507 | || width != r->TermWin.fwidth |
730 | || width != r->TermWin.fwidth |
508 | || height != r->TermWin.fheight; |
731 | || height != r->TermWin.fheight; |
509 | |
732 | |
510 | int base = r->TermWin.fbase; |
733 | int base = r->TermWin.fbase; |
511 | |
734 | |
512 | XGCValues v; |
735 | XGCValues v; |
513 | v.foreground = r->PixColors[fg]; |
736 | v.foreground = r->PixColors[fg]; |
514 | v.background = r->PixColors[bg]; |
|
|
515 | v.font = f->fid; |
737 | v.font = f->fid; |
516 | |
738 | |
517 | if (enc2b) |
739 | if (enc2b) |
518 | { |
740 | { |
519 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
741 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
520 | |
742 | |
521 | if (bg == Color_bg && !slow) |
743 | if (bg == Color_bg && !slow) |
522 | { |
744 | { |
|
|
745 | v.background = r->PixColors[bg]; |
523 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
746 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
524 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
747 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
525 | } |
748 | } |
526 | else |
749 | else |
527 | { |
750 | { |
528 | 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); |
529 | |
752 | |
530 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
753 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
531 | |
754 | |
532 | if (slow) |
755 | if (slow) |
533 | { |
756 | { |
534 | do |
757 | do |
535 | { |
758 | { |
536 | if (xc->byte1 || xc->byte2) |
759 | if (xc->byte1 || xc->byte2) |
537 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
760 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
538 | |
761 | |
539 | x += r->TermWin.fwidth; |
762 | x += r->TermWin.fwidth; |
540 | xc++; len--; |
763 | xc++; len--; |
541 | } |
764 | } |
542 | while (len); |
765 | while (len); |
543 | } |
766 | } |
544 | else |
767 | else |
545 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
768 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
546 | } |
769 | } |
547 | } |
770 | } |
548 | else |
771 | else |
549 | { |
772 | { |
550 | const char *xc = enc_char (text, len, cs, slow); |
773 | const char *xc = enc_char (text, len, cs, slow); |
551 | |
774 | |
552 | if (bg == Color_bg && !slow) |
775 | if (bg == Color_bg && !slow) |
553 | { |
776 | { |
|
|
777 | v.background = r->PixColors[bg]; |
554 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
778 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
555 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
779 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
556 | } |
780 | } |
557 | else |
781 | else |
558 | { |
782 | { |
559 | 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); |
560 | |
784 | |
561 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
785 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
562 | |
786 | |
563 | if (slow) |
787 | if (slow) |
564 | { |
788 | { |
565 | do |
789 | do |
566 | { |
790 | { |
567 | if (*xc) |
791 | if (*xc) |
568 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
792 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
569 | |
793 | |
570 | x += r->TermWin.fwidth; |
794 | x += r->TermWin.fwidth; |
571 | xc++; len--; |
795 | xc++; len--; |
572 | } |
796 | } |
573 | while (len); |
797 | while (len); |
574 | } |
798 | } |
575 | else |
799 | else |
576 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
800 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
577 | } |
801 | } |
578 | } |
802 | } |
579 | } |
803 | } |
580 | |
804 | |
581 | ///////////////////////////////////////////////////////////////////////////// |
805 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
586 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
810 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
587 | #define SWATHBITS 8 |
811 | #define SWATHBITS 8 |
588 | #endif |
812 | #endif |
589 | |
813 | |
590 | struct rxvt_font_xft : rxvt_font { |
814 | struct rxvt_font_xft : rxvt_font { |
591 | #if 0 |
|
|
592 | enum { |
|
|
593 | SWATHCOUNT = 1 << (21 - UNIBITS), |
|
|
594 | SWATHSIZE = 1 << (SWATHBITS - 5) |
|
|
595 | }; |
|
|
596 | typedef uint32_t swath[SWATHSIZE]; |
|
|
597 | |
|
|
598 | swath *cvr[SWATHCOUNT]; |
|
|
599 | #endif |
|
|
600 | |
|
|
601 | #if 0 |
|
|
602 | void gen_coverage_swath (unsigned int page); |
|
|
603 | |
|
|
604 | bool has_char (uint32_t ch) |
|
|
605 | { |
|
|
606 | unsigned int page = ch >> SWATHBITS; |
|
|
607 | unsigned int idx = ch & ((1 << SWATHBITS) - 1); |
|
|
608 | |
|
|
609 | if (page >= SWATHCOUNT) |
|
|
610 | return false; |
|
|
611 | |
|
|
612 | if (!cvr[page]) gen_coverage_swath (page); |
|
|
613 | |
|
|
614 | return cvr[page][idx >> 5] & (1 << (idx & 31)); |
|
|
615 | } |
|
|
616 | #endif |
|
|
617 | rxvt_font_xft () { f = 0; d = 0; } |
815 | rxvt_font_xft () { f = 0; } |
618 | |
816 | |
619 | void clear (); |
817 | void clear (); |
620 | |
818 | |
621 | bool load (int maxheight); |
819 | rxvt_fontprop properties (); |
622 | |
820 | |
623 | void draw (int x, int y, |
821 | bool load (const rxvt_fontprop &prop); |
|
|
822 | |
|
|
823 | void draw (rxvt_drawable &d, int x, int y, |
624 | const text_t *text, int len, |
824 | const text_t *text, int len, |
625 | int fg, int bg); |
825 | int fg, int bg); |
626 | |
826 | |
627 | bool has_codepoint (uint32_t unicode); |
827 | bool has_codepoint (unicode_t unicode); |
628 | |
828 | |
629 | protected: |
829 | protected: |
630 | XftFont *f; |
830 | XftFont *f; |
631 | XftDraw *d; |
|
|
632 | |
|
|
633 | #if 0 |
|
|
634 | virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0; |
|
|
635 | void set_swath (uint32_t ch) |
|
|
636 | { |
|
|
637 | cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1)); |
|
|
638 | } |
|
|
639 | #endif |
|
|
640 | }; |
831 | }; |
641 | |
832 | |
642 | void |
833 | void |
643 | rxvt_font_xft::clear () |
834 | rxvt_font_xft::clear () |
644 | { |
835 | { |
645 | if (f) |
836 | if (f) |
646 | { |
837 | { |
647 | XftFontClose (DISPLAY, f); |
838 | XftFontClose (DISPLAY, f); |
648 | f = 0; |
839 | f = 0; |
649 | } |
840 | } |
|
|
841 | } |
650 | |
842 | |
651 | if (d) |
843 | rxvt_fontprop |
652 | { |
844 | rxvt_font_xft::properties () |
653 | XftDrawDestroy (d); |
845 | { |
654 | d = 0; |
846 | rxvt_fontprop p; |
655 | } |
|
|
656 | |
847 | |
657 | #if 0 |
848 | FT_Face face = XftLockFace (f); |
658 | for (int i = 0; i < SWATHCOUNT; i++) |
849 | |
659 | delete cvr[i]; |
850 | p.width = width; p.height = height; |
660 | #endif |
851 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
852 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
|
|
853 | |
|
|
854 | XftUnlockFace (f); |
|
|
855 | |
|
|
856 | return p; |
661 | } |
857 | } |
662 | |
858 | |
663 | bool |
859 | bool |
664 | rxvt_font_xft::load (int maxheight) |
860 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
665 | { |
861 | { |
666 | #if 0 |
862 | #if 0 |
667 | for (int i = 0; i < SWATHCOUNT; i++) |
863 | for (int i = 0; i < SWATHCOUNT; i++) |
668 | cvr[i] = 0; |
864 | cvr[i] = 0; |
669 | #endif |
865 | #endif |
670 | |
866 | |
671 | clear (); |
867 | clear (); |
672 | |
868 | |
673 | f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); |
869 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
|
|
870 | |
|
|
871 | if (!p) |
|
|
872 | return false; |
|
|
873 | |
|
|
874 | FcValue v; |
|
|
875 | |
|
|
876 | if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
|
|
877 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
|
|
878 | |
|
|
879 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
|
|
880 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
|
|
881 | |
|
|
882 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
|
|
883 | // clip width, we can't do better, or can we? |
|
|
884 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
|
|
885 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
|
|
886 | #endif |
|
|
887 | |
|
|
888 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
|
|
889 | |
|
|
890 | XftResult result; |
|
|
891 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
|
|
892 | |
|
|
893 | FcPatternDestroy (p); |
|
|
894 | |
|
|
895 | if (!match) |
|
|
896 | return false; |
|
|
897 | |
|
|
898 | f = XftFontOpenPattern (DISPLAY, match); |
674 | |
899 | |
675 | if (!f) |
900 | if (!f) |
|
|
901 | { |
|
|
902 | FcPatternDestroy (match); |
676 | return false; |
903 | return false; |
|
|
904 | } |
677 | |
905 | |
678 | FT_Face face = XftLockFace (f); |
906 | FT_Face face = XftLockFace (f); |
679 | |
907 | |
680 | prop = !FT_IS_FIXED_WIDTH (face); |
908 | slow = !FT_IS_FIXED_WIDTH (face); |
681 | |
909 | |
682 | int ftheight = 0; |
910 | int ftheight = 0; |
683 | |
911 | |
684 | for (;;) |
912 | for (;;) |
685 | { |
913 | { |
… | |
… | |
687 | FcChar8 c; |
915 | FcChar8 c; |
688 | |
916 | |
689 | c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); |
917 | c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); |
690 | c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); |
918 | c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); |
691 | |
919 | |
692 | prop = prop || g1.xOff != g2.xOff; // don't simply trust the font |
920 | if (g1.xOff != g2.xOff) // don't simply trust the font |
|
|
921 | slow = true; |
693 | |
922 | |
694 | width = g2.xOff; |
923 | width = g2.xOff; |
695 | ascent = (face->size->metrics.ascender + 63) >> 6; |
924 | ascent = (face->size->metrics.ascender + 63) >> 6; |
696 | descent = (-face->size->metrics.descender + 63) >> 6; |
925 | descent = (-face->size->metrics.descender + 63) >> 6; |
697 | height = ascent + descent; |
926 | height = ascent + descent; |
698 | |
927 | |
699 | if (height <= maxheight || !maxheight) |
928 | if (height <= prop.height || !prop.height) |
700 | break; |
929 | break; |
701 | |
930 | |
702 | if (ftheight) |
931 | if (ftheight) |
703 | { |
932 | { |
704 | // take smaller steps near the end |
933 | // take smaller steps near the end |
705 | if (height > maxheight + 1) ftheight++; |
934 | if (height > prop.height + 1) ftheight++; |
706 | if (height > maxheight + 2) ftheight++; |
935 | if (height > prop.height + 2) ftheight++; |
707 | if (height > maxheight + 3) ftheight++; |
936 | if (height > prop.height + 3) ftheight++; |
708 | |
937 | |
709 | FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); |
938 | FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); |
710 | } |
939 | } |
711 | else |
940 | else |
712 | FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); |
941 | FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); |
713 | } |
942 | } |
714 | |
943 | |
715 | XftUnlockFace (f); |
944 | XftUnlockFace (f); |
716 | |
945 | |
717 | return true; |
946 | return true; |
718 | } |
947 | } |
719 | |
948 | |
720 | #if 0 |
|
|
721 | void rxvt_font::gen_coverage_swath (unsigned int page) |
|
|
722 | { |
|
|
723 | cvr[page] = new swath; |
|
|
724 | |
|
|
725 | for (int i = 0; i < SWATHSIZE; i++) |
|
|
726 | cvr[page][i] = 0; |
|
|
727 | |
|
|
728 | populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1); |
|
|
729 | } |
|
|
730 | #endif |
|
|
731 | |
|
|
732 | bool |
949 | bool |
733 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
950 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
734 | { |
951 | { |
735 | return XftCharExists (DISPLAY, f, unicode); |
952 | return XftCharExists (DISPLAY, f, unicode); |
736 | } |
953 | } |
737 | |
954 | |
738 | void |
955 | void |
739 | rxvt_font_xft::draw (int x, int y, |
956 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
740 | const text_t *text, int len, |
957 | const text_t *text, int len, |
741 | int fg, int bg) |
958 | int fg, int bg) |
742 | { |
959 | { |
743 | if (!d) |
|
|
744 | { |
|
|
745 | dR; |
|
|
746 | d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); |
|
|
747 | } |
|
|
748 | |
|
|
749 | if (bg >= 0 && bg != Color_bg) |
|
|
750 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
751 | else |
|
|
752 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
960 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
753 | |
961 | |
754 | if (!prop && width == r->TermWin.fwidth) |
962 | if (!slow && width == r->TermWin.fwidth && 0) |
755 | { |
963 | { |
756 | if (sizeof (text_t) == sizeof (FcChar16)) |
964 | if (sizeof (text_t) == sizeof (FcChar16)) |
757 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
965 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
758 | else |
966 | else |
759 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
967 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
… | |
… | |
762 | { |
970 | { |
763 | while (len) |
971 | while (len) |
764 | { |
972 | { |
765 | if (*text != NOCHAR && *text != ' ') |
973 | if (*text != NOCHAR && *text != ' ') |
766 | { |
974 | { |
|
|
975 | int fwidth = r->TermWin.fwidth; |
|
|
976 | if (len >= 2 && text[1] == NOCHAR) |
|
|
977 | fwidth *= 2; |
|
|
978 | |
|
|
979 | XGlyphInfo extents; |
767 | if (sizeof (text_t) == sizeof (FcChar16)) |
980 | if (sizeof (text_t) == sizeof (FcChar16)) |
768 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
981 | { |
|
|
982 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
|
|
983 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
984 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
|
|
985 | } |
769 | else |
986 | else |
770 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
987 | { |
|
|
988 | XGlyphInfo extents; |
|
|
989 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
|
|
990 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
991 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
|
|
992 | } |
771 | } |
993 | } |
772 | |
994 | |
773 | x += r->TermWin.fwidth; |
995 | x += r->TermWin.fwidth; |
774 | text++; |
996 | text++; |
775 | len--; |
997 | len--; |
… | |
… | |
779 | #endif |
1001 | #endif |
780 | |
1002 | |
781 | ///////////////////////////////////////////////////////////////////////////// |
1003 | ///////////////////////////////////////////////////////////////////////////// |
782 | |
1004 | |
783 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1005 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
784 | #ifdef EXPLICIT_CONTEXT |
1006 | : r (r), fontdesc (0) |
785 | : r(r) |
|
|
786 | #endif |
|
|
787 | { |
1007 | { |
788 | clear (); |
1008 | clear (); |
789 | } |
1009 | } |
790 | |
1010 | |
791 | rxvt_fontset::~rxvt_fontset () |
1011 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
794 | } |
1014 | } |
795 | |
1015 | |
796 | void |
1016 | void |
797 | rxvt_fontset::clear () |
1017 | rxvt_fontset::clear () |
798 | { |
1018 | { |
799 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
1019 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
800 | FONT_UNREF (*i); |
1020 | FONT_UNREF (*i); |
|
|
1021 | |
|
|
1022 | free (fontdesc); fontdesc = 0; |
801 | |
1023 | |
802 | fonts.clear (); |
1024 | fonts.clear (); |
803 | base_id = 0; |
1025 | base_id = 0; |
804 | height = 0x7fffffff; |
1026 | base_prop.height = 0x7fffffff; |
|
|
1027 | base_prop.weight = rxvt_fontprop::medium; |
|
|
1028 | base_prop.slant = rxvt_fontprop::roman; |
805 | |
1029 | |
806 | fallback = fallback_fonts; |
1030 | fallback = fallback_fonts; |
807 | } |
1031 | } |
808 | |
1032 | |
809 | rxvt_font * |
1033 | rxvt_font * |
… | |
… | |
829 | f = new rxvt_font_x11; |
1053 | f = new rxvt_font_x11; |
830 | } |
1054 | } |
831 | else |
1055 | else |
832 | f = new rxvt_font_x11; |
1056 | f = new rxvt_font_x11; |
833 | |
1057 | |
|
|
1058 | f->fs = this; |
834 | f->set_term (r); |
1059 | f->set_term (r); |
835 | f->set_name (strdup (name)); |
1060 | f->set_name (strdup (name)); |
836 | |
1061 | |
837 | f->cs = cs; |
1062 | f->cs = cs; |
838 | f->loaded = false; |
1063 | f->loaded = false; |
… | |
… | |
856 | |
1081 | |
857 | if (*desc == '[') |
1082 | if (*desc == '[') |
858 | { |
1083 | { |
859 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1084 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
860 | |
1085 | |
861 | const char *extra = desc++; |
1086 | //const char *extra = desc++; // not yet used |
862 | |
1087 | |
863 | desc = strchr (desc, ']'); |
1088 | desc = strchr (desc, ']'); |
864 | |
1089 | |
865 | if (!desc) |
1090 | if (!desc) |
866 | { |
1091 | { |
… | |
… | |
894 | rxvt_fontset::realize_font (int i) |
1119 | rxvt_fontset::realize_font (int i) |
895 | { |
1120 | { |
896 | if (fonts[i]->loaded) |
1121 | if (fonts[i]->loaded) |
897 | return true; |
1122 | return true; |
898 | |
1123 | |
899 | if (fonts[i]->load (height)) |
|
|
900 | return fonts[i]->loaded = true; |
1124 | fonts[i]->loaded = true; |
901 | |
1125 | |
902 | delete fonts[i]; |
1126 | if (!fonts[i]->load (base_prop)) |
903 | fonts.erase (fonts.begin () + i); |
1127 | { |
904 | |
1128 | fonts[i]->cs = CS_UNKNOWN; |
905 | return false; |
1129 | return false; |
906 | } |
1130 | } |
907 | |
1131 | |
908 | void |
1132 | return true; |
|
|
1133 | } |
|
|
1134 | |
|
|
1135 | bool |
909 | rxvt_fontset::populate (const char *desc) |
1136 | rxvt_fontset::populate (const char *desc) |
910 | { |
1137 | { |
911 | clear (); |
1138 | clear (); |
|
|
1139 | |
|
|
1140 | fontdesc = strdup (desc); |
912 | |
1141 | |
913 | fonts.push_back (new_font (0, CS_UNICODE)); |
1142 | fonts.push_back (new_font (0, CS_UNICODE)); |
914 | realize_font (0); |
1143 | realize_font (0); |
915 | |
1144 | |
916 | add_fonts (desc); |
1145 | add_fonts (desc); |
917 | |
1146 | |
918 | if (!base_id) |
1147 | if (!base_id) |
919 | base_id = 1; |
1148 | base_id = 1; |
920 | |
1149 | |
921 | // we currently need a base-font, no matter what |
1150 | // we currently need a base-font, no matter what |
922 | if (fonts.size () <= base_id) |
1151 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
923 | { |
1152 | { |
|
|
1153 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
924 | add_fonts ("fixed"); |
1154 | add_fonts ("fixed"); |
925 | base_id = 1; |
1155 | base_id = fonts.size () - 1; |
926 | } |
1156 | } |
927 | |
1157 | |
928 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1158 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
929 | { |
1159 | return false; |
930 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
|
|
931 | exit (1); |
|
|
932 | } |
|
|
933 | |
1160 | |
934 | height = fonts[base_id]->height; |
1161 | base_prop = fonts[base_id]->properties (); |
935 | |
1162 | |
936 | /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ |
1163 | return true; |
937 | } |
1164 | } |
938 | |
1165 | |
939 | int |
1166 | int |
940 | rxvt_fontset::find_font (uint32_t unicode) |
1167 | rxvt_fontset::find_font (unicode_t unicode) |
941 | { |
1168 | { |
942 | for (int i = 0; i < fonts.size (); i++) |
1169 | for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii |
|
|
1170 | i < fonts.size (); |
|
|
1171 | i++) |
943 | { |
1172 | { |
944 | rxvt_font *f = fonts[i]; |
1173 | rxvt_font *f = fonts[i]; |
945 | |
1174 | |
946 | if (!f->loaded) |
1175 | if (!f->loaded) |
947 | { |
1176 | { |
948 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1177 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
949 | goto next_font; |
1178 | goto next_font; |
950 | |
1179 | |
951 | if (!realize_font (i)) |
1180 | if (!realize_font (i)) |
952 | { |
|
|
953 | --i; |
|
|
954 | goto next_font; |
1181 | goto next_font; |
955 | } |
1182 | } |
956 | |
1183 | |
957 | //printf ("added font %s for %04lx\n", f->name, unicode); |
|
|
958 | } |
|
|
959 | |
|
|
960 | if (f->has_codepoint (unicode)) |
1184 | if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) |
961 | return i; |
1185 | return i; |
962 | |
1186 | |
963 | next_font: |
1187 | next_font: |
964 | if (i == fonts.size () - 1 && fallback->name) |
1188 | if (i == fonts.size () - 1 && fallback->name) |
965 | { |
1189 | { |
966 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1190 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
967 | fallback++; |
1191 | fallback++; |
|
|
1192 | i = 0; |
968 | } |
1193 | } |
969 | } |
1194 | } |
970 | |
1195 | |
971 | return 0; /* we must return SOME font */ |
1196 | return 0; /* we must return SOME font */ |
972 | } |
1197 | } |