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.55 by root, Mon Jul 26 14:57:12 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" },
97 { CS_UNICODE, "xft:FreeMono" },
91#endif 98#endif
92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 103
104#if UNICODE_3 && XFT
105 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
106#endif
107
98 { CS_UNKNOWN, 0 } 108 { CS_UNKNOWN, 0 }
99}; 109};
100 110
101///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
102 112
113#if XFT
114rxvt_drawable::~rxvt_drawable ()
115{
116 if (xftdrawable)
117 XftDrawDestroy (xftdrawable);
118}
119
120rxvt_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
103static void *enc_buf; 131static void *enc_buf;
104static uint32_t enc_len; 132static uint32_t enc_len;
105 133
106static inline void * 134static inline void *
107get_enc_buf (int len) 135get_enc_buf (uint32_t len)
108{ 136{
109 if (len > enc_len) 137 if (len > enc_len)
110 { 138 {
111 free (enc_buf); 139 free (enc_buf);
112 enc_buf = malloc (len); 140 enc_buf = malloc (len);
… …
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.height = 1; 216 p.width = p.height = 1;
233 p.weight = rxvt_fontprop::medium; 217 p.weight = rxvt_fontprop::medium;
234 p.slant = rxvt_fontprop::roman; 218 p.slant = rxvt_fontprop::roman;
235 219
236 return p; 220 return p;
237 } 221 }
… …
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{
447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
384 p.height = height; 448 p.height = height;
385 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;
386 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;
387 451
388 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);
389} 538}
390 539
391bool 540bool
392rxvt_font_x11::load (const rxvt_fontprop &prop) 541rxvt_font_x11::load (const rxvt_fontprop &prop)
393{ 542{
394 clear (); 543 clear ();
395 544
396 char **list; 545 char **list;
397 int count; 546 int count;
398 XFontStruct *info;
399 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 547 list = XListFonts (DISPLAY, name, 512, &count);
548 set_name (0);
400 549
401 if (!list) 550 if (!list)
402 return false; 551 return false;
403 552
404 int bestdiff = 0x7fffffff; 553 int bestdiff = 0x7fffffff;
405 XFontStruct *best = 0;
406 for (int i = 0; i < count; i++) 554 for (int i = 0; i < count; i++)
407 { 555 {
408 XFontStruct *f = info + i; 556 rxvt_fontprop p;
557 char fname[1024];
558 fix_scalable (fname, list[i], prop);
409 559
560 if (!set_properties (p, fname))
561 continue;
562
410 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 563 if (p.height > prop.height) // weed out too large fonts
411 { 564 continue;
412 rxvt_fontprop p = properties (f); 565
413 int diff = (prop.height - f->ascent + f->descent) * 32 566 int diff = (prop.height - p.height) * 32
414 + abs (prop.weight - p.weight) 567 + abs (prop.weight - p.weight)
415 + abs (prop.slant - p.slant ); 568 + abs (prop.slant - p.slant );
416 569
417 if (!best // compare against best found so far 570 if (!name // compare against best found so far
418 || diff < bestdiff) 571 || diff < bestdiff)
419 { 572 {
420 best = f; 573 set_name (strdup (fname));
421 bestdiff = diff; 574 bestdiff = diff;
422 } 575 }
423 }
424 } 576 }
425 577
578 XFreeFontNames (list);
579
426 if (!best) 580 if (!name)
427 return false; 581 return false;
428
429 set_name (strdup (list[best - info]));
430
431 XFreeFontInfo (list, info, count);
432 582
433 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
434 584
435 if (!f) 585 if (!f)
436 return false; 586 return false;
437 587
438 unsigned long value;
439
440 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
441 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
442 590
443 if (registry && encoding) 591 if (registry && encoding)
444 { 592 {
445 char charset[64]; 593 char charset[64];
446 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
459 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
460 break; 608 break;
461 609
462 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
463 } 611 }
612
613 free (registry);
614 free (encoding);
464 615
465 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
466 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
467 618
468 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
518 f = 0; 669 f = 0;
519 } 670 }
520} 671}
521 672
522bool 673bool
523rxvt_font_x11::has_codepoint (uint32_t unicode) 674rxvt_font_x11::has_codepoint (unicode_t unicode)
524{ 675{
525 uint32_t ch = FROM_UNICODE (cs, unicode); 676 uint32_t ch = FROM_UNICODE (cs, unicode);
526 677
527 if (ch == NOCHAR) 678 if (ch == NOCHAR)
528 return false; 679 return false;
… …
530 /* check wether the character exists in _this_ font. horrible. */ 681 /* check wether the character exists in _this_ font. horrible. */
531 XCharStruct *xcs; 682 XCharStruct *xcs;
532 683
533 if (encm) 684 if (encm)
534 { 685 {
535 int byte1 = ch >> 8; 686 unsigned char byte1 = ch >> 8;
536 int byte2 = ch & 255; 687 unsigned char byte2 = ch & 255;
537 688
538 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
539 || 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)
540 return false; 691 return false;
541 692
… …
564 715
565 return true; 716 return true;
566} 717}
567 718
568void 719void
569rxvt_font_x11::draw (int x, int y, 720rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
570 const text_t *text, int len, 721 const text_t *text, int len,
571 int fg, int bg) 722 int fg, int bg)
572{ 723{
573 // this looks like a mess /. 724 // this looks like a mess /.
574 // and it is a mess /. 725 // and it is a mess /.
… …
581 732
582 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
583 734
584 XGCValues v; 735 XGCValues v;
585 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
586 v.background = r->PixColors[bg];
587 v.font = f->fid; 737 v.font = f->fid;
588 738
589 if (enc2b) 739 if (enc2b)
590 { 740 {
591 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
592 742
593 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
594 { 744 {
745 v.background = r->PixColors[bg];
595 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
596 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
597 } 748 }
598 else 749 else
599 { 750 {
600 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);
601 752
602 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
603 754
604 if (slow) 755 if (slow)
605 { 756 {
606 do 757 do
607 { 758 {
608 if (xc->byte1 || xc->byte2) 759 if (xc->byte1 || xc->byte2)
609 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
610 761
611 x += r->TermWin.fwidth; 762 x += r->TermWin.fwidth;
612 xc++; len--; 763 xc++; len--;
613 } 764 }
614 while (len); 765 while (len);
615 } 766 }
616 else 767 else
617 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
618 } 769 }
619 } 770 }
620 else 771 else
621 { 772 {
622 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
623 774
624 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
625 { 776 {
777 v.background = r->PixColors[bg];
626 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
627 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
628 } 780 }
629 else 781 else
630 { 782 {
631 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);
632 784
633 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
634 786
635 if (slow) 787 if (slow)
636 { 788 {
637 do 789 do
638 { 790 {
639 if (*xc) 791 if (*xc)
640 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
641 793
642 x += r->TermWin.fwidth; 794 x += r->TermWin.fwidth;
643 xc++; len--; 795 xc++; len--;
644 } 796 }
645 while (len); 797 while (len);
646 } 798 }
647 else 799 else
648 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
649 } 801 }
650 } 802 }
651} 803}
652 804
653///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////
… …
658//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659#define SWATHBITS 8 811#define SWATHBITS 8
660#endif 812#endif
661 813
662struct rxvt_font_xft : rxvt_font { 814struct 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; } 815 rxvt_font_xft () { f = 0; }
690 816
691 void clear (); 817 void clear ();
692 818
693 rxvt_fontprop properties (); 819 rxvt_fontprop properties ();
694 820
695 bool load (const rxvt_fontprop &prop); 821 bool load (const rxvt_fontprop &prop);
696 822
697 void draw (int x, int y, 823 void draw (rxvt_drawable &d, int x, int y,
698 const text_t *text, int len, 824 const text_t *text, int len,
699 int fg, int bg); 825 int fg, int bg);
700 826
701 bool has_codepoint (uint32_t unicode); 827 bool has_codepoint (unicode_t unicode);
702 828
703protected: 829protected:
704 XftFont *f; 830 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}; 831};
715 832
716void 833void
717rxvt_font_xft::clear () 834rxvt_font_xft::clear ()
718{ 835{
719 if (f) 836 if (f)
720 { 837 {
721 XftFontClose (DISPLAY, f); 838 XftFontClose (DISPLAY, f);
722 f = 0; 839 f = 0;
723 } 840 }
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} 841}
736 842
737rxvt_fontprop 843rxvt_fontprop
738rxvt_font_xft::properties () 844rxvt_font_xft::properties ()
739{ 845{
740 rxvt_fontprop p; 846 rxvt_fontprop p;
741 847
742 FT_Face face = XftLockFace (f); 848 FT_Face face = XftLockFace (f);
743 849
744 p.height = height; 850 p.width = width; p.height = height;
745 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 851 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; 852 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747 853
748 XftUnlockFace (f); 854 XftUnlockFace (f);
749 855
… …
770 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 876 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
771 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 877 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772 878
773 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774 FcPatternAddInteger (p, FC_SLANT, prop.slant); 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
775 887
776 //FcPatternAddBool (p, FC_MINSPACE, 1); 888 //FcPatternAddBool (p, FC_MINSPACE, 1);
777 889
778 XftResult result; 890 XftResult result;
779 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 891 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
… …
832 XftUnlockFace (f); 944 XftUnlockFace (f);
833 945
834 return true; 946 return true;
835} 947}
836 948
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 949bool
850rxvt_font_xft::has_codepoint (uint32_t unicode) 950rxvt_font_xft::has_codepoint (unicode_t unicode)
851{ 951{
852 return XftCharExists (DISPLAY, f, unicode); 952 return XftCharExists (DISPLAY, f, unicode);
853} 953}
854 954
855void 955void
856rxvt_font_xft::draw (int x, int y, 956rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
857 const text_t *text, int len, 957 const text_t *text, int len,
858 int fg, int bg) 958 int fg, int bg)
859{ 959{
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); 960 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870 961
871 if (!slow && width == r->TermWin.fwidth) 962 if (!slow && width == r->TermWin.fwidth && 0)
872 { 963 {
873 if (sizeof (text_t) == sizeof (FcChar16)) 964 if (sizeof (text_t) == sizeof (FcChar16))
874 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);
875 else 966 else
876 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);
… …
879 { 970 {
880 while (len) 971 while (len)
881 { 972 {
882 if (*text != NOCHAR && *text != ' ') 973 if (*text != NOCHAR && *text != ' ')
883 { 974 {
975 int fwidth = r->TermWin.fwidth;
976 if (len >= 2 && text[1] == NOCHAR)
977 fwidth *= 2;
978
979 XGlyphInfo extents;
884 if (sizeof (text_t) == sizeof (FcChar16)) 980 if (sizeof (text_t) == sizeof (FcChar16))
885 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 }
886 else 986 else
887 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 }
888 } 993 }
889 994
890 x += r->TermWin.fwidth; 995 x += r->TermWin.fwidth;
891 text++; 996 text++;
892 len--; 997 len--;
… …
896#endif 1001#endif
897 1002
898///////////////////////////////////////////////////////////////////////////// 1003/////////////////////////////////////////////////////////////////////////////
899 1004
900rxvt_fontset::rxvt_fontset (rxvt_t r) 1005rxvt_fontset::rxvt_fontset (rxvt_t r)
901#ifdef EXPLICIT_CONTEXT 1006: r (r), fontdesc (0)
902: r(r)
903#endif
904{ 1007{
905 clear (); 1008 clear ();
906} 1009}
907 1010
908rxvt_fontset::~rxvt_fontset () 1011rxvt_fontset::~rxvt_fontset ()
… …
911} 1014}
912 1015
913void 1016void
914rxvt_fontset::clear () 1017rxvt_fontset::clear ()
915{ 1018{
916 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1019 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
917 FONT_UNREF (*i); 1020 FONT_UNREF (*i);
1021
1022 free (fontdesc); fontdesc = 0;
918 1023
919 fonts.clear (); 1024 fonts.clear ();
920 base_id = 0; 1025 base_id = 0;
921 base_prop.height = 0x7fffffff; 1026 base_prop.height = 0x7fffffff;
922 base_prop.weight = rxvt_fontprop::medium; 1027 base_prop.weight = rxvt_fontprop::medium;
… …
948 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
949 } 1054 }
950 else 1055 else
951 f = new rxvt_font_x11; 1056 f = new rxvt_font_x11;
952 1057
1058 f->fs = this;
953 f->set_term (r); 1059 f->set_term (r);
954 f->set_name (strdup (name)); 1060 f->set_name (strdup (name));
955 1061
956 f->cs = cs; 1062 f->cs = cs;
957 f->loaded = false; 1063 f->loaded = false;
… …
975 1081
976 if (*desc == '[') 1082 if (*desc == '[')
977 { 1083 {
978 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1084 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
979 1085
980 const char *extra = desc++; 1086 //const char *extra = desc++; // not yet used
981 1087
982 desc = strchr (desc, ']'); 1088 desc = strchr (desc, ']');
983 1089
984 if (!desc) 1090 if (!desc)
985 { 1091 {
… …
1024 } 1130 }
1025 1131
1026 return true; 1132 return true;
1027} 1133}
1028 1134
1029void 1135bool
1030rxvt_fontset::populate (const char *desc) 1136rxvt_fontset::populate (const char *desc)
1031{ 1137{
1032 clear (); 1138 clear ();
1139
1140 fontdesc = strdup (desc);
1033 1141
1034 fonts.push_back (new_font (0, CS_UNICODE)); 1142 fonts.push_back (new_font (0, CS_UNICODE));
1035 realize_font (0); 1143 realize_font (0);
1036 1144
1037 add_fonts (desc); 1145 add_fonts (desc);
1038 1146
1039 if (!base_id) 1147 if (!base_id)
1040 base_id = 1; 1148 base_id = 1;
1041 1149
1042 // we currently need a base-font, no matter what 1150 // we currently need a base-font, no matter what
1043 if (fonts.size () <= base_id || !realize_font (base_id)) 1151 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1044 { 1152 {
1153 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1045 add_fonts ("fixed"); 1154 add_fonts ("fixed");
1046 base_id = fonts.size () - 1; 1155 base_id = fonts.size () - 1;
1047 } 1156 }
1048 1157
1049 if (fonts.size () <= base_id || !realize_font (base_id)) 1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1050 { 1159 return false;
1051 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1052 exit (1);
1053 }
1054 1160
1055 base_prop = fonts[base_id]->properties (); 1161 base_prop = fonts[base_id]->properties ();
1162
1163 return true;
1056} 1164}
1057 1165
1058int 1166int
1059rxvt_fontset::find_font (uint32_t unicode) 1167rxvt_fontset::find_font (unicode_t unicode, bool bold)
1060{ 1168{
1061 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++)
1062 { 1172 {
1063 rxvt_font *f = fonts[i]; 1173 rxvt_font *f = fonts[i];
1064 1174
1065 if (!f->loaded) 1175 if (!f->loaded)
1066 { 1176 {
… …
1069 1179
1070 if (!realize_font (i)) 1180 if (!realize_font (i))
1071 goto next_font; 1181 goto next_font;
1072 } 1182 }
1073 1183
1184 if (f->cs == CS_UNKNOWN)
1185 goto next_font;
1186
1187 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1188 goto next_font;
1189
1074 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1190 if (f->has_codepoint (unicode))
1075 return i; 1191 return i;
1076 1192
1077 next_font: 1193 next_font:
1078 if (i == fonts.size () - 1 && fallback->name) 1194 if (i == fonts.size () - 1 && fallback->name)
1079 { 1195 {
… …
1081 fallback++; 1197 fallback++;
1082 i = 0; 1198 i = 0;
1083 } 1199 }
1084 } 1200 }
1085 1201
1202 // if no bold font found, use a regular one
1203 if (bold)
1204 return find_font (unicode);
1205
1086 return 0; /* we must return SOME font */ 1206 return 0; /* we must return SOME font */
1087} 1207}
1088 1208
1089 1209
1090 1210

Diff Legend

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