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.16 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.58 by root, Wed Aug 11 03:51:32 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" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 88 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 92#endif
88 93
89#if XFT 94#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
97 { CS_UNICODE, "xft:FreeMono" },
92#endif 98#endif
93 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 103
99 { CS_UNKNOWN, 0 } 104 { CS_UNKNOWN, 0 }
100}; 105};
101 106
102///////////////////////////////////////////////////////////////////////////// 107/////////////////////////////////////////////////////////////////////////////
103 108
109#if XFT
110rxvt_drawable::~rxvt_drawable ()
111{
112 if (xftdrawable)
113 XftDrawDestroy (xftdrawable);
114}
115
116rxvt_drawable::operator XftDraw *()
117{
118 if (!xftdrawable)
119 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
120
121 return xftdrawable;
122}
123#endif
124
125/////////////////////////////////////////////////////////////////////////////
126
104static void *enc_buf; 127static void *enc_buf;
105static uint32_t enc_len; 128static uint32_t enc_len;
106 129
107static inline void * 130static inline void *
108get_enc_buf (uint32_t len) 131get_enc_buf (uint32_t len)
109{ 132{
110 if (len > enc_len) 133 if (len > enc_len)
111 { 134 {
112 free (enc_buf); 135 free (enc_buf);
113 enc_buf = malloc (len); 136 enc_buf = malloc (len);
137 enc_len = len;
114 } 138 }
115 139
116 return enc_buf; 140 return enc_buf;
117} 141}
118 142
… …
161} 185}
162 186
163///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
164 188
165void 189void
166rxvt_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)
167{ 191{
168 if (color == Color_bg) 192 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 194 else if (color >= 0)
171 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
174 } 202 }
175} 203}
176 204
177static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
178 "1hH", "2hH", "1vV", "2vV",
179 0, 0, 0, 0,
180 0, 0, 0, 0,
181 "1HV", "2H1V", "1H2V", "2HV",
182
183 // 2510
184 "1hV", "2h1V", "1h2V", "2hV",
185 "1Hv", "2H1v", "1H2v", "2Hv",
186 "1hv", "2h1v", "1h2v", "2hv",
187 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
188
189 // 2520
190 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
191 "1hvV", "2h1vV", "1hV2v", "1hv2V",
192 "1h2vV", "2hv1V", "1v2hV", "2hvV",
193 "1hHV", "2h1HV", "2H1hV", "2hH1V",
194
195 // 2530
196 "1hH2V", "2hV1H", "1h2HV", "2hHV",
197 "1hHv", "1vH2h", "1hv2H", "1v2hH",
198 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
199 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
200
201 // 2540
202 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
203 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
204 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
205 0, 0, 0, 0,
206
207 // 2550
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211 0, 0, 0, 0,
212
213 // 2560
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217 0, 0, 0, 0,
218
219 // 2570
220 0, "1a", "1b", "1ab",
221 "1h", "1v", "1H", "1V",
222 "2h", "2v", "2H", "2V",
223 "1h2H", "1v2V", "1H2h", "1V2v"
224
225 // to be done
226};
227 206
228struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
229 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
230 { 210 {
231 rxvt_fontprop p; 211 rxvt_fontprop p;
232 212
233 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
240 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
241 { 221 {
242 width = 1; height = 1; 222 width = 1; height = 1;
243 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
244 224
225 set_name (strdup ("built-in pseudofont"));
226
245 return true; 227 return true;
246 } 228 }
247 229
248 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
249 { 231 {
250 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
251 return true; 233 return true;
252 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
253 return true; 239 return true;
254 240
255 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
256 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
257 return true; 245 return true;
258 246
259 switch (unicode) 247 switch (unicode)
260 { 248 {
261 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
263 } 251 }
264 252
265 return false; 253 return false;
266 } 254 }
267 255
268 void draw (int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 257 const text_t *text, int len,
270 int fg, int bg); 258 int fg, int bg);
271}; 259};
272 260
273void 261void
274rxvt_font_default::draw (int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 263 const text_t *text, int len,
276 int fg, int bg) 264 int fg, int bg)
277{ 265{
278 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);
279 267
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
281 269
282 while (len--) 270 while (len--)
283 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
284 text_t t = *text++; 275 text_t t = *text++;
285 276
286 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++)
287 { 290 {
288 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 }
289 294
290 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;
291 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;
292 297
293 XGCValues gcv; 298 XGCValues gcv;
294 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
295 while (*p) 304 while (a < b)
296 { 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
297 switch (*p++) 316 switch (op)
298 { 317 {
299 case '1': 318 case 0: // line
300 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
302 break; 320 break;
303 321
304 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);
305 gcv.line_width = 2; 342 gcv.stipple = 0;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 343 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
307 break; 346 break;
308 347 case 2: // arc
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 351 break;
313 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
314 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
315 } 352 }
316 } 353 }
317 354 }
318 gcv.line_width = 0; 355#if ENABLE_COMBINING
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 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
321 else 371 else
322 switch (*text++) 372 switch (t)
323 { 373 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
326 break; 375 break;
376
327 default: 377 default:
328 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;
329 } 389 }
330 390
331 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
332 } 392 }
333} 393}
… …
341 401
342 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
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;
357 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
358 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
359 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
360}; 420};
361 421
362const char * 422char *
363rxvt_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
364{ 424{
365 unsigned long value; 425 unsigned long value;
366 426
367 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
368 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
369 else 429 else
370 return repl; 430 return rxvt_strdup (repl);
371} 431}
372 432
373rxvt_fontprop 433rxvt_fontprop
374rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
375{ 435{
… …
390} 450}
391 451
392bool 452bool
393rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
394{ 454{
395 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
396 const char *slant = get_property (f, "SLANT", "r");
397
398 unsigned long height; 455 unsigned long height;
399 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
400 return false; 457 return false;
401 458
402 unsigned long avgwidth; 459 unsigned long avgwidth;
403 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
404 avgwidth = 0; 461 avgwidth = 0;
405 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
406 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
407} 472}
408 473
409bool 474bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 476{
412 int slashes = 0; 477 int slashes = 0;
413 const char *comp[12]; 478 const char *comp[13];
414 479
415 for (const char *c = name; *c; c++) 480 for (const char *c = name; *c; c++)
416 if (*c == '-') 481 if (*c == '-')
417 { 482 {
418 comp[slashes++] = c + 1; 483 comp[slashes++] = c + 1;
… …
428 493
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 494 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 495
431 if (f) 496 if (f)
432 { 497 {
433 // the font should really exists now. if not, we have a problem 498 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts). 499 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 500 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 501 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 502 XFreeFont (DISPLAY, f);
438 return ret; 503 return ret;
… …
474{ 539{
475 clear (); 540 clear ();
476 541
477 char **list; 542 char **list;
478 int count; 543 int count;
479 list = XListFonts (DISPLAY, name, 512, &count); 544 list = XListFonts (DISPLAY, name, 1024, &count);
480 set_name (0); 545 set_name (0);
481 546
482 if (!list) 547 if (!list)
483 return false; 548 return false;
484 549
… …
515 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
516 581
517 if (!f) 582 if (!f)
518 return false; 583 return false;
519 584
520 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
521 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
522 587
523 if (registry && encoding) 588 if (registry && encoding)
524 { 589 {
525 char charset[64]; 590 char charset[64];
526 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
539 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
540 break; 605 break;
541 606
542 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
543 } 608 }
609
610 free (registry);
611 free (encoding);
544 612
545 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
546 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
547 615
548 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
598 f = 0; 666 f = 0;
599 } 667 }
600} 668}
601 669
602bool 670bool
603rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
604{ 672{
605 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
606 674
607 if (ch == NOCHAR) 675 if (ch == NOCHAR)
608 return false; 676 return false;
… …
644 712
645 return true; 713 return true;
646} 714}
647 715
648void 716void
649rxvt_font_x11::draw (int x, int y, 717rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
650 const text_t *text, int len, 718 const text_t *text, int len,
651 int fg, int bg) 719 int fg, int bg)
652{ 720{
653 // this looks like a mess /. 721 // this looks like a mess /.
654 // and it is a mess /. 722 // and it is a mess /.
… …
661 729
662 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
663 731
664 XGCValues v; 732 XGCValues v;
665 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
666 v.background = r->PixColors[bg];
667 v.font = f->fid; 734 v.font = f->fid;
668 735
669 if (enc2b) 736 if (enc2b)
670 { 737 {
671 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
672 739
673 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
674 { 741 {
742 v.background = r->PixColors[bg];
675 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
676 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
677 } 745 }
678 else 746 else
679 { 747 {
680 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);
681 749
682 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
683 751
684 if (slow) 752 if (slow)
685 { 753 {
686 do 754 do
687 { 755 {
688 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
689 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
690 758
691 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
692 xc++; len--; 760 xc++; len--;
693 } 761 }
694 while (len); 762 while (len);
695 } 763 }
696 else 764 else
697 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
698 } 766 }
699 } 767 }
700 else 768 else
701 { 769 {
702 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
703 771
704 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
705 { 773 {
774 v.background = r->PixColors[bg];
706 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
707 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
708 } 777 }
709 else 778 else
710 { 779 {
711 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);
712 781
713 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
714 783
715 if (slow) 784 if (slow)
716 { 785 {
717 do 786 do
718 { 787 {
719 if (*xc) 788 if (*xc)
720 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
721 790
722 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
723 xc++; len--; 792 xc++; len--;
724 } 793 }
725 while (len); 794 while (len);
726 } 795 }
727 else 796 else
728 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
729 } 798 }
730 } 799 }
731} 800}
732 801
733///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
738//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 807//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
739#define SWATHBITS 8 808#define SWATHBITS 8
740#endif 809#endif
741 810
742struct rxvt_font_xft : rxvt_font { 811struct rxvt_font_xft : rxvt_font {
743 rxvt_font_xft () { f = 0; d = 0; } 812 rxvt_font_xft () { f = 0; }
744 813
745 void clear (); 814 void clear ();
746 815
747 rxvt_fontprop properties (); 816 rxvt_fontprop properties ();
748 817
749 bool load (const rxvt_fontprop &prop); 818 bool load (const rxvt_fontprop &prop);
750 819
751 void draw (int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
752 const text_t *text, int len, 821 const text_t *text, int len,
753 int fg, int bg); 822 int fg, int bg);
754 823
755 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
756 825
757protected: 826protected:
758 XftFont *f; 827 XftFont *f;
759 XftDraw *d;
760}; 828};
761 829
762void 830void
763rxvt_font_xft::clear () 831rxvt_font_xft::clear ()
764{ 832{
765 if (f) 833 if (f)
766 { 834 {
767 XftFontClose (DISPLAY, f); 835 XftFontClose (DISPLAY, f);
768 f = 0; 836 f = 0;
769 } 837 }
770
771 if (d)
772 {
773 XftDrawDestroy (d);
774 d = 0;
775 }
776} 838}
777 839
778rxvt_fontprop 840rxvt_fontprop
779rxvt_font_xft::properties () 841rxvt_font_xft::properties ()
780{ 842{
781 rxvt_fontprop p; 843 rxvt_fontprop p;
782 844
783 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
784 846
785 p.width = width; p.height = height; 847 p.width = width;
786 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.height = height;
787 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 849 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
850 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
851 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
852 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
788 853
789 XftUnlockFace (f); 854 XftUnlockFace (f);
790 855
791 return p; 856 return p;
792} 857}
… …
805 870
806 if (!p) 871 if (!p)
807 return false; 872 return false;
808 873
809 FcValue v; 874 FcValue v;
875
876 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
810 878
811 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
812 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 880 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
813 881
814 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
… …
880 948
881 return true; 949 return true;
882} 950}
883 951
884bool 952bool
885rxvt_font_xft::has_codepoint (uint32_t unicode) 953rxvt_font_xft::has_codepoint (unicode_t unicode)
886{ 954{
887 return XftCharExists (DISPLAY, f, unicode); 955 return XftCharExists (DISPLAY, f, unicode);
888} 956}
889 957
890void 958void
891rxvt_font_xft::draw (int x, int y, 959rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
892 const text_t *text, int len, 960 const text_t *text, int len,
893 int fg, int bg) 961 int fg, int bg)
894{ 962{
895 if (!d)
896 d = XftDrawCreate (DISPLAY, DRAWABLE, r->Xvisual, r->Xcmap);
897
898 if (bg >= 0 && bg != Color_bg)
899 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
900 else
901 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 963 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
902 964
903 if (!slow && width == r->TermWin.fwidth && 0) 965 if (!slow && width == r->TermWin.fwidth && 0)
904 { 966 {
905 if (sizeof (text_t) == sizeof (FcChar16)) 967 if (sizeof (text_t) == sizeof (FcChar16))
906 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 968 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
918 fwidth *= 2; 980 fwidth *= 2;
919 981
920 XGlyphInfo extents; 982 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 983 if (sizeof (text_t) == sizeof (FcChar16))
922 { 984 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 985 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 986 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 987 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 988 }
927 else 989 else
928 { 990 {
929 XGlyphInfo extents; 991 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 992 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 993 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 994 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 995 }
934 } 996 }
935 997
… …
942#endif 1004#endif
943 1005
944///////////////////////////////////////////////////////////////////////////// 1006/////////////////////////////////////////////////////////////////////////////
945 1007
946rxvt_fontset::rxvt_fontset (rxvt_t r) 1008rxvt_fontset::rxvt_fontset (rxvt_t r)
947: r(r) 1009: r (r), fontdesc (0)
948{ 1010{
949 clear (); 1011 clear ();
950} 1012}
951 1013
952rxvt_fontset::~rxvt_fontset () 1014rxvt_fontset::~rxvt_fontset ()
… …
955} 1017}
956 1018
957void 1019void
958rxvt_fontset::clear () 1020rxvt_fontset::clear ()
959{ 1021{
960 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1022 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
961 FONT_UNREF (*i); 1023 FONT_UNREF (*i);
1024
1025 free (fontdesc); fontdesc = 0;
962 1026
963 fonts.clear (); 1027 fonts.clear ();
964 base_id = 0; 1028 base_id = 0;
965 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
966 base_prop.weight = rxvt_fontprop::medium; 1030 base_prop.weight = rxvt_fontprop::medium;
… …
992 f = new rxvt_font_x11; 1056 f = new rxvt_font_x11;
993 } 1057 }
994 else 1058 else
995 f = new rxvt_font_x11; 1059 f = new rxvt_font_x11;
996 1060
1061 f->fs = this;
997 f->set_term (r); 1062 f->set_term (r);
998 f->set_name (strdup (name)); 1063 f->set_name (strdup (name));
999 1064
1000 f->cs = cs; 1065 f->cs = cs;
1001 f->loaded = false; 1066 f->loaded = false;
… …
1068 } 1133 }
1069 1134
1070 return true; 1135 return true;
1071} 1136}
1072 1137
1073void 1138bool
1074rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1075{ 1140{
1076 clear (); 1141 clear ();
1142
1143 fontdesc = strdup (desc);
1077 1144
1078 fonts.push_back (new_font (0, CS_UNICODE)); 1145 fonts.push_back (new_font (0, CS_UNICODE));
1079 realize_font (0); 1146 realize_font (0);
1080 1147
1081 add_fonts (desc); 1148 add_fonts (desc);
… …
1084 base_id = 1; 1151 base_id = 1;
1085 1152
1086 // we currently need a base-font, no matter what 1153 // we currently need a base-font, no matter what
1087 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1154 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1088 { 1155 {
1089 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1156 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1090 add_fonts ("fixed"); 1157 add_fonts ("fixed");
1091 base_id = fonts.size () - 1; 1158 base_id = fonts.size () - 1;
1092 } 1159 }
1093 1160
1094 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1161 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1162 return false;
1096 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1097 exit (1);
1098 }
1099 1163
1100 base_prop = fonts[base_id]->properties (); 1164 base_prop = fonts[base_id]->properties ();
1165
1166 return true;
1101} 1167}
1102 1168
1103int 1169int
1104rxvt_fontset::find_font (uint32_t unicode) 1170rxvt_fontset::find_font (const char *name) const
1105{ 1171{
1106 for (unsigned int i = 0; i < fonts.size (); i++) 1172 for (rxvt_font *const *f = fonts.begin (); f < fonts.end (); f++)
1173 if ((*f)->name && !strcmp ((*f)->name, name))
1174 return f - fonts.begin ();
1175
1176 return -1;
1177}
1178
1179int
1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1181{
1182
1183 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1184 i < fonts.size ();
1185 i++)
1107 { 1186 {
1108 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
1109 1188
1110 if (!f->loaded) 1189 if (!f->loaded)
1111 { 1190 {
… …
1114 1193
1115 if (!realize_font (i)) 1194 if (!realize_font (i))
1116 goto next_font; 1195 goto next_font;
1117 } 1196 }
1118 1197
1198 if (f->cs == CS_UNKNOWN)
1199 goto next_font;
1200
1201 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1202 goto next_font;
1203
1119 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1120 return i; 1205 return i;
1121 1206
1122 next_font: 1207 next_font:
1123 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1124 { 1211 {
1212 // search through the fallback list
1125 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1126 fallback++; 1214 fallback++;
1127 i = 0;
1128 } 1215 }
1216 else
1217 {
1218 // try to find a new font.
1219 // only xft currently supported, as there is no
1220 // way to configure this and xft is easier to hack in,
1221 // while x11 has more framework in place already.
1222#if XFT
1223 // grab the first xft font that seems suitable
1224 FcPattern *p = FcPatternCreate ();
1225
1226 FcCharSet *s = FcCharSetCreate ();
1227 FcCharSetAddChar (s, unicode);
1228 FcPatternAddCharSet (p, FC_CHARSET, s);
1229 // charsets don't help that much, as xft might return
1230 // a non-matching font even if a better font is available :/
1231
1232 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);
1233 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);
1234 FcPatternAddInteger (p, FC_SLANT, base_prop.slant);
1235
1236 XftResult result;
1237 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
1238
1239 FcPatternDestroy (p);
1240
1241 if (match)
1242 {
1243 FcPatternDel (match, FC_CHARSET);
1244 char *font = (char *)FcNameUnparse (match);
1245 FcPatternDestroy (match);
1246
1247 if (find_font (font) < 0)
1248 {
1249 char fontname[4096];
1250 sprintf (fontname, "xft:%-.4090s", font);
1251
1252 fonts.push_back (new_font (fontname, CS_UNICODE));
1253 }
1254
1255 free (font);
1256 }
1257#endif
1258 }
1259 }
1129 } 1260 }
1261
1262 // if no bold font found, use a regular one
1263 if (bold)
1264 return find_font (unicode);
1130 1265
1131 return 0; /* we must return SOME font */ 1266 return 0; /* we must return SOME font */
1132} 1267}
1133 1268
1134 1269

Diff Legend

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