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.40 by pcg, Mon Mar 15 00:08:11 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",
… …
240 bool load (const rxvt_fontprop &prop) 268 bool load (const rxvt_fontprop &prop)
241 { 269 {
242 width = 1; height = 1; 270 width = 1; height = 1;
243 ascent = 1; descent = 0; 271 ascent = 1; descent = 0;
244 272
273 set_name ("built-in pseudofont");
274
245 return true; 275 return true;
246 } 276 }
247 277
248 bool has_codepoint (uint32_t unicode) 278 bool has_codepoint (unicode_t unicode)
249 { 279 {
250 if (unicode <= 0x001f) 280 if (unicode <= 0x001f)
251 return true; 281 return true;
282
252 if (unicode >= 0x0080 && unicode <= 0x009f) 283 if (unicode >= 0x0080 && unicode <= 0x009f)
253 return true; 284 return true;
254 285
255 if (unicode >= 0x2500 && unicode <= 0x257f 286 if (unicode >= 0x2500 && unicode <= 0x257f
256 && linedraw_cmds[unicode - 0x2500]) 287 && linedraw_cmds[unicode - 0x2500])
288 return true;
289
290 if (IS_COMPOSE (unicode))
257 return true; 291 return true;
258 292
259 switch (unicode) 293 switch (unicode)
260 { 294 {
261 case ZERO_WIDTH_CHAR: 295 case ZERO_WIDTH_CHAR:
… …
263 } 297 }
264 298
265 return false; 299 return false;
266 } 300 }
267 301
268 void draw (int x, int y, 302 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 303 const text_t *text, int len,
270 int fg, int bg); 304 int fg, int bg);
271}; 305};
272 306
273void 307void
274rxvt_font_default::draw (int x, int y, 308rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 309 const text_t *text, int len,
276 int fg, int bg) 310 int fg, int bg)
277{ 311{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 313
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 314 XSetForeground (d.display->display, GC, r->PixColors[fg]);
281 315
282 while (len--) 316 while (len--)
283 { 317 {
318#if ENABLE_COMBINING
319 compose_char *cc;
320#endif
284 text_t t = *text++; 321 text_t t = *text++;
285 322
323 // is it in our linedrawing table?
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
287 { 325 {
288 const char *p = linedraw_cmds[t - 0x2500]; 326 const char *p = linedraw_cmds[t - 0x2500];
289 327
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 328 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; 329 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
292 330
293 XGCValues gcv; 331 XGCValues gcv;
294 332
295 while (*p) 333 while (*p)
296 { 334 {
297 switch (*p++) 335 switch (*p++)
298 { 336 {
299 case '1': 337 case '1':
300 gcv.line_width = 0; 338 gcv.line_width = 0;
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
302 break; 340 break;
303 341
304 case '2': 342 case '2':
305 gcv.line_width = 2; 343 gcv.line_width = 2;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
307 break; 345 break;
308 346
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 347 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; 348 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; 349 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; 350 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; 351 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; 352 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
315 } 353 }
316 } 354 }
317 355
318 gcv.line_width = 0; 356 gcv.line_width = 0;
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 357 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358 }
359#if ENABLE_COMBINING
360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 361 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
364 if (cc->c2 != NOCHAR)
365 {
366 // prefer font of first character, for no good reasons
367 rxvt_font *f2 = f1->has_codepoint (cc->c2)
368 ? f1
369 : (*fs)[fs->find_font (cc->c2)];
370
371 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
372 }
373 }
374#endif
321 else 375 else
322 switch (*text++) 376 switch (t)
323 { 377 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
326 break; 379 break;
327 default: 380 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
391 x += w;
329 } 392 }
330 393
331 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
332 } 395 }
333} 396}
… …
341 404
342 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
343 406
344 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
345 408
346 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
347 410
348 void draw (int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 412 const text_t *text, int len,
350 int fg, int bg); 413 int fg, int bg);
351 414
352 XFontStruct *f; 415 XFontStruct *f;
353 codeset cs; 416 codeset cs;
… …
408 471
409bool 472bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 473rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 474{
412 int slashes = 0; 475 int slashes = 0;
413 const char *comp[12]; 476 const char *comp[13];
414 477
415 for (const char *c = name; *c; c++) 478 for (const char *c = name; *c; c++)
416 if (*c == '-') 479 if (*c == '-')
417 { 480 {
418 comp[slashes++] = c + 1; 481 comp[slashes++] = c + 1;
… …
428 491
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 492 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 493
431 if (f) 494 if (f)
432 { 495 {
433 // the font should really exists now. if not, we have a problem 496 // 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). 497 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 498 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 499 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 500 XFreeFont (DISPLAY, f);
438 return ret; 501 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 578 f = XLoadQueryFont (DISPLAY, name);
516 579
517 if (!f) 580 if (!f)
518 return false; 581 return false;
519 582
520 unsigned long value;
521
522 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 583 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
523 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 584 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
524 585
525 if (registry && encoding) 586 if (registry && encoding)
526 { 587 {
… …
600 f = 0; 661 f = 0;
601 } 662 }
602} 663}
603 664
604bool 665bool
605rxvt_font_x11::has_codepoint (uint32_t unicode) 666rxvt_font_x11::has_codepoint (unicode_t unicode)
606{ 667{
607 uint32_t ch = FROM_UNICODE (cs, unicode); 668 uint32_t ch = FROM_UNICODE (cs, unicode);
608 669
609 if (ch == NOCHAR) 670 if (ch == NOCHAR)
610 return false; 671 return false;
… …
612 /* check wether the character exists in _this_ font. horrible. */ 673 /* check wether the character exists in _this_ font. horrible. */
613 XCharStruct *xcs; 674 XCharStruct *xcs;
614 675
615 if (encm) 676 if (encm)
616 { 677 {
617 int byte1 = ch >> 8; 678 unsigned char byte1 = ch >> 8;
618 int byte2 = ch & 255; 679 unsigned char byte2 = ch & 255;
619 680
620 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 681 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
621 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 682 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
622 return false; 683 return false;
623 684
… …
646 707
647 return true; 708 return true;
648} 709}
649 710
650void 711void
651rxvt_font_x11::draw (int x, int y, 712rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
652 const text_t *text, int len, 713 const text_t *text, int len,
653 int fg, int bg) 714 int fg, int bg)
654{ 715{
655 // this looks like a mess /. 716 // this looks like a mess /.
656 // and it is a mess /. 717 // and it is a mess /.
… …
672 { 733 {
673 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
674 735
675 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
676 { 737 {
677 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
678 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
679 } 740 }
680 else 741 else
681 { 742 {
682 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);
683 744
684 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
685 746
686 if (slow) 747 if (slow)
687 { 748 {
688 do 749 do
689 { 750 {
690 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
691 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
692 753
693 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
694 xc++; len--; 755 xc++; len--;
695 } 756 }
696 while (len); 757 while (len);
697 } 758 }
698 else 759 else
699 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
700 } 761 }
701 } 762 }
702 else 763 else
703 { 764 {
704 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
705 766
706 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
707 { 768 {
708 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
709 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
710 } 771 }
711 else 772 else
712 { 773 {
713 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
714 775
715 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
716 777
717 if (slow) 778 if (slow)
718 { 779 {
719 do 780 do
720 { 781 {
721 if (*xc) 782 if (*xc)
722 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
723 784
724 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
725 xc++; len--; 786 xc++; len--;
726 } 787 }
727 while (len); 788 while (len);
728 } 789 }
729 else 790 else
730 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
731 } 792 }
732 } 793 }
733} 794}
734 795
735///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
740//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 801//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
741#define SWATHBITS 8 802#define SWATHBITS 8
742#endif 803#endif
743 804
744struct rxvt_font_xft : rxvt_font { 805struct rxvt_font_xft : rxvt_font {
745 rxvt_font_xft () { f = 0; d = 0; } 806 rxvt_font_xft () { f = 0; }
746 807
747 void clear (); 808 void clear ();
748 809
749 rxvt_fontprop properties (); 810 rxvt_fontprop properties ();
750 811
751 bool load (const rxvt_fontprop &prop); 812 bool load (const rxvt_fontprop &prop);
752 813
753 void draw (int x, int y, 814 void draw (rxvt_drawable &d, int x, int y,
754 const text_t *text, int len, 815 const text_t *text, int len,
755 int fg, int bg); 816 int fg, int bg);
756 817
757 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (unicode_t unicode);
758 819
759protected: 820protected:
760 XftFont *f; 821 XftFont *f;
761 XftDraw *d;
762}; 822};
763 823
764void 824void
765rxvt_font_xft::clear () 825rxvt_font_xft::clear ()
766{ 826{
767 if (f) 827 if (f)
768 { 828 {
769 XftFontClose (DISPLAY, f); 829 XftFontClose (DISPLAY, f);
770 f = 0; 830 f = 0;
771 }
772
773 if (d)
774 {
775 XftDrawDestroy (d);
776 d = 0;
777 } 831 }
778} 832}
779 833
780rxvt_fontprop 834rxvt_fontprop
781rxvt_font_xft::properties () 835rxvt_font_xft::properties ()
… …
882 936
883 return true; 937 return true;
884} 938}
885 939
886bool 940bool
887rxvt_font_xft::has_codepoint (uint32_t unicode) 941rxvt_font_xft::has_codepoint (unicode_t unicode)
888{ 942{
889 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
890} 944}
891 945
892void 946void
893rxvt_font_xft::draw (int x, int y, 947rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
894 const text_t *text, int len, 948 const text_t *text, int len,
895 int fg, int bg) 949 int fg, int bg)
896{ 950{
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); 951 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
907 952
908 if (!slow && width == r->TermWin.fwidth && 0) 953 if (!slow && width == r->TermWin.fwidth && 0)
909 { 954 {
910 if (sizeof (text_t) == sizeof (FcChar16)) 955 if (sizeof (text_t) == sizeof (FcChar16))
911 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 956 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
923 fwidth *= 2; 968 fwidth *= 2;
924 969
925 XGlyphInfo extents; 970 XGlyphInfo extents;
926 if (sizeof (text_t) == sizeof (FcChar16)) 971 if (sizeof (text_t) == sizeof (FcChar16))
927 { 972 {
928 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 973 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, 974 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
930 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 975 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
931 } 976 }
932 else 977 else
933 { 978 {
934 XGlyphInfo extents; 979 XGlyphInfo extents;
935 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 980 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, 981 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
937 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 982 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
938 } 983 }
939 } 984 }
940 985
… …
947#endif 992#endif
948 993
949///////////////////////////////////////////////////////////////////////////// 994/////////////////////////////////////////////////////////////////////////////
950 995
951rxvt_fontset::rxvt_fontset (rxvt_t r) 996rxvt_fontset::rxvt_fontset (rxvt_t r)
952#ifdef EXPLICIT_CONTEXT
953: r(r) 997: r (r)
954#endif
955{ 998{
956 clear (); 999 clear ();
957} 1000}
958 1001
959rxvt_fontset::~rxvt_fontset () 1002rxvt_fontset::~rxvt_fontset ()
… …
962} 1005}
963 1006
964void 1007void
965rxvt_fontset::clear () 1008rxvt_fontset::clear ()
966{ 1009{
967 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1010 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
968 FONT_UNREF (*i); 1011 FONT_UNREF (*i);
969 1012
970 fonts.clear (); 1013 fonts.clear ();
971 base_id = 0; 1014 base_id = 0;
972 base_prop.height = 0x7fffffff; 1015 base_prop.height = 0x7fffffff;
… …
999 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
1000 } 1043 }
1001 else 1044 else
1002 f = new rxvt_font_x11; 1045 f = new rxvt_font_x11;
1003 1046
1047 f->fs = this;
1004 f->set_term (r); 1048 f->set_term (r);
1005 f->set_name (strdup (name)); 1049 f->set_name (strdup (name));
1006 1050
1007 f->cs = cs; 1051 f->cs = cs;
1008 f->loaded = false; 1052 f->loaded = false;
… …
1026 1070
1027 if (*desc == '[') 1071 if (*desc == '[')
1028 { 1072 {
1029 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1073 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1030 1074
1031 const char *extra = desc++; 1075 //const char *extra = desc++; // not yet used
1032 1076
1033 desc = strchr (desc, ']'); 1077 desc = strchr (desc, ']');
1034 1078
1035 if (!desc) 1079 if (!desc)
1036 { 1080 {
… …
1075 } 1119 }
1076 1120
1077 return true; 1121 return true;
1078} 1122}
1079 1123
1080void 1124bool
1081rxvt_fontset::populate (const char *desc) 1125rxvt_fontset::populate (const char *desc)
1082{ 1126{
1083 clear (); 1127 clear ();
1084 1128
1085 fonts.push_back (new_font (0, CS_UNICODE)); 1129 fonts.push_back (new_font (0, CS_UNICODE));
… …
1089 1133
1090 if (!base_id) 1134 if (!base_id)
1091 base_id = 1; 1135 base_id = 1;
1092 1136
1093 // we currently need a base-font, no matter what 1137 // we currently need a base-font, no matter what
1094 if (fonts.size () <= base_id || !realize_font (base_id)) 1138 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1139 {
1096 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1140 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1097 add_fonts ("fixed"); 1141 add_fonts ("fixed");
1098 base_id = fonts.size () - 1; 1142 base_id = fonts.size () - 1;
1099 } 1143 }
1100 1144
1101 if (fonts.size () <= base_id || !realize_font (base_id)) 1145 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1102 { 1146 return false;
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 exit (1);
1105 }
1106 1147
1107 base_prop = fonts[base_id]->properties (); 1148 base_prop = fonts[base_id]->properties ();
1149
1150 return true;
1108} 1151}
1109 1152
1110int 1153int
1111rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (unicode_t unicode)
1112{ 1155{
1113 for (int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
1114 { 1157 {
1115 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
1116 1159
1117 if (!f->loaded) 1160 if (!f->loaded)
1118 { 1161 {

Diff Legend

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