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.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 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, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
67 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
68 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
69#endif 68#endif
70 69
71#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
72# if XFT 71# if XFT
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# endif 76# endif
77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 89#endif
87 90
88#if XFT 91#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
91#endif 95#endif
92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
98 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
99}; 106};
100 107
101///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
102 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_drawable::operator XftDraw *()
118{
119 if (!xftdrawable)
120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
121
122 return xftdrawable;
123}
124#endif
125
126/////////////////////////////////////////////////////////////////////////////
127
103static void *enc_buf; 128static void *enc_buf;
104static uint32_t enc_len; 129static uint32_t enc_len;
105 130
106static inline void * 131static inline void *
107get_enc_buf (int len) 132get_enc_buf (uint32_t len)
108{ 133{
109 if (len > enc_len) 134 if (len > enc_len)
110 { 135 {
111 free (enc_buf); 136 free (enc_buf);
112 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
114 139
115 return enc_buf; 140 return enc_buf;
116} 141}
117 142
118static const char * 143static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 145{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 147
123 while (len--) 148 while (len--)
124 { 149 {
… …
135 160
136 return (const char *)enc_buf; 161 return (const char *)enc_buf;
137} 162}
138 163
139static const XChar2b * 164static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 166{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 168
144 while (len--) 169 while (len--)
145 { 170 {
… …
160} 185}
161 186
162///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
163 188
164void 189void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 190rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 191{
167 if (color == Color_bg) 192 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 194 else if (color >= 0)
170 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
173 } 202 }
174} 203}
175 204
176static const char *linedraw_cmds[128] = { 205#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 206
227struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
228 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
229 { 210 {
230 rxvt_fontprop p; 211 rxvt_fontprop p;
231 212
232 p.height = 1; 213 p.width = p.height = 1;
233 p.weight = rxvt_fontprop::medium; 214 p.weight = rxvt_fontprop::medium;
234 p.slant = rxvt_fontprop::roman; 215 p.slant = rxvt_fontprop::roman;
235 216
236 return p; 217 return p;
237 } 218 }
… …
239 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
240 { 221 {
241 width = 1; height = 1; 222 width = 1; height = 1;
242 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
243 224
225 set_name (strdup ("built-in pseudofont"));
226
244 return true; 227 return true;
245 } 228 }
246 229
247 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
248 { 231 {
249 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
250 return true; 233 return true;
251 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
252 return true; 239 return true;
253 240
254 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
255 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
256 return true; 245 return true;
257 246
258 switch (unicode) 247 switch (unicode)
259 { 248 {
260 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
262 } 251 }
263 252
264 return false; 253 return false;
265 } 254 }
266 255
267 void draw (int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 257 const text_t *text, int len,
269 int fg, int bg); 258 int fg, int bg);
270}; 259};
271 260
272void 261void
273rxvt_font_default::draw (int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 263 const text_t *text, int len,
275 int fg, int bg) 264 int fg, int bg)
276{ 265{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 267
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280 269
281 while (len--) 270 while (len--)
282 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
283 text_t t = *text++; 275 text_t t = *text++;
284 276
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 277 if (0x2500 <= t && t <= 0x259f)
278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
286 { 290 {
287 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
288 294
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 295 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; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
291 297
292 XGCValues gcv; 298 XGCValues gcv;
293 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
294 while (*p) 304 while (a < b)
295 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
296 switch (*p++) 316 switch (op)
297 { 317 {
298 case '1': 318 case 0: // line
299 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301 break; 320 break;
302 321
303 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
304 gcv.line_width = 2; 342 gcv.stipple = 0;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 343 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
306 break; 346 break;
307 347 case 2: // arc
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 351 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 } 352 }
315 } 353 }
316 354 }
317 gcv.line_width = 0; 355#if ENABLE_COMBINING
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 357 {
358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
360 if (cc->c2 != NOCHAR)
361 {
362 // prefer font of first character, for no good reasons
363 rxvt_font *f2 = f1->has_codepoint (cc->c2)
364 ? f1
365 : (*fs)[fs->find_font (cc->c2)];
366
367 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
368 }
369 }
370#endif
320 else 371 else
321 switch (*text++) 372 switch (t)
322 { 373 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
325 break; 375 break;
376
326 default: 377 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 378 int w = 0;
379 while (len > 0 && *text == NOCHAR)
380 {
381 ++text;
382 --len;
383 w += r->TermWin.fwidth;
384 }
385
386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
388 x += w;
328 } 389 }
329 390
330 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
331 } 392 }
332} 393}
… …
337 rxvt_font_x11 () { f = 0; } 398 rxvt_font_x11 () { f = 0; }
338 399
339 void clear (); 400 void clear ();
340 401
341 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
342 rxvt_fontprop properties (XFontStruct *f);
343 403
344 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
345 405
346 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
347 407
348 void draw (int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 409 const text_t *text, int len,
350 int fg, int bg); 410 int fg, int bg);
351 411
352 XFontStruct *f; 412 XFontStruct *f;
353 codeset cs; 413 codeset cs;
354 bool enc2b, encm; 414 bool enc2b, encm;
355 415
356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
419 bool set_properties (rxvt_fontprop &p, const char *name);
357}; 420};
358 421
359const char * 422char *
360rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
361{ 424{
362 unsigned long value; 425 unsigned long value;
363 426
364 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
365 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
366 else 429 else
367 return repl; 430 return rxvt_strdup (repl);
368} 431}
369 432
370rxvt_fontprop 433rxvt_fontprop
371rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
372{ 435{
373 return properties (f);
374}
375
376rxvt_fontprop
377rxvt_font_x11::properties (XFontStruct *f)
378{
379 rxvt_fontprop p; 436 rxvt_fontprop p;
437 set_properties (p, f);
438 return p;
439}
380 440
381 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 441bool
382 const char *slant = get_property (f, "SLANT", "r"); 442rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
383 443{
444 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
384 p.height = height; 445 p.height = height;
385 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 446 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
386 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 447 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
387 448
388 return p; 449 return true;
450}
451
452bool
453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
454{
455 unsigned long height;
456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
457 return false;
458
459 unsigned long avgwidth;
460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
461 avgwidth = 0;
462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
472}
473
474bool
475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
476{
477 int slashes = 0;
478 const char *comp[13];
479
480 for (const char *c = name; *c; c++)
481 if (*c == '-')
482 {
483 comp[slashes++] = c + 1;
484 if (slashes >= 13)
485 break;
486 }
487
488 /* can we short-circuit the costly XLoadQueryFont? */
489 if (slashes >= 13
490 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
491 && (*comp[11] >= '0' && *comp[11] <= '9'))
492 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
493
494 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
495
496 if (f)
497 {
498 // the font should really exist now. if not, we have a problem
499 // (e.g. if the user did xset fp rehash just when we were searching fonts).
500 // in that case, just return garbage.
501 bool ret = set_properties (p, f);
502 XFreeFont (DISPLAY, f);
503 return ret;
504 }
505 else
506 return false;
507}
508
509// fix the size of scalable fonts
510static void
511fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
512{
513 int slashes = 0;
514 const char *size;
515
516 for (const char *c = name; *c; c++)
517 if (*c == '-')
518 {
519 if (slashes == 6)
520 size = c + 1;
521
522 if (++slashes >= 13)
523 break;
524 }
525
526 if (slashes >= 13 && size[0] == '0')
527 {
528 strncpy (buf, name, size - name);
529 buf += size - name;
530 buf += sprintf (buf, "%d", prop.height);
531 strcpy (buf, size + 1);
532 }
533 else
534 strcpy (buf, name);
389} 535}
390 536
391bool 537bool
392rxvt_font_x11::load (const rxvt_fontprop &prop) 538rxvt_font_x11::load (const rxvt_fontprop &prop)
393{ 539{
394 clear (); 540 clear ();
395 541
396 char **list; 542 char **list;
397 int count; 543 int count;
398 XFontStruct *info;
399 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 544 list = XListFonts (DISPLAY, name, 512, &count);
545 set_name (0);
400 546
401 if (!list) 547 if (!list)
402 return false; 548 return false;
403 549
404 int bestdiff = 0x7fffffff; 550 int bestdiff = 0x7fffffff;
405 XFontStruct *best = 0;
406 for (int i = 0; i < count; i++) 551 for (int i = 0; i < count; i++)
407 { 552 {
408 XFontStruct *f = info + i; 553 rxvt_fontprop p;
554 char fname[1024];
555 fix_scalable (fname, list[i], prop);
409 556
557 if (!set_properties (p, fname))
558 continue;
559
410 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 560 if (p.height > prop.height) // weed out too large fonts
411 { 561 continue;
412 rxvt_fontprop p = properties (f); 562
413 int diff = (prop.height - f->ascent + f->descent) * 32 563 int diff = (prop.height - p.height) * 32
414 + abs (prop.weight - p.weight) 564 + abs (prop.weight - p.weight)
415 + abs (prop.slant - p.slant ); 565 + abs (prop.slant - p.slant );
416 566
417 if (!best // compare against best found so far 567 if (!name // compare against best found so far
418 || diff < bestdiff) 568 || diff < bestdiff)
419 { 569 {
420 best = f; 570 set_name (strdup (fname));
421 bestdiff = diff; 571 bestdiff = diff;
422 } 572 }
423 }
424 } 573 }
425 574
575 XFreeFontNames (list);
576
426 if (!best) 577 if (!name)
427 return false; 578 return false;
428
429 set_name (strdup (list[best - info]));
430
431 XFreeFontInfo (list, info, count);
432 579
433 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
434 581
435 if (!f) 582 if (!f)
436 return false; 583 return false;
437 584
438 unsigned long value;
439
440 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
441 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
442 587
443 if (registry && encoding) 588 if (registry && encoding)
444 { 589 {
445 char charset[64]; 590 char charset[64];
446 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
459 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
460 break; 605 break;
461 606
462 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
463 } 608 }
609
610 free (registry);
611 free (encoding);
464 612
465 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
466 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
467 615
468 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
518 f = 0; 666 f = 0;
519 } 667 }
520} 668}
521 669
522bool 670bool
523rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
524{ 672{
525 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
526 674
527 if (ch == NOCHAR) 675 if (ch == NOCHAR)
528 return false; 676 return false;
… …
530 /* check wether the character exists in _this_ font. horrible. */ 678 /* check wether the character exists in _this_ font. horrible. */
531 XCharStruct *xcs; 679 XCharStruct *xcs;
532 680
533 if (encm) 681 if (encm)
534 { 682 {
535 int byte1 = ch >> 8; 683 unsigned char byte1 = ch >> 8;
536 int byte2 = ch & 255; 684 unsigned char byte2 = ch & 255;
537 685
538 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 686 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
539 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 687 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
540 return false; 688 return false;
541 689
… …
564 712
565 return true; 713 return true;
566} 714}
567 715
568void 716void
569rxvt_font_x11::draw (int x, int y, 717rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
570 const text_t *text, int len, 718 const text_t *text, int len,
571 int fg, int bg) 719 int fg, int bg)
572{ 720{
573 // this looks like a mess /. 721 // this looks like a mess /.
574 // and it is a mess /. 722 // and it is a mess /.
… …
581 729
582 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
583 731
584 XGCValues v; 732 XGCValues v;
585 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
586 v.background = r->PixColors[bg];
587 v.font = f->fid; 734 v.font = f->fid;
588 735
589 if (enc2b) 736 if (enc2b)
590 { 737 {
591 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
592 739
593 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
594 { 741 {
742 v.background = r->PixColors[bg];
595 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
596 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
597 } 745 }
598 else 746 else
599 { 747 {
600 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
601 749
602 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
603 751
604 if (slow) 752 if (slow)
605 { 753 {
606 do 754 do
607 { 755 {
608 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
609 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
610 758
611 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
612 xc++; len--; 760 xc++; len--;
613 } 761 }
614 while (len); 762 while (len);
615 } 763 }
616 else 764 else
617 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
618 } 766 }
619 } 767 }
620 else 768 else
621 { 769 {
622 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
623 771
624 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
625 { 773 {
774 v.background = r->PixColors[bg];
626 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
627 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
628 } 777 }
629 else 778 else
630 { 779 {
631 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
632 781
633 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
634 783
635 if (slow) 784 if (slow)
636 { 785 {
637 do 786 do
638 { 787 {
639 if (*xc) 788 if (*xc)
640 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
641 790
642 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
643 xc++; len--; 792 xc++; len--;
644 } 793 }
645 while (len); 794 while (len);
646 } 795 }
647 else 796 else
648 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
649 } 798 }
650 } 799 }
651} 800}
652 801
653///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
658//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 807//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659#define SWATHBITS 8 808#define SWATHBITS 8
660#endif 809#endif
661 810
662struct rxvt_font_xft : rxvt_font { 811struct rxvt_font_xft : rxvt_font {
663#if 0
664 enum {
665 SWATHCOUNT = 1 << (21 - UNIBITS),
666 SWATHSIZE = 1 << (SWATHBITS - 5)
667 };
668 typedef uint32_t swath[SWATHSIZE];
669
670 swath *cvr[SWATHCOUNT];
671#endif
672
673#if 0
674 void gen_coverage_swath (unsigned int page);
675
676 bool has_char (uint32_t ch)
677 {
678 unsigned int page = ch >> SWATHBITS;
679 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
680
681 if (page >= SWATHCOUNT)
682 return false;
683
684 if (!cvr[page]) gen_coverage_swath (page);
685
686 return cvr[page][idx >> 5] & (1 << (idx & 31));
687 }
688#endif
689 rxvt_font_xft () { f = 0; d = 0; } 812 rxvt_font_xft () { f = 0; }
690 813
691 void clear (); 814 void clear ();
692 815
693 rxvt_fontprop properties (); 816 rxvt_fontprop properties ();
694 817
695 bool load (const rxvt_fontprop &prop); 818 bool load (const rxvt_fontprop &prop);
696 819
697 void draw (int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
698 const text_t *text, int len, 821 const text_t *text, int len,
699 int fg, int bg); 822 int fg, int bg);
700 823
701 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
702 825
703protected: 826protected:
704 XftFont *f; 827 XftFont *f;
705 XftDraw *d;
706
707#if 0
708 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
709 void set_swath (uint32_t ch)
710 {
711 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
712 }
713#endif
714}; 828};
715 829
716void 830void
717rxvt_font_xft::clear () 831rxvt_font_xft::clear ()
718{ 832{
719 if (f) 833 if (f)
720 { 834 {
721 XftFontClose (DISPLAY, f); 835 XftFontClose (DISPLAY, f);
722 f = 0; 836 f = 0;
723 } 837 }
724
725 if (d)
726 {
727 XftDrawDestroy (d);
728 d = 0;
729 }
730
731#if 0
732 for (int i = 0; i < SWATHCOUNT; i++)
733 delete cvr[i];
734#endif
735} 838}
736 839
737rxvt_fontprop 840rxvt_fontprop
738rxvt_font_xft::properties () 841rxvt_font_xft::properties ()
739{ 842{
740 rxvt_fontprop p; 843 rxvt_fontprop p;
741 844
742 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
743 846
744 p.height = height; 847 p.width = width; p.height = height;
745 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
746 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 849 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747 850
748 XftUnlockFace (f); 851 XftUnlockFace (f);
749 852
… …
770 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 873 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
771 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 874 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772 875
773 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 876 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774 FcPatternAddInteger (p, FC_SLANT, prop.slant); 877 FcPatternAddInteger (p, FC_SLANT, prop.slant);
878
879#if 0 // clipping unfortunately destroys our precious double-width-characters
880 // clip width, we can't do better, or can we?
881 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
882 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
883#endif
775 884
776 //FcPatternAddBool (p, FC_MINSPACE, 1); 885 //FcPatternAddBool (p, FC_MINSPACE, 1);
777 886
778 XftResult result; 887 XftResult result;
779 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 888 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
… …
832 XftUnlockFace (f); 941 XftUnlockFace (f);
833 942
834 return true; 943 return true;
835} 944}
836 945
837#if 0
838void rxvt_font::gen_coverage_swath (unsigned int page)
839{
840 cvr[page] = new swath;
841
842 for (int i = 0; i < SWATHSIZE; i++)
843 cvr[page][i] = 0;
844
845 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
846}
847#endif
848
849bool 946bool
850rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
851{ 948{
852 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
853} 950}
854 951
855void 952void
856rxvt_font_xft::draw (int x, int y, 953rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
857 const text_t *text, int len, 954 const text_t *text, int len,
858 int fg, int bg) 955 int fg, int bg)
859{ 956{
860 if (!d)
861 {
862 dR;
863 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
864 }
865
866 if (bg >= 0 && bg != Color_bg)
867 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
868 else
869 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 957 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870 958
871 if (!slow && width == r->TermWin.fwidth) 959 if (!slow && width == r->TermWin.fwidth && 0)
872 { 960 {
873 if (sizeof (text_t) == sizeof (FcChar16)) 961 if (sizeof (text_t) == sizeof (FcChar16))
874 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 962 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
875 else 963 else
876 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 964 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
879 { 967 {
880 while (len) 968 while (len)
881 { 969 {
882 if (*text != NOCHAR && *text != ' ') 970 if (*text != NOCHAR && *text != ' ')
883 { 971 {
972 int fwidth = r->TermWin.fwidth;
973 if (len >= 2 && text[1] == NOCHAR)
974 fwidth *= 2;
975
976 XGlyphInfo extents;
884 if (sizeof (text_t) == sizeof (FcChar16)) 977 if (sizeof (text_t) == sizeof (FcChar16))
885 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 978 {
979 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
980 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
981 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
982 }
886 else 983 else
887 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 984 {
985 XGlyphInfo extents;
986 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
987 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
988 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
989 }
888 } 990 }
889 991
890 x += r->TermWin.fwidth; 992 x += r->TermWin.fwidth;
891 text++; 993 text++;
892 len--; 994 len--;
… …
896#endif 998#endif
897 999
898///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
899 1001
900rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
901#ifdef EXPLICIT_CONTEXT 1003: r (r), fontdesc (0)
902: r(r)
903#endif
904{ 1004{
905 clear (); 1005 clear ();
906} 1006}
907 1007
908rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
911} 1011}
912 1012
913void 1013void
914rxvt_fontset::clear () 1014rxvt_fontset::clear ()
915{ 1015{
916 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
917 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
918 1020
919 fonts.clear (); 1021 fonts.clear ();
920 base_id = 0; 1022 base_id = 0;
921 base_prop.height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
922 base_prop.weight = rxvt_fontprop::medium; 1024 base_prop.weight = rxvt_fontprop::medium;
… …
948 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
949 } 1051 }
950 else 1052 else
951 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
952 1054
1055 f->fs = this;
953 f->set_term (r); 1056 f->set_term (r);
954 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
955 1058
956 f->cs = cs; 1059 f->cs = cs;
957 f->loaded = false; 1060 f->loaded = false;
… …
975 1078
976 if (*desc == '[') 1079 if (*desc == '[')
977 { 1080 {
978 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1081 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
979 1082
980 const char *extra = desc++; 1083 //const char *extra = desc++; // not yet used
981 1084
982 desc = strchr (desc, ']'); 1085 desc = strchr (desc, ']');
983 1086
984 if (!desc) 1087 if (!desc)
985 { 1088 {
… …
1024 } 1127 }
1025 1128
1026 return true; 1129 return true;
1027} 1130}
1028 1131
1029void 1132bool
1030rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
1031{ 1134{
1032 clear (); 1135 clear ();
1136
1137 fontdesc = strdup (desc);
1033 1138
1034 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
1035 realize_font (0); 1140 realize_font (0);
1036 1141
1037 add_fonts (desc); 1142 add_fonts (desc);
1038 1143
1039 if (!base_id) 1144 if (!base_id)
1040 base_id = 1; 1145 base_id = 1;
1041 1146
1042 // we currently need a base-font, no matter what 1147 // we currently need a base-font, no matter what
1043 if (fonts.size () <= base_id || !realize_font (base_id)) 1148 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1044 { 1149 {
1150 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1045 add_fonts ("fixed"); 1151 add_fonts ("fixed");
1046 base_id = fonts.size () - 1; 1152 base_id = fonts.size () - 1;
1047 } 1153 }
1048 1154
1049 if (fonts.size () <= base_id || !realize_font (base_id)) 1155 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1050 { 1156 return false;
1051 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1052 exit (1);
1053 }
1054 1157
1055 base_prop = fonts[base_id]->properties (); 1158 base_prop = fonts[base_id]->properties ();
1159
1160 return true;
1056} 1161}
1057 1162
1058int 1163int
1059rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
1060{ 1165{
1061 for (int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
1062 { 1169 {
1063 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
1064 1171
1065 if (!f->loaded) 1172 if (!f->loaded)
1066 { 1173 {

Diff Legend

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