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.2 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 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
… …
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib>
27
26#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
27#define DRAWABLE r->TermWin.vt
28#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
29 30
30const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
31 codeset cs; 32 codeset cs;
32 const char *name; 33 const char *name;
33} fallback_fonts[] = { 34} fallback_fonts[] = {
34 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
35 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
37 38
38#if ENCODING_EU 39#if ENCODING_EU
39 // cyrillic 40 // cyrillic
40 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
41 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
42 43
43 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
44 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
45 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
46 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
47 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
48 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
49 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
50 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
51 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
52 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
53 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
54 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
55 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
56#endif 57#endif
57 58
58 // japanese 59 // japanese
59#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
60# if XFT 61# if XFT
61 // prefer xft for complex scripts 62 // prefer xft for complex scripts
62 { CS_UNICODE, "xft:Kochi Gothic" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63# endif 64# endif
64 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
65 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
66 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
67#endif 68#endif
68 69
69#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
70# if XFT 71# if XFT
71 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75# endif 76# endif
77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
76 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
77 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
78 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
79 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
80 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
81 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
82 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
83 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
84#endif 89#endif
85 90
86#if XFT 91#if XFT
87 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
88 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
89#endif 95#endif
90 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
91 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
92 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 100
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
94 104
95 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
96}; 106};
97 107
98///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
99 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_drawable::operator XftDraw *()
118{
119 if (!xftdrawable)
120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
121
122 return xftdrawable;
123}
124#endif
125
126/////////////////////////////////////////////////////////////////////////////
127
100static void *enc_buf; 128static void *enc_buf;
101static uint32_t enc_len; 129static uint32_t enc_len;
102 130
103static inline void * 131static inline void *
104get_enc_buf (int len) 132get_enc_buf (uint32_t len)
105{ 133{
106 if (len > enc_len) 134 if (len > enc_len)
107 { 135 {
108 free (enc_buf); 136 free (enc_buf);
109 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
111 139
112 return enc_buf; 140 return enc_buf;
113} 141}
114 142
115static const char * 143static const char *
116enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117{ 145{
118 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
119 147
120 while (len--) 148 while (len--)
121 { 149 {
… …
132 160
133 return (const char *)enc_buf; 161 return (const char *)enc_buf;
134} 162}
135 163
136static const XChar2b * 164static const XChar2b *
137enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138{ 166{
139 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
140 168
141 while (len--) 169 while (len--)
142 { 170 {
… …
157} 185}
158 186
159///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
160 188
161void 189void
162rxvt_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)
163{ 191{
164 if (color == Color_bg) 192 if (color == Color_bg)
165 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
166 else if (color >= 0) 194 else if (color >= 0)
167 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
168 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
169 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
170 } 202 }
171} 203}
204
205#include "table/linedraw.h"
172 206
173struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
174 bool load (int maxheight) 208
209 rxvt_fontprop properties ()
210 {
211 rxvt_fontprop p;
212
213 p.width = p.height = 1;
214 p.weight = rxvt_fontprop::medium;
215 p.slant = rxvt_fontprop::roman;
216
217 return p;
218 }
219
220 bool load (const rxvt_fontprop &prop)
175 { 221 {
176 width = 1; height = 1; 222 width = 1; height = 1;
177 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
178 224
225 set_name (strdup ("built-in pseudofont"));
226
179 return true; 227 return true;
180 } 228 }
181 229
182 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
183 { 231 {
184 if (unicode <= 0x001f 232 if (unicode <= 0x001f)
233 return true;
234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
239 return true;
240
185 || (unicode >= 0x80 && unicode <= 0x9f)) 241 if (unicode >= 0x2500 && unicode <= 0x259f)
242 return true;
243
244 if (IS_COMPOSE (unicode))
186 return true; 245 return true;
187 246
188 switch (unicode) 247 switch (unicode)
189 { 248 {
190 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
192 } 251 }
193 252
194 return false; 253 return false;
195 } 254 }
196 255
197 void draw (int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
198 const text_t *text, int len, 257 const text_t *text, int len,
199 int fg, int bg); 258 int fg, int bg);
200}; 259};
201 260
202void 261void
203rxvt_font_default::draw (int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
204 const text_t *text, int len, 263 const text_t *text, int len,
205 int fg, int bg) 264 int fg, int bg)
206{ 265{
207 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);
267
268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
208 269
209 while (len--) 270 while (len--)
210 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
275 text_t t = *text++;
276
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++)
290 {
291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
294
295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
297
298 XGCValues gcv;
299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
304 while (a < b)
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
316 switch (op)
317 {
318 case 0: // line
319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
320 break;
321
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);
342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
346 break;
347 case 2: // arc
348 XDrawArc (d.display->display, d, TGC,
349 x1 - W/2, y1 - H/2, W-1, H-1,
350 (a - 1) * 90*64, (b - 1) * 90*64);
351 break;
352 }
353 }
354 }
355#if ENABLE_COMBINING
356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
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
371 else
211 switch (*text++) 372 switch (t)
212 { 373 {
213 case NOCHAR:
214 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
215 break; 375 break;
376
216 default: 377 default:
217 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 378 int w = 0;
218 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 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;
219 } 389 }
220 390
221 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
222 } 392 }
223} 393}
224 394
… …
227struct rxvt_font_x11 : rxvt_font { 397struct rxvt_font_x11 : rxvt_font {
228 rxvt_font_x11 () { f = 0; } 398 rxvt_font_x11 () { f = 0; }
229 399
230 void clear (); 400 void clear ();
231 401
232 bool load (int maxheight); 402 rxvt_fontprop properties ();
233 403
404 bool load (const rxvt_fontprop &prop);
405
234 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
235 407
236 void draw (int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
237 const text_t *text, int len, 409 const text_t *text, int len,
238 int fg, int bg); 410 int fg, int bg);
239 411
240 XFontStruct *f; 412 XFontStruct *f;
241 codeset cs; 413 codeset cs;
242 bool enc2b, encm; 414 bool enc2b, encm;
243 415
244 const char *get_property (const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
419 bool set_properties (rxvt_fontprop &p, const char *name);
245}; 420};
246 421
247const char * 422char *
248rxvt_font_x11::get_property (const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
249{ 424{
250 unsigned long value; 425 unsigned long value;
251 426
252 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
253 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
254 else 429 else
430 return rxvt_strdup (repl);
431}
432
433rxvt_fontprop
434rxvt_font_x11::properties ()
435{
436 rxvt_fontprop p;
437 set_properties (p, f);
255 return repl; 438 return p;
256} 439}
257 440
258bool 441bool
259rxvt_font_x11::load (int maxheight) 442rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
443{
444 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
445 p.height = height;
446 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
447 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
448
449 return true;
450}
451
452bool
453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
454{
455 unsigned long height;
456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
457 return false;
458
459 unsigned long avgwidth;
460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
461 avgwidth = 0;
462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
472}
473
474bool
475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
476{
477 int slashes = 0;
478 const char *comp[13];
479
480 for (const char *c = name; *c; c++)
481 if (*c == '-')
482 {
483 comp[slashes++] = c + 1;
484 if (slashes >= 13)
485 break;
486 }
487
488 /* can we short-circuit the costly XLoadQueryFont? */
489 if (slashes >= 13
490 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
491 && (*comp[11] >= '0' && *comp[11] <= '9'))
492 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
493
494 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
495
496 if (f)
497 {
498 // the font should really exist now. if not, we have a problem
499 // (e.g. if the user did xset fp rehash just when we were searching fonts).
500 // in that case, just return garbage.
501 bool ret = set_properties (p, f);
502 XFreeFont (DISPLAY, f);
503 return ret;
504 }
505 else
506 return false;
507}
508
509// fix the size of scalable fonts
510static void
511fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
512{
513 int slashes = 0;
514 const char *size;
515
516 for (const char *c = name; *c; c++)
517 if (*c == '-')
518 {
519 if (slashes == 6)
520 size = c + 1;
521
522 if (++slashes >= 13)
523 break;
524 }
525
526 if (slashes >= 13 && size[0] == '0')
527 {
528 strncpy (buf, name, size - name);
529 buf += size - name;
530 buf += sprintf (buf, "%d", prop.height);
531 strcpy (buf, size + 1);
532 }
533 else
534 strcpy (buf, name);
535}
536
537bool
538rxvt_font_x11::load (const rxvt_fontprop &prop)
260{ 539{
261 clear (); 540 clear ();
541
542 char **list;
543 int count;
544 list = XListFonts (DISPLAY, name, 512, &count);
545 set_name (0);
546
547 if (!list)
548 return false;
549
550 int bestdiff = 0x7fffffff;
551 for (int i = 0; i < count; i++)
552 {
553 rxvt_fontprop p;
554 char fname[1024];
555 fix_scalable (fname, list[i], prop);
556
557 if (!set_properties (p, fname))
558 continue;
559
560 if (p.height > prop.height) // weed out too large fonts
561 continue;
562
563 int diff = (prop.height - p.height) * 32
564 + abs (prop.weight - p.weight)
565 + abs (prop.slant - p.slant );
566
567 if (!name // compare against best found so far
568 || diff < bestdiff)
569 {
570 set_name (strdup (fname));
571 bestdiff = diff;
572 }
573 }
574
575 XFreeFontNames (list);
576
577 if (!name)
578 return false;
262 579
263 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
264 581
265 if (!f) 582 if (!f)
266 return false; 583 return false;
267 584
268 unsigned long value;
269
270 const char *registry = get_property ("CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
271 const char *encoding = get_property ("CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
272 587
273 if (registry && encoding) 588 if (registry && encoding)
274 { 589 {
275 char charset[64]; 590 char charset[64];
276 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
277 592
278 cs = codeset_from_name (charset); 593 cs = codeset_from_name (charset);
279 } 594 }
280 else 595 else
281 { 596 {
282 const char *charset = get_property ("FONT", 0); 597 const char *charset = get_property (f, "FONT", 0);
283 598
284 if (!charset) 599 if (!charset)
285 charset = name; 600 charset = name;
286 601
287 int count = 13; 602 int count = 13;
… …
290 break; 605 break;
291 606
292 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
293 } 608 }
294 609
610 free (registry);
611 free (encoding);
612
295 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
296 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
297 615
298 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
299 enc2b = encm || f->max_char_or_byte2 > 255; 617 enc2b = encm || f->max_char_or_byte2 > 255;
300 618
301 ascent = f->ascent; 619 ascent = f->ascent;
302 descent = f->descent; 620 descent = f->descent;
303 height = ascent + descent; 621 height = ascent + descent;
304 622
305 prop = false; 623 slow = false;
306 624
307 if (f->min_bounds.width == f->max_bounds.width) 625 if (f->min_bounds.width == f->max_bounds.width)
308 width = f->min_bounds.width; 626 width = f->min_bounds.width;
309 else if (f->per_char == NULL) 627 else if (f->per_char == NULL)
310 width = f->max_bounds.width; 628 width = f->max_bounds.width;
311 else 629 else
312 { 630 {
313 prop = true; 631 slow = true;
314 632
315 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 633 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
316 634
317 if (encm) 635 if (encm)
318 N += (f->max_byte1 - f->min_byte1) 636 N += (f->max_byte1 - f->min_byte1)
… …
348 f = 0; 666 f = 0;
349 } 667 }
350} 668}
351 669
352bool 670bool
353rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
354{ 672{
355 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
356 674
357 if (ch == NOCHAR) 675 if (ch == NOCHAR)
358 return false; 676 return false;
… …
360 /* check wether the character exists in _this_ font. horrible. */ 678 /* check wether the character exists in _this_ font. horrible. */
361 XCharStruct *xcs; 679 XCharStruct *xcs;
362 680
363 if (encm) 681 if (encm)
364 { 682 {
365 int byte1 = ch >> 8; 683 unsigned char byte1 = ch >> 8;
366 int byte2 = ch & 255; 684 unsigned char byte2 = ch & 255;
367 685
368 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 686 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
369 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 687 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
370 return false; 688 return false;
371 689
… …
394 712
395 return true; 713 return true;
396} 714}
397 715
398void 716void
399rxvt_font_x11::draw (int x, int y, 717rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
400 const text_t *text, int len, 718 const text_t *text, int len,
401 int fg, int bg) 719 int fg, int bg)
402{ 720{
403 // this looks like a mess /. 721 // this looks like a mess /.
404 // and it is a mess /. 722 // and it is a mess /.
405 // yet we are trying to be perfect /. 723 // yet we are trying to be perfect /.
406 // but the result still isn't perfect /. 724 // but the result still isn't perfect /.
407 725
408 bool slow = prop 726 bool slow = this->slow
409 || width != r->TermWin.fwidth 727 || width != r->TermWin.fwidth
410 || height != r->TermWin.fheight; 728 || height != r->TermWin.fheight;
411 729
412 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
413 731
414 XGCValues v; 732 XGCValues v;
415 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
416 v.background = r->PixColors[bg];
417 v.font = f->fid; 734 v.font = f->fid;
418 735
419 if (enc2b) 736 if (enc2b)
420 { 737 {
421 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
422 739
423 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
424 { 741 {
742 v.background = r->PixColors[bg];
425 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
426 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
427 } 745 }
428 else 746 else
429 { 747 {
430 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);
431 749
432 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
433 751
434 if (slow) 752 if (slow)
435 { 753 {
436 do 754 do
437 { 755 {
438 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
439 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
440 758
441 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
442 xc++; len--; 760 xc++; len--;
443 } 761 }
444 while (len); 762 while (len);
445 } 763 }
446 else 764 else
447 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
448 } 766 }
449 } 767 }
450 else 768 else
451 { 769 {
452 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
453 771
454 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
455 { 773 {
774 v.background = r->PixColors[bg];
456 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
457 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
458 } 777 }
459 else 778 else
460 { 779 {
461 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);
462 781
463 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
464 783
465 if (slow) 784 if (slow)
466 { 785 {
467 do 786 do
468 { 787 {
469 if (*xc) 788 if (*xc)
470 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
471 790
472 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
473 xc++; len--; 792 xc++; len--;
474 } 793 }
475 while (len); 794 while (len);
476 } 795 }
477 else 796 else
478 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
479 } 798 }
480 } 799 }
481} 800}
482 801
483///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
488//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 807//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
489#define SWATHBITS 8 808#define SWATHBITS 8
490#endif 809#endif
491 810
492struct rxvt_font_xft : rxvt_font { 811struct rxvt_font_xft : rxvt_font {
493#if 0
494 enum {
495 SWATHCOUNT = 1 << (21 - UNIBITS),
496 SWATHSIZE = 1 << (SWATHBITS - 5)
497 };
498 typedef uint32_t swath[SWATHSIZE];
499
500 swath *cvr[SWATHCOUNT];
501#endif
502
503#if 0
504 void gen_coverage_swath (unsigned int page);
505
506 bool has_char (uint32_t ch)
507 {
508 unsigned int page = ch >> SWATHBITS;
509 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
510
511 if (page >= SWATHCOUNT)
512 return false;
513
514 if (!cvr[page]) gen_coverage_swath (page);
515
516 return cvr[page][idx >> 5] & (1 << (idx & 31));
517 }
518#endif
519 rxvt_font_xft () { f = 0; d = 0; } 812 rxvt_font_xft () { f = 0; }
520 813
521 void clear (); 814 void clear ();
522 815
523 bool load (int maxheight); 816 rxvt_fontprop properties ();
524 817
525 void draw (int x, int y, 818 bool load (const rxvt_fontprop &prop);
819
820 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 821 const text_t *text, int len,
527 int fg, int bg); 822 int fg, int bg);
528 823
529 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
530 825
531protected: 826protected:
532 XftFont *f; 827 XftFont *f;
533 XftDraw *d;
534
535#if 0
536 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
537 void set_swath (uint32_t ch)
538 {
539 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
540 }
541#endif
542}; 828};
543 829
544void 830void
545rxvt_font_xft::clear () 831rxvt_font_xft::clear ()
546{ 832{
547 if (f) 833 if (f)
548 { 834 {
549 XftFontClose (DISPLAY, f); 835 XftFontClose (DISPLAY, f);
550 f = 0; 836 f = 0;
551 } 837 }
838}
552 839
553 if (d) 840rxvt_fontprop
554 { 841rxvt_font_xft::properties ()
555 XftDrawDestroy (d); 842{
556 d = 0; 843 rxvt_fontprop p;
557 }
558 844
559#if 0 845 FT_Face face = XftLockFace (f);
560 for (int i = 0; i < SWATHCOUNT; i++) 846
561 delete cvr[i]; 847 p.width = width; p.height = height;
562#endif 848 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
849 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
850
851 XftUnlockFace (f);
852
853 return p;
563} 854}
564 855
565bool 856bool
566rxvt_font_xft::load (int maxheight) 857rxvt_font_xft::load (const rxvt_fontprop &prop)
567{ 858{
568#if 0 859#if 0
569 for (int i = 0; i < SWATHCOUNT; i++) 860 for (int i = 0; i < SWATHCOUNT; i++)
570 cvr[i] = 0; 861 cvr[i] = 0;
571#endif 862#endif
572 863
573 clear (); 864 clear ();
574 865
575 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 866 FcPattern *p = FcNameParse ((FcChar8 *) name);
867
868 if (!p)
869 return false;
870
871 FcValue v;
872
873 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
874 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
875
876 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_SLANT, prop.slant);
878
879#if 0 // clipping unfortunately destroys our precious double-width-characters
880 // clip width, we can't do better, or can we?
881 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
882 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
883#endif
884
885 //FcPatternAddBool (p, FC_MINSPACE, 1);
886
887 XftResult result;
888 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
889
890 FcPatternDestroy (p);
891
892 if (!match)
893 return false;
894
895 f = XftFontOpenPattern (DISPLAY, match);
576 896
577 if (!f) 897 if (!f)
898 {
899 FcPatternDestroy (match);
578 return false; 900 return false;
901 }
579 902
580 FT_Face face = XftLockFace (f); 903 FT_Face face = XftLockFace (f);
581 904
582 prop = !FT_IS_FIXED_WIDTH (face); 905 slow = !FT_IS_FIXED_WIDTH (face);
583 906
584 int ftheight = 0; 907 int ftheight = 0;
585 908
586 for (;;) 909 for (;;)
587 { 910 {
… …
589 FcChar8 c; 912 FcChar8 c;
590 913
591 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 914 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
592 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 915 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
593 916
594 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 917 if (g1.xOff != g2.xOff) // don't simply trust the font
918 slow = true;
595 919
596 width = g2.xOff; 920 width = g2.xOff;
597 ascent = (face->size->metrics.ascender + 63) >> 6; 921 ascent = (face->size->metrics.ascender + 63) >> 6;
598 descent = (-face->size->metrics.descender + 63) >> 6; 922 descent = (-face->size->metrics.descender + 63) >> 6;
599 height = ascent + descent; 923 height = ascent + descent;
600 924
601 if (height <= maxheight || !maxheight) 925 if (height <= prop.height || !prop.height)
602 break; 926 break;
603 927
604 if (ftheight) 928 if (ftheight)
605 { 929 {
606 // take smaller steps near the end 930 // take smaller steps near the end
607 if (height > maxheight + 1) ftheight++; 931 if (height > prop.height + 1) ftheight++;
608 if (height > maxheight + 2) ftheight++; 932 if (height > prop.height + 2) ftheight++;
609 if (height > maxheight + 3) ftheight++; 933 if (height > prop.height + 3) ftheight++;
610 934
611 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 935 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
612 } 936 }
613 else 937 else
614 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 938 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
615 } 939 }
616 940
617 XftUnlockFace (f); 941 XftUnlockFace (f);
618 942
619 return true; 943 return true;
620} 944}
621 945
622#if 0
623void rxvt_font::gen_coverage_swath (unsigned int page)
624{
625 cvr[page] = new swath;
626
627 for (int i = 0; i < SWATHSIZE; i++)
628 cvr[page][i] = 0;
629
630 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
631}
632#endif
633
634bool 946bool
635rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
636{ 948{
637 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
638} 950}
639 951
640void 952void
641rxvt_font_xft::draw (int x, int y, 953rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
642 const text_t *text, int len, 954 const text_t *text, int len,
643 int fg, int bg) 955 int fg, int bg)
644{ 956{
645 if (!d)
646 {
647 dR;
648 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
649 }
650
651 if (bg >= 0 && bg != Color_bg)
652 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
653 else
654 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 957 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
655 958
656 if (!prop && width == r->TermWin.fwidth) 959 if (!slow && width == r->TermWin.fwidth && 0)
657 { 960 {
658 if (sizeof (text_t) == sizeof (FcChar16)) 961 if (sizeof (text_t) == sizeof (FcChar16))
659 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 962 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
660 else 963 else
661 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 964 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
664 { 967 {
665 while (len) 968 while (len)
666 { 969 {
667 if (*text != NOCHAR && *text != ' ') 970 if (*text != NOCHAR && *text != ' ')
668 { 971 {
972 int fwidth = r->TermWin.fwidth;
973 if (len >= 2 && text[1] == NOCHAR)
974 fwidth *= 2;
975
976 XGlyphInfo extents;
669 if (sizeof (text_t) == sizeof (FcChar16)) 977 if (sizeof (text_t) == sizeof (FcChar16))
670 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 978 {
979 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
980 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
981 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
982 }
671 else 983 else
672 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 984 {
985 XGlyphInfo extents;
986 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
987 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
988 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
989 }
673 } 990 }
674 991
675 x += r->TermWin.fwidth; 992 x += r->TermWin.fwidth;
676 text++; 993 text++;
677 len--; 994 len--;
… …
681#endif 998#endif
682 999
683///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
684 1001
685rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
686#ifdef EXPLICIT_CONTEXT 1003: r (r), fontdesc (0)
687: r(r)
688#endif
689{ 1004{
690 clear (); 1005 clear ();
691} 1006}
692 1007
693rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
696} 1011}
697 1012
698void 1013void
699rxvt_fontset::clear () 1014rxvt_fontset::clear ()
700{ 1015{
701 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
702 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
703 1020
704 fonts.clear (); 1021 fonts.clear ();
705 base_id = 0; 1022 base_id = 0;
706 height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
1024 base_prop.weight = rxvt_fontprop::medium;
1025 base_prop.slant = rxvt_fontprop::roman;
707 1026
708 fallback = fallback_fonts; 1027 fallback = fallback_fonts;
709} 1028}
710 1029
711rxvt_font * 1030rxvt_font *
… …
731 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
732 } 1051 }
733 else 1052 else
734 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
735 1054
1055 f->fs = this;
736 f->set_term (r); 1056 f->set_term (r);
737 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
738 1058
739 f->cs = cs; 1059 f->cs = cs;
740 f->loaded = false; 1060 f->loaded = false;
… …
758 1078
759 if (*desc == '[') 1079 if (*desc == '[')
760 { 1080 {
761 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1081 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
762 1082
763 const char *extra = desc++; 1083 //const char *extra = desc++; // not yet used
764 1084
765 desc = strchr (desc, ']'); 1085 desc = strchr (desc, ']');
766 1086
767 if (!desc) 1087 if (!desc)
768 { 1088 {
… …
796rxvt_fontset::realize_font (int i) 1116rxvt_fontset::realize_font (int i)
797{ 1117{
798 if (fonts[i]->loaded) 1118 if (fonts[i]->loaded)
799 return true; 1119 return true;
800 1120
801 if (fonts[i]->load (height))
802 return fonts[i]->loaded = true; 1121 fonts[i]->loaded = true;
803 1122
804 delete fonts[i]; 1123 if (!fonts[i]->load (base_prop))
805 fonts.erase (fonts.begin () + i); 1124 {
806 1125 fonts[i]->cs = CS_UNKNOWN;
807 return false; 1126 return false;
808} 1127 }
809 1128
810void 1129 return true;
1130}
1131
1132bool
811rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
812{ 1134{
813 clear (); 1135 clear ();
1136
1137 fontdesc = strdup (desc);
814 1138
815 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
816 realize_font (0); 1140 realize_font (0);
817 1141
818 add_fonts (desc); 1142 add_fonts (desc);
819 1143
820 if (!base_id) 1144 if (!base_id)
821 base_id = 1; 1145 base_id = 1;
822 1146
823 // we currently need a base-font, no matter what 1147 // we currently need a base-font, no matter what
824 if (fonts.size () <= base_id) 1148 if ((int)fonts.size () <= base_id || !realize_font (base_id))
825 { 1149 {
1150 puts ("unable to load specified font (s), falling back to 'fixed'\n");
826 add_fonts ("fixed"); 1151 add_fonts ("fixed");
827 base_id = 1; 1152 base_id = fonts.size () - 1;
828 } 1153 }
829 1154
830 if (fonts.size () <= base_id || !realize_font (base_id)) 1155 if ((int)fonts.size () <= base_id || !realize_font (base_id))
831 { 1156 return false;
832 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
833 exit (1);
834 }
835 1157
836 height = fonts[base_id]->height; 1158 base_prop = fonts[base_id]->properties ();
837 1159
838 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1160 return true;
839} 1161}
840 1162
841int 1163int
842rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
843{ 1165{
844 for (int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
845 { 1169 {
846 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
847 1171
848 if (!f->loaded) 1172 if (!f->loaded)
849 { 1173 {
850 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1174 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
851 goto next_font; 1175 goto next_font;
852 1176
853 if (!realize_font (i)) 1177 if (!realize_font (i))
854 {
855 --i;
856 goto next_font; 1178 goto next_font;
857 } 1179 }
858 1180
859 //printf ("added font %s for %04lx\n", f->name, unicode);
860 }
861
862 if (f->has_codepoint (unicode)) 1181 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
863 return i; 1182 return i;
864 1183
865 next_font: 1184 next_font:
866 if (i == fonts.size () - 1 && fallback->name) 1185 if (i == fonts.size () - 1 && fallback->name)
867 { 1186 {
868 fonts.push_back (new_font (fallback->name, fallback->cs)); 1187 fonts.push_back (new_font (fallback->name, fallback->cs));
869 fallback++; 1188 fallback++;
1189 i = 0;
870 } 1190 }
871 } 1191 }
872 1192
873 return 0; /* we must return SOME font */ 1193 return 0; /* we must return SOME font */
874} 1194}

Diff Legend

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