ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.C
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.13 by pcg, Fri Dec 26 08:18:45 2003 UTC vs.
Revision 1.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
… …
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" },
80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 89#endif
87 90
88#if XFT 91#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
93 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
98 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
99}; 106};
100 107
101///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
102 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
103static void *enc_buf; 128static void *enc_buf;
104static uint32_t enc_len; 129static uint32_t enc_len;
105 130
106static inline void * 131static inline void *
107get_enc_buf (int len) 132get_enc_buf (uint32_t len)
108{ 133{
109 if (len > enc_len) 134 if (len > enc_len)
110 { 135 {
111 free (enc_buf); 136 free (enc_buf);
112 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
114 139
115 return enc_buf; 140 return enc_buf;
116} 141}
117 142
118static const char * 143static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 145{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 147
123 while (len--) 148 while (len--)
124 { 149 {
… …
135 160
136 return (const char *)enc_buf; 161 return (const char *)enc_buf;
137} 162}
138 163
139static const XChar2b * 164static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 166{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 168
144 while (len--) 169 while (len--)
145 { 170 {
… …
160} 185}
161 186
162///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
163 188
164void 189void
165rxvt_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)
166{ 191{
167 if (color == Color_bg) 192 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 194 else if (color >= 0)
170 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, GC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, GC, x, y, w, h);
201#endif
173 } 202 }
174} 203}
175 204
176static const char *linedraw_cmds[128] = { 205static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV", 206 "1hH", "2hH", "1vV", "2vV",
… …
246 275
247 bool has_codepoint (uint32_t unicode) 276 bool has_codepoint (uint32_t unicode)
248 { 277 {
249 if (unicode <= 0x001f) 278 if (unicode <= 0x001f)
250 return true; 279 return true;
280
251 if (unicode >= 0x0080 && unicode <= 0x009f) 281 if (unicode >= 0x0080 && unicode <= 0x009f)
252 return true; 282 return true;
253 283
254 if (unicode >= 0x2500 && unicode <= 0x257f 284 if (unicode >= 0x2500 && unicode <= 0x257f
255 && linedraw_cmds[unicode - 0x2500]) 285 && linedraw_cmds[unicode - 0x2500])
286 return true;
287
288 if (IS_COMPOSE (unicode))
256 return true; 289 return true;
257 290
258 switch (unicode) 291 switch (unicode)
259 { 292 {
260 case ZERO_WIDTH_CHAR: 293 case ZERO_WIDTH_CHAR:
… …
262 } 295 }
263 296
264 return false; 297 return false;
265 } 298 }
266 299
267 void draw (int x, int y, 300 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 301 const text_t *text, int len,
269 int fg, int bg); 302 int fg, int bg);
270}; 303};
271 304
272void 305void
273rxvt_font_default::draw (int x, int y, 306rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 307 const text_t *text, int len,
275 int fg, int bg) 308 int fg, int bg)
276{ 309{
277 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);
278 311
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 312 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 313
281 while (len--) 314 while (len--)
282 { 315 {
316 compose_char *cc;
283 text_t t = *text++; 317 text_t t = *text++;
284 318
319 // is it in our linedrawing table?
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 320 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 321 {
287 const char *p = linedraw_cmds[t - 0x2500]; 322 const char *p = linedraw_cmds[t - 0x2500];
288 323
289 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;
290 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;
291 326
292 XGCValues gcv; 327 XGCValues gcv;
293 328
294 while (*p) 329 while (*p)
295 { 330 {
296 switch (*p++) 331 switch (*p++)
297 { 332 {
298 case '1': 333 case '1':
299 gcv.line_width = 0; 334 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 336 break;
302 337
303 case '2': 338 case '2':
304 gcv.line_width = 2; 339 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 341 break;
307 342
308 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;
309 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;
310 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;
311 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;
312 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;
313 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;
314 } 349 }
315 } 350 }
316 351
317 gcv.line_width = 0; 352 gcv.line_width = 0;
318 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 }
319 } 368 }
320 else 369 else
321 switch (*text++) 370 switch (t)
322 { 371 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 372 case ZERO_WIDTH_CHAR:
325 break; 373 break;
326 default: 374 default:
327 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;
328 } 386 }
329 387
330 x += r->TermWin.fwidth; 388 x += r->TermWin.fwidth;
331 } 389 }
332} 390}
… …
342 400
343 bool load (const rxvt_fontprop &prop); 401 bool load (const rxvt_fontprop &prop);
344 402
345 bool has_codepoint (uint32_t unicode); 403 bool has_codepoint (uint32_t unicode);
346 404
347 void draw (int x, int y, 405 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 406 const text_t *text, int len,
349 int fg, int bg); 407 int fg, int bg);
350 408
351 XFontStruct *f; 409 XFontStruct *f;
352 codeset cs; 410 codeset cs;
… …
407 465
408bool 466bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 467rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 468{
411 int slashes = 0; 469 int slashes = 0;
412 const char *comp[12]; 470 const char *comp[13];
413 471
414 for (const char *c = name; *c; c++) 472 for (const char *c = name; *c; c++)
415 if (*c == '-') 473 if (*c == '-')
416 { 474 {
417 comp[slashes++] = c + 1; 475 comp[slashes++] = c + 1;
… …
427 485
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 486 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 487
430 if (f) 488 if (f)
431 { 489 {
432 // 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
433 // (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).
434 // in that case, just return garbage. 492 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 493 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 494 XFreeFont (DISPLAY, f);
437 return ret; 495 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 572 f = XLoadQueryFont (DISPLAY, name);
515 573
516 if (!f) 574 if (!f)
517 return false; 575 return false;
518 576
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 577 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 578 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 579
524 if (registry && encoding) 580 if (registry && encoding)
525 { 581 {
… …
611 /* check wether the character exists in _this_ font. horrible. */ 667 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 668 XCharStruct *xcs;
613 669
614 if (encm) 670 if (encm)
615 { 671 {
616 int byte1 = ch >> 8; 672 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 673 unsigned char byte2 = ch & 255;
618 674
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 675 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 676 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 677 return false;
622 678
… …
645 701
646 return true; 702 return true;
647} 703}
648 704
649void 705void
650rxvt_font_x11::draw (int x, int y, 706rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 707 const text_t *text, int len,
652 int fg, int bg) 708 int fg, int bg)
653{ 709{
654 // this looks like a mess /. 710 // this looks like a mess /.
655 // and it is a mess /. 711 // and it is a mess /.
… …
671 { 727 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 729
674 if (bg == Color_bg && !slow) 730 if (bg == Color_bg && !slow)
675 { 731 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 732 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 733 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
678 } 734 }
679 else 735 else
680 { 736 {
681 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);
682 738
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 739 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
684 740
685 if (slow) 741 if (slow)
686 { 742 {
687 do 743 do
688 { 744 {
689 if (xc->byte1 || xc->byte2) 745 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 746 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
691 747
692 x += r->TermWin.fwidth; 748 x += r->TermWin.fwidth;
693 xc++; len--; 749 xc++; len--;
694 } 750 }
695 while (len); 751 while (len);
696 } 752 }
697 else 753 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 754 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
699 } 755 }
700 } 756 }
701 else 757 else
702 { 758 {
703 const char *xc = enc_char (text, len, cs, slow); 759 const char *xc = enc_char (text, len, cs, slow);
704 760
705 if (bg == Color_bg && !slow) 761 if (bg == Color_bg && !slow)
706 { 762 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 763 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 764 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
709 } 765 }
710 else 766 else
711 { 767 {
712 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);
713 769
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 770 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
715 771
716 if (slow) 772 if (slow)
717 { 773 {
718 do 774 do
719 { 775 {
720 if (*xc) 776 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 777 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
722 778
723 x += r->TermWin.fwidth; 779 x += r->TermWin.fwidth;
724 xc++; len--; 780 xc++; len--;
725 } 781 }
726 while (len); 782 while (len);
727 } 783 }
728 else 784 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 785 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
730 } 786 }
731 } 787 }
732} 788}
733 789
734///////////////////////////////////////////////////////////////////////////// 790/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 795//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 796#define SWATHBITS 8
741#endif 797#endif
742 798
743struct rxvt_font_xft : rxvt_font { 799struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 800 rxvt_font_xft () { f = 0; }
745 801
746 void clear (); 802 void clear ();
747 803
748 rxvt_fontprop properties (); 804 rxvt_fontprop properties ();
749 805
750 bool load (const rxvt_fontprop &prop); 806 bool load (const rxvt_fontprop &prop);
751 807
752 void draw (int x, int y, 808 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 809 const text_t *text, int len,
754 int fg, int bg); 810 int fg, int bg);
755 811
756 bool has_codepoint (uint32_t unicode); 812 bool has_codepoint (uint32_t unicode);
757 813
758protected: 814protected:
759 XftFont *f; 815 XftFont *f;
760 XftDraw *d;
761}; 816};
762 817
763void 818void
764rxvt_font_xft::clear () 819rxvt_font_xft::clear ()
765{ 820{
766 if (f) 821 if (f)
767 { 822 {
768 XftFontClose (DISPLAY, f); 823 XftFontClose (DISPLAY, f);
769 f = 0; 824 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 825 }
777} 826}
778 827
779rxvt_fontprop 828rxvt_fontprop
780rxvt_font_xft::properties () 829rxvt_font_xft::properties ()
… …
887{ 936{
888 return XftCharExists (DISPLAY, f, unicode); 937 return XftCharExists (DISPLAY, f, unicode);
889} 938}
890 939
891void 940void
892rxvt_font_xft::draw (int x, int y, 941rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 942 const text_t *text, int len,
894 int fg, int bg) 943 int fg, int bg)
895{ 944{
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); 945 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 946
907 if (!slow && width == r->TermWin.fwidth && 0) 947 if (!slow && width == r->TermWin.fwidth && 0)
908 { 948 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 949 if (sizeof (text_t) == sizeof (FcChar16))
910 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);
… …
922 fwidth *= 2; 962 fwidth *= 2;
923 963
924 XGlyphInfo extents; 964 XGlyphInfo extents;
925 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
926 { 966 {
927 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 967 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
928 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 968 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
929 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 969 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
930 } 970 }
931 else 971 else
932 { 972 {
933 XGlyphInfo extents; 973 XGlyphInfo extents;
934 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 974 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
935 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 975 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
936 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 976 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
937 } 977 }
938 } 978 }
939 979
… …
946#endif 986#endif
947 987
948///////////////////////////////////////////////////////////////////////////// 988/////////////////////////////////////////////////////////////////////////////
949 989
950rxvt_fontset::rxvt_fontset (rxvt_t r) 990rxvt_fontset::rxvt_fontset (rxvt_t r)
951#ifdef EXPLICIT_CONTEXT
952: r(r) 991: r (r)
953#endif
954{ 992{
955 clear (); 993 clear ();
956} 994}
957 995
958rxvt_fontset::~rxvt_fontset () 996rxvt_fontset::~rxvt_fontset ()
… …
961} 999}
962 1000
963void 1001void
964rxvt_fontset::clear () 1002rxvt_fontset::clear ()
965{ 1003{
966 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1004 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
967 FONT_UNREF (*i); 1005 FONT_UNREF (*i);
968 1006
969 fonts.clear (); 1007 fonts.clear ();
970 base_id = 0; 1008 base_id = 0;
971 base_prop.height = 0x7fffffff; 1009 base_prop.height = 0x7fffffff;
… …
998 f = new rxvt_font_x11; 1036 f = new rxvt_font_x11;
999 } 1037 }
1000 else 1038 else
1001 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
1002 1040
1041 f->fs = this;
1003 f->set_term (r); 1042 f->set_term (r);
1004 f->set_name (strdup (name)); 1043 f->set_name (strdup (name));
1005 1044
1006 f->cs = cs; 1045 f->cs = cs;
1007 f->loaded = false; 1046 f->loaded = false;
… …
1025 1064
1026 if (*desc == '[') 1065 if (*desc == '[')
1027 { 1066 {
1028 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1067 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1029 1068
1030 const char *extra = desc++; 1069 //const char *extra = desc++; // not yet used
1031 1070
1032 desc = strchr (desc, ']'); 1071 desc = strchr (desc, ']');
1033 1072
1034 if (!desc) 1073 if (!desc)
1035 { 1074 {
… …
1074 } 1113 }
1075 1114
1076 return true; 1115 return true;
1077} 1116}
1078 1117
1079void 1118bool
1080rxvt_fontset::populate (const char *desc) 1119rxvt_fontset::populate (const char *desc)
1081{ 1120{
1082 clear (); 1121 clear ();
1083 1122
1084 fonts.push_back (new_font (0, CS_UNICODE)); 1123 fonts.push_back (new_font (0, CS_UNICODE));
… …
1088 1127
1089 if (!base_id) 1128 if (!base_id)
1090 base_id = 1; 1129 base_id = 1;
1091 1130
1092 // we currently need a base-font, no matter what 1131 // we currently need a base-font, no matter what
1093 if (fonts.size () <= base_id || !realize_font (base_id)) 1132 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1094 { 1133 {
1095 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");
1096 add_fonts ("fixed"); 1135 add_fonts ("fixed");
1097 base_id = fonts.size () - 1; 1136 base_id = fonts.size () - 1;
1098 } 1137 }
1099 1138
1100 if (fonts.size () <= base_id || !realize_font (base_id)) 1139 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1101 { 1140 return false;
1102 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1103 exit (1);
1104 }
1105 1141
1106 base_prop = fonts[base_id]->properties (); 1142 base_prop = fonts[base_id]->properties ();
1143
1144 return true;
1107} 1145}
1108 1146
1109int 1147int
1110rxvt_fontset::find_font (uint32_t unicode) 1148rxvt_fontset::find_font (uint32_t unicode)
1111{ 1149{
1112 for (int i = 0; i < fonts.size (); i++) 1150 for (unsigned int i = 0; i < fonts.size (); i++)
1113 { 1151 {
1114 rxvt_font *f = fonts[i]; 1152 rxvt_font *f = fonts[i];
1115 1153
1116 if (!f->loaded) 1154 if (!f->loaded)
1117 { 1155 {

Diff Legend

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