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

Diff Legend

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