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

Diff Legend

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