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.14 by pcg, Thu Jan 29 00:27:16 2004 UTC vs.
Revision 1.35 by pcg, Thu Mar 4 20:09:01 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" },
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};
101 107
102///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
103 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
104static void *enc_buf; 128static void *enc_buf;
105static uint32_t enc_len; 129static uint32_t enc_len;
106 130
107static inline void * 131static inline void *
108get_enc_buf (int len) 132get_enc_buf (uint32_t len)
109{ 133{
110 if (len > enc_len) 134 if (len > enc_len)
111 { 135 {
112 free (enc_buf); 136 free (enc_buf);
113 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
115 139
116 return enc_buf; 140 return enc_buf;
117} 141}
118 142
119static const char * 143static const char *
120enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
121{ 145{
122 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
123 147
124 while (len--) 148 while (len--)
125 { 149 {
… …
136 160
137 return (const char *)enc_buf; 161 return (const char *)enc_buf;
138} 162}
139 163
140static const XChar2b * 164static const XChar2b *
141enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
142{ 166{
143 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
144 168
145 while (len--) 169 while (len--)
146 { 170 {
… …
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 {
284 text_t t = *text++; 316 text_t t = *text++;
285 317
318 // is it in our linedrawing table?
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 319 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
287 { 320 {
288 const char *p = linedraw_cmds[t - 0x2500]; 321 const char *p = linedraw_cmds[t - 0x2500];
289 322
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 323 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; 324 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
292 325
293 XGCValues gcv; 326 XGCValues gcv;
294 327
295 while (*p) 328 while (*p)
296 { 329 {
297 switch (*p++) 330 switch (*p++)
298 { 331 {
299 case '1': 332 case '1':
300 gcv.line_width = 0; 333 gcv.line_width = 0;
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 334 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
302 break; 335 break;
303 336
304 case '2': 337 case '2':
305 gcv.line_width = 2; 338 gcv.line_width = 2;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
307 break; 340 break;
308 341
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 342 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; 343 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; 344 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; 345 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; 346 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; 347 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
315 } 348 }
316 } 349 }
317 350
318 gcv.line_width = 0; 351 gcv.line_width = 0;
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 352 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
353 }
354 else if (IS_COMPOSE (t))
355 {
356 const compose_char &cc = rxvt_composite[t];
357 (void)0; //D ADD pseudo handling here
320 } 358 }
321 else 359 else
322 switch (*text++) 360 switch (t)
323 { 361 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 362 case ZERO_WIDTH_CHAR:
326 break; 363 break;
327 default: 364 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 365 int w = 0;
366 while (len > 0 && *text == NOCHAR)
367 {
368 ++text;
369 --len;
370 w += r->TermWin.fwidth;
371 }
372
373 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
374 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
375 x += w;
329 } 376 }
330 377
331 x += r->TermWin.fwidth; 378 x += r->TermWin.fwidth;
332 } 379 }
333} 380}
… …
343 390
344 bool load (const rxvt_fontprop &prop); 391 bool load (const rxvt_fontprop &prop);
345 392
346 bool has_codepoint (uint32_t unicode); 393 bool has_codepoint (uint32_t unicode);
347 394
348 void draw (int x, int y, 395 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 396 const text_t *text, int len,
350 int fg, int bg); 397 int fg, int bg);
351 398
352 XFontStruct *f; 399 XFontStruct *f;
353 codeset cs; 400 codeset cs;
… …
408 455
409bool 456bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 458{
412 int slashes = 0; 459 int slashes = 0;
413 const char *comp[12]; 460 const char *comp[13];
414 461
415 for (const char *c = name; *c; c++) 462 for (const char *c = name; *c; c++)
416 if (*c == '-') 463 if (*c == '-')
417 { 464 {
418 comp[slashes++] = c + 1; 465 comp[slashes++] = c + 1;
… …
428 475
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 476 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 477
431 if (f) 478 if (f)
432 { 479 {
433 // the font should really exists now. if not, we have a problem 480 // 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). 481 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 482 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 483 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 484 XFreeFont (DISPLAY, f);
438 return ret; 485 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 562 f = XLoadQueryFont (DISPLAY, name);
516 563
517 if (!f) 564 if (!f)
518 return false; 565 return false;
519 566
520 unsigned long value;
521
522 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 567 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
523 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 568 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
524 569
525 if (registry && encoding) 570 if (registry && encoding)
526 { 571 {
… …
612 /* check wether the character exists in _this_ font. horrible. */ 657 /* check wether the character exists in _this_ font. horrible. */
613 XCharStruct *xcs; 658 XCharStruct *xcs;
614 659
615 if (encm) 660 if (encm)
616 { 661 {
617 int byte1 = ch >> 8; 662 unsigned char byte1 = ch >> 8;
618 int byte2 = ch & 255; 663 unsigned char byte2 = ch & 255;
619 664
620 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 665 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
621 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 666 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
622 return false; 667 return false;
623 668
… …
646 691
647 return true; 692 return true;
648} 693}
649 694
650void 695void
651rxvt_font_x11::draw (int x, int y, 696rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
652 const text_t *text, int len, 697 const text_t *text, int len,
653 int fg, int bg) 698 int fg, int bg)
654{ 699{
655 // this looks like a mess /. 700 // this looks like a mess /.
656 // and it is a mess /. 701 // and it is a mess /.
… …
672 { 717 {
673 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 718 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
674 719
675 if (bg == Color_bg && !slow) 720 if (bg == Color_bg && !slow)
676 { 721 {
677 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 722 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
678 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 723 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
679 } 724 }
680 else 725 else
681 { 726 {
682 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 727 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
683 728
684 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 729 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
685 730
686 if (slow) 731 if (slow)
687 { 732 {
688 do 733 do
689 { 734 {
690 if (xc->byte1 || xc->byte2) 735 if (xc->byte1 || xc->byte2)
691 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 736 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
692 737
693 x += r->TermWin.fwidth; 738 x += r->TermWin.fwidth;
694 xc++; len--; 739 xc++; len--;
695 } 740 }
696 while (len); 741 while (len);
697 } 742 }
698 else 743 else
699 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
700 } 745 }
701 } 746 }
702 else 747 else
703 { 748 {
704 const char *xc = enc_char (text, len, cs, slow); 749 const char *xc = enc_char (text, len, cs, slow);
705 750
706 if (bg == Color_bg && !slow) 751 if (bg == Color_bg && !slow)
707 { 752 {
708 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 753 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
709 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 754 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
710 } 755 }
711 else 756 else
712 { 757 {
713 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 758 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
714 759
715 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 760 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
716 761
717 if (slow) 762 if (slow)
718 { 763 {
719 do 764 do
720 { 765 {
721 if (*xc) 766 if (*xc)
722 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 767 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
723 768
724 x += r->TermWin.fwidth; 769 x += r->TermWin.fwidth;
725 xc++; len--; 770 xc++; len--;
726 } 771 }
727 while (len); 772 while (len);
728 } 773 }
729 else 774 else
730 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 775 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
731 } 776 }
732 } 777 }
733} 778}
734 779
735///////////////////////////////////////////////////////////////////////////// 780/////////////////////////////////////////////////////////////////////////////
… …
740//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 785//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
741#define SWATHBITS 8 786#define SWATHBITS 8
742#endif 787#endif
743 788
744struct rxvt_font_xft : rxvt_font { 789struct rxvt_font_xft : rxvt_font {
745 rxvt_font_xft () { f = 0; d = 0; } 790 rxvt_font_xft () { f = 0; }
746 791
747 void clear (); 792 void clear ();
748 793
749 rxvt_fontprop properties (); 794 rxvt_fontprop properties ();
750 795
751 bool load (const rxvt_fontprop &prop); 796 bool load (const rxvt_fontprop &prop);
752 797
753 void draw (int x, int y, 798 void draw (rxvt_drawable &d, int x, int y,
754 const text_t *text, int len, 799 const text_t *text, int len,
755 int fg, int bg); 800 int fg, int bg);
756 801
757 bool has_codepoint (uint32_t unicode); 802 bool has_codepoint (uint32_t unicode);
758 803
759protected: 804protected:
760 XftFont *f; 805 XftFont *f;
761 XftDraw *d;
762}; 806};
763 807
764void 808void
765rxvt_font_xft::clear () 809rxvt_font_xft::clear ()
766{ 810{
767 if (f) 811 if (f)
768 { 812 {
769 XftFontClose (DISPLAY, f); 813 XftFontClose (DISPLAY, f);
770 f = 0; 814 f = 0;
771 }
772
773 if (d)
774 {
775 XftDrawDestroy (d);
776 d = 0;
777 } 815 }
778} 816}
779 817
780rxvt_fontprop 818rxvt_fontprop
781rxvt_font_xft::properties () 819rxvt_font_xft::properties ()
… …
888{ 926{
889 return XftCharExists (DISPLAY, f, unicode); 927 return XftCharExists (DISPLAY, f, unicode);
890} 928}
891 929
892void 930void
893rxvt_font_xft::draw (int x, int y, 931rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
894 const text_t *text, int len, 932 const text_t *text, int len,
895 int fg, int bg) 933 int fg, int bg)
896{ 934{
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); 935 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
907 936
908 if (!slow && width == r->TermWin.fwidth && 0) 937 if (!slow && width == r->TermWin.fwidth && 0)
909 { 938 {
910 if (sizeof (text_t) == sizeof (FcChar16)) 939 if (sizeof (text_t) == sizeof (FcChar16))
911 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 940 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
923 fwidth *= 2; 952 fwidth *= 2;
924 953
925 XGlyphInfo extents; 954 XGlyphInfo extents;
926 if (sizeof (text_t) == sizeof (FcChar16)) 955 if (sizeof (text_t) == sizeof (FcChar16))
927 { 956 {
928 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 957 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, 958 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
930 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 959 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
931 } 960 }
932 else 961 else
933 { 962 {
934 XGlyphInfo extents; 963 XGlyphInfo extents;
935 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 964 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, 965 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
937 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 966 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
938 } 967 }
939 } 968 }
940 969
… …
947#endif 976#endif
948 977
949///////////////////////////////////////////////////////////////////////////// 978/////////////////////////////////////////////////////////////////////////////
950 979
951rxvt_fontset::rxvt_fontset (rxvt_t r) 980rxvt_fontset::rxvt_fontset (rxvt_t r)
952#ifdef EXPLICIT_CONTEXT
953: r(r) 981: r (r)
954#endif
955{ 982{
956 clear (); 983 clear ();
957} 984}
958 985
959rxvt_fontset::~rxvt_fontset () 986rxvt_fontset::~rxvt_fontset ()
… …
962} 989}
963 990
964void 991void
965rxvt_fontset::clear () 992rxvt_fontset::clear ()
966{ 993{
967 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 994 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
968 FONT_UNREF (*i); 995 FONT_UNREF (*i);
969 996
970 fonts.clear (); 997 fonts.clear ();
971 base_id = 0; 998 base_id = 0;
972 base_prop.height = 0x7fffffff; 999 base_prop.height = 0x7fffffff;
… …
1026 1053
1027 if (*desc == '[') 1054 if (*desc == '[')
1028 { 1055 {
1029 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1056 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1030 1057
1031 const char *extra = desc++; 1058 //const char *extra = desc++; // not yet used
1032 1059
1033 desc = strchr (desc, ']'); 1060 desc = strchr (desc, ']');
1034 1061
1035 if (!desc) 1062 if (!desc)
1036 { 1063 {
… …
1075 } 1102 }
1076 1103
1077 return true; 1104 return true;
1078} 1105}
1079 1106
1080void 1107bool
1081rxvt_fontset::populate (const char *desc) 1108rxvt_fontset::populate (const char *desc)
1082{ 1109{
1083 clear (); 1110 clear ();
1084 1111
1085 fonts.push_back (new_font (0, CS_UNICODE)); 1112 fonts.push_back (new_font (0, CS_UNICODE));
… …
1089 1116
1090 if (!base_id) 1117 if (!base_id)
1091 base_id = 1; 1118 base_id = 1;
1092 1119
1093 // we currently need a base-font, no matter what 1120 // we currently need a base-font, no matter what
1094 if (fonts.size () <= base_id || !realize_font (base_id)) 1121 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1122 {
1096 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1123 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1097 add_fonts ("fixed"); 1124 add_fonts ("fixed");
1098 base_id = fonts.size () - 1; 1125 base_id = fonts.size () - 1;
1099 } 1126 }
1100 1127
1101 if (fonts.size () <= base_id || !realize_font (base_id)) 1128 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1102 { 1129 return false;
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 exit (1);
1105 }
1106 1130
1107 base_prop = fonts[base_id]->properties (); 1131 base_prop = fonts[base_id]->properties ();
1132
1133 return true;
1108} 1134}
1109 1135
1110int 1136int
1111rxvt_fontset::find_font (uint32_t unicode) 1137rxvt_fontset::find_font (uint32_t unicode)
1112{ 1138{
1113 for (int i = 0; i < fonts.size (); i++) 1139 for (unsigned int i = 0; i < fonts.size (); i++)
1114 { 1140 {
1115 rxvt_font *f = fonts[i]; 1141 rxvt_font *f = fonts[i];
1116 1142
1117 if (!f->loaded) 1143 if (!f->loaded)
1118 { 1144 {

Diff Legend

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