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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.59 by root, Wed Aug 11 15:55:35 2004 UTC

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
… …
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->Xdisplay 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
32const struct rxvt_fallback_font { 31const 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" },
83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 88 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 92#endif
87 93
88#if XFT 94#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
91#endif 97#endif
92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { 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
97 106
98 { CS_UNKNOWN, 0 } 107 { CS_UNKNOWN, 0 }
99}; 108};
100 109
101///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
102 111
112#if XFT
113rxvt_drawable::~rxvt_drawable ()
114{
115 if (xftdrawable)
116 XftDrawDestroy (xftdrawable);
117}
118
119rxvt_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
103static void *enc_buf; 130static void *enc_buf;
104static uint32_t enc_len; 131static uint32_t enc_len;
105 132
106static inline void * 133static inline void *
107get_enc_buf (int len) 134get_enc_buf (uint32_t len)
108{ 135{
109 if (len > enc_len) 136 if (len > enc_len)
110 { 137 {
111 free (enc_buf); 138 free (enc_buf);
112 enc_buf = malloc (len); 139 enc_buf = malloc (len);
140 enc_len = len;
113 } 141 }
114 142
115 return enc_buf; 143 return enc_buf;
116} 144}
117 145
118static const char * 146static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 147enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 148{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 149 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 150
123 while (len--) 151 while (len--)
124 { 152 {
… …
135 163
136 return (const char *)enc_buf; 164 return (const char *)enc_buf;
137} 165}
138 166
139static const XChar2b * 167static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 168enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 169{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 170 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 171
144 while (len--) 172 while (len--)
145 { 173 {
… …
160} 188}
161 189
162///////////////////////////////////////////////////////////////////////////// 190/////////////////////////////////////////////////////////////////////////////
163 191
164void 192void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 193rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 194{
167 if (color == Color_bg) 195 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 196 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 197 else if (color >= 0)
170 { 198 {
199#if XFT
200 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
201#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 202 XSetForeground (d.display->display, TGC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 203 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
204#endif
173 } 205 }
174} 206}
175 207
176static const char *linedraw_cmds[128] = { 208#include "table/linedraw.h"
177 "1hH", "2hH", "1vV", "2vV",
178 0, 0, 0, 0,
179 0, 0, 0, 0,
180 "1HV", "2H1V", "1H2V", "2HV",
181
182 // 2510
183 "1hV", "2h1V", "1h2V", "2hV",
184 "1Hv", "2H1v", "1H2v", "2Hv",
185 "1hv", "2h1v", "1h2v", "2hv",
186 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
187
188 // 2520
189 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
190 "1hvV", "2h1vV", "1hV2v", "1hv2V",
191 "1h2vV", "2hv1V", "1v2hV", "2hvV",
192 "1hHV", "2h1HV", "2H1hV", "2hH1V",
193
194 // 2530
195 "1hH2V", "2hV1H", "1h2HV", "2hHV",
196 "1hHv", "1vH2h", "1hv2H", "1v2hH",
197 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
198 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
199
200 // 2540
201 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
202 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
203 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
204 0, 0, 0, 0,
205
206 // 2550
207 0, 0, 0, 0,
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211
212 // 2560
213 0, 0, 0, 0,
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217
218 // 2570
219 0, "1a", "1b", "1ab",
220 "1h", "1v", "1H", "1V",
221 "2h", "2v", "2H", "2V",
222 "1h2H", "1v2V", "1H2h", "1V2v"
223
224 // to be done
225};
226 209
227struct rxvt_font_default : rxvt_font { 210struct rxvt_font_default : rxvt_font {
211
228 rxvt_fontprop properties () 212 rxvt_fontprop properties ()
229 { 213 {
230 rxvt_fontprop p; 214 rxvt_fontprop p;
231 215
232 p.width = p.height = 1; 216 p.width = p.height = 1;
… …
239 bool load (const rxvt_fontprop &prop) 223 bool load (const rxvt_fontprop &prop)
240 { 224 {
241 width = 1; height = 1; 225 width = 1; height = 1;
242 ascent = 1; descent = 0; 226 ascent = 1; descent = 0;
243 227
228 set_name (strdup ("built-in pseudofont"));
229
244 return true; 230 return true;
245 } 231 }
246 232
247 bool has_codepoint (uint32_t unicode) 233 bool has_codepoint (unicode_t unicode)
248 { 234 {
249 if (unicode <= 0x001f) 235 if (unicode <= 0x001f)
250 return true; 236 return true;
251 if (unicode >= 0x0080 && unicode <= 0x009f) 237
238 if (unicode <= 0x007f)
239 return false;
240
241 if (unicode <= 0x009f)
252 return true; 242 return true;
253 243
254 if (unicode >= 0x2500 && unicode <= 0x257f 244 if (unicode >= 0x2500 && unicode <= 0x259f)
255 && linedraw_cmds[unicode - 0x2500]) 245 return true;
246
247 if (IS_COMPOSE (unicode))
256 return true; 248 return true;
257 249
258 switch (unicode) 250 switch (unicode)
259 { 251 {
260 case ZERO_WIDTH_CHAR: 252 case ZERO_WIDTH_CHAR:
… …
262 } 254 }
263 255
264 return false; 256 return false;
265 } 257 }
266 258
267 void draw (int x, int y, 259 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 260 const text_t *text, int len,
269 int fg, int bg); 261 int fg, int bg);
270}; 262};
271 263
272void 264void
273rxvt_font_default::draw (int x, int y, 265rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 266 const text_t *text, int len,
275 int fg, int bg) 267 int fg, int bg)
276{ 268{
277 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);
278 270
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 271 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280 272
281 while (len--) 273 while (len--)
282 { 274 {
275#if ENABLE_COMBINING
276 compose_char *cc;
277#endif
283 text_t t = *text++; 278 text_t t = *text++;
284 279
285 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++)
286 { 293 {
287 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 }
288 297
289 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;
290 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;
291 300
292 XGCValues gcv; 301 XGCValues gcv;
293 302
303 gcv.cap_style = CapButt;
304 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
306
294 while (*p) 307 while (a < b)
295 { 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
296 switch (*p++) 319 switch (op)
297 { 320 {
298 case '1': 321 case 0: // line
299 gcv.line_width = 0; 322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301 break; 323 break;
302 324
303 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);
304 gcv.line_width = 2; 345 gcv.stipple = 0;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 346 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 }
306 break; 349 break;
307 350 case 2: // arc
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 354 break;
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
314 } 355 }
315 } 356 }
316 357 }
317 gcv.line_width = 0; 358#if ENABLE_COMBINING
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 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
320 else 374 else
321 switch (*text++) 375 switch (t)
322 { 376 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
325 break; 378 break;
379
326 default: 380 default:
327 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;
328 } 392 }
329 393
330 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
331 } 395 }
332} 396}
… …
337 rxvt_font_x11 () { f = 0; } 401 rxvt_font_x11 () { f = 0; }
338 402
339 void clear (); 403 void clear ();
340 404
341 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
342 rxvt_fontprop properties (XFontStruct *f);
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;
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);
357}; 423};
358 424
359const char * 425char *
360rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
361{ 427{
362 unsigned long value; 428 unsigned long value;
363 429
364 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
365 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
366 else 432 else
367 return repl; 433 return rxvt_strdup (repl);
368} 434}
369 435
370rxvt_fontprop 436rxvt_fontprop
371rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
372{ 438{
373 return properties (f);
374}
375
376rxvt_fontprop
377rxvt_font_x11::properties (XFontStruct *f)
378{
379 rxvt_fontprop p; 439 rxvt_fontprop p;
440 set_properties (p, f);
441 return p;
442}
380 443
381 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 444bool
382 const char *slant = get_property (f, "SLANT", "r"); 445rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
383 446{
384 unsigned long avgwidth; 447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
385 p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)
386 ? avgwidth / 10
387 : (height + 1) / 2;
388 p.height = height; 448 p.height = height;
389 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 449 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 450 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391 451
392 return p; 452 return true;
453}
454
455bool
456rxvt_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
477bool
478rxvt_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
513static void
514fix_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);
393} 538}
394 539
395bool 540bool
396rxvt_font_x11::load (const rxvt_fontprop &prop) 541rxvt_font_x11::load (const rxvt_fontprop &prop)
397{ 542{
398 clear (); 543 clear ();
399 544
400 char **list; 545 char **list;
401 int count; 546 int count;
402 XFontStruct *info;
403 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 547 list = XListFonts (DISPLAY, name, 1024, &count);
548 set_name (0);
404 549
405 if (!list) 550 if (!list)
406 return false; 551 return false;
407 552
408 int bestdiff = 0x7fffffff; 553 int bestdiff = 0x7fffffff;
409 XFontStruct *best = 0;
410 for (int i = 0; i < count; i++) 554 for (int i = 0; i < count; i++)
411 { 555 {
412 XFontStruct *f = info + i; 556 rxvt_fontprop p;
557 char fname[1024];
558 fix_scalable (fname, list[i], prop);
413 559
560 if (!set_properties (p, fname))
561 continue;
562
414 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 563 if (p.height > prop.height) // weed out too large fonts
415 { 564 continue;
416 rxvt_fontprop p = properties (f); 565
417 int diff = (prop.height - f->ascent + f->descent) * 32 566 int diff = (prop.height - p.height) * 32
418 + abs (prop.weight - p.weight) 567 + abs (prop.weight - p.weight)
419 + abs (prop.slant - p.slant ); 568 + abs (prop.slant - p.slant );
420 569
421 if (!best // compare against best found so far 570 if (!name // compare against best found so far
422 || diff < bestdiff) 571 || diff < bestdiff)
423 { 572 {
424 best = f; 573 set_name (strdup (fname));
425 bestdiff = diff; 574 bestdiff = diff;
426 } 575 }
427 }
428 } 576 }
429 577
578 XFreeFontNames (list);
579
430 if (!best) 580 if (!name)
431 return false; 581 return false;
432
433 set_name (strdup (list[best - info]));
434
435 XFreeFontInfo (list, info, count);
436 582
437 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
438 584
439 if (!f) 585 if (!f)
440 return false; 586 return false;
441 587
442 unsigned long value;
443
444 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446 590
447 if (registry && encoding) 591 if (registry && encoding)
448 { 592 {
449 char charset[64]; 593 char charset[64];
450 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
463 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
464 break; 608 break;
465 609
466 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
467 } 611 }
612
613 free (registry);
614 free (encoding);
468 615
469 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
470 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
471 618
472 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
522 f = 0; 669 f = 0;
523 } 670 }
524} 671}
525 672
526bool 673bool
527rxvt_font_x11::has_codepoint (uint32_t unicode) 674rxvt_font_x11::has_codepoint (unicode_t unicode)
528{ 675{
529 uint32_t ch = FROM_UNICODE (cs, unicode); 676 uint32_t ch = FROM_UNICODE (cs, unicode);
530 677
531 if (ch == NOCHAR) 678 if (ch == NOCHAR)
532 return false; 679 return false;
… …
534 /* check wether the character exists in _this_ font. horrible. */ 681 /* check wether the character exists in _this_ font. horrible. */
535 XCharStruct *xcs; 682 XCharStruct *xcs;
536 683
537 if (encm) 684 if (encm)
538 { 685 {
539 int byte1 = ch >> 8; 686 unsigned char byte1 = ch >> 8;
540 int byte2 = ch & 255; 687 unsigned char byte2 = ch & 255;
541 688
542 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
543 || 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)
544 return false; 691 return false;
545 692
… …
568 715
569 return true; 716 return true;
570} 717}
571 718
572void 719void
573rxvt_font_x11::draw (int x, int y, 720rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
574 const text_t *text, int len, 721 const text_t *text, int len,
575 int fg, int bg) 722 int fg, int bg)
576{ 723{
577 // this looks like a mess /. 724 // this looks like a mess /.
578 // and it is a mess /. 725 // and it is a mess /.
… …
585 732
586 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
587 734
588 XGCValues v; 735 XGCValues v;
589 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
590 v.background = r->PixColors[bg];
591 v.font = f->fid; 737 v.font = f->fid;
592 738
593 if (enc2b) 739 if (enc2b)
594 { 740 {
595 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
596 742
597 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
598 { 744 {
745 v.background = r->PixColors[bg];
599 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
600 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
601 } 748 }
602 else 749 else
603 { 750 {
604 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);
605 752
606 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
607 754
608 if (slow) 755 if (slow)
609 { 756 {
610 do 757 do
611 { 758 {
612 if (xc->byte1 || xc->byte2) 759 if (xc->byte1 || xc->byte2)
613 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
614 761
615 x += r->TermWin.fwidth; 762 x += r->TermWin.fwidth;
616 xc++; len--; 763 xc++; len--;
617 } 764 }
618 while (len); 765 while (len);
619 } 766 }
620 else 767 else
621 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
622 } 769 }
623 } 770 }
624 else 771 else
625 { 772 {
626 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
627 774
628 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
629 { 776 {
777 v.background = r->PixColors[bg];
630 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
631 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
632 } 780 }
633 else 781 else
634 { 782 {
635 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);
636 784
637 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
638 786
639 if (slow) 787 if (slow)
640 { 788 {
641 do 789 do
642 { 790 {
643 if (*xc) 791 if (*xc)
644 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
645 793
646 x += r->TermWin.fwidth; 794 x += r->TermWin.fwidth;
647 xc++; len--; 795 xc++; len--;
648 } 796 }
649 while (len); 797 while (len);
650 } 798 }
651 else 799 else
652 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
653 } 801 }
654 } 802 }
655} 803}
656 804
657///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////
… …
662//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
663#define SWATHBITS 8 811#define SWATHBITS 8
664#endif 812#endif
665 813
666struct rxvt_font_xft : rxvt_font { 814struct rxvt_font_xft : rxvt_font {
667 rxvt_font_xft () { f = 0; d = 0; } 815 rxvt_font_xft () { f = 0; }
668 816
669 void clear (); 817 void clear ();
670 818
671 rxvt_fontprop properties (); 819 rxvt_fontprop properties ();
672 820
673 bool load (const rxvt_fontprop &prop); 821 bool load (const rxvt_fontprop &prop);
674 822
675 void draw (int x, int y, 823 void draw (rxvt_drawable &d, int x, int y,
676 const text_t *text, int len, 824 const text_t *text, int len,
677 int fg, int bg); 825 int fg, int bg);
678 826
679 bool has_codepoint (uint32_t unicode); 827 bool has_codepoint (unicode_t unicode);
680 828
681protected: 829protected:
682 XftFont *f; 830 XftFont *f;
683 XftDraw *d;
684}; 831};
685 832
686void 833void
687rxvt_font_xft::clear () 834rxvt_font_xft::clear ()
688{ 835{
689 if (f) 836 if (f)
690 { 837 {
691 XftFontClose (DISPLAY, f); 838 XftFontClose (DISPLAY, f);
692 f = 0; 839 f = 0;
693 } 840 }
694
695 if (d)
696 {
697 XftDrawDestroy (d);
698 d = 0;
699 }
700} 841}
701 842
702rxvt_fontprop 843rxvt_fontprop
703rxvt_font_xft::properties () 844rxvt_font_xft::properties ()
704{ 845{
705 rxvt_fontprop p; 846 rxvt_fontprop p;
706 847
707 FT_Face face = XftLockFace (f); 848 FT_Face face = XftLockFace (f);
708 849
709 p.width = width; p.height = height; 850 p.width = width;
710 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 851 p.height = height;
711 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;
712 856
713 XftUnlockFace (f); 857 XftUnlockFace (f);
714 858
715 return p; 859 return p;
716} 860}
… …
730 if (!p) 874 if (!p)
731 return false; 875 return false;
732 876
733 FcValue v; 877 FcValue v;
734 878
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881
735 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
736 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
737 884
738 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
739 FcPatternAddInteger (p, FC_SLANT, prop.slant); 886 FcPatternAddInteger (p, FC_SLANT, prop.slant);
740 887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890
891#if 0 // clipping unfortunately destroys our precious double-width-characters
741 // clip width, we can't do better, or can we? 892 // clip width, we can't do better, or can we?
742 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
743 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
744 895#endif
745 //FcPatternAddBool (p, FC_MINSPACE, 1);
746 896
747 XftResult result; 897 XftResult result;
748 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
749 899
750 FcPatternDestroy (p); 900 FcPatternDestroy (p);
… …
802 952
803 return true; 953 return true;
804} 954}
805 955
806bool 956bool
807rxvt_font_xft::has_codepoint (uint32_t unicode) 957rxvt_font_xft::has_codepoint (unicode_t unicode)
808{ 958{
809 return XftCharExists (DISPLAY, f, unicode); 959 return XftCharExists (DISPLAY, f, unicode);
810} 960}
811 961
812void 962void
813rxvt_font_xft::draw (int x, int y, 963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
814 const text_t *text, int len, 964 const text_t *text, int len,
815 int fg, int bg) 965 int fg, int bg)
816{ 966{
817 if (!d)
818 {
819 dR;
820 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
821 }
822
823 if (bg >= 0 && bg != Color_bg)
824 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
825 else
826 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);
827 968
828 if (!slow && width == r->TermWin.fwidth) 969 if (!slow && width == r->TermWin.fwidth && 0)
829 { 970 {
830 if (sizeof (text_t) == sizeof (FcChar16)) 971 if (sizeof (text_t) == sizeof (FcChar16))
831 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);
832 else 973 else
833 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 974 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
836 { 977 {
837 while (len) 978 while (len)
838 { 979 {
839 if (*text != NOCHAR && *text != ' ') 980 if (*text != NOCHAR && *text != ' ')
840 { 981 {
982 int fwidth = r->TermWin.fwidth;
983 if (len >= 2 && text[1] == NOCHAR)
984 fwidth *= 2;
985
986 XGlyphInfo extents;
841 if (sizeof (text_t) == sizeof (FcChar16)) 987 if (sizeof (text_t) == sizeof (FcChar16))
842 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 988 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
990 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
992 }
843 else 993 else
844 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 994 {
995 XGlyphInfo extents;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
997 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
999 }
845 } 1000 }
846 1001
847 x += r->TermWin.fwidth; 1002 x += r->TermWin.fwidth;
848 text++; 1003 text++;
849 len--; 1004 len--;
… …
853#endif 1008#endif
854 1009
855///////////////////////////////////////////////////////////////////////////// 1010/////////////////////////////////////////////////////////////////////////////
856 1011
857rxvt_fontset::rxvt_fontset (rxvt_t r) 1012rxvt_fontset::rxvt_fontset (rxvt_t r)
858#ifdef EXPLICIT_CONTEXT 1013: r (r), fontdesc (0)
859: r(r)
860#endif
861{ 1014{
862 clear (); 1015 clear ();
863} 1016}
864 1017
865rxvt_fontset::~rxvt_fontset () 1018rxvt_fontset::~rxvt_fontset ()
… …
868} 1021}
869 1022
870void 1023void
871rxvt_fontset::clear () 1024rxvt_fontset::clear ()
872{ 1025{
873 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
874 FONT_UNREF (*i); 1027 FONT_UNREF (*i);
1028
1029 free (fontdesc); fontdesc = 0;
875 1030
876 fonts.clear (); 1031 fonts.clear ();
877 base_id = 0; 1032 base_id = 0;
878 base_prop.height = 0x7fffffff; 1033 base_prop.height = 0x7fffffff;
879 base_prop.weight = rxvt_fontprop::medium; 1034 base_prop.weight = rxvt_fontprop::medium;
… …
905 f = new rxvt_font_x11; 1060 f = new rxvt_font_x11;
906 } 1061 }
907 else 1062 else
908 f = new rxvt_font_x11; 1063 f = new rxvt_font_x11;
909 1064
1065 f->fs = this;
910 f->set_term (r); 1066 f->set_term (r);
911 f->set_name (strdup (name)); 1067 f->set_name (strdup (name));
912 1068
913 f->cs = cs; 1069 f->cs = cs;
914 f->loaded = false; 1070 f->loaded = false;
… …
932 1088
933 if (*desc == '[') 1089 if (*desc == '[')
934 { 1090 {
935 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
936 1092
937 const char *extra = desc++; 1093 //const char *extra = desc++; // not yet used
938 1094
939 desc = strchr (desc, ']'); 1095 desc = strchr (desc, ']');
940 1096
941 if (!desc) 1097 if (!desc)
942 { 1098 {
… …
981 } 1137 }
982 1138
983 return true; 1139 return true;
984} 1140}
985 1141
986void 1142bool
987rxvt_fontset::populate (const char *desc) 1143rxvt_fontset::populate (const char *desc)
988{ 1144{
989 clear (); 1145 clear ();
1146
1147 fontdesc = strdup (desc);
990 1148
991 fonts.push_back (new_font (0, CS_UNICODE)); 1149 fonts.push_back (new_font (0, CS_UNICODE));
992 realize_font (0); 1150 realize_font (0);
993 1151
994 add_fonts (desc); 1152 add_fonts (desc);
995 1153
996 if (!base_id) 1154 if (!base_id)
997 base_id = 1; 1155 base_id = 1;
998 1156
999 // we currently need a base-font, no matter what 1157 // we currently need a base-font, no matter what
1000 if (fonts.size () <= base_id || !realize_font (base_id)) 1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1001 { 1159 {
1160 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1002 add_fonts ("fixed"); 1161 add_fonts ("fixed");
1003 base_id = fonts.size () - 1; 1162 base_id = fonts.size () - 1;
1004 } 1163 }
1005 1164
1006 if (fonts.size () <= base_id || !realize_font (base_id)) 1165 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1007 { 1166 return false;
1008 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1009 exit (1);
1010 }
1011 1167
1012 base_prop = fonts[base_id]->properties (); 1168 base_prop = fonts[base_id]->properties ();
1169
1170 return true;
1013} 1171}
1014 1172
1015int 1173int
1016rxvt_fontset::find_font (uint32_t unicode) 1174rxvt_fontset::find_font (const char *name) const
1017{ 1175{
1018 for (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
1183int
1184rxvt_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++)
1019 { 1190 {
1020 rxvt_font *f = fonts[i]; 1191 rxvt_font *f = fonts[i];
1021 1192
1022 if (!f->loaded) 1193 if (!f->loaded)
1023 { 1194 {
… …
1026 1197
1027 if (!realize_font (i)) 1198 if (!realize_font (i))
1028 goto next_font; 1199 goto next_font;
1029 } 1200 }
1030 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
1031 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1208 if (f->has_codepoint (unicode))
1032 return i; 1209 return i;
1033 1210
1034 next_font: 1211 next_font:
1035 if (i == fonts.size () - 1 && fallback->name) 1212 if (i == fonts.size () - 1)
1213 {
1214 if (fallback->name)
1036 { 1215 {
1216 // search through the fallback list
1037 fonts.push_back (new_font (fallback->name, fallback->cs)); 1217 fonts.push_back (new_font (fallback->name, fallback->cs));
1038 fallback++; 1218 fallback++;
1039 i = 0;
1040 } 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 }
1041 } 1266 }
1267
1268 // if no bold font found, use a regular one
1269 if (bold)
1270 return find_font (unicode);
1042 1271
1043 return 0; /* we must return SOME font */ 1272 return 0; /* we must return SOME font */
1044} 1273}
1045 1274
1046 1275

Diff Legend

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