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.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.56 by root, Mon Aug 2 04:42:11 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);
141 enc_len = len;
113 } 142 }
114 143
115 return enc_buf; 144 return enc_buf;
116} 145}
117 146
118static const char * 147static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 148enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 149{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 150 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 151
123 while (len--) 152 while (len--)
124 { 153 {
… …
135 164
136 return (const char *)enc_buf; 165 return (const char *)enc_buf;
137} 166}
138 167
139static const XChar2b * 168static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 169enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 170{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 171 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 172
144 while (len--) 173 while (len--)
145 { 174 {
… …
160} 189}
161 190
162///////////////////////////////////////////////////////////////////////////// 191/////////////////////////////////////////////////////////////////////////////
163 192
164void 193void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 194rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 195{
167 if (color == Color_bg) 196 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 197 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 198 else if (color >= 0)
170 { 199 {
200#if XFT
201 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
202#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 203 XSetForeground (d.display->display, TGC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 204 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
205#endif
173 } 206 }
174} 207}
175 208
176static const char *linedraw_cmds[128] = { 209#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 210
227struct rxvt_font_default : rxvt_font { 211struct rxvt_font_default : rxvt_font {
212
228 rxvt_fontprop properties () 213 rxvt_fontprop properties ()
229 { 214 {
230 rxvt_fontprop p; 215 rxvt_fontprop p;
231 216
232 p.width = p.height = 1; 217 p.width = p.height = 1;
… …
239 bool load (const rxvt_fontprop &prop) 224 bool load (const rxvt_fontprop &prop)
240 { 225 {
241 width = 1; height = 1; 226 width = 1; height = 1;
242 ascent = 1; descent = 0; 227 ascent = 1; descent = 0;
243 228
229 set_name (strdup ("built-in pseudofont"));
230
244 return true; 231 return true;
245 } 232 }
246 233
247 bool has_codepoint (uint32_t unicode) 234 bool has_codepoint (unicode_t unicode)
248 { 235 {
249 if (unicode <= 0x001f) 236 if (unicode <= 0x001f)
250 return true; 237 return true;
251 if (unicode >= 0x0080 && unicode <= 0x009f) 238
239 if (unicode <= 0x007f)
240 return false;
241
242 if (unicode <= 0x009f)
252 return true; 243 return true;
253 244
254 if (unicode >= 0x2500 && unicode <= 0x257f 245 if (unicode >= 0x2500 && unicode <= 0x259f)
255 && linedraw_cmds[unicode - 0x2500]) 246 return true;
247
248 if (IS_COMPOSE (unicode))
256 return true; 249 return true;
257 250
258 switch (unicode) 251 switch (unicode)
259 { 252 {
260 case ZERO_WIDTH_CHAR: 253 case ZERO_WIDTH_CHAR:
… …
262 } 255 }
263 256
264 return false; 257 return false;
265 } 258 }
266 259
267 void draw (int x, int y, 260 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 261 const text_t *text, int len,
269 int fg, int bg); 262 int fg, int bg);
270}; 263};
271 264
272void 265void
273rxvt_font_default::draw (int x, int y, 266rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 267 const text_t *text, int len,
275 int fg, int bg) 268 int fg, int bg)
276{ 269{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 270 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 271
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 272 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280 273
281 while (len--) 274 while (len--)
282 { 275 {
276#if ENABLE_COMBINING
277 compose_char *cc;
278#endif
283 text_t t = *text++; 279 text_t t = *text++;
284 280
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 281 if (0x2500 <= t && t <= 0x259f)
282 {
283 uint16_t offs = linedraw_offs[t - 0x2500];
284 uint32_t *a = linedraw_command + (offs >> 4);
285 uint32_t *b = a + (offs & 15);
286
287 int W = r->TermWin.fwidth;
288 int H = r->TermWin.fheight;
289
290 int x_[16];
291 int y_[16];
292
293 for (int i = 0; i <= 8; i++)
286 { 294 {
287 const char *p = linedraw_cmds[t - 0x2500]; 295 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
296 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
297 }
288 298
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 299 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; 300 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
291 301
292 XGCValues gcv; 302 XGCValues gcv;
293 303
304 gcv.cap_style = CapButt;
305 gcv.line_width = 0;
306 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
307
294 while (*p) 308 while (a < b)
295 { 309 {
310 uint32_t command = *a++;
311
312 int op = (command >> 24) & 255;
313 int a = (command >> 20) & 15;
314 int b = (command >> 16) & 15;
315 int x1 = x_[(command >> 12) & 15];
316 int y1 = y_[(command >> 8) & 15];
317 int x2 = x_[(command >> 4) & 15];
318 int y2 = y_[(command >> 0) & 15];
319
296 switch (*p++) 320 switch (op)
297 { 321 {
298 case '1': 322 case 0: // line
299 gcv.line_width = 0; 323 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301 break; 324 break;
302 325
303 case '2': 326 case 1: // rectangle, possibly stippled
327 if (a)
328 {
329 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
330
331 gcv.fill_style = FillStippled;
332 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
333 gcv.ts_x_origin = x;
334 gcv.ts_y_origin = y;
335
336 XChangeGC (d.display->display, TGC,
337 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
338 &gcv);
339 }
340
341 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
342
343 if (a)
344 {
345 XFreePixmap (d.display->display, gcv.stipple);
304 gcv.line_width = 2; 346 gcv.stipple = 0;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 347 gcv.fill_style = FillSolid;
348 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
349 }
306 break; 350 break;
307 351 case 2: // arc
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 352 XDrawArc (d.display->display, d, TGC,
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 355 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 } 356 }
315 } 357 }
316 358 }
317 gcv.line_width = 0; 359#if ENABLE_COMBINING
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 361 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
364 if (cc->c2 != NOCHAR)
365 {
366 // prefer font of first character, for no good reasons
367 rxvt_font *f2 = f1->has_codepoint (cc->c2)
368 ? f1
369 : (*fs)[fs->find_font (cc->c2)];
370
371 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
372 }
373 }
374#endif
320 else 375 else
321 switch (*text++) 376 switch (t)
322 { 377 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
325 break; 379 break;
380
326 default: 381 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 382 int w = 0;
383 while (len > 0 && *text == NOCHAR)
384 {
385 ++text;
386 --len;
387 w += r->TermWin.fwidth;
388 }
389
390 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
391 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
392 x += w;
328 } 393 }
329 394
330 x += r->TermWin.fwidth; 395 x += r->TermWin.fwidth;
331 } 396 }
332} 397}
… …
340 405
341 rxvt_fontprop properties (); 406 rxvt_fontprop properties ();
342 407
343 bool load (const rxvt_fontprop &prop); 408 bool load (const rxvt_fontprop &prop);
344 409
345 bool has_codepoint (uint32_t unicode); 410 bool has_codepoint (unicode_t unicode);
346 411
347 void draw (int x, int y, 412 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 413 const text_t *text, int len,
349 int fg, int bg); 414 int fg, int bg);
350 415
351 XFontStruct *f; 416 XFontStruct *f;
352 codeset cs; 417 codeset cs;
353 bool enc2b, encm; 418 bool enc2b, encm;
354 419
355 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 420 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
356 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 421 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
357 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 422 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
358 bool set_properties (rxvt_fontprop &p, const char *name); 423 bool set_properties (rxvt_fontprop &p, const char *name);
359}; 424};
360 425
361const char * 426char *
362rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 427rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
363{ 428{
364 unsigned long value; 429 unsigned long value;
365 430
366 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
367 return XGetAtomName (DISPLAY, value); 432 return XGetAtomName (DISPLAY, value);
368 else 433 else
369 return repl; 434 return rxvt_strdup (repl);
370} 435}
371 436
372rxvt_fontprop 437rxvt_fontprop
373rxvt_font_x11::properties () 438rxvt_font_x11::properties ()
374{ 439{
… …
389} 454}
390 455
391bool 456bool
392rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
393{ 458{
394 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
395 const char *slant = get_property (f, "SLANT", "r");
396
397 unsigned long height; 459 unsigned long height;
398 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
399 return false; 461 return false;
400 462
401 unsigned long avgwidth; 463 unsigned long avgwidth;
402 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 464 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
403 avgwidth = 0; 465 avgwidth = 0;
404 466
467 char *weight = get_property (f, "WEIGHT_NAME", "medium");
468 char *slant = get_property (f, "SLANT", "r");
469
405 return set_properties (p, height, weight, slant, avgwidth); 470 set_properties (p, height, weight, slant, avgwidth);
471
472 free (weight);
473 free (slant);
474
475 return true;
406} 476}
407 477
408bool 478bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 479rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 480{
411 int slashes = 0; 481 int slashes = 0;
412 const char *comp[12]; 482 const char *comp[13];
413 483
414 for (const char *c = name; *c; c++) 484 for (const char *c = name; *c; c++)
415 if (*c == '-') 485 if (*c == '-')
416 { 486 {
417 comp[slashes++] = c + 1; 487 comp[slashes++] = c + 1;
… …
427 497
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 498 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 499
430 if (f) 500 if (f)
431 { 501 {
432 // the font should really exists now. if not, we have a problem 502 // the font should really exist now. if not, we have a problem
433 // (e.g. if the user did xset fp rehash just when we were searching fonts). 503 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 504 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 505 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 506 XFreeFont (DISPLAY, f);
437 return ret; 507 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 584 f = XLoadQueryFont (DISPLAY, name);
515 585
516 if (!f) 586 if (!f)
517 return false; 587 return false;
518 588
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 589 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 590 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 591
524 if (registry && encoding) 592 if (registry && encoding)
525 { 593 {
526 char charset[64]; 594 char charset[64];
527 snprintf (charset, 64, "%s-%s", registry, encoding); 595 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
540 if (*charset++ == '-' && !--count) 608 if (*charset++ == '-' && !--count)
541 break; 609 break;
542 610
543 cs = codeset_from_name (charset); 611 cs = codeset_from_name (charset);
544 } 612 }
613
614 free (registry);
615 free (encoding);
545 616
546 if (cs == CS_UNICODE) 617 if (cs == CS_UNICODE)
547 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 618 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
548 619
549 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 620 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
599 f = 0; 670 f = 0;
600 } 671 }
601} 672}
602 673
603bool 674bool
604rxvt_font_x11::has_codepoint (uint32_t unicode) 675rxvt_font_x11::has_codepoint (unicode_t unicode)
605{ 676{
606 uint32_t ch = FROM_UNICODE (cs, unicode); 677 uint32_t ch = FROM_UNICODE (cs, unicode);
607 678
608 if (ch == NOCHAR) 679 if (ch == NOCHAR)
609 return false; 680 return false;
… …
611 /* check wether the character exists in _this_ font. horrible. */ 682 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 683 XCharStruct *xcs;
613 684
614 if (encm) 685 if (encm)
615 { 686 {
616 int byte1 = ch >> 8; 687 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 688 unsigned char byte2 = ch & 255;
618 689
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 690 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 691 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 692 return false;
622 693
… …
645 716
646 return true; 717 return true;
647} 718}
648 719
649void 720void
650rxvt_font_x11::draw (int x, int y, 721rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 722 const text_t *text, int len,
652 int fg, int bg) 723 int fg, int bg)
653{ 724{
654 // this looks like a mess /. 725 // this looks like a mess /.
655 // and it is a mess /. 726 // and it is a mess /.
… …
662 733
663 int base = r->TermWin.fbase; 734 int base = r->TermWin.fbase;
664 735
665 XGCValues v; 736 XGCValues v;
666 v.foreground = r->PixColors[fg]; 737 v.foreground = r->PixColors[fg];
667 v.background = r->PixColors[bg];
668 v.font = f->fid; 738 v.font = f->fid;
669 739
670 if (enc2b) 740 if (enc2b)
671 { 741 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 742 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 743
674 if (bg == Color_bg && !slow) 744 if (bg == Color_bg && !slow)
675 { 745 {
746 v.background = r->PixColors[bg];
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 747 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 748 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
678 } 749 }
679 else 750 else
680 { 751 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 752 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 753
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 754 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
684 755
685 if (slow) 756 if (slow)
686 { 757 {
687 do 758 do
688 { 759 {
689 if (xc->byte1 || xc->byte2) 760 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 761 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
691 762
692 x += r->TermWin.fwidth; 763 x += r->TermWin.fwidth;
693 xc++; len--; 764 xc++; len--;
694 } 765 }
695 while (len); 766 while (len);
696 } 767 }
697 else 768 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 769 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
699 } 770 }
700 } 771 }
701 else 772 else
702 { 773 {
703 const char *xc = enc_char (text, len, cs, slow); 774 const char *xc = enc_char (text, len, cs, slow);
704 775
705 if (bg == Color_bg && !slow) 776 if (bg == Color_bg && !slow)
706 { 777 {
778 v.background = r->PixColors[bg];
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 779 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 780 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
709 } 781 }
710 else 782 else
711 { 783 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 784 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 785
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 786 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
715 787
716 if (slow) 788 if (slow)
717 { 789 {
718 do 790 do
719 { 791 {
720 if (*xc) 792 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 793 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
722 794
723 x += r->TermWin.fwidth; 795 x += r->TermWin.fwidth;
724 xc++; len--; 796 xc++; len--;
725 } 797 }
726 while (len); 798 while (len);
727 } 799 }
728 else 800 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 801 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
730 } 802 }
731 } 803 }
732} 804}
733 805
734///////////////////////////////////////////////////////////////////////////// 806/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 811//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 812#define SWATHBITS 8
741#endif 813#endif
742 814
743struct rxvt_font_xft : rxvt_font { 815struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 816 rxvt_font_xft () { f = 0; }
745 817
746 void clear (); 818 void clear ();
747 819
748 rxvt_fontprop properties (); 820 rxvt_fontprop properties ();
749 821
750 bool load (const rxvt_fontprop &prop); 822 bool load (const rxvt_fontprop &prop);
751 823
752 void draw (int x, int y, 824 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 825 const text_t *text, int len,
754 int fg, int bg); 826 int fg, int bg);
755 827
756 bool has_codepoint (uint32_t unicode); 828 bool has_codepoint (unicode_t unicode);
757 829
758protected: 830protected:
759 XftFont *f; 831 XftFont *f;
760 XftDraw *d;
761}; 832};
762 833
763void 834void
764rxvt_font_xft::clear () 835rxvt_font_xft::clear ()
765{ 836{
766 if (f) 837 if (f)
767 { 838 {
768 XftFontClose (DISPLAY, f); 839 XftFontClose (DISPLAY, f);
769 f = 0; 840 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 841 }
777} 842}
778 843
779rxvt_fontprop 844rxvt_fontprop
780rxvt_font_xft::properties () 845rxvt_font_xft::properties ()
… …
881 946
882 return true; 947 return true;
883} 948}
884 949
885bool 950bool
886rxvt_font_xft::has_codepoint (uint32_t unicode) 951rxvt_font_xft::has_codepoint (unicode_t unicode)
887{ 952{
888 return XftCharExists (DISPLAY, f, unicode); 953 return XftCharExists (DISPLAY, f, unicode);
889} 954}
890 955
891void 956void
892rxvt_font_xft::draw (int x, int y, 957rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 958 const text_t *text, int len,
894 int fg, int bg) 959 int fg, int bg)
895{ 960{
896 if (!d)
897 {
898 dR;
899 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
900 }
901
902 if (bg >= 0 && bg != Color_bg)
903 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
904 else
905 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 961 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 962
907 if (!slow && width == r->TermWin.fwidth && 0) 963 if (!slow && width == r->TermWin.fwidth && 0)
908 { 964 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 966 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
915 { 971 {
916 while (len) 972 while (len)
917 { 973 {
918 if (*text != NOCHAR && *text != ' ') 974 if (*text != NOCHAR && *text != ' ')
919 { 975 {
976 int fwidth = r->TermWin.fwidth;
977 if (len >= 2 && text[1] == NOCHAR)
978 fwidth *= 2;
979
920 XGlyphInfo extents; 980 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 981 if (sizeof (text_t) == sizeof (FcChar16))
922 { 982 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 983 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 984 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 985 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 986 }
927 else 987 else
928 { 988 {
929 XGlyphInfo extents; 989 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 990 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 991 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 992 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 993 }
934 } 994 }
935 995
936 x += r->TermWin.fwidth; 996 x += r->TermWin.fwidth;
… …
942#endif 1002#endif
943 1003
944///////////////////////////////////////////////////////////////////////////// 1004/////////////////////////////////////////////////////////////////////////////
945 1005
946rxvt_fontset::rxvt_fontset (rxvt_t r) 1006rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT 1007: r (r), fontdesc (0)
948: r(r)
949#endif
950{ 1008{
951 clear (); 1009 clear ();
952} 1010}
953 1011
954rxvt_fontset::~rxvt_fontset () 1012rxvt_fontset::~rxvt_fontset ()
… …
957} 1015}
958 1016
959void 1017void
960rxvt_fontset::clear () 1018rxvt_fontset::clear ()
961{ 1019{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1020 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 1021 FONT_UNREF (*i);
1022
1023 free (fontdesc); fontdesc = 0;
964 1024
965 fonts.clear (); 1025 fonts.clear ();
966 base_id = 0; 1026 base_id = 0;
967 base_prop.height = 0x7fffffff; 1027 base_prop.height = 0x7fffffff;
968 base_prop.weight = rxvt_fontprop::medium; 1028 base_prop.weight = rxvt_fontprop::medium;
… …
994 f = new rxvt_font_x11; 1054 f = new rxvt_font_x11;
995 } 1055 }
996 else 1056 else
997 f = new rxvt_font_x11; 1057 f = new rxvt_font_x11;
998 1058
1059 f->fs = this;
999 f->set_term (r); 1060 f->set_term (r);
1000 f->set_name (strdup (name)); 1061 f->set_name (strdup (name));
1001 1062
1002 f->cs = cs; 1063 f->cs = cs;
1003 f->loaded = false; 1064 f->loaded = false;
… …
1021 1082
1022 if (*desc == '[') 1083 if (*desc == '[')
1023 { 1084 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1085 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1086
1026 const char *extra = desc++; 1087 //const char *extra = desc++; // not yet used
1027 1088
1028 desc = strchr (desc, ']'); 1089 desc = strchr (desc, ']');
1029 1090
1030 if (!desc) 1091 if (!desc)
1031 { 1092 {
… …
1070 } 1131 }
1071 1132
1072 return true; 1133 return true;
1073} 1134}
1074 1135
1075void 1136bool
1076rxvt_fontset::populate (const char *desc) 1137rxvt_fontset::populate (const char *desc)
1077{ 1138{
1078 clear (); 1139 clear ();
1140
1141 fontdesc = strdup (desc);
1079 1142
1080 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
1081 realize_font (0); 1144 realize_font (0);
1082 1145
1083 add_fonts (desc); 1146 add_fonts (desc);
1084 1147
1085 if (!base_id) 1148 if (!base_id)
1086 base_id = 1; 1149 base_id = 1;
1087 1150
1088 // we currently need a base-font, no matter what 1151 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1152 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1153 {
1154 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1155 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1156 base_id = fonts.size () - 1;
1093 } 1157 }
1094 1158
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1159 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1160 return false;
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1);
1099 }
1100 1161
1101 base_prop = fonts[base_id]->properties (); 1162 base_prop = fonts[base_id]->properties ();
1163
1164 return true;
1102} 1165}
1103 1166
1104int 1167int
1105rxvt_fontset::find_font (uint32_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode, bool bold)
1106{ 1169{
1107 for (int i = 0; i < fonts.size (); i++) 1170 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1171 i < fonts.size ();
1172 i++)
1108 { 1173 {
1109 rxvt_font *f = fonts[i]; 1174 rxvt_font *f = fonts[i];
1110 1175
1111 if (!f->loaded) 1176 if (!f->loaded)
1112 { 1177 {
… …
1115 1180
1116 if (!realize_font (i)) 1181 if (!realize_font (i))
1117 goto next_font; 1182 goto next_font;
1118 } 1183 }
1119 1184
1185 if (f->cs == CS_UNKNOWN)
1186 goto next_font;
1187
1188 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1189 goto next_font;
1190
1120 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1191 if (f->has_codepoint (unicode))
1121 return i; 1192 return i;
1122 1193
1123 next_font: 1194 next_font:
1124 if (i == fonts.size () - 1 && fallback->name) 1195 if (i == fonts.size () - 1 && fallback->name)
1125 { 1196 {
… …
1127 fallback++; 1198 fallback++;
1128 i = 0; 1199 i = 0;
1129 } 1200 }
1130 } 1201 }
1131 1202
1203 // if no bold font found, use a regular one
1204 if (bold)
1205 return find_font (unicode);
1206
1132 return 0; /* we must return SOME font */ 1207 return 0; /* we must return SOME font */
1133} 1208}
1134 1209
1135 1210
1136 1211

Diff Legend

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