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.31 by pcg, Thu Mar 4 00:40:06 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",
… …
262 } 291 }
263 292
264 return false; 293 return false;
265 } 294 }
266 295
267 void draw (int x, int y, 296 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 297 const text_t *text, int len,
269 int fg, int bg); 298 int fg, int bg);
270}; 299};
271 300
272void 301void
273rxvt_font_default::draw (int x, int y, 302rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 303 const text_t *text, int len,
275 int fg, int bg) 304 int fg, int bg)
276{ 305{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 306 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 307
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 308 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 309
281 while (len--) 310 while (len--)
282 { 311 {
283 text_t t = *text++; 312 text_t t = *text++;
284 313
314 // is it in our linedrawing table?
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 315 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 316 {
287 const char *p = linedraw_cmds[t - 0x2500]; 317 const char *p = linedraw_cmds[t - 0x2500];
288 318
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 319 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; 320 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
291 321
292 XGCValues gcv; 322 XGCValues gcv;
293 323
294 while (*p) 324 while (*p)
295 { 325 {
296 switch (*p++) 326 switch (*p++)
297 { 327 {
298 case '1': 328 case '1':
299 gcv.line_width = 0; 329 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 330 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 331 break;
302 332
303 case '2': 333 case '2':
304 gcv.line_width = 2; 334 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 336 break;
307 337
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 338 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; 339 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; 340 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; 341 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; 342 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; 343 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314 } 344 }
315 } 345 }
316 346
317 gcv.line_width = 0; 347 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 348 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
319 } 349 }
320 else 350 else
321 switch (*text++) 351 switch (t)
322 { 352 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 353 case ZERO_WIDTH_CHAR:
325 break; 354 break;
326 default: 355 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 356 int w = 0;
357 while (len > 0 && *text == NOCHAR)
358 {
359 ++text;
360 --len;
361 w += r->TermWin.fwidth;
362 }
363
364 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
365 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
366 x += w;
328 } 367 }
329 368
330 x += r->TermWin.fwidth; 369 x += r->TermWin.fwidth;
331 } 370 }
332} 371}
… …
342 381
343 bool load (const rxvt_fontprop &prop); 382 bool load (const rxvt_fontprop &prop);
344 383
345 bool has_codepoint (uint32_t unicode); 384 bool has_codepoint (uint32_t unicode);
346 385
347 void draw (int x, int y, 386 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 387 const text_t *text, int len,
349 int fg, int bg); 388 int fg, int bg);
350 389
351 XFontStruct *f; 390 XFontStruct *f;
352 codeset cs; 391 codeset cs;
… …
407 446
408bool 447bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 448rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 449{
411 int slashes = 0; 450 int slashes = 0;
412 const char *comp[12]; 451 const char *comp[13];
413 452
414 for (const char *c = name; *c; c++) 453 for (const char *c = name; *c; c++)
415 if (*c == '-') 454 if (*c == '-')
416 { 455 {
417 comp[slashes++] = c + 1; 456 comp[slashes++] = c + 1;
… …
427 466
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 467 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 468
430 if (f) 469 if (f)
431 { 470 {
432 // the font should really exists now. if not, we have a problem 471 // 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). 472 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 473 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 474 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 475 XFreeFont (DISPLAY, f);
437 return ret; 476 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 553 f = XLoadQueryFont (DISPLAY, name);
515 554
516 if (!f) 555 if (!f)
517 return false; 556 return false;
518 557
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 558 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 559 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 560
524 if (registry && encoding) 561 if (registry && encoding)
525 { 562 {
… …
611 /* check wether the character exists in _this_ font. horrible. */ 648 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 649 XCharStruct *xcs;
613 650
614 if (encm) 651 if (encm)
615 { 652 {
616 int byte1 = ch >> 8; 653 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 654 unsigned char byte2 = ch & 255;
618 655
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 656 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 657 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 658 return false;
622 659
… …
645 682
646 return true; 683 return true;
647} 684}
648 685
649void 686void
650rxvt_font_x11::draw (int x, int y, 687rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 688 const text_t *text, int len,
652 int fg, int bg) 689 int fg, int bg)
653{ 690{
654 // this looks like a mess /. 691 // this looks like a mess /.
655 // and it is a mess /. 692 // and it is a mess /.
… …
671 { 708 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 709 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 710
674 if (bg == Color_bg && !slow) 711 if (bg == Color_bg && !slow)
675 { 712 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 713 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 714 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
678 } 715 }
679 else 716 else
680 { 717 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 718 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 719
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 720 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
684 721
685 if (slow) 722 if (slow)
686 { 723 {
687 do 724 do
688 { 725 {
689 if (xc->byte1 || xc->byte2) 726 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 727 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
691 728
692 x += r->TermWin.fwidth; 729 x += r->TermWin.fwidth;
693 xc++; len--; 730 xc++; len--;
694 } 731 }
695 while (len); 732 while (len);
696 } 733 }
697 else 734 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 735 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
699 } 736 }
700 } 737 }
701 else 738 else
702 { 739 {
703 const char *xc = enc_char (text, len, cs, slow); 740 const char *xc = enc_char (text, len, cs, slow);
704 741
705 if (bg == Color_bg && !slow) 742 if (bg == Color_bg && !slow)
706 { 743 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 744 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 745 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
709 } 746 }
710 else 747 else
711 { 748 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 749 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 750
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 751 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
715 752
716 if (slow) 753 if (slow)
717 { 754 {
718 do 755 do
719 { 756 {
720 if (*xc) 757 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 758 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
722 759
723 x += r->TermWin.fwidth; 760 x += r->TermWin.fwidth;
724 xc++; len--; 761 xc++; len--;
725 } 762 }
726 while (len); 763 while (len);
727 } 764 }
728 else 765 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 766 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
730 } 767 }
731 } 768 }
732} 769}
733 770
734///////////////////////////////////////////////////////////////////////////// 771/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 776//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 777#define SWATHBITS 8
741#endif 778#endif
742 779
743struct rxvt_font_xft : rxvt_font { 780struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 781 rxvt_font_xft () { f = 0; }
745 782
746 void clear (); 783 void clear ();
747 784
748 rxvt_fontprop properties (); 785 rxvt_fontprop properties ();
749 786
750 bool load (const rxvt_fontprop &prop); 787 bool load (const rxvt_fontprop &prop);
751 788
752 void draw (int x, int y, 789 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 790 const text_t *text, int len,
754 int fg, int bg); 791 int fg, int bg);
755 792
756 bool has_codepoint (uint32_t unicode); 793 bool has_codepoint (uint32_t unicode);
757 794
758protected: 795protected:
759 XftFont *f; 796 XftFont *f;
760 XftDraw *d;
761}; 797};
762 798
763void 799void
764rxvt_font_xft::clear () 800rxvt_font_xft::clear ()
765{ 801{
766 if (f) 802 if (f)
767 { 803 {
768 XftFontClose (DISPLAY, f); 804 XftFontClose (DISPLAY, f);
769 f = 0; 805 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 806 }
777} 807}
778 808
779rxvt_fontprop 809rxvt_fontprop
780rxvt_font_xft::properties () 810rxvt_font_xft::properties ()
… …
887{ 917{
888 return XftCharExists (DISPLAY, f, unicode); 918 return XftCharExists (DISPLAY, f, unicode);
889} 919}
890 920
891void 921void
892rxvt_font_xft::draw (int x, int y, 922rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 923 const text_t *text, int len,
894 int fg, int bg) 924 int fg, int bg)
895{ 925{
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); 926 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 927
907 if (!slow && width == r->TermWin.fwidth && 0) 928 if (!slow && width == r->TermWin.fwidth && 0)
908 { 929 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 930 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 931 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
915 { 936 {
916 while (len) 937 while (len)
917 { 938 {
918 if (*text != NOCHAR && *text != ' ') 939 if (*text != NOCHAR && *text != ' ')
919 { 940 {
941 int fwidth = r->TermWin.fwidth;
942 if (len >= 2 && text[1] == NOCHAR)
943 fwidth *= 2;
944
920 XGlyphInfo extents; 945 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 946 if (sizeof (text_t) == sizeof (FcChar16))
922 { 947 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 948 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, 949 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 950 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 951 }
927 else 952 else
928 { 953 {
929 XGlyphInfo extents; 954 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 955 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, 956 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 957 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 958 }
934 } 959 }
935 960
936 x += r->TermWin.fwidth; 961 x += r->TermWin.fwidth;
… …
942#endif 967#endif
943 968
944///////////////////////////////////////////////////////////////////////////// 969/////////////////////////////////////////////////////////////////////////////
945 970
946rxvt_fontset::rxvt_fontset (rxvt_t r) 971rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT
948: r(r) 972: r (r)
949#endif
950{ 973{
951 clear (); 974 clear ();
952} 975}
953 976
954rxvt_fontset::~rxvt_fontset () 977rxvt_fontset::~rxvt_fontset ()
… …
957} 980}
958 981
959void 982void
960rxvt_fontset::clear () 983rxvt_fontset::clear ()
961{ 984{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 985 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 986 FONT_UNREF (*i);
964 987
965 fonts.clear (); 988 fonts.clear ();
966 base_id = 0; 989 base_id = 0;
967 base_prop.height = 0x7fffffff; 990 base_prop.height = 0x7fffffff;
… …
1021 1044
1022 if (*desc == '[') 1045 if (*desc == '[')
1023 { 1046 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1047 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1048
1026 const char *extra = desc++; 1049 //const char *extra = desc++; // not yet used
1027 1050
1028 desc = strchr (desc, ']'); 1051 desc = strchr (desc, ']');
1029 1052
1030 if (!desc) 1053 if (!desc)
1031 { 1054 {
… …
1070 } 1093 }
1071 1094
1072 return true; 1095 return true;
1073} 1096}
1074 1097
1075void 1098bool
1076rxvt_fontset::populate (const char *desc) 1099rxvt_fontset::populate (const char *desc)
1077{ 1100{
1078 clear (); 1101 clear ();
1079 1102
1080 fonts.push_back (new_font (0, CS_UNICODE)); 1103 fonts.push_back (new_font (0, CS_UNICODE));
… …
1084 1107
1085 if (!base_id) 1108 if (!base_id)
1086 base_id = 1; 1109 base_id = 1;
1087 1110
1088 // we currently need a base-font, no matter what 1111 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1112 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1113 {
1114 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1115 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1116 base_id = fonts.size () - 1;
1093 } 1117 }
1094 1118
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1119 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1120 return false;
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1);
1099 }
1100 1121
1101 base_prop = fonts[base_id]->properties (); 1122 base_prop = fonts[base_id]->properties ();
1123
1124 return true;
1102} 1125}
1103 1126
1104int 1127int
1105rxvt_fontset::find_font (uint32_t unicode) 1128rxvt_fontset::find_font (uint32_t unicode)
1106{ 1129{
1107 for (int i = 0; i < fonts.size (); i++) 1130 for (unsigned int i = 0; i < fonts.size (); i++)
1108 { 1131 {
1109 rxvt_font *f = fonts[i]; 1132 rxvt_font *f = fonts[i];
1110 1133
1111 if (!f->loaded) 1134 if (!f->loaded)
1112 { 1135 {

Diff Legend

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