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.25 by pcg, Tue Feb 24 23:58:12 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*;
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
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_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 86#endif
87 87
88#if XFT 88#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 89 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 90 { CS_UNICODE, "xft:Arial Unicode MS" },
91#endif 91#endif
92 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
96 97
97 { CS_UNKNOWN, 0 } 98 { CS_UNKNOWN, 0 }
98}; 99};
99 100
100///////////////////////////////////////////////////////////////////////////// 101/////////////////////////////////////////////////////////////////////////////
101 102
103rxvt_drawable::~rxvt_drawable ()
104{
105 if (xftdrawable)
106 XftDrawDestroy (xftdrawable);
107}
108
109rxvt_drawable::operator XftDraw *()
110{
111 if (!xftdrawable)
112 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
113
114 return xftdrawable;
115}
116
117/////////////////////////////////////////////////////////////////////////////
118
102static void *enc_buf; 119static void *enc_buf;
103static uint32_t enc_len; 120static uint32_t enc_len;
104 121
105static inline void * 122static inline void *
106get_enc_buf (int len) 123get_enc_buf (uint32_t len)
107{ 124{
108 if (len > enc_len) 125 if (len > enc_len)
109 { 126 {
110 free (enc_buf); 127 free (enc_buf);
111 enc_buf = malloc (len); 128 enc_buf = malloc (len);
… …
113 130
114 return enc_buf; 131 return enc_buf;
115} 132}
116 133
117static const char * 134static const char *
118enc_char (const text_t *text, int len, codeset cs, bool &zero) 135enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
119{ 136{
120 uint8_t *buf = (uint8_t *)get_enc_buf (len); 137 uint8_t *buf = (uint8_t *)get_enc_buf (len);
121 138
122 while (len--) 139 while (len--)
123 { 140 {
… …
134 151
135 return (const char *)enc_buf; 152 return (const char *)enc_buf;
136} 153}
137 154
138static const XChar2b * 155static const XChar2b *
139enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 156enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
140{ 157{
141 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 158 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
142 159
143 while (len--) 160 while (len--)
144 { 161 {
… …
159} 176}
160 177
161///////////////////////////////////////////////////////////////////////////// 178/////////////////////////////////////////////////////////////////////////////
162 179
163void 180void
164rxvt_font::clear_rect (int x, int y, int w, int h, int color) 181rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
165{ 182{
166 if (color == Color_bg) 183 if (color == Color_bg)
167 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 184 XClearArea (d.display->display, d, x, y, w, h, FALSE);
168 else if (color >= 0) 185 else if (color >= 0)
169 { 186 {
187#if XFT
188 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
189#else
170 XSetForeground (DISPLAY, GC, r->PixColors[color]); 190 XSetForeground (d.display->display, GC, r->PixColors[color]);
171 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 191 XFillRectangle (d.display->display, d, GC, x, y, w, h);
192#endif
172 } 193 }
173} 194}
174 195
175static const char *linedraw_cmds[128] = { 196static const char *linedraw_cmds[128] = {
176 "1hH", "2hH", "1vV", "2vV", 197 "1hH", "2hH", "1vV", "2vV",
… …
226struct rxvt_font_default : rxvt_font { 247struct rxvt_font_default : rxvt_font {
227 rxvt_fontprop properties () 248 rxvt_fontprop properties ()
228 { 249 {
229 rxvt_fontprop p; 250 rxvt_fontprop p;
230 251
231 p.height = 1; 252 p.width = p.height = 1;
232 p.weight = rxvt_fontprop::medium; 253 p.weight = rxvt_fontprop::medium;
233 p.slant = rxvt_fontprop::roman; 254 p.slant = rxvt_fontprop::roman;
234 255
235 return p; 256 return p;
236 } 257 }
… …
261 } 282 }
262 283
263 return false; 284 return false;
264 } 285 }
265 286
266 void draw (int x, int y, 287 void draw (rxvt_drawable &d, int x, int y,
267 const text_t *text, int len, 288 const text_t *text, int len,
268 int fg, int bg); 289 int fg, int bg);
269}; 290};
270 291
271void 292void
272rxvt_font_default::draw (int x, int y, 293rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
273 const text_t *text, int len, 294 const text_t *text, int len,
274 int fg, int bg) 295 int fg, int bg)
275{ 296{
276 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 297 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
277 298
278 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 299 XSetForeground (d.display->display, GC, r->PixColors[fg]);
279 300
280 while (len--) 301 while (len--)
281 { 302 {
282 text_t t = *text++; 303 text_t t = *text++;
283 304
284 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 305 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
285 { 306 {
286 const char *p = linedraw_cmds[t - 0x2500]; 307 const char *p = linedraw_cmds[t - 0x2500];
287 308
288 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 309 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
289 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 310 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
290 311
291 XGCValues gcv; 312 XGCValues gcv;
292 313
293 while (*p) 314 while (*p)
294 { 315 {
295 switch (*p++) 316 switch (*p++)
296 { 317 {
297 case '1': 318 case '1':
298 gcv.line_width = 0; 319 gcv.line_width = 0;
299 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 320 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
300 break; 321 break;
301 322
302 case '2': 323 case '2':
303 gcv.line_width = 2; 324 gcv.line_width = 2;
304 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 325 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
305 break; 326 break;
306 327
307 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 328 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
308 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 329 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
309 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 330 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
310 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 331 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
311 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 332 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
312 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 333 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
313 } 334 }
314 } 335 }
315 336
316 gcv.line_width = 0; 337 gcv.line_width = 0;
317 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 338 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
318 } 339 }
319 else 340 else
320 switch (*text++) 341 switch (*text++)
321 { 342 {
322 case NOCHAR: 343 case NOCHAR:
323 case ZERO_WIDTH_CHAR: 344 case ZERO_WIDTH_CHAR:
324 break; 345 break;
325 default: 346 default:
326 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 347 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
327 } 348 }
328 349
329 x += r->TermWin.fwidth; 350 x += r->TermWin.fwidth;
330 } 351 }
331} 352}
… …
336 rxvt_font_x11 () { f = 0; } 357 rxvt_font_x11 () { f = 0; }
337 358
338 void clear (); 359 void clear ();
339 360
340 rxvt_fontprop properties (); 361 rxvt_fontprop properties ();
341 rxvt_fontprop properties (XFontStruct *f);
342 362
343 bool load (const rxvt_fontprop &prop); 363 bool load (const rxvt_fontprop &prop);
344 364
345 bool has_codepoint (uint32_t unicode); 365 bool has_codepoint (uint32_t unicode);
346 366
347 void draw (int x, int y, 367 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 368 const text_t *text, int len,
349 int fg, int bg); 369 int fg, int bg);
350 370
351 XFontStruct *f; 371 XFontStruct *f;
352 codeset cs; 372 codeset cs;
353 bool enc2b, encm; 373 bool enc2b, encm;
354 374
355 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 375 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
376 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
377 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
378 bool set_properties (rxvt_fontprop &p, const char *name);
356}; 379};
357 380
358const char * 381const char *
359rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 382rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
360{ 383{
… …
367} 390}
368 391
369rxvt_fontprop 392rxvt_fontprop
370rxvt_font_x11::properties () 393rxvt_font_x11::properties ()
371{ 394{
372 return properties (f);
373}
374
375rxvt_fontprop
376rxvt_font_x11::properties (XFontStruct *f)
377{
378 rxvt_fontprop p; 395 rxvt_fontprop p;
396 set_properties (p, f);
397 return p;
398}
379 399
400bool
401rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
402{
403 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
404 p.height = height;
405 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
406 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
407
408 return true;
409}
410
411bool
412rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
413{
380 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 414 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381 const char *slant = get_property (f, "SLANT", "r"); 415 const char *slant = get_property (f, "SLANT", "r");
382 416
383 p.height = height; 417 unsigned long height;
384 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 418 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
385 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 419 return false;
386 420
387 return p; 421 unsigned long avgwidth;
422 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
423 avgwidth = 0;
424
425 return set_properties (p, height, weight, slant, avgwidth);
426}
427
428bool
429rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
430{
431 int slashes = 0;
432 const char *comp[12];
433
434 for (const char *c = name; *c; c++)
435 if (*c == '-')
436 {
437 comp[slashes++] = c + 1;
438 if (slashes >= 13)
439 break;
440 }
441
442 /* can we short-circuit the costly XLoadQueryFont? */
443 if (slashes >= 13
444 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
445 && (*comp[11] >= '0' && *comp[11] <= '9'))
446 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
447
448 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
449
450 if (f)
451 {
452 // the font should really exist now. if not, we have a problem
453 // (e.g. if the user did xset fp rehash just when we were searching fonts).
454 // in that case, just return garbage.
455 bool ret = set_properties (p, f);
456 XFreeFont (DISPLAY, f);
457 return ret;
458 }
459 else
460 return false;
461}
462
463// fix the size of scalable fonts
464static void
465fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
466{
467 int slashes = 0;
468 const char *size;
469
470 for (const char *c = name; *c; c++)
471 if (*c == '-')
472 {
473 if (slashes == 6)
474 size = c + 1;
475
476 if (++slashes >= 13)
477 break;
478 }
479
480 if (slashes >= 13 && size[0] == '0')
481 {
482 strncpy (buf, name, size - name);
483 buf += size - name;
484 buf += sprintf (buf, "%d", prop.height);
485 strcpy (buf, size + 1);
486 }
487 else
488 strcpy (buf, name);
388} 489}
389 490
390bool 491bool
391rxvt_font_x11::load (const rxvt_fontprop &prop) 492rxvt_font_x11::load (const rxvt_fontprop &prop)
392{ 493{
393 clear (); 494 clear ();
394 495
395 char **list; 496 char **list;
396 int count; 497 int count;
397 XFontStruct *info;
398 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 498 list = XListFonts (DISPLAY, name, 512, &count);
499 set_name (0);
399 500
400 if (!list) 501 if (!list)
401 return false; 502 return false;
402 503
403 int bestdiff = 0x7fffffff; 504 int bestdiff = 0x7fffffff;
404 XFontStruct *best = 0;
405 for (int i = 0; i < count; i++) 505 for (int i = 0; i < count; i++)
406 { 506 {
407 XFontStruct *f = info + i; 507 rxvt_fontprop p;
508 char fname[1024];
509 fix_scalable (fname, list[i], prop);
408 510
511 if (!set_properties (p, fname))
512 continue;
513
409 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 514 if (p.height > prop.height) // weed out too large fonts
410 { 515 continue;
411 rxvt_fontprop p = properties (f); 516
412 int diff = (prop.height - f->ascent + f->descent) * 32 517 int diff = (prop.height - p.height) * 32
413 + abs (prop.weight - p.weight) 518 + abs (prop.weight - p.weight)
414 + abs (prop.slant - p.slant ); 519 + abs (prop.slant - p.slant );
415 520
416 if (!best // compare against best found so far 521 if (!name // compare against best found so far
417 || diff < bestdiff) 522 || diff < bestdiff)
418 { 523 {
419 best = f; 524 set_name (strdup (fname));
420 bestdiff = diff; 525 bestdiff = diff;
421 } 526 }
422 }
423 } 527 }
424 528
425 set_name (strdup (list[best - info])); 529 XFreeFontNames (list);
426 530
427 XFreeFontInfo (list, info, count); 531 if (!name)
532 return false;
428 533
429 f = XLoadQueryFont (DISPLAY, name); 534 f = XLoadQueryFont (DISPLAY, name);
430 535
431 if (!f) 536 if (!f)
432 return false; 537 return false;
433
434 unsigned long value;
435 538
436 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 539 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 540 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438 541
439 if (registry && encoding) 542 if (registry && encoding)
… …
526 /* check wether the character exists in _this_ font. horrible. */ 629 /* check wether the character exists in _this_ font. horrible. */
527 XCharStruct *xcs; 630 XCharStruct *xcs;
528 631
529 if (encm) 632 if (encm)
530 { 633 {
531 int byte1 = ch >> 8; 634 unsigned char byte1 = ch >> 8;
532 int byte2 = ch & 255; 635 unsigned char byte2 = ch & 255;
533 636
534 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 637 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
535 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 638 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
536 return false; 639 return false;
537 640
… …
560 663
561 return true; 664 return true;
562} 665}
563 666
564void 667void
565rxvt_font_x11::draw (int x, int y, 668rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
566 const text_t *text, int len, 669 const text_t *text, int len,
567 int fg, int bg) 670 int fg, int bg)
568{ 671{
569 // this looks like a mess /. 672 // this looks like a mess /.
570 // and it is a mess /. 673 // and it is a mess /.
… …
586 { 689 {
587 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 690 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
588 691
589 if (bg == Color_bg && !slow) 692 if (bg == Color_bg && !slow)
590 { 693 {
591 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 694 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
592 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 695 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
593 } 696 }
594 else 697 else
595 { 698 {
596 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 699 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
597 700
598 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 701 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
599 702
600 if (slow) 703 if (slow)
601 { 704 {
602 do 705 do
603 { 706 {
604 if (xc->byte1 || xc->byte2) 707 if (xc->byte1 || xc->byte2)
605 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 708 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
606 709
607 x += r->TermWin.fwidth; 710 x += r->TermWin.fwidth;
608 xc++; len--; 711 xc++; len--;
609 } 712 }
610 while (len); 713 while (len);
611 } 714 }
612 else 715 else
613 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 716 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
614 } 717 }
615 } 718 }
616 else 719 else
617 { 720 {
618 const char *xc = enc_char (text, len, cs, slow); 721 const char *xc = enc_char (text, len, cs, slow);
619 722
620 if (bg == Color_bg && !slow) 723 if (bg == Color_bg && !slow)
621 { 724 {
622 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 725 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
623 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 726 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
624 } 727 }
625 else 728 else
626 { 729 {
627 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 730 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
628 731
629 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 732 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
630 733
631 if (slow) 734 if (slow)
632 { 735 {
633 do 736 do
634 { 737 {
635 if (*xc) 738 if (*xc)
636 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 739 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
637 740
638 x += r->TermWin.fwidth; 741 x += r->TermWin.fwidth;
639 xc++; len--; 742 xc++; len--;
640 } 743 }
641 while (len); 744 while (len);
642 } 745 }
643 else 746 else
644 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 747 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
645 } 748 }
646 } 749 }
647} 750}
648 751
649///////////////////////////////////////////////////////////////////////////// 752/////////////////////////////////////////////////////////////////////////////
… …
654//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 757//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655#define SWATHBITS 8 758#define SWATHBITS 8
656#endif 759#endif
657 760
658struct rxvt_font_xft : rxvt_font { 761struct 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; } 762 rxvt_font_xft () { f = 0; }
686 763
687 void clear (); 764 void clear ();
688 765
689 rxvt_fontprop properties (); 766 rxvt_fontprop properties ();
690 767
691 bool load (const rxvt_fontprop &prop); 768 bool load (const rxvt_fontprop &prop);
692 769
693 void draw (int x, int y, 770 void draw (rxvt_drawable &d, int x, int y,
694 const text_t *text, int len, 771 const text_t *text, int len,
695 int fg, int bg); 772 int fg, int bg);
696 773
697 bool has_codepoint (uint32_t unicode); 774 bool has_codepoint (uint32_t unicode);
698 775
699protected: 776protected:
700 XftFont *f; 777 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}; 778};
711 779
712void 780void
713rxvt_font_xft::clear () 781rxvt_font_xft::clear ()
714{ 782{
715 if (f) 783 if (f)
716 { 784 {
717 XftFontClose (DISPLAY, f); 785 XftFontClose (DISPLAY, f);
718 f = 0; 786 f = 0;
719 } 787 }
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} 788}
732 789
733rxvt_fontprop 790rxvt_fontprop
734rxvt_font_xft::properties () 791rxvt_font_xft::properties ()
735{ 792{
736 rxvt_fontprop p; 793 rxvt_fontprop p;
737 794
738 FT_Face face = XftLockFace (f); 795 FT_Face face = XftLockFace (f);
739 796
740 p.height = height; 797 p.width = width; p.height = height;
741 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 798 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; 799 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743 800
744 XftUnlockFace (f); 801 XftUnlockFace (f);
745 802
… …
767 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 824 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768 825
769 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 826 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770 FcPatternAddInteger (p, FC_SLANT, prop.slant); 827 FcPatternAddInteger (p, FC_SLANT, prop.slant);
771 828
829#if 0 // clipping unfortunately destroys our precious double-width-characters
830 // clip width, we can't do better, or can we?
831 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
832 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
833#endif
834
772 //FcPatternAddBool (p, FC_MINSPACE, 1); 835 //FcPatternAddBool (p, FC_MINSPACE, 1);
773 836
774 XftResult result; 837 XftResult result;
775 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 838 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
776 839
… …
828 XftUnlockFace (f); 891 XftUnlockFace (f);
829 892
830 return true; 893 return true;
831} 894}
832 895
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 896bool
846rxvt_font_xft::has_codepoint (uint32_t unicode) 897rxvt_font_xft::has_codepoint (uint32_t unicode)
847{ 898{
848 return XftCharExists (DISPLAY, f, unicode); 899 return XftCharExists (DISPLAY, f, unicode);
849} 900}
850 901
851void 902void
852rxvt_font_xft::draw (int x, int y, 903rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
853 const text_t *text, int len, 904 const text_t *text, int len,
854 int fg, int bg) 905 int fg, int bg)
855{ 906{
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); 907 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
866 908
867 if (!slow && width == r->TermWin.fwidth) 909 if (!slow && width == r->TermWin.fwidth && 0)
868 { 910 {
869 if (sizeof (text_t) == sizeof (FcChar16)) 911 if (sizeof (text_t) == sizeof (FcChar16))
870 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 912 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
871 else 913 else
872 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 914 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
875 { 917 {
876 while (len) 918 while (len)
877 { 919 {
878 if (*text != NOCHAR && *text != ' ') 920 if (*text != NOCHAR && *text != ' ')
879 { 921 {
922 int fwidth = r->TermWin.fwidth;
923 if (len >= 2 && text[1] == NOCHAR)
924 fwidth *= 2;
925
926 XGlyphInfo extents;
880 if (sizeof (text_t) == sizeof (FcChar16)) 927 if (sizeof (text_t) == sizeof (FcChar16))
881 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 928 {
929 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
930 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
931 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
932 }
882 else 933 else
883 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 934 {
935 XGlyphInfo extents;
936 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
937 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
938 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
939 }
884 } 940 }
885 941
886 x += r->TermWin.fwidth; 942 x += r->TermWin.fwidth;
887 text++; 943 text++;
888 len--; 944 len--;
… …
892#endif 948#endif
893 949
894///////////////////////////////////////////////////////////////////////////// 950/////////////////////////////////////////////////////////////////////////////
895 951
896rxvt_fontset::rxvt_fontset (rxvt_t r) 952rxvt_fontset::rxvt_fontset (rxvt_t r)
897#ifdef EXPLICIT_CONTEXT
898: r(r) 953: r (r)
899#endif
900{ 954{
901 clear (); 955 clear ();
902} 956}
903 957
904rxvt_fontset::~rxvt_fontset () 958rxvt_fontset::~rxvt_fontset ()
… …
907} 961}
908 962
909void 963void
910rxvt_fontset::clear () 964rxvt_fontset::clear ()
911{ 965{
912 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 966 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
913 FONT_UNREF (*i); 967 FONT_UNREF (*i);
914 968
915 fonts.clear (); 969 fonts.clear ();
916 base_id = 0; 970 base_id = 0;
917 base_prop.height = 0x7fffffff; 971 base_prop.height = 0x7fffffff;
… …
971 1025
972 if (*desc == '[') 1026 if (*desc == '[')
973 { 1027 {
974 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1028 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
975 1029
976 const char *extra = desc++; 1030 //const char *extra = desc++; // not yet used
977 1031
978 desc = strchr (desc, ']'); 1032 desc = strchr (desc, ']');
979 1033
980 if (!desc) 1034 if (!desc)
981 { 1035 {
… …
1020 } 1074 }
1021 1075
1022 return true; 1076 return true;
1023} 1077}
1024 1078
1025void 1079bool
1026rxvt_fontset::populate (const char *desc) 1080rxvt_fontset::populate (const char *desc)
1027{ 1081{
1028 clear (); 1082 clear ();
1029 1083
1030 fonts.push_back (new_font (0, CS_UNICODE)); 1084 fonts.push_back (new_font (0, CS_UNICODE));
… …
1034 1088
1035 if (!base_id) 1089 if (!base_id)
1036 base_id = 1; 1090 base_id = 1;
1037 1091
1038 // we currently need a base-font, no matter what 1092 // we currently need a base-font, no matter what
1039 if (fonts.size () <= base_id || !realize_font (base_id)) 1093 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1040 { 1094 {
1095 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1041 add_fonts ("fixed"); 1096 add_fonts ("fixed");
1042 base_id = fonts.size () - 1; 1097 base_id = fonts.size () - 1;
1043 } 1098 }
1044 1099
1045 if (fonts.size () <= base_id || !realize_font (base_id)) 1100 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1046 { 1101 return false;
1047 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1048 exit (1);
1049 }
1050 1102
1051 base_prop = fonts[base_id]->properties (); 1103 base_prop = fonts[base_id]->properties ();
1104
1105 return true;
1052} 1106}
1053 1107
1054int 1108int
1055rxvt_fontset::find_font (uint32_t unicode) 1109rxvt_fontset::find_font (uint32_t unicode)
1056{ 1110{
1057 for (int i = 0; i < fonts.size (); i++) 1111 for (unsigned int i = 0; i < fonts.size (); i++)
1058 { 1112 {
1059 rxvt_font *f = fonts[i]; 1113 rxvt_font *f = fonts[i];
1060 1114
1061 if (!f->loaded) 1115 if (!f->loaded)
1062 { 1116 {

Diff Legend

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