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.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.25 by pcg, Tue Feb 24 23:58: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 GC 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;
… …
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_1983_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" },
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_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
76 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
77 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
78 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
79 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
80 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
81 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
82 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
83 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
84#endif 86#endif
85 87
86#if XFT 88#if XFT
87 { CS_UNICODE, "xft:Andale Mono" }, 89 { CS_UNICODE, "xft:Andale Mono" },
88 { CS_UNICODE, "xft:Arial Unicode MS" }, 90 { CS_UNICODE, "xft:Arial Unicode MS" },
89#endif 91#endif
90 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
91 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
92 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
94 97
95 { CS_UNKNOWN, 0 } 98 { CS_UNKNOWN, 0 }
96}; 99};
97 100
98///////////////////////////////////////////////////////////////////////////// 101/////////////////////////////////////////////////////////////////////////////
99 102
103rxvt_drawable::~rxvt_drawable ()
104{
105 if (xftdrawable)
106 XftDrawDestroy (xftdrawable);
107}
108
109rxvt_drawable::operator XftDraw *()
110{
111 if (!xftdrawable)
112 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
113
114 return xftdrawable;
115}
116
117/////////////////////////////////////////////////////////////////////////////
118
100static void *enc_buf; 119static void *enc_buf;
101static uint32_t enc_len; 120static uint32_t enc_len;
102 121
103static inline void * 122static inline void *
104get_enc_buf (int len) 123get_enc_buf (uint32_t len)
105{ 124{
106 if (len > enc_len) 125 if (len > enc_len)
107 { 126 {
108 free (enc_buf); 127 free (enc_buf);
109 enc_buf = malloc (len); 128 enc_buf = malloc (len);
… …
111 130
112 return enc_buf; 131 return enc_buf;
113} 132}
114 133
115static const char * 134static const char *
116enc_char (const text_t *text, int len, codeset cs, bool &zero) 135enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117{ 136{
118 uint8_t *buf = (uint8_t *)get_enc_buf (len); 137 uint8_t *buf = (uint8_t *)get_enc_buf (len);
119 138
120 while (len--) 139 while (len--)
121 { 140 {
… …
132 151
133 return (const char *)enc_buf; 152 return (const char *)enc_buf;
134} 153}
135 154
136static const XChar2b * 155static const XChar2b *
137enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 156enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138{ 157{
139 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 158 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
140 159
141 while (len--) 160 while (len--)
142 { 161 {
… …
157} 176}
158 177
159///////////////////////////////////////////////////////////////////////////// 178/////////////////////////////////////////////////////////////////////////////
160 179
161void 180void
162rxvt_font::clear_rect (int x, int y, int w, int h, int color) 181rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
163{ 182{
164 if (color == Color_bg) 183 if (color == Color_bg)
165 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 184 XClearArea (d.display->display, d, x, y, w, h, FALSE);
166 else if (color >= 0) 185 else if (color >= 0)
167 { 186 {
187#if XFT
188 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
189#else
168 XSetForeground (DISPLAY, GC, r->PixColors[color]); 190 XSetForeground (d.display->display, GC, r->PixColors[color]);
169 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 191 XFillRectangle (d.display->display, d, GC, x, y, w, h);
192#endif
170 } 193 }
171} 194}
172 195
173static const char *linedraw_cmds[128] = { 196static const char *linedraw_cmds[128] = {
174 "1hH", "2hH", "1vV", "2vV", 197 "1hH", "2hH", "1vV", "2vV",
… …
220 243
221 // to be done 244 // to be done
222}; 245};
223 246
224struct rxvt_font_default : rxvt_font { 247struct rxvt_font_default : rxvt_font {
225 bool load (int maxheight) 248 rxvt_fontprop properties ()
249 {
250 rxvt_fontprop p;
251
252 p.width = p.height = 1;
253 p.weight = rxvt_fontprop::medium;
254 p.slant = rxvt_fontprop::roman;
255
256 return p;
257 }
258
259 bool load (const rxvt_fontprop &prop)
226 { 260 {
227 width = 1; height = 1; 261 width = 1; height = 1;
228 ascent = 1; descent = 0; 262 ascent = 1; descent = 0;
229 263
230 return true; 264 return true;
… …
248 } 282 }
249 283
250 return false; 284 return false;
251 } 285 }
252 286
253 void draw (int x, int y, 287 void draw (rxvt_drawable &d, int x, int y,
254 const text_t *text, int len, 288 const text_t *text, int len,
255 int fg, int bg); 289 int fg, int bg);
256}; 290};
257 291
258void 292void
259rxvt_font_default::draw (int x, int y, 293rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260 const text_t *text, int len, 294 const text_t *text, int len,
261 int fg, int bg) 295 int fg, int bg)
262{ 296{
263 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 297 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
264 298
265 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 299 XSetForeground (d.display->display, GC, r->PixColors[fg]);
266 300
267 while (len--) 301 while (len--)
268 { 302 {
269 text_t t = *text++; 303 text_t t = *text++;
270 304
271 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 305 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
272 { 306 {
273 const char *p = linedraw_cmds[t - 0x2500]; 307 const char *p = linedraw_cmds[t - 0x2500];
274 308
275 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 309 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
276 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 310 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
277 311
278 XGCValues gcv; 312 XGCValues gcv;
279 313
280 while (*p) 314 while (*p)
281 { 315 {
282 switch (*p++) 316 switch (*p++)
283 { 317 {
284 case '1': 318 case '1':
285 gcv.line_width = 0; 319 gcv.line_width = 0;
286 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 320 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
287 break; 321 break;
288 322
289 case '2': 323 case '2':
290 gcv.line_width = 2; 324 gcv.line_width = 2;
291 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 325 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
292 break; 326 break;
293 327
294 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 328 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
295 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 329 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
296 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 330 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
297 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 331 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
298 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 332 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
299 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 333 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
300 } 334 }
301 } 335 }
302 336
303 gcv.line_width = 0; 337 gcv.line_width = 0;
304 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 338 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
305 } 339 }
306 else 340 else
307 switch (*text++) 341 switch (*text++)
308 { 342 {
309 case NOCHAR: 343 case NOCHAR:
310 case ZERO_WIDTH_CHAR: 344 case ZERO_WIDTH_CHAR:
311 break; 345 break;
312 default: 346 default:
313 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 347 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
314 } 348 }
315 349
316 x += r->TermWin.fwidth; 350 x += r->TermWin.fwidth;
317 } 351 }
318} 352}
… …
322struct rxvt_font_x11 : rxvt_font { 356struct rxvt_font_x11 : rxvt_font {
323 rxvt_font_x11 () { f = 0; } 357 rxvt_font_x11 () { f = 0; }
324 358
325 void clear (); 359 void clear ();
326 360
327 bool load (int maxheight); 361 rxvt_fontprop properties ();
362
363 bool load (const rxvt_fontprop &prop);
328 364
329 bool has_codepoint (uint32_t unicode); 365 bool has_codepoint (uint32_t unicode);
330 366
331 void draw (int x, int y, 367 void draw (rxvt_drawable &d, int x, int y,
332 const text_t *text, int len, 368 const text_t *text, int len,
333 int fg, int bg); 369 int fg, int bg);
334 370
335 XFontStruct *f; 371 XFontStruct *f;
336 codeset cs; 372 codeset cs;
337 bool enc2b, encm; 373 bool enc2b, encm;
338 374
339 const char *get_property (const char *property, const char *repl) const; 375 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
376 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
377 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
378 bool set_properties (rxvt_fontprop &p, const char *name);
340}; 379};
341 380
342const char * 381const char *
343rxvt_font_x11::get_property (const char *property, const char *repl) const 382rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
344{ 383{
345 unsigned long value; 384 unsigned long value;
346 385
347 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 386 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348 return XGetAtomName (DISPLAY, value); 387 return XGetAtomName (DISPLAY, value);
349 else 388 else
350 return repl; 389 return repl;
351} 390}
352 391
392rxvt_fontprop
393rxvt_font_x11::properties ()
394{
395 rxvt_fontprop p;
396 set_properties (p, f);
397 return p;
398}
399
353bool 400bool
354rxvt_font_x11::load (int maxheight) 401rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
402{
403 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
404 p.height = height;
405 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
406 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
407
408 return true;
409}
410
411bool
412rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
413{
414 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
415 const char *slant = get_property (f, "SLANT", "r");
416
417 unsigned long height;
418 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
419 return false;
420
421 unsigned long avgwidth;
422 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
423 avgwidth = 0;
424
425 return set_properties (p, height, weight, slant, avgwidth);
426}
427
428bool
429rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
430{
431 int slashes = 0;
432 const char *comp[12];
433
434 for (const char *c = name; *c; c++)
435 if (*c == '-')
436 {
437 comp[slashes++] = c + 1;
438 if (slashes >= 13)
439 break;
440 }
441
442 /* can we short-circuit the costly XLoadQueryFont? */
443 if (slashes >= 13
444 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
445 && (*comp[11] >= '0' && *comp[11] <= '9'))
446 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
447
448 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
449
450 if (f)
451 {
452 // the font should really exist now. if not, we have a problem
453 // (e.g. if the user did xset fp rehash just when we were searching fonts).
454 // in that case, just return garbage.
455 bool ret = set_properties (p, f);
456 XFreeFont (DISPLAY, f);
457 return ret;
458 }
459 else
460 return false;
461}
462
463// fix the size of scalable fonts
464static void
465fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
466{
467 int slashes = 0;
468 const char *size;
469
470 for (const char *c = name; *c; c++)
471 if (*c == '-')
472 {
473 if (slashes == 6)
474 size = c + 1;
475
476 if (++slashes >= 13)
477 break;
478 }
479
480 if (slashes >= 13 && size[0] == '0')
481 {
482 strncpy (buf, name, size - name);
483 buf += size - name;
484 buf += sprintf (buf, "%d", prop.height);
485 strcpy (buf, size + 1);
486 }
487 else
488 strcpy (buf, name);
489}
490
491bool
492rxvt_font_x11::load (const rxvt_fontprop &prop)
355{ 493{
356 clear (); 494 clear ();
495
496 char **list;
497 int count;
498 list = XListFonts (DISPLAY, name, 512, &count);
499 set_name (0);
500
501 if (!list)
502 return false;
503
504 int bestdiff = 0x7fffffff;
505 for (int i = 0; i < count; i++)
506 {
507 rxvt_fontprop p;
508 char fname[1024];
509 fix_scalable (fname, list[i], prop);
510
511 if (!set_properties (p, fname))
512 continue;
513
514 if (p.height > prop.height) // weed out too large fonts
515 continue;
516
517 int diff = (prop.height - p.height) * 32
518 + abs (prop.weight - p.weight)
519 + abs (prop.slant - p.slant );
520
521 if (!name // compare against best found so far
522 || diff < bestdiff)
523 {
524 set_name (strdup (fname));
525 bestdiff = diff;
526 }
527 }
528
529 XFreeFontNames (list);
530
531 if (!name)
532 return false;
357 533
358 f = XLoadQueryFont (DISPLAY, name); 534 f = XLoadQueryFont (DISPLAY, name);
359 535
360 if (!f) 536 if (!f)
361 return false; 537 return false;
362 538
363 unsigned long value;
364
365 const char *registry = get_property ("CHARSET_REGISTRY", 0); 539 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366 const char *encoding = get_property ("CHARSET_ENCODING", 0); 540 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367 541
368 if (registry && encoding) 542 if (registry && encoding)
369 { 543 {
370 char charset[64]; 544 char charset[64];
371 snprintf (charset, 64, "%s-%s", registry, encoding); 545 snprintf (charset, 64, "%s-%s", registry, encoding);
372 546
373 cs = codeset_from_name (charset); 547 cs = codeset_from_name (charset);
374 } 548 }
375 else 549 else
376 { 550 {
377 const char *charset = get_property ("FONT", 0); 551 const char *charset = get_property (f, "FONT", 0);
378 552
379 if (!charset) 553 if (!charset)
380 charset = name; 554 charset = name;
381 555
382 int count = 13; 556 int count = 13;
… …
395 569
396 ascent = f->ascent; 570 ascent = f->ascent;
397 descent = f->descent; 571 descent = f->descent;
398 height = ascent + descent; 572 height = ascent + descent;
399 573
400 prop = false; 574 slow = false;
401 575
402 if (f->min_bounds.width == f->max_bounds.width) 576 if (f->min_bounds.width == f->max_bounds.width)
403 width = f->min_bounds.width; 577 width = f->min_bounds.width;
404 else if (f->per_char == NULL) 578 else if (f->per_char == NULL)
405 width = f->max_bounds.width; 579 width = f->max_bounds.width;
406 else 580 else
407 { 581 {
408 prop = true; 582 slow = true;
409 583
410 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 584 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411 585
412 if (encm) 586 if (encm)
413 N += (f->max_byte1 - f->min_byte1) 587 N += (f->max_byte1 - f->min_byte1)
… …
455 /* check wether the character exists in _this_ font. horrible. */ 629 /* check wether the character exists in _this_ font. horrible. */
456 XCharStruct *xcs; 630 XCharStruct *xcs;
457 631
458 if (encm) 632 if (encm)
459 { 633 {
460 int byte1 = ch >> 8; 634 unsigned char byte1 = ch >> 8;
461 int byte2 = ch & 255; 635 unsigned char byte2 = ch & 255;
462 636
463 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 637 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
464 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 638 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
465 return false; 639 return false;
466 640
… …
489 663
490 return true; 664 return true;
491} 665}
492 666
493void 667void
494rxvt_font_x11::draw (int x, int y, 668rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
495 const text_t *text, int len, 669 const text_t *text, int len,
496 int fg, int bg) 670 int fg, int bg)
497{ 671{
498 // this looks like a mess /. 672 // this looks like a mess /.
499 // and it is a mess /. 673 // and it is a mess /.
500 // yet we are trying to be perfect /. 674 // yet we are trying to be perfect /.
501 // but the result still isn't perfect /. 675 // but the result still isn't perfect /.
502 676
503 bool slow = prop 677 bool slow = this->slow
504 || width != r->TermWin.fwidth 678 || width != r->TermWin.fwidth
505 || height != r->TermWin.fheight; 679 || height != r->TermWin.fheight;
506 680
507 int base = r->TermWin.fbase; 681 int base = r->TermWin.fbase;
508 682
… …
515 { 689 {
516 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 690 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
517 691
518 if (bg == Color_bg && !slow) 692 if (bg == Color_bg && !slow)
519 { 693 {
520 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 694 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
521 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 695 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
522 } 696 }
523 else 697 else
524 { 698 {
525 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 699 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
526 700
527 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 701 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
528 702
529 if (slow) 703 if (slow)
530 { 704 {
531 do 705 do
532 { 706 {
533 if (xc->byte1 || xc->byte2) 707 if (xc->byte1 || xc->byte2)
534 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 708 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
535 709
536 x += r->TermWin.fwidth; 710 x += r->TermWin.fwidth;
537 xc++; len--; 711 xc++; len--;
538 } 712 }
539 while (len); 713 while (len);
540 } 714 }
541 else 715 else
542 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 716 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
543 } 717 }
544 } 718 }
545 else 719 else
546 { 720 {
547 const char *xc = enc_char (text, len, cs, slow); 721 const char *xc = enc_char (text, len, cs, slow);
548 722
549 if (bg == Color_bg && !slow) 723 if (bg == Color_bg && !slow)
550 { 724 {
551 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 725 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
552 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 726 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
553 } 727 }
554 else 728 else
555 { 729 {
556 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 730 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
557 731
558 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 732 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
559 733
560 if (slow) 734 if (slow)
561 { 735 {
562 do 736 do
563 { 737 {
564 if (*xc) 738 if (*xc)
565 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 739 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
566 740
567 x += r->TermWin.fwidth; 741 x += r->TermWin.fwidth;
568 xc++; len--; 742 xc++; len--;
569 } 743 }
570 while (len); 744 while (len);
571 } 745 }
572 else 746 else
573 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 747 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
574 } 748 }
575 } 749 }
576} 750}
577 751
578///////////////////////////////////////////////////////////////////////////// 752/////////////////////////////////////////////////////////////////////////////
… …
583//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 757//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
584#define SWATHBITS 8 758#define SWATHBITS 8
585#endif 759#endif
586 760
587struct rxvt_font_xft : rxvt_font { 761struct rxvt_font_xft : rxvt_font {
588#if 0
589 enum {
590 SWATHCOUNT = 1 << (21 - UNIBITS),
591 SWATHSIZE = 1 << (SWATHBITS - 5)
592 };
593 typedef uint32_t swath[SWATHSIZE];
594
595 swath *cvr[SWATHCOUNT];
596#endif
597
598#if 0
599 void gen_coverage_swath (unsigned int page);
600
601 bool has_char (uint32_t ch)
602 {
603 unsigned int page = ch >> SWATHBITS;
604 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
605
606 if (page >= SWATHCOUNT)
607 return false;
608
609 if (!cvr[page]) gen_coverage_swath (page);
610
611 return cvr[page][idx >> 5] & (1 << (idx & 31));
612 }
613#endif
614 rxvt_font_xft () { f = 0; d = 0; } 762 rxvt_font_xft () { f = 0; }
615 763
616 void clear (); 764 void clear ();
617 765
618 bool load (int maxheight); 766 rxvt_fontprop properties ();
619 767
620 void draw (int x, int y, 768 bool load (const rxvt_fontprop &prop);
769
770 void draw (rxvt_drawable &d, int x, int y,
621 const text_t *text, int len, 771 const text_t *text, int len,
622 int fg, int bg); 772 int fg, int bg);
623 773
624 bool has_codepoint (uint32_t unicode); 774 bool has_codepoint (uint32_t unicode);
625 775
626protected: 776protected:
627 XftFont *f; 777 XftFont *f;
628 XftDraw *d;
629
630#if 0
631 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
632 void set_swath (uint32_t ch)
633 {
634 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
635 }
636#endif
637}; 778};
638 779
639void 780void
640rxvt_font_xft::clear () 781rxvt_font_xft::clear ()
641{ 782{
642 if (f) 783 if (f)
643 { 784 {
644 XftFontClose (DISPLAY, f); 785 XftFontClose (DISPLAY, f);
645 f = 0; 786 f = 0;
646 } 787 }
788}
647 789
648 if (d) 790rxvt_fontprop
649 { 791rxvt_font_xft::properties ()
650 XftDrawDestroy (d); 792{
651 d = 0; 793 rxvt_fontprop p;
652 }
653 794
654#if 0 795 FT_Face face = XftLockFace (f);
655 for (int i = 0; i < SWATHCOUNT; i++) 796
656 delete cvr[i]; 797 p.width = width; p.height = height;
657#endif 798 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
799 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
800
801 XftUnlockFace (f);
802
803 return p;
658} 804}
659 805
660bool 806bool
661rxvt_font_xft::load (int maxheight) 807rxvt_font_xft::load (const rxvt_fontprop &prop)
662{ 808{
663#if 0 809#if 0
664 for (int i = 0; i < SWATHCOUNT; i++) 810 for (int i = 0; i < SWATHCOUNT; i++)
665 cvr[i] = 0; 811 cvr[i] = 0;
666#endif 812#endif
667 813
668 clear (); 814 clear ();
669 815
670 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 816 FcPattern *p = FcNameParse ((FcChar8 *) name);
817
818 if (!p)
819 return false;
820
821 FcValue v;
822
823 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
824 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
825
826 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
827 FcPatternAddInteger (p, FC_SLANT, prop.slant);
828
829#if 0 // clipping unfortunately destroys our precious double-width-characters
830 // clip width, we can't do better, or can we?
831 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
832 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
833#endif
834
835 //FcPatternAddBool (p, FC_MINSPACE, 1);
836
837 XftResult result;
838 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
839
840 FcPatternDestroy (p);
841
842 if (!match)
843 return false;
844
845 f = XftFontOpenPattern (DISPLAY, match);
671 846
672 if (!f) 847 if (!f)
848 {
849 FcPatternDestroy (match);
673 return false; 850 return false;
851 }
674 852
675 FT_Face face = XftLockFace (f); 853 FT_Face face = XftLockFace (f);
676 854
677 prop = !FT_IS_FIXED_WIDTH (face); 855 slow = !FT_IS_FIXED_WIDTH (face);
678 856
679 int ftheight = 0; 857 int ftheight = 0;
680 858
681 for (;;) 859 for (;;)
682 { 860 {
… …
684 FcChar8 c; 862 FcChar8 c;
685 863
686 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 864 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 865 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688 866
689 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 867 if (g1.xOff != g2.xOff) // don't simply trust the font
868 slow = true;
690 869
691 width = g2.xOff; 870 width = g2.xOff;
692 ascent = (face->size->metrics.ascender + 63) >> 6; 871 ascent = (face->size->metrics.ascender + 63) >> 6;
693 descent = (-face->size->metrics.descender + 63) >> 6; 872 descent = (-face->size->metrics.descender + 63) >> 6;
694 height = ascent + descent; 873 height = ascent + descent;
695 874
696 if (height <= maxheight || !maxheight) 875 if (height <= prop.height || !prop.height)
697 break; 876 break;
698 877
699 if (ftheight) 878 if (ftheight)
700 { 879 {
701 // take smaller steps near the end 880 // take smaller steps near the end
702 if (height > maxheight + 1) ftheight++; 881 if (height > prop.height + 1) ftheight++;
703 if (height > maxheight + 2) ftheight++; 882 if (height > prop.height + 2) ftheight++;
704 if (height > maxheight + 3) ftheight++; 883 if (height > prop.height + 3) ftheight++;
705 884
706 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 885 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707 } 886 }
708 else 887 else
709 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 888 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710 } 889 }
711 890
712 XftUnlockFace (f); 891 XftUnlockFace (f);
713 892
714 return true; 893 return true;
715} 894}
716
717#if 0
718void rxvt_font::gen_coverage_swath (unsigned int page)
719{
720 cvr[page] = new swath;
721
722 for (int i = 0; i < SWATHSIZE; i++)
723 cvr[page][i] = 0;
724
725 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
726}
727#endif
728 895
729bool 896bool
730rxvt_font_xft::has_codepoint (uint32_t unicode) 897rxvt_font_xft::has_codepoint (uint32_t unicode)
731{ 898{
732 return XftCharExists (DISPLAY, f, unicode); 899 return XftCharExists (DISPLAY, f, unicode);
733} 900}
734 901
735void 902void
736rxvt_font_xft::draw (int x, int y, 903rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
737 const text_t *text, int len, 904 const text_t *text, int len,
738 int fg, int bg) 905 int fg, int bg)
739{ 906{
740 if (!d)
741 {
742 dR;
743 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
744 }
745
746 if (bg >= 0 && bg != Color_bg)
747 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
748 else
749 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 907 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750 908
751 if (!prop && width == r->TermWin.fwidth) 909 if (!slow && width == r->TermWin.fwidth && 0)
752 { 910 {
753 if (sizeof (text_t) == sizeof (FcChar16)) 911 if (sizeof (text_t) == sizeof (FcChar16))
754 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 912 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755 else 913 else
756 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 914 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
759 { 917 {
760 while (len) 918 while (len)
761 { 919 {
762 if (*text != NOCHAR && *text != ' ') 920 if (*text != NOCHAR && *text != ' ')
763 { 921 {
922 int fwidth = r->TermWin.fwidth;
923 if (len >= 2 && text[1] == NOCHAR)
924 fwidth *= 2;
925
926 XGlyphInfo extents;
764 if (sizeof (text_t) == sizeof (FcChar16)) 927 if (sizeof (text_t) == sizeof (FcChar16))
765 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 928 {
929 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
930 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
931 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
932 }
766 else 933 else
767 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 934 {
935 XGlyphInfo extents;
936 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
937 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
938 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
939 }
768 } 940 }
769 941
770 x += r->TermWin.fwidth; 942 x += r->TermWin.fwidth;
771 text++; 943 text++;
772 len--; 944 len--;
… …
776#endif 948#endif
777 949
778///////////////////////////////////////////////////////////////////////////// 950/////////////////////////////////////////////////////////////////////////////
779 951
780rxvt_fontset::rxvt_fontset (rxvt_t r) 952rxvt_fontset::rxvt_fontset (rxvt_t r)
781#ifdef EXPLICIT_CONTEXT
782: r(r) 953: r (r)
783#endif
784{ 954{
785 clear (); 955 clear ();
786} 956}
787 957
788rxvt_fontset::~rxvt_fontset () 958rxvt_fontset::~rxvt_fontset ()
… …
791} 961}
792 962
793void 963void
794rxvt_fontset::clear () 964rxvt_fontset::clear ()
795{ 965{
796 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 966 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
797 FONT_UNREF (*i); 967 FONT_UNREF (*i);
798 968
799 fonts.clear (); 969 fonts.clear ();
800 base_id = 0; 970 base_id = 0;
801 height = 0x7fffffff; 971 base_prop.height = 0x7fffffff;
972 base_prop.weight = rxvt_fontprop::medium;
973 base_prop.slant = rxvt_fontprop::roman;
802 974
803 fallback = fallback_fonts; 975 fallback = fallback_fonts;
804} 976}
805 977
806rxvt_font * 978rxvt_font *
… …
853 1025
854 if (*desc == '[') 1026 if (*desc == '[')
855 { 1027 {
856 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1028 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
857 1029
858 const char *extra = desc++; 1030 //const char *extra = desc++; // not yet used
859 1031
860 desc = strchr (desc, ']'); 1032 desc = strchr (desc, ']');
861 1033
862 if (!desc) 1034 if (!desc)
863 { 1035 {
… …
891rxvt_fontset::realize_font (int i) 1063rxvt_fontset::realize_font (int i)
892{ 1064{
893 if (fonts[i]->loaded) 1065 if (fonts[i]->loaded)
894 return true; 1066 return true;
895 1067
896 if (fonts[i]->load (height))
897 return fonts[i]->loaded = true; 1068 fonts[i]->loaded = true;
898 1069
899 delete fonts[i]; 1070 if (!fonts[i]->load (base_prop))
900 fonts.erase (fonts.begin () + i); 1071 {
901 1072 fonts[i]->cs = CS_UNKNOWN;
902 return false; 1073 return false;
903} 1074 }
904 1075
905void 1076 return true;
1077}
1078
1079bool
906rxvt_fontset::populate (const char *desc) 1080rxvt_fontset::populate (const char *desc)
907{ 1081{
908 clear (); 1082 clear ();
909 1083
910 fonts.push_back (new_font (0, CS_UNICODE)); 1084 fonts.push_back (new_font (0, CS_UNICODE));
… …
914 1088
915 if (!base_id) 1089 if (!base_id)
916 base_id = 1; 1090 base_id = 1;
917 1091
918 // we currently need a base-font, no matter what 1092 // we currently need a base-font, no matter what
919 if (fonts.size () <= base_id) 1093 if ((int)fonts.size () <= base_id || !realize_font (base_id))
920 { 1094 {
1095 puts ("unable to load specified font (s), falling back to 'fixed'\n");
921 add_fonts ("fixed"); 1096 add_fonts ("fixed");
922 base_id = 1; 1097 base_id = fonts.size () - 1;
923 } 1098 }
924 1099
925 if (fonts.size () <= base_id || !realize_font (base_id)) 1100 if ((int)fonts.size () <= base_id || !realize_font (base_id))
926 { 1101 return false;
927 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
928 exit (1);
929 }
930 1102
931 height = fonts[base_id]->height; 1103 base_prop = fonts[base_id]->properties ();
932 1104
933 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1105 return true;
934} 1106}
935 1107
936int 1108int
937rxvt_fontset::find_font (uint32_t unicode) 1109rxvt_fontset::find_font (uint32_t unicode)
938{ 1110{
939 for (int i = 0; i < fonts.size (); i++) 1111 for (unsigned int i = 0; i < fonts.size (); i++)
940 { 1112 {
941 rxvt_font *f = fonts[i]; 1113 rxvt_font *f = fonts[i];
942 1114
943 if (!f->loaded) 1115 if (!f->loaded)
944 { 1116 {
945 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1117 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
946 goto next_font; 1118 goto next_font;
947 1119
948 if (!realize_font (i)) 1120 if (!realize_font (i))
949 {
950 --i;
951 goto next_font; 1121 goto next_font;
952 } 1122 }
953 1123
954 //printf ("added font %s for %04lx\n", f->name, unicode);
955 }
956
957 if (f->has_codepoint (unicode)) 1124 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
958 return i; 1125 return i;
959 1126
960 next_font: 1127 next_font:
961 if (i == fonts.size () - 1 && fallback->name) 1128 if (i == fonts.size () - 1 && fallback->name)
962 { 1129 {
963 fonts.push_back (new_font (fallback->name, fallback->cs)); 1130 fonts.push_back (new_font (fallback->name, fallback->cs));
964 fallback++; 1131 fallback++;
1132 i = 0;
965 } 1133 }
966 } 1134 }
967 1135
968 return 0; /* we must return SOME font */ 1136 return 0; /* we must return SOME font */
969} 1137}

Diff Legend

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