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.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 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_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 87#endif
88 88
89#if XFT 89#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 90 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 91 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
99 { CS_UNKNOWN, 0 } 99 { CS_UNKNOWN, 0 }
100}; 100};
101 101
102///////////////////////////////////////////////////////////////////////////// 102/////////////////////////////////////////////////////////////////////////////
103 103
104#if XFT
105rxvt_drawable::~rxvt_drawable ()
106{
107 if (xftdrawable)
108 XftDrawDestroy (xftdrawable);
109}
110
111rxvt_drawable::operator XftDraw *()
112{
113 if (!xftdrawable)
114 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
115
116 return xftdrawable;
117}
118#endif
119
120/////////////////////////////////////////////////////////////////////////////
121
104static void *enc_buf; 122static void *enc_buf;
105static uint32_t enc_len; 123static uint32_t enc_len;
106 124
107static inline void * 125static inline void *
108get_enc_buf (int len) 126get_enc_buf (uint32_t len)
109{ 127{
110 if (len > enc_len) 128 if (len > enc_len)
111 { 129 {
112 free (enc_buf); 130 free (enc_buf);
113 enc_buf = malloc (len); 131 enc_buf = malloc (len);
… …
115 133
116 return enc_buf; 134 return enc_buf;
117} 135}
118 136
119static const char * 137static const char *
120enc_char (const text_t *text, int len, codeset cs, bool &zero) 138enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
121{ 139{
122 uint8_t *buf = (uint8_t *)get_enc_buf (len); 140 uint8_t *buf = (uint8_t *)get_enc_buf (len);
123 141
124 while (len--) 142 while (len--)
125 { 143 {
… …
136 154
137 return (const char *)enc_buf; 155 return (const char *)enc_buf;
138} 156}
139 157
140static const XChar2b * 158static const XChar2b *
141enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 159enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
142{ 160{
143 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 161 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
144 162
145 while (len--) 163 while (len--)
146 { 164 {
… …
161} 179}
162 180
163///////////////////////////////////////////////////////////////////////////// 181/////////////////////////////////////////////////////////////////////////////
164 182
165void 183void
166rxvt_font::clear_rect (int x, int y, int w, int h, int color) 184rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
167{ 185{
168 if (color == Color_bg) 186 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 187 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 188 else if (color >= 0)
171 { 189 {
190#if XFT
191 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
192#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 193 XSetForeground (d.display->display, GC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 194 XFillRectangle (d.display->display, d, GC, x, y, w, h);
195#endif
174 } 196 }
175} 197}
176 198
177static const char *linedraw_cmds[128] = { 199static const char *linedraw_cmds[128] = {
178 "1hH", "2hH", "1vV", "2vV", 200 "1hH", "2hH", "1vV", "2vV",
… …
263 } 285 }
264 286
265 return false; 287 return false;
266 } 288 }
267 289
268 void draw (int x, int y, 290 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 291 const text_t *text, int len,
270 int fg, int bg); 292 int fg, int bg);
271}; 293};
272 294
273void 295void
274rxvt_font_default::draw (int x, int y, 296rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 297 const text_t *text, int len,
276 int fg, int bg) 298 int fg, int bg)
277{ 299{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 300 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 301
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 302 XSetForeground (d.display->display, GC, r->PixColors[fg]);
281 303
282 while (len--) 304 while (len--)
283 { 305 {
284 text_t t = *text++; 306 text_t t = *text++;
285 307
308 // is it in our linedrawing table?
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 309 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
287 { 310 {
288 const char *p = linedraw_cmds[t - 0x2500]; 311 const char *p = linedraw_cmds[t - 0x2500];
289 312
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 313 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 314 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
292 315
293 XGCValues gcv; 316 XGCValues gcv;
294 317
295 while (*p) 318 while (*p)
296 { 319 {
297 switch (*p++) 320 switch (*p++)
298 { 321 {
299 case '1': 322 case '1':
300 gcv.line_width = 0; 323 gcv.line_width = 0;
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 324 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
302 break; 325 break;
303 326
304 case '2': 327 case '2':
305 gcv.line_width = 2; 328 gcv.line_width = 2;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 329 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
307 break; 330 break;
308 331
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 332 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 333 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 334 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 335 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
313 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 336 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
314 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 337 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
315 } 338 }
316 } 339 }
317 340
318 gcv.line_width = 0; 341 gcv.line_width = 0;
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 342 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
320 } 343 }
321 else 344 else
322 switch (*text++) 345 switch (t)
323 { 346 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 347 case ZERO_WIDTH_CHAR:
326 break; 348 break;
327 default: 349 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 350 int w = 0;
351 while (len > 0 && *text == NOCHAR)
352 {
353 ++text;
354 --len;
355 w += r->TermWin.fwidth;
356 }
357
358 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
359 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
360 x += w;
329 } 361 }
330 362
331 x += r->TermWin.fwidth; 363 x += r->TermWin.fwidth;
332 } 364 }
333} 365}
… …
343 375
344 bool load (const rxvt_fontprop &prop); 376 bool load (const rxvt_fontprop &prop);
345 377
346 bool has_codepoint (uint32_t unicode); 378 bool has_codepoint (uint32_t unicode);
347 379
348 void draw (int x, int y, 380 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 381 const text_t *text, int len,
350 int fg, int bg); 382 int fg, int bg);
351 383
352 XFontStruct *f; 384 XFontStruct *f;
353 codeset cs; 385 codeset cs;
… …
428 460
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 461 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 462
431 if (f) 463 if (f)
432 { 464 {
433 // the font should really exists now. if not, we have a problem 465 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts). 466 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 467 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 468 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 469 XFreeFont (DISPLAY, f);
438 return ret; 470 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 547 f = XLoadQueryFont (DISPLAY, name);
516 548
517 if (!f) 549 if (!f)
518 return false; 550 return false;
519 551
520 unsigned long value;
521
522 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 552 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
523 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 553 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
524 554
525 if (registry && encoding) 555 if (registry && encoding)
526 { 556 {
… …
612 /* check wether the character exists in _this_ font. horrible. */ 642 /* check wether the character exists in _this_ font. horrible. */
613 XCharStruct *xcs; 643 XCharStruct *xcs;
614 644
615 if (encm) 645 if (encm)
616 { 646 {
617 int byte1 = ch >> 8; 647 unsigned char byte1 = ch >> 8;
618 int byte2 = ch & 255; 648 unsigned char byte2 = ch & 255;
619 649
620 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 650 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
621 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 651 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
622 return false; 652 return false;
623 653
… …
646 676
647 return true; 677 return true;
648} 678}
649 679
650void 680void
651rxvt_font_x11::draw (int x, int y, 681rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
652 const text_t *text, int len, 682 const text_t *text, int len,
653 int fg, int bg) 683 int fg, int bg)
654{ 684{
655 // this looks like a mess /. 685 // this looks like a mess /.
656 // and it is a mess /. 686 // and it is a mess /.
… …
672 { 702 {
673 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 703 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
674 704
675 if (bg == Color_bg && !slow) 705 if (bg == Color_bg && !slow)
676 { 706 {
677 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 707 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
678 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 708 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
679 } 709 }
680 else 710 else
681 { 711 {
682 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 712 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
683 713
684 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 714 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
685 715
686 if (slow) 716 if (slow)
687 { 717 {
688 do 718 do
689 { 719 {
690 if (xc->byte1 || xc->byte2) 720 if (xc->byte1 || xc->byte2)
691 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 721 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
692 722
693 x += r->TermWin.fwidth; 723 x += r->TermWin.fwidth;
694 xc++; len--; 724 xc++; len--;
695 } 725 }
696 while (len); 726 while (len);
697 } 727 }
698 else 728 else
699 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 729 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
700 } 730 }
701 } 731 }
702 else 732 else
703 { 733 {
704 const char *xc = enc_char (text, len, cs, slow); 734 const char *xc = enc_char (text, len, cs, slow);
705 735
706 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
707 { 737 {
708 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
709 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 739 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
710 } 740 }
711 else 741 else
712 { 742 {
713 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);
714 744
715 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
716 746
717 if (slow) 747 if (slow)
718 { 748 {
719 do 749 do
720 { 750 {
721 if (*xc) 751 if (*xc)
722 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 752 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
723 753
724 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
725 xc++; len--; 755 xc++; len--;
726 } 756 }
727 while (len); 757 while (len);
728 } 758 }
729 else 759 else
730 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 760 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
731 } 761 }
732 } 762 }
733} 763}
734 764
735///////////////////////////////////////////////////////////////////////////// 765/////////////////////////////////////////////////////////////////////////////
… …
740//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 770//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
741#define SWATHBITS 8 771#define SWATHBITS 8
742#endif 772#endif
743 773
744struct rxvt_font_xft : rxvt_font { 774struct rxvt_font_xft : rxvt_font {
745 rxvt_font_xft () { f = 0; d = 0; } 775 rxvt_font_xft () { f = 0; }
746 776
747 void clear (); 777 void clear ();
748 778
749 rxvt_fontprop properties (); 779 rxvt_fontprop properties ();
750 780
751 bool load (const rxvt_fontprop &prop); 781 bool load (const rxvt_fontprop &prop);
752 782
753 void draw (int x, int y, 783 void draw (rxvt_drawable &d, int x, int y,
754 const text_t *text, int len, 784 const text_t *text, int len,
755 int fg, int bg); 785 int fg, int bg);
756 786
757 bool has_codepoint (uint32_t unicode); 787 bool has_codepoint (uint32_t unicode);
758 788
759protected: 789protected:
760 XftFont *f; 790 XftFont *f;
761 XftDraw *d;
762}; 791};
763 792
764void 793void
765rxvt_font_xft::clear () 794rxvt_font_xft::clear ()
766{ 795{
767 if (f) 796 if (f)
768 { 797 {
769 XftFontClose (DISPLAY, f); 798 XftFontClose (DISPLAY, f);
770 f = 0; 799 f = 0;
771 }
772
773 if (d)
774 {
775 XftDrawDestroy (d);
776 d = 0;
777 } 800 }
778} 801}
779 802
780rxvt_fontprop 803rxvt_fontprop
781rxvt_font_xft::properties () 804rxvt_font_xft::properties ()
… …
888{ 911{
889 return XftCharExists (DISPLAY, f, unicode); 912 return XftCharExists (DISPLAY, f, unicode);
890} 913}
891 914
892void 915void
893rxvt_font_xft::draw (int x, int y, 916rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
894 const text_t *text, int len, 917 const text_t *text, int len,
895 int fg, int bg) 918 int fg, int bg)
896{ 919{
897 if (!d)
898 {
899 dR;
900 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
901 }
902
903 if (bg >= 0 && bg != Color_bg)
904 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
905 else
906 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 920 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
907 921
908 if (!slow && width == r->TermWin.fwidth && 0) 922 if (!slow && width == r->TermWin.fwidth && 0)
909 { 923 {
910 if (sizeof (text_t) == sizeof (FcChar16)) 924 if (sizeof (text_t) == sizeof (FcChar16))
911 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 925 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
923 fwidth *= 2; 937 fwidth *= 2;
924 938
925 XGlyphInfo extents; 939 XGlyphInfo extents;
926 if (sizeof (text_t) == sizeof (FcChar16)) 940 if (sizeof (text_t) == sizeof (FcChar16))
927 { 941 {
928 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 942 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
929 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 943 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
930 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 944 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
931 } 945 }
932 else 946 else
933 { 947 {
934 XGlyphInfo extents; 948 XGlyphInfo extents;
935 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 949 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
936 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 950 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
937 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 951 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
938 } 952 }
939 } 953 }
940 954
… …
947#endif 961#endif
948 962
949///////////////////////////////////////////////////////////////////////////// 963/////////////////////////////////////////////////////////////////////////////
950 964
951rxvt_fontset::rxvt_fontset (rxvt_t r) 965rxvt_fontset::rxvt_fontset (rxvt_t r)
952#ifdef EXPLICIT_CONTEXT
953: r(r) 966: r (r)
954#endif
955{ 967{
956 clear (); 968 clear ();
957} 969}
958 970
959rxvt_fontset::~rxvt_fontset () 971rxvt_fontset::~rxvt_fontset ()
… …
962} 974}
963 975
964void 976void
965rxvt_fontset::clear () 977rxvt_fontset::clear ()
966{ 978{
967 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 979 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
968 FONT_UNREF (*i); 980 FONT_UNREF (*i);
969 981
970 fonts.clear (); 982 fonts.clear ();
971 base_id = 0; 983 base_id = 0;
972 base_prop.height = 0x7fffffff; 984 base_prop.height = 0x7fffffff;
… …
1026 1038
1027 if (*desc == '[') 1039 if (*desc == '[')
1028 { 1040 {
1029 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1041 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1030 1042
1031 const char *extra = desc++; 1043 //const char *extra = desc++; // not yet used
1032 1044
1033 desc = strchr (desc, ']'); 1045 desc = strchr (desc, ']');
1034 1046
1035 if (!desc) 1047 if (!desc)
1036 { 1048 {
… …
1075 } 1087 }
1076 1088
1077 return true; 1089 return true;
1078} 1090}
1079 1091
1080void 1092bool
1081rxvt_fontset::populate (const char *desc) 1093rxvt_fontset::populate (const char *desc)
1082{ 1094{
1083 clear (); 1095 clear ();
1084 1096
1085 fonts.push_back (new_font (0, CS_UNICODE)); 1097 fonts.push_back (new_font (0, CS_UNICODE));
… …
1089 1101
1090 if (!base_id) 1102 if (!base_id)
1091 base_id = 1; 1103 base_id = 1;
1092 1104
1093 // we currently need a base-font, no matter what 1105 // we currently need a base-font, no matter what
1094 if (fonts.size () <= base_id || !realize_font (base_id)) 1106 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1107 {
1096 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1108 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1097 add_fonts ("fixed"); 1109 add_fonts ("fixed");
1098 base_id = fonts.size () - 1; 1110 base_id = fonts.size () - 1;
1099 } 1111 }
1100 1112
1101 if (fonts.size () <= base_id || !realize_font (base_id)) 1113 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1102 { 1114 return false;
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 exit (1);
1105 }
1106 1115
1107 base_prop = fonts[base_id]->properties (); 1116 base_prop = fonts[base_id]->properties ();
1117
1118 return true;
1108} 1119}
1109 1120
1110int 1121int
1111rxvt_fontset::find_font (uint32_t unicode) 1122rxvt_fontset::find_font (uint32_t unicode)
1112{ 1123{
1113 for (int i = 0; i < fonts.size (); i++) 1124 for (unsigned int i = 0; i < fonts.size (); i++)
1114 { 1125 {
1115 rxvt_font *f = fonts[i]; 1126 rxvt_font *f = fonts[i];
1116 1127
1117 if (!f->loaded) 1128 if (!f->loaded)
1118 { 1129 {

Diff Legend

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