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

Diff Legend

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