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

Diff Legend

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