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.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.39 by pcg, Thu Mar 11 20:26:49 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;
… …
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, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-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" },
… …
93 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
98 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
99}; 106};
100 107
101///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
102 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_drawable::operator XftDraw *()
118{
119 if (!xftdrawable)
120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
121
122 return xftdrawable;
123}
124#endif
125
126/////////////////////////////////////////////////////////////////////////////
127
103static void *enc_buf; 128static void *enc_buf;
104static uint32_t enc_len; 129static uint32_t enc_len;
105 130
106static inline void * 131static inline void *
107get_enc_buf (int len) 132get_enc_buf (uint32_t len)
108{ 133{
109 if (len > enc_len) 134 if (len > enc_len)
110 { 135 {
111 free (enc_buf); 136 free (enc_buf);
112 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
114 139
115 return enc_buf; 140 return enc_buf;
116} 141}
117 142
118static const char * 143static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 145{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 147
123 while (len--) 148 while (len--)
124 { 149 {
… …
135 160
136 return (const char *)enc_buf; 161 return (const char *)enc_buf;
137} 162}
138 163
139static const XChar2b * 164static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 166{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 168
144 while (len--) 169 while (len--)
145 { 170 {
… …
160} 185}
161 186
162///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
163 188
164void 189void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 190rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 191{
167 if (color == Color_bg) 192 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 194 else if (color >= 0)
170 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, GC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, GC, x, y, w, h);
201#endif
173 } 202 }
174} 203}
175 204
176static const char *linedraw_cmds[128] = { 205static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV", 206 "1hH", "2hH", "1vV", "2vV",
… …
239 bool load (const rxvt_fontprop &prop) 268 bool load (const rxvt_fontprop &prop)
240 { 269 {
241 width = 1; height = 1; 270 width = 1; height = 1;
242 ascent = 1; descent = 0; 271 ascent = 1; descent = 0;
243 272
273 set_name ("built-in pseudofont");
274
244 return true; 275 return true;
245 } 276 }
246 277
247 bool has_codepoint (uint32_t unicode) 278 bool has_codepoint (uint32_t unicode)
248 { 279 {
249 if (unicode <= 0x001f) 280 if (unicode <= 0x001f)
250 return true; 281 return true;
282
251 if (unicode >= 0x0080 && unicode <= 0x009f) 283 if (unicode >= 0x0080 && unicode <= 0x009f)
252 return true; 284 return true;
253 285
254 if (unicode >= 0x2500 && unicode <= 0x257f 286 if (unicode >= 0x2500 && unicode <= 0x257f
255 && linedraw_cmds[unicode - 0x2500]) 287 && linedraw_cmds[unicode - 0x2500])
288 return true;
289
290 if (IS_COMPOSE (unicode))
256 return true; 291 return true;
257 292
258 switch (unicode) 293 switch (unicode)
259 { 294 {
260 case ZERO_WIDTH_CHAR: 295 case ZERO_WIDTH_CHAR:
… …
262 } 297 }
263 298
264 return false; 299 return false;
265 } 300 }
266 301
267 void draw (int x, int y, 302 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 303 const text_t *text, int len,
269 int fg, int bg); 304 int fg, int bg);
270}; 305};
271 306
272void 307void
273rxvt_font_default::draw (int x, int y, 308rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 309 const text_t *text, int len,
275 int fg, int bg) 310 int fg, int bg)
276{ 311{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 313
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 314 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 315
281 while (len--) 316 while (len--)
282 { 317 {
318#if ENABLE_COMBINING
319 compose_char *cc;
320#endif
283 text_t t = *text++; 321 text_t t = *text++;
284 322
323 // is it in our linedrawing table?
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 325 {
287 const char *p = linedraw_cmds[t - 0x2500]; 326 const char *p = linedraw_cmds[t - 0x2500];
288 327
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 328 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 329 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
291 330
292 XGCValues gcv; 331 XGCValues gcv;
293 332
294 while (*p) 333 while (*p)
295 { 334 {
296 switch (*p++) 335 switch (*p++)
297 { 336 {
298 case '1': 337 case '1':
299 gcv.line_width = 0; 338 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 340 break;
302 341
303 case '2': 342 case '2':
304 gcv.line_width = 2; 343 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 345 break;
307 346
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 347 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 348 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 349 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 350 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 351 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 352 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314 } 353 }
315 } 354 }
316 355
317 gcv.line_width = 0; 356 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 357 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358 }
359#if ENABLE_COMBINING
360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 361 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
364 if (cc->c2 != NOCHAR)
365 {
366 // prefer font of first character, for no good reasons
367 rxvt_font *f2 = f1->has_codepoint (cc->c2)
368 ? f1
369 : (*fs)[fs->find_font (cc->c2)];
370
371 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
372 }
373 }
374#endif
320 else 375 else
321 switch (*text++) 376 switch (t)
322 { 377 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
325 break; 379 break;
326 default: 380 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
391 x += w;
328 } 392 }
329 393
330 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
331 } 395 }
332} 396}
… …
342 406
343 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
344 408
345 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (uint32_t unicode);
346 410
347 void draw (int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 412 const text_t *text, int len,
349 int fg, int bg); 413 int fg, int bg);
350 414
351 XFontStruct *f; 415 XFontStruct *f;
352 codeset cs; 416 codeset cs;
… …
407 471
408bool 472bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 473rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 474{
411 int slashes = 0; 475 int slashes = 0;
412 const char *comp[12]; 476 const char *comp[13];
413 477
414 for (const char *c = name; *c; c++) 478 for (const char *c = name; *c; c++)
415 if (*c == '-') 479 if (*c == '-')
416 { 480 {
417 comp[slashes++] = c + 1; 481 comp[slashes++] = c + 1;
… …
427 491
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 492 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 493
430 if (f) 494 if (f)
431 { 495 {
432 // the font should really exists now. if not, we have a problem 496 // the font should really exist now. if not, we have a problem
433 // (e.g. if the user did xset fp rehash just when we were searching fonts). 497 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 498 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 499 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 500 XFreeFont (DISPLAY, f);
437 return ret; 501 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 578 f = XLoadQueryFont (DISPLAY, name);
515 579
516 if (!f) 580 if (!f)
517 return false; 581 return false;
518 582
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 583 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 584 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 585
524 if (registry && encoding) 586 if (registry && encoding)
525 { 587 {
… …
611 /* check wether the character exists in _this_ font. horrible. */ 673 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 674 XCharStruct *xcs;
613 675
614 if (encm) 676 if (encm)
615 { 677 {
616 int byte1 = ch >> 8; 678 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 679 unsigned char byte2 = ch & 255;
618 680
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 681 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 682 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 683 return false;
622 684
… …
645 707
646 return true; 708 return true;
647} 709}
648 710
649void 711void
650rxvt_font_x11::draw (int x, int y, 712rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 713 const text_t *text, int len,
652 int fg, int bg) 714 int fg, int bg)
653{ 715{
654 // this looks like a mess /. 716 // this looks like a mess /.
655 // and it is a mess /. 717 // and it is a mess /.
… …
671 { 733 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 735
674 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
675 { 737 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
678 } 740 }
679 else 741 else
680 { 742 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 744
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
684 746
685 if (slow) 747 if (slow)
686 { 748 {
687 do 749 do
688 { 750 {
689 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
691 753
692 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
693 xc++; len--; 755 xc++; len--;
694 } 756 }
695 while (len); 757 while (len);
696 } 758 }
697 else 759 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
699 } 761 }
700 } 762 }
701 else 763 else
702 { 764 {
703 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
704 766
705 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
706 { 768 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
709 } 771 }
710 else 772 else
711 { 773 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 775
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
715 777
716 if (slow) 778 if (slow)
717 { 779 {
718 do 780 do
719 { 781 {
720 if (*xc) 782 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
722 784
723 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
724 xc++; len--; 786 xc++; len--;
725 } 787 }
726 while (len); 788 while (len);
727 } 789 }
728 else 790 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
730 } 792 }
731 } 793 }
732} 794}
733 795
734///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 801//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 802#define SWATHBITS 8
741#endif 803#endif
742 804
743struct rxvt_font_xft : rxvt_font { 805struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 806 rxvt_font_xft () { f = 0; }
745 807
746 void clear (); 808 void clear ();
747 809
748 rxvt_fontprop properties (); 810 rxvt_fontprop properties ();
749 811
750 bool load (const rxvt_fontprop &prop); 812 bool load (const rxvt_fontprop &prop);
751 813
752 void draw (int x, int y, 814 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 815 const text_t *text, int len,
754 int fg, int bg); 816 int fg, int bg);
755 817
756 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (uint32_t unicode);
757 819
758protected: 820protected:
759 XftFont *f; 821 XftFont *f;
760 XftDraw *d;
761}; 822};
762 823
763void 824void
764rxvt_font_xft::clear () 825rxvt_font_xft::clear ()
765{ 826{
766 if (f) 827 if (f)
767 { 828 {
768 XftFontClose (DISPLAY, f); 829 XftFontClose (DISPLAY, f);
769 f = 0; 830 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 831 }
777} 832}
778 833
779rxvt_fontprop 834rxvt_fontprop
780rxvt_font_xft::properties () 835rxvt_font_xft::properties ()
… …
887{ 942{
888 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
889} 944}
890 945
891void 946void
892rxvt_font_xft::draw (int x, int y, 947rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 948 const text_t *text, int len,
894 int fg, int bg) 949 int fg, int bg)
895{ 950{
896 if (!d)
897 {
898 dR;
899 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
900 }
901
902 if (bg >= 0 && bg != Color_bg)
903 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
904 else
905 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 951 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 952
907 if (!slow && width == r->TermWin.fwidth && 0) 953 if (!slow && width == r->TermWin.fwidth && 0)
908 { 954 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 955 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 956 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
915 { 961 {
916 while (len) 962 while (len)
917 { 963 {
918 if (*text != NOCHAR && *text != ' ') 964 if (*text != NOCHAR && *text != ' ')
919 { 965 {
966 int fwidth = r->TermWin.fwidth;
967 if (len >= 2 && text[1] == NOCHAR)
968 fwidth *= 2;
969
920 XGlyphInfo extents; 970 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 971 if (sizeof (text_t) == sizeof (FcChar16))
922 { 972 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 973 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 974 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 975 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 976 }
927 else 977 else
928 { 978 {
929 XGlyphInfo extents; 979 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 980 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 981 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 982 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 983 }
934 } 984 }
935 985
936 x += r->TermWin.fwidth; 986 x += r->TermWin.fwidth;
… …
942#endif 992#endif
943 993
944///////////////////////////////////////////////////////////////////////////// 994/////////////////////////////////////////////////////////////////////////////
945 995
946rxvt_fontset::rxvt_fontset (rxvt_t r) 996rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT
948: r(r) 997: r (r)
949#endif
950{ 998{
951 clear (); 999 clear ();
952} 1000}
953 1001
954rxvt_fontset::~rxvt_fontset () 1002rxvt_fontset::~rxvt_fontset ()
… …
957} 1005}
958 1006
959void 1007void
960rxvt_fontset::clear () 1008rxvt_fontset::clear ()
961{ 1009{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1010 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 1011 FONT_UNREF (*i);
964 1012
965 fonts.clear (); 1013 fonts.clear ();
966 base_id = 0; 1014 base_id = 0;
967 base_prop.height = 0x7fffffff; 1015 base_prop.height = 0x7fffffff;
… …
994 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
995 } 1043 }
996 else 1044 else
997 f = new rxvt_font_x11; 1045 f = new rxvt_font_x11;
998 1046
1047 f->fs = this;
999 f->set_term (r); 1048 f->set_term (r);
1000 f->set_name (strdup (name)); 1049 f->set_name (strdup (name));
1001 1050
1002 f->cs = cs; 1051 f->cs = cs;
1003 f->loaded = false; 1052 f->loaded = false;
… …
1021 1070
1022 if (*desc == '[') 1071 if (*desc == '[')
1023 { 1072 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1073 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1074
1026 const char *extra = desc++; 1075 //const char *extra = desc++; // not yet used
1027 1076
1028 desc = strchr (desc, ']'); 1077 desc = strchr (desc, ']');
1029 1078
1030 if (!desc) 1079 if (!desc)
1031 { 1080 {
… …
1070 } 1119 }
1071 1120
1072 return true; 1121 return true;
1073} 1122}
1074 1123
1075void 1124bool
1076rxvt_fontset::populate (const char *desc) 1125rxvt_fontset::populate (const char *desc)
1077{ 1126{
1078 clear (); 1127 clear ();
1079 1128
1080 fonts.push_back (new_font (0, CS_UNICODE)); 1129 fonts.push_back (new_font (0, CS_UNICODE));
… …
1084 1133
1085 if (!base_id) 1134 if (!base_id)
1086 base_id = 1; 1135 base_id = 1;
1087 1136
1088 // we currently need a base-font, no matter what 1137 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1138 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1139 {
1140 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1141 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1142 base_id = fonts.size () - 1;
1093 } 1143 }
1094 1144
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1145 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1146 return false;
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1);
1099 }
1100 1147
1101 base_prop = fonts[base_id]->properties (); 1148 base_prop = fonts[base_id]->properties ();
1149
1150 return true;
1102} 1151}
1103 1152
1104int 1153int
1105rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (uint32_t unicode)
1106{ 1155{
1107 for (int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
1108 { 1157 {
1109 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
1110 1159
1111 if (!f->loaded) 1160 if (!f->loaded)
1112 { 1161 {

Diff Legend

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