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

Diff Legend

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