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.8 by pcg, Thu Dec 18 04:27:36 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
… …
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
29#define DRAWABLE r->TermWin.vt
30#define GC r->TermWin.gc 29#define GC r->TermWin.gc
31 30
32const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
33 codeset cs; 32 codeset cs;
34 const char *name; 33 const char *name;
… …
59 58
60 // japanese 59 // japanese
61#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
62# if XFT 61# if XFT
63 // prefer xft for complex scripts 62 // prefer xft for complex scripts
64 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65# endif 64# endif
66 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
67 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
68 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
69#endif 68#endif
70 69
71#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
72# if XFT 71# if XFT
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# 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" },
78 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 89#endif
87 90
88#if XFT 91#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
91#endif 94#endif
92 { 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" },
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
96 100
97 { CS_UNKNOWN, 0 } 101 { CS_UNKNOWN, 0 }
98}; 102};
99 103
100///////////////////////////////////////////////////////////////////////////// 104/////////////////////////////////////////////////////////////////////////////
101 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
102static void *enc_buf; 124static void *enc_buf;
103static uint32_t enc_len; 125static uint32_t enc_len;
104 126
105static inline void * 127static inline void *
106get_enc_buf (int len) 128get_enc_buf (uint32_t len)
107{ 129{
108 if (len > enc_len) 130 if (len > enc_len)
109 { 131 {
110 free (enc_buf); 132 free (enc_buf);
111 enc_buf = malloc (len); 133 enc_buf = malloc (len);
… …
113 135
114 return enc_buf; 136 return enc_buf;
115} 137}
116 138
117static const char * 139static const char *
118enc_char (const text_t *text, int len, codeset cs, bool &zero) 140enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
119{ 141{
120 uint8_t *buf = (uint8_t *)get_enc_buf (len); 142 uint8_t *buf = (uint8_t *)get_enc_buf (len);
121 143
122 while (len--) 144 while (len--)
123 { 145 {
… …
134 156
135 return (const char *)enc_buf; 157 return (const char *)enc_buf;
136} 158}
137 159
138static const XChar2b * 160static const XChar2b *
139enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 161enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
140{ 162{
141 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 163 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
142 164
143 while (len--) 165 while (len--)
144 { 166 {
… …
159} 181}
160 182
161///////////////////////////////////////////////////////////////////////////// 183/////////////////////////////////////////////////////////////////////////////
162 184
163void 185void
164rxvt_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)
165{ 187{
166 if (color == Color_bg) 188 if (color == Color_bg)
167 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 189 XClearArea (d.display->display, d, x, y, w, h, FALSE);
168 else if (color >= 0) 190 else if (color >= 0)
169 { 191 {
192#if XFT
193 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
194#else
170 XSetForeground (DISPLAY, GC, r->PixColors[color]); 195 XSetForeground (d.display->display, GC, r->PixColors[color]);
171 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 196 XFillRectangle (d.display->display, d, GC, x, y, w, h);
197#endif
172 } 198 }
173} 199}
174 200
175static const char *linedraw_cmds[128] = { 201static const char *linedraw_cmds[128] = {
176 "1hH", "2hH", "1vV", "2vV", 202 "1hH", "2hH", "1vV", "2vV",
… …
226struct rxvt_font_default : rxvt_font { 252struct rxvt_font_default : rxvt_font {
227 rxvt_fontprop properties () 253 rxvt_fontprop properties ()
228 { 254 {
229 rxvt_fontprop p; 255 rxvt_fontprop p;
230 256
231 p.height = 1; 257 p.width = p.height = 1;
232 p.weight = rxvt_fontprop::medium; 258 p.weight = rxvt_fontprop::medium;
233 p.slant = rxvt_fontprop::roman; 259 p.slant = rxvt_fontprop::roman;
234 260
235 return p; 261 return p;
236 } 262 }
… …
261 } 287 }
262 288
263 return false; 289 return false;
264 } 290 }
265 291
266 void draw (int x, int y, 292 void draw (rxvt_drawable &d, int x, int y,
267 const text_t *text, int len, 293 const text_t *text, int len,
268 int fg, int bg); 294 int fg, int bg);
269}; 295};
270 296
271void 297void
272rxvt_font_default::draw (int x, int y, 298rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
273 const text_t *text, int len, 299 const text_t *text, int len,
274 int fg, int bg) 300 int fg, int bg)
275{ 301{
276 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);
277 303
278 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 304 XSetForeground (d.display->display, GC, r->PixColors[fg]);
279 305
280 while (len--) 306 while (len--)
281 { 307 {
282 text_t t = *text++; 308 text_t t = *text++;
283 309
310 // is it in our linedrawing table?
284 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 311 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
285 { 312 {
286 const char *p = linedraw_cmds[t - 0x2500]; 313 const char *p = linedraw_cmds[t - 0x2500];
287 314
288 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;
289 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;
290 317
291 XGCValues gcv; 318 XGCValues gcv;
292 319
293 while (*p) 320 while (*p)
294 { 321 {
295 switch (*p++) 322 switch (*p++)
296 { 323 {
297 case '1': 324 case '1':
298 gcv.line_width = 0; 325 gcv.line_width = 0;
299 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 326 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
300 break; 327 break;
301 328
302 case '2': 329 case '2':
303 gcv.line_width = 2; 330 gcv.line_width = 2;
304 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 331 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
305 break; 332 break;
306 333
307 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;
308 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;
309 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;
310 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;
311 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;
312 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;
313 } 340 }
314 } 341 }
315 342
316 gcv.line_width = 0; 343 gcv.line_width = 0;
317 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
318 } 345 }
319 else 346 else
320 switch (*text++) 347 switch (t)
321 { 348 {
322 case NOCHAR:
323 case ZERO_WIDTH_CHAR: 349 case ZERO_WIDTH_CHAR:
324 break; 350 break;
325 default: 351 default:
326 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;
327 } 363 }
328 364
329 x += r->TermWin.fwidth; 365 x += r->TermWin.fwidth;
330 } 366 }
331} 367}
… …
336 rxvt_font_x11 () { f = 0; } 372 rxvt_font_x11 () { f = 0; }
337 373
338 void clear (); 374 void clear ();
339 375
340 rxvt_fontprop properties (); 376 rxvt_fontprop properties ();
341 rxvt_fontprop properties (XFontStruct *f);
342 377
343 bool load (const rxvt_fontprop &prop); 378 bool load (const rxvt_fontprop &prop);
344 379
345 bool has_codepoint (uint32_t unicode); 380 bool has_codepoint (uint32_t unicode);
346 381
347 void draw (int x, int y, 382 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 383 const text_t *text, int len,
349 int fg, int bg); 384 int fg, int bg);
350 385
351 XFontStruct *f; 386 XFontStruct *f;
352 codeset cs; 387 codeset cs;
353 bool enc2b, encm; 388 bool enc2b, encm;
354 389
355 const char *get_property (XFontStruct *f, 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);
356}; 394};
357 395
358const char * 396const char *
359rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 397rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
360{ 398{
… …
367} 405}
368 406
369rxvt_fontprop 407rxvt_fontprop
370rxvt_font_x11::properties () 408rxvt_font_x11::properties ()
371{ 409{
372 return properties (f);
373}
374
375rxvt_fontprop
376rxvt_font_x11::properties (XFontStruct *f)
377{
378 rxvt_fontprop p; 410 rxvt_fontprop p;
411 set_properties (p, f);
412 return p;
413}
379 414
415bool
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{
380 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 429 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381 const char *slant = get_property (f, "SLANT", "r"); 430 const char *slant = get_property (f, "SLANT", "r");
382 431
383 p.height = height; 432 unsigned long height;
384 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 433 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
385 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 434 return false;
386 435
387 return p; 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);
388} 504}
389 505
390bool 506bool
391rxvt_font_x11::load (const rxvt_fontprop &prop) 507rxvt_font_x11::load (const rxvt_fontprop &prop)
392{ 508{
393 clear (); 509 clear ();
394 510
395 char **list; 511 char **list;
396 int count; 512 int count;
397 XFontStruct *info;
398 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 513 list = XListFonts (DISPLAY, name, 512, &count);
514 set_name (0);
399 515
400 if (!list) 516 if (!list)
401 return false; 517 return false;
402 518
403 int bestdiff = 0x7fffffff; 519 int bestdiff = 0x7fffffff;
404 XFontStruct *best = 0;
405 for (int i = 0; i < count; i++) 520 for (int i = 0; i < count; i++)
406 { 521 {
407 XFontStruct *f = info + i; 522 rxvt_fontprop p;
523 char fname[1024];
524 fix_scalable (fname, list[i], prop);
408 525
526 if (!set_properties (p, fname))
527 continue;
528
409 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 529 if (p.height > prop.height) // weed out too large fonts
410 { 530 continue;
411 rxvt_fontprop p = properties (f); 531
412 int diff = (prop.height - f->ascent + f->descent) * 32 532 int diff = (prop.height - p.height) * 32
413 + abs (prop.weight - p.weight) 533 + abs (prop.weight - p.weight)
414 + abs (prop.slant - p.slant ); 534 + abs (prop.slant - p.slant );
415 535
416 if (!best // compare against best found so far 536 if (!name // compare against best found so far
417 || diff < bestdiff) 537 || diff < bestdiff)
418 { 538 {
419 best = f; 539 set_name (strdup (fname));
420 bestdiff = diff; 540 bestdiff = diff;
421 } 541 }
422 }
423 } 542 }
424 543
425 set_name (strdup (list[best - info])); 544 XFreeFontNames (list);
426 545
427 XFreeFontInfo (list, info, count); 546 if (!name)
547 return false;
428 548
429 f = XLoadQueryFont (DISPLAY, name); 549 f = XLoadQueryFont (DISPLAY, name);
430 550
431 if (!f) 551 if (!f)
432 return false; 552 return false;
433
434 unsigned long value;
435 553
436 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 554 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 555 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438 556
439 if (registry && encoding) 557 if (registry && encoding)
… …
526 /* check wether the character exists in _this_ font. horrible. */ 644 /* check wether the character exists in _this_ font. horrible. */
527 XCharStruct *xcs; 645 XCharStruct *xcs;
528 646
529 if (encm) 647 if (encm)
530 { 648 {
531 int byte1 = ch >> 8; 649 unsigned char byte1 = ch >> 8;
532 int byte2 = ch & 255; 650 unsigned char byte2 = ch & 255;
533 651
534 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 652 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
535 || 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)
536 return false; 654 return false;
537 655
… …
560 678
561 return true; 679 return true;
562} 680}
563 681
564void 682void
565rxvt_font_x11::draw (int x, int y, 683rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
566 const text_t *text, int len, 684 const text_t *text, int len,
567 int fg, int bg) 685 int fg, int bg)
568{ 686{
569 // this looks like a mess /. 687 // this looks like a mess /.
570 // and it is a mess /. 688 // and it is a mess /.
… …
586 { 704 {
587 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 705 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
588 706
589 if (bg == Color_bg && !slow) 707 if (bg == Color_bg && !slow)
590 { 708 {
591 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 709 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
592 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 710 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
593 } 711 }
594 else 712 else
595 { 713 {
596 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);
597 715
598 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 716 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
599 717
600 if (slow) 718 if (slow)
601 { 719 {
602 do 720 do
603 { 721 {
604 if (xc->byte1 || xc->byte2) 722 if (xc->byte1 || xc->byte2)
605 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 723 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
606 724
607 x += r->TermWin.fwidth; 725 x += r->TermWin.fwidth;
608 xc++; len--; 726 xc++; len--;
609 } 727 }
610 while (len); 728 while (len);
611 } 729 }
612 else 730 else
613 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 731 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
614 } 732 }
615 } 733 }
616 else 734 else
617 { 735 {
618 const char *xc = enc_char (text, len, cs, slow); 736 const char *xc = enc_char (text, len, cs, slow);
619 737
620 if (bg == Color_bg && !slow) 738 if (bg == Color_bg && !slow)
621 { 739 {
622 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 740 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
623 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 741 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
624 } 742 }
625 else 743 else
626 { 744 {
627 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);
628 746
629 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 747 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
630 748
631 if (slow) 749 if (slow)
632 { 750 {
633 do 751 do
634 { 752 {
635 if (*xc) 753 if (*xc)
636 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 754 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
637 755
638 x += r->TermWin.fwidth; 756 x += r->TermWin.fwidth;
639 xc++; len--; 757 xc++; len--;
640 } 758 }
641 while (len); 759 while (len);
642 } 760 }
643 else 761 else
644 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 762 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
645 } 763 }
646 } 764 }
647} 765}
648 766
649///////////////////////////////////////////////////////////////////////////// 767/////////////////////////////////////////////////////////////////////////////
… …
654//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 772//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655#define SWATHBITS 8 773#define SWATHBITS 8
656#endif 774#endif
657 775
658struct rxvt_font_xft : rxvt_font { 776struct rxvt_font_xft : rxvt_font {
659#if 0
660 enum {
661 SWATHCOUNT = 1 << (21 - UNIBITS),
662 SWATHSIZE = 1 << (SWATHBITS - 5)
663 };
664 typedef uint32_t swath[SWATHSIZE];
665
666 swath *cvr[SWATHCOUNT];
667#endif
668
669#if 0
670 void gen_coverage_swath (unsigned int page);
671
672 bool has_char (uint32_t ch)
673 {
674 unsigned int page = ch >> SWATHBITS;
675 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
676
677 if (page >= SWATHCOUNT)
678 return false;
679
680 if (!cvr[page]) gen_coverage_swath (page);
681
682 return cvr[page][idx >> 5] & (1 << (idx & 31));
683 }
684#endif
685 rxvt_font_xft () { f = 0; d = 0; } 777 rxvt_font_xft () { f = 0; }
686 778
687 void clear (); 779 void clear ();
688 780
689 rxvt_fontprop properties (); 781 rxvt_fontprop properties ();
690 782
691 bool load (const rxvt_fontprop &prop); 783 bool load (const rxvt_fontprop &prop);
692 784
693 void draw (int x, int y, 785 void draw (rxvt_drawable &d, int x, int y,
694 const text_t *text, int len, 786 const text_t *text, int len,
695 int fg, int bg); 787 int fg, int bg);
696 788
697 bool has_codepoint (uint32_t unicode); 789 bool has_codepoint (uint32_t unicode);
698 790
699protected: 791protected:
700 XftFont *f; 792 XftFont *f;
701 XftDraw *d;
702
703#if 0
704 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
705 void set_swath (uint32_t ch)
706 {
707 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
708 }
709#endif
710}; 793};
711 794
712void 795void
713rxvt_font_xft::clear () 796rxvt_font_xft::clear ()
714{ 797{
715 if (f) 798 if (f)
716 { 799 {
717 XftFontClose (DISPLAY, f); 800 XftFontClose (DISPLAY, f);
718 f = 0; 801 f = 0;
719 } 802 }
720
721 if (d)
722 {
723 XftDrawDestroy (d);
724 d = 0;
725 }
726
727#if 0
728 for (int i = 0; i < SWATHCOUNT; i++)
729 delete cvr[i];
730#endif
731} 803}
732 804
733rxvt_fontprop 805rxvt_fontprop
734rxvt_font_xft::properties () 806rxvt_font_xft::properties ()
735{ 807{
736 rxvt_fontprop p; 808 rxvt_fontprop p;
737 809
738 FT_Face face = XftLockFace (f); 810 FT_Face face = XftLockFace (f);
739 811
740 p.height = height; 812 p.width = width; p.height = height;
741 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 813 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
742 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 814 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743 815
744 XftUnlockFace (f); 816 XftUnlockFace (f);
745 817
… …
767 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 839 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768 840
769 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 841 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770 FcPatternAddInteger (p, FC_SLANT, prop.slant); 842 FcPatternAddInteger (p, FC_SLANT, prop.slant);
771 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
772 //FcPatternAddBool (p, FC_MINSPACE, 1); 850 //FcPatternAddBool (p, FC_MINSPACE, 1);
773 851
774 XftResult result; 852 XftResult result;
775 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 853 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
776 854
… …
828 XftUnlockFace (f); 906 XftUnlockFace (f);
829 907
830 return true; 908 return true;
831} 909}
832 910
833#if 0
834void rxvt_font::gen_coverage_swath (unsigned int page)
835{
836 cvr[page] = new swath;
837
838 for (int i = 0; i < SWATHSIZE; i++)
839 cvr[page][i] = 0;
840
841 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
842}
843#endif
844
845bool 911bool
846rxvt_font_xft::has_codepoint (uint32_t unicode) 912rxvt_font_xft::has_codepoint (uint32_t unicode)
847{ 913{
848 return XftCharExists (DISPLAY, f, unicode); 914 return XftCharExists (DISPLAY, f, unicode);
849} 915}
850 916
851void 917void
852rxvt_font_xft::draw (int x, int y, 918rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
853 const text_t *text, int len, 919 const text_t *text, int len,
854 int fg, int bg) 920 int fg, int bg)
855{ 921{
856 if (!d)
857 {
858 dR;
859 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
860 }
861
862 if (bg >= 0 && bg != Color_bg)
863 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
864 else
865 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);
866 923
867 if (!slow && width == r->TermWin.fwidth) 924 if (!slow && width == r->TermWin.fwidth && 0)
868 { 925 {
869 if (sizeof (text_t) == sizeof (FcChar16)) 926 if (sizeof (text_t) == sizeof (FcChar16))
870 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);
871 else 928 else
872 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);
… …
875 { 932 {
876 while (len) 933 while (len)
877 { 934 {
878 if (*text != NOCHAR && *text != ' ') 935 if (*text != NOCHAR && *text != ' ')
879 { 936 {
937 int fwidth = r->TermWin.fwidth;
938 if (len >= 2 && text[1] == NOCHAR)
939 fwidth *= 2;
940
941 XGlyphInfo extents;
880 if (sizeof (text_t) == sizeof (FcChar16)) 942 if (sizeof (text_t) == sizeof (FcChar16))
881 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 }
882 else 948 else
883 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 }
884 } 955 }
885 956
886 x += r->TermWin.fwidth; 957 x += r->TermWin.fwidth;
887 text++; 958 text++;
888 len--; 959 len--;
… …
892#endif 963#endif
893 964
894///////////////////////////////////////////////////////////////////////////// 965/////////////////////////////////////////////////////////////////////////////
895 966
896rxvt_fontset::rxvt_fontset (rxvt_t r) 967rxvt_fontset::rxvt_fontset (rxvt_t r)
897#ifdef EXPLICIT_CONTEXT
898: r(r) 968: r (r)
899#endif
900{ 969{
901 clear (); 970 clear ();
902} 971}
903 972
904rxvt_fontset::~rxvt_fontset () 973rxvt_fontset::~rxvt_fontset ()
… …
907} 976}
908 977
909void 978void
910rxvt_fontset::clear () 979rxvt_fontset::clear ()
911{ 980{
912 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 981 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
913 FONT_UNREF (*i); 982 FONT_UNREF (*i);
914 983
915 fonts.clear (); 984 fonts.clear ();
916 base_id = 0; 985 base_id = 0;
917 base_prop.height = 0x7fffffff; 986 base_prop.height = 0x7fffffff;
… …
971 1040
972 if (*desc == '[') 1041 if (*desc == '[')
973 { 1042 {
974 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1043 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
975 1044
976 const char *extra = desc++; 1045 //const char *extra = desc++; // not yet used
977 1046
978 desc = strchr (desc, ']'); 1047 desc = strchr (desc, ']');
979 1048
980 if (!desc) 1049 if (!desc)
981 { 1050 {
… …
1020 } 1089 }
1021 1090
1022 return true; 1091 return true;
1023} 1092}
1024 1093
1025void 1094bool
1026rxvt_fontset::populate (const char *desc) 1095rxvt_fontset::populate (const char *desc)
1027{ 1096{
1028 clear (); 1097 clear ();
1029 1098
1030 fonts.push_back (new_font (0, CS_UNICODE)); 1099 fonts.push_back (new_font (0, CS_UNICODE));
… …
1034 1103
1035 if (!base_id) 1104 if (!base_id)
1036 base_id = 1; 1105 base_id = 1;
1037 1106
1038 // we currently need a base-font, no matter what 1107 // we currently need a base-font, no matter what
1039 if (fonts.size () <= base_id || !realize_font (base_id)) 1108 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1040 { 1109 {
1110 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1041 add_fonts ("fixed"); 1111 add_fonts ("fixed");
1042 base_id = fonts.size () - 1; 1112 base_id = fonts.size () - 1;
1043 } 1113 }
1044 1114
1045 if (fonts.size () <= base_id || !realize_font (base_id)) 1115 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1046 { 1116 return false;
1047 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1048 exit (1);
1049 }
1050 1117
1051 base_prop = fonts[base_id]->properties (); 1118 base_prop = fonts[base_id]->properties ();
1119
1120 return true;
1052} 1121}
1053 1122
1054int 1123int
1055rxvt_fontset::find_font (uint32_t unicode) 1124rxvt_fontset::find_font (uint32_t unicode)
1056{ 1125{
1057 for (int i = 0; i < fonts.size (); i++) 1126 for (unsigned int i = 0; i < fonts.size (); i++)
1058 { 1127 {
1059 rxvt_font *f = fonts[i]; 1128 rxvt_font *f = fonts[i];
1060 1129
1061 if (!f->loaded) 1130 if (!f->loaded)
1062 { 1131 {

Diff Legend

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