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.13 by pcg, Fri Dec 26 08:18:45 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 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_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-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" },
… …
98 { CS_UNKNOWN, 0 } 98 { CS_UNKNOWN, 0 }
99}; 99};
100 100
101///////////////////////////////////////////////////////////////////////////// 101/////////////////////////////////////////////////////////////////////////////
102 102
103#if XFT
104rxvt_drawable::~rxvt_drawable ()
105{
106 if (xftdrawable)
107 XftDrawDestroy (xftdrawable);
108}
109
110rxvt_drawable::operator XftDraw *()
111{
112 if (!xftdrawable)
113 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
114
115 return xftdrawable;
116}
117#endif
118
119/////////////////////////////////////////////////////////////////////////////
120
103static void *enc_buf; 121static void *enc_buf;
104static uint32_t enc_len; 122static uint32_t enc_len;
105 123
106static inline void * 124static inline void *
107get_enc_buf (int len) 125get_enc_buf (uint32_t len)
108{ 126{
109 if (len > enc_len) 127 if (len > enc_len)
110 { 128 {
111 free (enc_buf); 129 free (enc_buf);
112 enc_buf = malloc (len); 130 enc_buf = malloc (len);
… …
114 132
115 return enc_buf; 133 return enc_buf;
116} 134}
117 135
118static const char * 136static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 137enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 138{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 139 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 140
123 while (len--) 141 while (len--)
124 { 142 {
… …
135 153
136 return (const char *)enc_buf; 154 return (const char *)enc_buf;
137} 155}
138 156
139static const XChar2b * 157static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 158enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 159{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 160 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 161
144 while (len--) 162 while (len--)
145 { 163 {
… …
160} 178}
161 179
162///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
163 181
164void 182void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 183rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 184{
167 if (color == Color_bg) 185 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 186 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 187 else if (color >= 0)
170 { 188 {
189#if XFT
190 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
191#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 192 XSetForeground (d.display->display, GC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 193 XFillRectangle (d.display->display, d, GC, x, y, w, h);
194#endif
173 } 195 }
174} 196}
175 197
176static const char *linedraw_cmds[128] = { 198static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV", 199 "1hH", "2hH", "1vV", "2vV",
… …
262 } 284 }
263 285
264 return false; 286 return false;
265 } 287 }
266 288
267 void draw (int x, int y, 289 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 290 const text_t *text, int len,
269 int fg, int bg); 291 int fg, int bg);
270}; 292};
271 293
272void 294void
273rxvt_font_default::draw (int x, int y, 295rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 296 const text_t *text, int len,
275 int fg, int bg) 297 int fg, int bg)
276{ 298{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 299 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 300
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 301 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 302
281 while (len--) 303 while (len--)
282 { 304 {
283 text_t t = *text++; 305 text_t t = *text++;
284 306
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 307 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 308 {
287 const char *p = linedraw_cmds[t - 0x2500]; 309 const char *p = linedraw_cmds[t - 0x2500];
288 310
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 311 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 312 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
291 313
292 XGCValues gcv; 314 XGCValues gcv;
293 315
294 while (*p) 316 while (*p)
295 { 317 {
296 switch (*p++) 318 switch (*p++)
297 { 319 {
298 case '1': 320 case '1':
299 gcv.line_width = 0; 321 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 322 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 323 break;
302 324
303 case '2': 325 case '2':
304 gcv.line_width = 2; 326 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 327 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 328 break;
307 329
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 330 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; 331 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; 332 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; 333 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; 334 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; 335 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314 } 336 }
315 } 337 }
316 338
317 gcv.line_width = 0; 339 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
319 } 341 }
320 else 342 else
321 switch (*text++) 343 switch (*text++)
322 { 344 {
323 case NOCHAR: 345 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 346 case ZERO_WIDTH_CHAR:
325 break; 347 break;
326 default: 348 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 349 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
328 } 350 }
329 351
330 x += r->TermWin.fwidth; 352 x += r->TermWin.fwidth;
331 } 353 }
332} 354}
… …
342 364
343 bool load (const rxvt_fontprop &prop); 365 bool load (const rxvt_fontprop &prop);
344 366
345 bool has_codepoint (uint32_t unicode); 367 bool has_codepoint (uint32_t unicode);
346 368
347 void draw (int x, int y, 369 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 370 const text_t *text, int len,
349 int fg, int bg); 371 int fg, int bg);
350 372
351 XFontStruct *f; 373 XFontStruct *f;
352 codeset cs; 374 codeset cs;
… …
427 449
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 450 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 451
430 if (f) 452 if (f)
431 { 453 {
432 // the font should really exists now. if not, we have a problem 454 // 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). 455 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 456 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 457 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 458 XFreeFont (DISPLAY, f);
437 return ret; 459 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 536 f = XLoadQueryFont (DISPLAY, name);
515 537
516 if (!f) 538 if (!f)
517 return false; 539 return false;
518 540
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 541 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 542 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 543
524 if (registry && encoding) 544 if (registry && encoding)
525 { 545 {
… …
611 /* check wether the character exists in _this_ font. horrible. */ 631 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 632 XCharStruct *xcs;
613 633
614 if (encm) 634 if (encm)
615 { 635 {
616 int byte1 = ch >> 8; 636 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 637 unsigned char byte2 = ch & 255;
618 638
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 639 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 640 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 641 return false;
622 642
… …
645 665
646 return true; 666 return true;
647} 667}
648 668
649void 669void
650rxvt_font_x11::draw (int x, int y, 670rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 671 const text_t *text, int len,
652 int fg, int bg) 672 int fg, int bg)
653{ 673{
654 // this looks like a mess /. 674 // this looks like a mess /.
655 // and it is a mess /. 675 // and it is a mess /.
… …
671 { 691 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 692 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 693
674 if (bg == Color_bg && !slow) 694 if (bg == Color_bg && !slow)
675 { 695 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 696 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 697 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
678 } 698 }
679 else 699 else
680 { 700 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 701 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 702
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 703 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
684 704
685 if (slow) 705 if (slow)
686 { 706 {
687 do 707 do
688 { 708 {
689 if (xc->byte1 || xc->byte2) 709 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 710 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
691 711
692 x += r->TermWin.fwidth; 712 x += r->TermWin.fwidth;
693 xc++; len--; 713 xc++; len--;
694 } 714 }
695 while (len); 715 while (len);
696 } 716 }
697 else 717 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 718 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
699 } 719 }
700 } 720 }
701 else 721 else
702 { 722 {
703 const char *xc = enc_char (text, len, cs, slow); 723 const char *xc = enc_char (text, len, cs, slow);
704 724
705 if (bg == Color_bg && !slow) 725 if (bg == Color_bg && !slow)
706 { 726 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 727 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 728 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
709 } 729 }
710 else 730 else
711 { 731 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 732 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 733
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 734 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
715 735
716 if (slow) 736 if (slow)
717 { 737 {
718 do 738 do
719 { 739 {
720 if (*xc) 740 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 741 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
722 742
723 x += r->TermWin.fwidth; 743 x += r->TermWin.fwidth;
724 xc++; len--; 744 xc++; len--;
725 } 745 }
726 while (len); 746 while (len);
727 } 747 }
728 else 748 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 749 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
730 } 750 }
731 } 751 }
732} 752}
733 753
734///////////////////////////////////////////////////////////////////////////// 754/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 759//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 760#define SWATHBITS 8
741#endif 761#endif
742 762
743struct rxvt_font_xft : rxvt_font { 763struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 764 rxvt_font_xft () { f = 0; }
745 765
746 void clear (); 766 void clear ();
747 767
748 rxvt_fontprop properties (); 768 rxvt_fontprop properties ();
749 769
750 bool load (const rxvt_fontprop &prop); 770 bool load (const rxvt_fontprop &prop);
751 771
752 void draw (int x, int y, 772 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 773 const text_t *text, int len,
754 int fg, int bg); 774 int fg, int bg);
755 775
756 bool has_codepoint (uint32_t unicode); 776 bool has_codepoint (uint32_t unicode);
757 777
758protected: 778protected:
759 XftFont *f; 779 XftFont *f;
760 XftDraw *d;
761}; 780};
762 781
763void 782void
764rxvt_font_xft::clear () 783rxvt_font_xft::clear ()
765{ 784{
766 if (f) 785 if (f)
767 { 786 {
768 XftFontClose (DISPLAY, f); 787 XftFontClose (DISPLAY, f);
769 f = 0; 788 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 789 }
777} 790}
778 791
779rxvt_fontprop 792rxvt_fontprop
780rxvt_font_xft::properties () 793rxvt_font_xft::properties ()
… …
887{ 900{
888 return XftCharExists (DISPLAY, f, unicode); 901 return XftCharExists (DISPLAY, f, unicode);
889} 902}
890 903
891void 904void
892rxvt_font_xft::draw (int x, int y, 905rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 906 const text_t *text, int len,
894 int fg, int bg) 907 int fg, int bg)
895{ 908{
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); 909 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 910
907 if (!slow && width == r->TermWin.fwidth && 0) 911 if (!slow && width == r->TermWin.fwidth && 0)
908 { 912 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 913 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 914 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
922 fwidth *= 2; 926 fwidth *= 2;
923 927
924 XGlyphInfo extents; 928 XGlyphInfo extents;
925 if (sizeof (text_t) == sizeof (FcChar16)) 929 if (sizeof (text_t) == sizeof (FcChar16))
926 { 930 {
927 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 931 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
928 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 932 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
929 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 933 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
930 } 934 }
931 else 935 else
932 { 936 {
933 XGlyphInfo extents; 937 XGlyphInfo extents;
934 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 938 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
935 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 939 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
936 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 940 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
937 } 941 }
938 } 942 }
939 943
… …
946#endif 950#endif
947 951
948///////////////////////////////////////////////////////////////////////////// 952/////////////////////////////////////////////////////////////////////////////
949 953
950rxvt_fontset::rxvt_fontset (rxvt_t r) 954rxvt_fontset::rxvt_fontset (rxvt_t r)
951#ifdef EXPLICIT_CONTEXT
952: r(r) 955: r (r)
953#endif
954{ 956{
955 clear (); 957 clear ();
956} 958}
957 959
958rxvt_fontset::~rxvt_fontset () 960rxvt_fontset::~rxvt_fontset ()
… …
961} 963}
962 964
963void 965void
964rxvt_fontset::clear () 966rxvt_fontset::clear ()
965{ 967{
966 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 968 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
967 FONT_UNREF (*i); 969 FONT_UNREF (*i);
968 970
969 fonts.clear (); 971 fonts.clear ();
970 base_id = 0; 972 base_id = 0;
971 base_prop.height = 0x7fffffff; 973 base_prop.height = 0x7fffffff;
… …
1025 1027
1026 if (*desc == '[') 1028 if (*desc == '[')
1027 { 1029 {
1028 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1030 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1029 1031
1030 const char *extra = desc++; 1032 //const char *extra = desc++; // not yet used
1031 1033
1032 desc = strchr (desc, ']'); 1034 desc = strchr (desc, ']');
1033 1035
1034 if (!desc) 1036 if (!desc)
1035 { 1037 {
… …
1074 } 1076 }
1075 1077
1076 return true; 1078 return true;
1077} 1079}
1078 1080
1079void 1081bool
1080rxvt_fontset::populate (const char *desc) 1082rxvt_fontset::populate (const char *desc)
1081{ 1083{
1082 clear (); 1084 clear ();
1083 1085
1084 fonts.push_back (new_font (0, CS_UNICODE)); 1086 fonts.push_back (new_font (0, CS_UNICODE));
… …
1088 1090
1089 if (!base_id) 1091 if (!base_id)
1090 base_id = 1; 1092 base_id = 1;
1091 1093
1092 // we currently need a base-font, no matter what 1094 // we currently need a base-font, no matter what
1093 if (fonts.size () <= base_id || !realize_font (base_id)) 1095 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1094 { 1096 {
1095 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1097 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1096 add_fonts ("fixed"); 1098 add_fonts ("fixed");
1097 base_id = fonts.size () - 1; 1099 base_id = fonts.size () - 1;
1098 } 1100 }
1099 1101
1100 if (fonts.size () <= base_id || !realize_font (base_id)) 1102 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1101 { 1103 return false;
1102 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1103 exit (1);
1104 }
1105 1104
1106 base_prop = fonts[base_id]->properties (); 1105 base_prop = fonts[base_id]->properties ();
1106
1107 return true;
1107} 1108}
1108 1109
1109int 1110int
1110rxvt_fontset::find_font (uint32_t unicode) 1111rxvt_fontset::find_font (uint32_t unicode)
1111{ 1112{
1112 for (int i = 0; i < fonts.size (); i++) 1113 for (unsigned int i = 0; i < fonts.size (); i++)
1113 { 1114 {
1114 rxvt_font *f = fonts[i]; 1115 rxvt_font *f = fonts[i];
1115 1116
1116 if (!f->loaded) 1117 if (!f->loaded)
1117 { 1118 {

Diff Legend

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