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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.55 by root, Mon Jul 26 14:57:12 2004 UTC

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

Diff Legend

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