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.17 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 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
… …
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->display->display 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" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 89#endif
88 90
89#if XFT 91#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
94 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
99 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
100}; 106};
107
108/////////////////////////////////////////////////////////////////////////////
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
101 125
102///////////////////////////////////////////////////////////////////////////// 126/////////////////////////////////////////////////////////////////////////////
103 127
104static void *enc_buf; 128static void *enc_buf;
105static uint32_t enc_len; 129static uint32_t enc_len;
… …
161} 185}
162 186
163///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
164 188
165void 189void
166rxvt_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)
167{ 191{
168 if (color == Color_bg) 192 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 194 else if (color >= 0)
171 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, GC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, GC, x, y, w, h);
201#endif
174 } 202 }
175} 203}
176 204
177static const char *linedraw_cmds[128] = { 205static const char *linedraw_cmds[128] = {
178 "1hH", "2hH", "1vV", "2vV", 206 "1hH", "2hH", "1vV", "2vV",
… …
247 275
248 bool has_codepoint (uint32_t unicode) 276 bool has_codepoint (uint32_t unicode)
249 { 277 {
250 if (unicode <= 0x001f) 278 if (unicode <= 0x001f)
251 return true; 279 return true;
280
252 if (unicode >= 0x0080 && unicode <= 0x009f) 281 if (unicode >= 0x0080 && unicode <= 0x009f)
253 return true; 282 return true;
254 283
255 if (unicode >= 0x2500 && unicode <= 0x257f 284 if (unicode >= 0x2500 && unicode <= 0x257f
256 && linedraw_cmds[unicode - 0x2500]) 285 && linedraw_cmds[unicode - 0x2500])
286 return true;
287
288 if (IS_COMPOSE (unicode))
257 return true; 289 return true;
258 290
259 switch (unicode) 291 switch (unicode)
260 { 292 {
261 case ZERO_WIDTH_CHAR: 293 case ZERO_WIDTH_CHAR:
… …
263 } 295 }
264 296
265 return false; 297 return false;
266 } 298 }
267 299
268 void draw (int x, int y, 300 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 301 const text_t *text, int len,
270 int fg, int bg); 302 int fg, int bg);
271}; 303};
272 304
273void 305void
274rxvt_font_default::draw (int x, int y, 306rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 307 const text_t *text, int len,
276 int fg, int bg) 308 int fg, int bg)
277{ 309{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 310 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 311
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 312 XSetForeground (d.display->display, GC, r->PixColors[fg]);
281 313
282 while (len--) 314 while (len--)
283 { 315 {
316 compose_char *cc;
284 text_t t = *text++; 317 text_t t = *text++;
285 318
319 // is it in our linedrawing table?
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 320 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
287 { 321 {
288 const char *p = linedraw_cmds[t - 0x2500]; 322 const char *p = linedraw_cmds[t - 0x2500];
289 323
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 324 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 325 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
292 326
293 XGCValues gcv; 327 XGCValues gcv;
294 328
295 while (*p) 329 while (*p)
296 { 330 {
297 switch (*p++) 331 switch (*p++)
298 { 332 {
299 case '1': 333 case '1':
300 gcv.line_width = 0; 334 gcv.line_width = 0;
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
302 break; 336 break;
303 337
304 case '2': 338 case '2':
305 gcv.line_width = 2; 339 gcv.line_width = 2;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
307 break; 341 break;
308 342
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 343 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; 344 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; 345 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; 346 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; 347 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; 348 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
315 } 349 }
316 } 350 }
317 351
318 gcv.line_width = 0; 352 gcv.line_width = 0;
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 353 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
354 }
355 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
356 {
357 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
358 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
359 if (cc->c2 != NOCHAR)
360 {
361 // prefer font of first character, for no good reasons
362 rxvt_font *f2 = f1->has_codepoint (cc->c2)
363 ? f1
364 : (*fs)[fs->find_font (cc->c2)];
365
366 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
367 }
320 } 368 }
321 else 369 else
322 switch (*text++) 370 switch (t)
323 { 371 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 372 case ZERO_WIDTH_CHAR:
326 break; 373 break;
327 default: 374 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 375 int w = 0;
376 while (len > 0 && *text == NOCHAR)
377 {
378 ++text;
379 --len;
380 w += r->TermWin.fwidth;
381 }
382
383 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
384 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
385 x += w;
329 } 386 }
330 387
331 x += r->TermWin.fwidth; 388 x += r->TermWin.fwidth;
332 } 389 }
333} 390}
… …
343 400
344 bool load (const rxvt_fontprop &prop); 401 bool load (const rxvt_fontprop &prop);
345 402
346 bool has_codepoint (uint32_t unicode); 403 bool has_codepoint (uint32_t unicode);
347 404
348 void draw (int x, int y, 405 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 406 const text_t *text, int len,
350 int fg, int bg); 407 int fg, int bg);
351 408
352 XFontStruct *f; 409 XFontStruct *f;
353 codeset cs; 410 codeset cs;
… …
408 465
409bool 466bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 467rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 468{
412 int slashes = 0; 469 int slashes = 0;
413 const char *comp[12]; 470 const char *comp[13];
414 471
415 for (const char *c = name; *c; c++) 472 for (const char *c = name; *c; c++)
416 if (*c == '-') 473 if (*c == '-')
417 { 474 {
418 comp[slashes++] = c + 1; 475 comp[slashes++] = c + 1;
… …
428 485
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 486 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 487
431 if (f) 488 if (f)
432 { 489 {
433 // the font should really exists now. if not, we have a problem 490 // 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). 491 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 492 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 493 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 494 XFreeFont (DISPLAY, f);
438 return ret; 495 return ret;
… …
644 701
645 return true; 702 return true;
646} 703}
647 704
648void 705void
649rxvt_font_x11::draw (int x, int y, 706rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
650 const text_t *text, int len, 707 const text_t *text, int len,
651 int fg, int bg) 708 int fg, int bg)
652{ 709{
653 // this looks like a mess /. 710 // this looks like a mess /.
654 // and it is a mess /. 711 // and it is a mess /.
… …
670 { 727 {
671 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
672 729
673 if (bg == Color_bg && !slow) 730 if (bg == Color_bg && !slow)
674 { 731 {
675 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 732 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
676 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 733 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
677 } 734 }
678 else 735 else
679 { 736 {
680 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 737 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
681 738
682 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 739 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
683 740
684 if (slow) 741 if (slow)
685 { 742 {
686 do 743 do
687 { 744 {
688 if (xc->byte1 || xc->byte2) 745 if (xc->byte1 || xc->byte2)
689 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 746 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
690 747
691 x += r->TermWin.fwidth; 748 x += r->TermWin.fwidth;
692 xc++; len--; 749 xc++; len--;
693 } 750 }
694 while (len); 751 while (len);
695 } 752 }
696 else 753 else
697 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 754 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
698 } 755 }
699 } 756 }
700 else 757 else
701 { 758 {
702 const char *xc = enc_char (text, len, cs, slow); 759 const char *xc = enc_char (text, len, cs, slow);
703 760
704 if (bg == Color_bg && !slow) 761 if (bg == Color_bg && !slow)
705 { 762 {
706 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 763 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
707 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 764 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
708 } 765 }
709 else 766 else
710 { 767 {
711 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 768 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
712 769
713 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 770 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
714 771
715 if (slow) 772 if (slow)
716 { 773 {
717 do 774 do
718 { 775 {
719 if (*xc) 776 if (*xc)
720 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 777 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
721 778
722 x += r->TermWin.fwidth; 779 x += r->TermWin.fwidth;
723 xc++; len--; 780 xc++; len--;
724 } 781 }
725 while (len); 782 while (len);
726 } 783 }
727 else 784 else
728 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 785 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
729 } 786 }
730 } 787 }
731} 788}
732 789
733///////////////////////////////////////////////////////////////////////////// 790/////////////////////////////////////////////////////////////////////////////
… …
738//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 795//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
739#define SWATHBITS 8 796#define SWATHBITS 8
740#endif 797#endif
741 798
742struct rxvt_font_xft : rxvt_font { 799struct rxvt_font_xft : rxvt_font {
743 rxvt_font_xft () { f = 0; d = 0; } 800 rxvt_font_xft () { f = 0; }
744 801
745 void clear (); 802 void clear ();
746 803
747 rxvt_fontprop properties (); 804 rxvt_fontprop properties ();
748 805
749 bool load (const rxvt_fontprop &prop); 806 bool load (const rxvt_fontprop &prop);
750 807
751 void draw (int x, int y, 808 void draw (rxvt_drawable &d, int x, int y,
752 const text_t *text, int len, 809 const text_t *text, int len,
753 int fg, int bg); 810 int fg, int bg);
754 811
755 bool has_codepoint (uint32_t unicode); 812 bool has_codepoint (uint32_t unicode);
756 813
757protected: 814protected:
758 XftFont *f; 815 XftFont *f;
759 XftDraw *d;
760}; 816};
761 817
762void 818void
763rxvt_font_xft::clear () 819rxvt_font_xft::clear ()
764{ 820{
765 if (f) 821 if (f)
766 { 822 {
767 XftFontClose (DISPLAY, f); 823 XftFontClose (DISPLAY, f);
768 f = 0; 824 f = 0;
769 }
770
771 if (d)
772 {
773 XftDrawDestroy (d);
774 d = 0;
775 } 825 }
776} 826}
777 827
778rxvt_fontprop 828rxvt_fontprop
779rxvt_font_xft::properties () 829rxvt_font_xft::properties ()
… …
886{ 936{
887 return XftCharExists (DISPLAY, f, unicode); 937 return XftCharExists (DISPLAY, f, unicode);
888} 938}
889 939
890void 940void
891rxvt_font_xft::draw (int x, int y, 941rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
892 const text_t *text, int len, 942 const text_t *text, int len,
893 int fg, int bg) 943 int fg, int bg)
894{ 944{
895 if (!d)
896 d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
897
898 if (bg >= 0 && bg != Color_bg)
899 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
900 else
901 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 945 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
902 946
903 if (!slow && width == r->TermWin.fwidth && 0) 947 if (!slow && width == r->TermWin.fwidth && 0)
904 { 948 {
905 if (sizeof (text_t) == sizeof (FcChar16)) 949 if (sizeof (text_t) == sizeof (FcChar16))
906 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 950 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
918 fwidth *= 2; 962 fwidth *= 2;
919 963
920 XGlyphInfo extents; 964 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
922 { 966 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 967 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 968 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 969 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 970 }
927 else 971 else
928 { 972 {
929 XGlyphInfo extents; 973 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 974 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 975 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 976 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 977 }
934 } 978 }
935 979
… …
942#endif 986#endif
943 987
944///////////////////////////////////////////////////////////////////////////// 988/////////////////////////////////////////////////////////////////////////////
945 989
946rxvt_fontset::rxvt_fontset (rxvt_t r) 990rxvt_fontset::rxvt_fontset (rxvt_t r)
947: r(r) 991: r (r)
948{ 992{
949 clear (); 993 clear ();
950} 994}
951 995
952rxvt_fontset::~rxvt_fontset () 996rxvt_fontset::~rxvt_fontset ()
… …
955} 999}
956 1000
957void 1001void
958rxvt_fontset::clear () 1002rxvt_fontset::clear ()
959{ 1003{
960 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1004 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
961 FONT_UNREF (*i); 1005 FONT_UNREF (*i);
962 1006
963 fonts.clear (); 1007 fonts.clear ();
964 base_id = 0; 1008 base_id = 0;
965 base_prop.height = 0x7fffffff; 1009 base_prop.height = 0x7fffffff;
… …
992 f = new rxvt_font_x11; 1036 f = new rxvt_font_x11;
993 } 1037 }
994 else 1038 else
995 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
996 1040
1041 f->fs = this;
997 f->set_term (r); 1042 f->set_term (r);
998 f->set_name (strdup (name)); 1043 f->set_name (strdup (name));
999 1044
1000 f->cs = cs; 1045 f->cs = cs;
1001 f->loaded = false; 1046 f->loaded = false;
… …
1068 } 1113 }
1069 1114
1070 return true; 1115 return true;
1071} 1116}
1072 1117
1073void 1118bool
1074rxvt_fontset::populate (const char *desc) 1119rxvt_fontset::populate (const char *desc)
1075{ 1120{
1076 clear (); 1121 clear ();
1077 1122
1078 fonts.push_back (new_font (0, CS_UNICODE)); 1123 fonts.push_back (new_font (0, CS_UNICODE));
… …
1084 base_id = 1; 1129 base_id = 1;
1085 1130
1086 // we currently need a base-font, no matter what 1131 // we currently need a base-font, no matter what
1087 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1132 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1088 { 1133 {
1089 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1134 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1090 add_fonts ("fixed"); 1135 add_fonts ("fixed");
1091 base_id = fonts.size () - 1; 1136 base_id = fonts.size () - 1;
1092 } 1137 }
1093 1138
1094 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1139 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1140 return false;
1096 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1097 exit (1);
1098 }
1099 1141
1100 base_prop = fonts[base_id]->properties (); 1142 base_prop = fonts[base_id]->properties ();
1143
1144 return true;
1101} 1145}
1102 1146
1103int 1147int
1104rxvt_fontset::find_font (uint32_t unicode) 1148rxvt_fontset::find_font (uint32_t unicode)
1105{ 1149{

Diff Legend

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