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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.129 by root, Wed Jan 23 05:18:43 2008 UTC vs.
Revision 1.224 by root, Thu Jan 4 19:52:37 2024 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
30 34
31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33 37
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 )) 42 ))
39 43
40const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
41 codeset cs; 45 codeset cs;
42 const char *name; 46 const char *name;
43} fallback_fonts[] = { 47} fallback_fonts[] = {
44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
79 83
80 // japanese 84 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 86# if XFT
83 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 92# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
130# endif 134# endif
131#endif 135#endif
132 136
133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 143
141 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 146#endif
144 147
… …
149 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
150}; 153};
151 154
152// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
154static uint16_t extent_test_chars[] = { 157static uint32_t extent_test_chars[] = {
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
161 0x1f600, // 😀
158}; 162};
159
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161 163
162#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
164 166
165///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 219{
218} 220}
219 221
220void 222void
221rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
222{ 224{
223 if (this->name == name) 225 if (name == name_)
224 return; 226 return;
225 227
226 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
227 this->name = name; 229 name = name_;
228} 230}
229 231
230void 232void
231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232{ 234{
… …
236 if (color == Color_bg || color == Color_transparent) 238 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 240 else if (color >= 0)
239 { 241 {
240#if XFT 242#if XFT
241 bool done = false; 243 Picture dst;
242#ifdef HAVE_BG_PIXMAP 244
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 245# ifdef HAVE_IMG
244 { 246 if (term->bg_img
247 && !term->pix_colors[color].is_opaque ()
245 Picture dst = XftDrawPicture (d); 248 && ((dst = XftDrawPicture (d))))
246 if (dst != 0)
247 { 249 {
248 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
251
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true;
252 } 254 }
253 } 255 else
254#endif 256# endif
255 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
257#else 259#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 262#endif
261 } 263 }
262} 264}
263 265
264///////////////////////////////////////////////////////////////////////////// 266/////////////////////////////////////////////////////////////////////////////
265 267
266struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font
269{
267 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
268 271
269 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
270 : rxvt_font () 273 : rxvt_font ()
271 { 274 {
… …
311 if (unicode >= 0x2500 && unicode <= 0x259f && 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 315 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 316 return true;
314#endif 317#endif
315 318
316 if (IS_COMPOSE (unicode)) 319 // we do not check for IS_COMPOSE here, as this would
317 return true; 320 // rob other fonts from taking over.
318 321
319 switch (unicode) 322 switch (unicode)
320 { 323 {
321 case ZERO_WIDTH_CHAR: 324 case ZERO_WIDTH_CHAR:
322 case NOCHAR: 325 case NOCHAR:
… …
343 346
344 XSetForeground (disp, gc, term->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
345 348
346 while (len) 349 while (len)
347 { 350 {
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
348#if ENABLE_COMBINING 357#if ENABLE_COMBINING
349 compose_char *cc; 358 compose_char *cc;
350#endif 359#endif
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
357 int width = text - tp; 360 int width = text - tp;
358 int fwidth = term->fwidth * width; 361 int fwidth = term->fwidth * width;
359 362
360#ifdef BUILTIN_GLYPHS 363#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
… …
443#endif 446#endif
444#if ENABLE_COMBINING 447#if ENABLE_COMBINING
445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
446 { 449 {
447 min_it (width, 2); // we only support wcwidth up to 2 450 min_it (width, 2); // we only support wcwidth up to 2
448
449 text_t chrs[2]; 451 text_t chrs[2];
450 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
451 453
452 *chrs = cc->c1; 454 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
455 457
456 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
457 { 459 {
458 bool careful; 460 bool careful;
459 461
460 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 463 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 465 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
465 467
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 469 }
468 } 470 }
469#endif 471#endif
… …
473 case '\t': 475 case '\t':
474 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 477 case NOCHAR:
476 break; 478 break;
477 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
478 default: 489 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
481 } 492 }
482 493
483 x += fwidth; 494 x += fwidth;
484 } 495 }
485} 496}
486 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1;
524 descent = (*fs)[2]->descent;
525
526 set_name (strdup ("built-in rendition overflow font"));
527
528 return true;
529 }
530
531 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
532 {
533 return false;
534 }
535
536 void draw (rxvt_drawable &d, int x, int y,
537 const text_t *text, int len,
538 int fg, int bg)
539 {
540 while (len)
541 {
542 int fid = fs->find_font_idx (*text);
543 int w = 1;
544 while (w < len && text[w] == NOCHAR)
545 w++;
546 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
547 text += w;
548 len -= w;
549 x += term->fwidth * w;
550 }
551 }
552};
553
487///////////////////////////////////////////////////////////////////////////// 554/////////////////////////////////////////////////////////////////////////////
488 555
489struct rxvt_font_x11 : rxvt_font { 556struct rxvt_font_x11 : rxvt_font
557{
490 rxvt_font_x11 () { f = 0; } 558 rxvt_font_x11 () { f = 0; }
491 559
492 void clear (); 560 void clear ();
493 561
494 rxvt_fontprop properties (); 562 rxvt_fontprop properties ();
… …
499 567
500 void draw (rxvt_drawable &d, int x, int y, 568 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 569 const text_t *text, int len,
502 int fg, int bg); 570 int fg, int bg);
503 571
504 bool slow; // wether this is a proportional font or has other funny characteristics 572 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 573 XFontStruct *f;
506 bool enc2b, encm; 574 bool enc2b, encm;
507 575
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 576 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 577 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 734 f = XLoadQueryFont (disp, name);
667 735
668 if (!f) 736 if (!f)
669 return false; 737 return false;
670 738
671 char *new_name = get_property (f, XA_FONT, name); 739 char *new_name = get_property (f, XA_FONT, 0);
672 740
673 if (new_name) 741 if (new_name)
674 set_name (new_name); 742 set_name (new_name);
675 else 743 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 744 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 745
678 XFreeFont (disp, f); 746 XFreeFont (disp, f);
679 f = 0; 747 f = 0;
680 } 748 }
681 749
… …
738 free (fname); 806 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 807 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 808 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 809 }
742 810
743 if (!set_properties (p, fname)) 811 if (!set_properties (p, fname)
812 // also weed out too large fonts
813 || (prop.height != rxvt_fontprop::unset
814 && p.height > prop.height))
815 {
816 free (fname);
744 continue; 817 continue;
745 818 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 819
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 820 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 821 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 822 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 823 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 829 XFreeFontNames (list);
760 830
761 // this loop only iterates when the guessed font-size is too small 831 // this loop only iterates when the guessed font-size is too small
762 for (;;) 832 for (;;)
763 { 833 {
764 font_weight *best = fonts + count - 1; 834 font_weight *best = fonts;
765 835
766 for (font_weight *w = best; w-- > fonts; ) 836 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 837 if (w->diff < best->diff)
768 best = w; 838 best = w;
769 839
770 if (!best->name 840 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 841 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 842 break;
… …
792 return false; 862 return false;
793 863
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 864 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 865 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 866
867 cs = CS_UNKNOWN;
868
797 if (registry && encoding) 869 if (registry && encoding)
798 { 870 {
799 char charset[64]; 871 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 872 snprintf (charset, 64, "%s-%s", registry, encoding);
801 873
802 cs = codeset_from_name (charset); 874 cs = codeset_from_name (charset);
803 } 875
804 else 876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 878 }
879
880 free (registry);
881 free (encoding);
882
883 if (cs == CS_UNKNOWN)
884 {
806 const char *charset = get_property (f, XA_FONT, 0); 885 char *value = get_property (f, XA_FONT, 0);
886 const char *charset = value;
807 887
808 if (!charset) 888 if (!charset)
809 charset = name; 889 charset = name;
810 890
811 int count = 13; 891 int count = 13;
812 while (*charset) 892 while (*charset)
813 if (*charset++ == '-' && !--count) 893 if (*charset++ == '-' && !--count)
814 break; 894 break;
815 895
816 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
897 if (cs == CS_UNKNOWN)
898 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
899
900 free (value);
901 }
902
903 if (cs == CS_UNKNOWN)
817 } 904 {
818 905 clear ();
819 free (registry); 906 return false;
820 free (encoding); 907 }
821 908
822 if (cs == CS_UNICODE) 909 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 910 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 911
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 912 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 937 }
851#endif 938#endif
852 939
853 width = 1; 940 width = 1;
854 941
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 942 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
856 { 943 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 944 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 945 continue;
859 946
860 // ignore characters we wouldn't use anyways 947 // ignore characters we wouldn't use anyways
861 bool careful; 948 bool careful;
862 if (!has_char (*t, &prop, careful)) 949 if (!has_char (*t, &prop, careful))
863 continue; 950 continue;
864 951
865 XChar2b ch = { *t >> 8, *t }; 952 // the casts are needed in C++11 (see 8.5.1)
953 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
866 954
867 XCharStruct g; 955 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 956 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 957 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 958
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 960 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 961
874 if (width < g.width) width = g.width; 962 if (width < g.width) width = g.width;
875 } 963 }
876 964
877 if (cs == CS_UNKNOWN) 965#if 0 // do it per-character
966 if (prop && width > prop->width)
878 { 967 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 968 clear ();
882 return false; 969 return false;
883 } 970 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 971#endif
892 972
893 return true; 973 return true;
894} 974}
895 975
… …
904} 984}
905 985
906bool 986bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 987rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 988{
989 careful = false;
990
909 uint32_t ch = FROM_UNICODE (cs, unicode); 991 uint32_t ch = FROM_UNICODE (cs, unicode);
910 992
911 if (ch == NOCHAR) 993 if (ch == NOCHAR)
912 return false; 994 return false;
913 995
914 /* check wether the character exists in _this_ font. horrible. */ 996 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 997 XCharStruct *xcs;
916 998
917 if (encm) 999 if (encm)
918 { 1000 {
919 unsigned char byte1 = ch >> 8; 1001 unsigned char byte1 = ch >> 8;
… …
949 return false; 1031 return false;
950 1032
951 if (!prop || prop->width == rxvt_fontprop::unset) 1033 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1034 return true;
953 1035
954 // check wether character overlaps previous/next character 1036 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1037 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1038 int wcw = max (WCWIDTH (unicode), 1);
957 1039
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1040 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1041
… …
976 dTermDisplay; 1058 dTermDisplay;
977 dTermGC; 1059 dTermGC;
978 1060
979 bool slow = this->slow 1061 bool slow = this->slow
980 || width != term->fwidth 1062 || width != term->fwidth
981 || height != term->fheight; 1063 || height != term->fheight
1064 || ascent != f->ascent;
982 1065
983 int base = ascent; // sorry, incorrect: term->fbase; 1066 int base = ascent; // sorry, incorrect: term->fbase;
984 1067
985 XGCValues v; 1068 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1069 v.foreground = term->pix_colors[fg];
… …
1054 1137
1055///////////////////////////////////////////////////////////////////////////// 1138/////////////////////////////////////////////////////////////////////////////
1056 1139
1057#if XFT 1140#if XFT
1058 1141
1059struct rxvt_font_xft : rxvt_font { 1142struct rxvt_font_xft : rxvt_font
1143{
1144#if XFT_CHAR_CACHE
1145 // we cache the qascii range xoffsets in the name of speed,
1146 // expecting terminals to deal mostly with these characters
1147 // we also assume the xoff always fits into uint8_t,
1148 // which is questionable, but let's see...
1149 // also, it is uncomfortably big, due to the uints.
1150 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1151 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1152 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1153#endif
1154
1060 rxvt_font_xft () { f = 0; } 1155 rxvt_font_xft ()
1156 {
1157 f = 0;
1158 }
1061 1159
1062 void clear (); 1160 void clear ();
1063 1161
1064 rxvt_fontprop properties (); 1162 rxvt_fontprop properties ();
1065 1163
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1231 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1232
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1233#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1234 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1235 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1236 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1237#endif
1140 1238
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1239 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1240 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1241
… …
1155 int ftheight = 0; 1253 int ftheight = 0;
1156 bool success = true; 1254 bool success = true;
1157 1255
1158 for (;;) 1256 for (;;)
1159 { 1257 {
1258 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1259 f = XftFontOpenPattern (disp, p);
1161 1260
1162 if (!f) 1261 if (!f)
1163 { 1262 {
1263 FcPatternDestroy (p);
1164 success = false; 1264 success = false;
1165 break; 1265 break;
1166 } 1266 }
1167 1267
1168 FT_Face face = XftLockFace (f); 1268 FT_Face face = XftLockFace (f);
1269
1270 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1271 // we also assume blindly that if the first lock succeeds, then subsequent
1272 // locks will also succeed.
1273 if (!face)
1274 {
1275 XftFontClose (disp, f);
1276 success = false;
1277 break;
1278 }
1169 1279
1170 ascent = (face->size->metrics.ascender + 63) >> 6; 1280 ascent = (face->size->metrics.ascender + 63) >> 6;
1171 descent = (-face->size->metrics.descender + 63) >> 6; 1281 descent = (-face->size->metrics.descender + 63) >> 6;
1172 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1282 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1173 width = 0; 1283 width = 0;
… …
1176 1286
1177 XftUnlockFace (f); 1287 XftUnlockFace (f);
1178 1288
1179 int glheight = height; 1289 int glheight = height;
1180 1290
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1291 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1292 {
1183 FcChar16 ch = *t; 1293 FcChar32 ch = *t;
1184 1294
1185 if (cs != CS_UNICODE 1295 if (cs != CS_UNICODE
1186 && ch > 0x100 1296 && ch > 0x100
1187 && FROM_UNICODE (cs, ch) == NOCHAR) 1297 && FROM_UNICODE (cs, ch) == NOCHAR)
1188 continue; 1298 continue;
… …
1191 bool careful; 1301 bool careful;
1192 if (!has_char (*t, &prop, careful)) 1302 if (!has_char (*t, &prop, careful))
1193 continue; 1303 continue;
1194 1304
1195 XGlyphInfo g; 1305 XGlyphInfo g;
1196 XftTextExtents16 (disp, f, &ch, 1, &g); 1306 XftTextExtents32 (disp, f, &ch, 1, &g);
1197 1307
1198 g.width -= g.x; 1308 g.width -= g.x;
1199 1309
1200 int wcw = WCWIDTH (ch); 1310 int wcw = WCWIDTH (ch);
1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1311 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
… …
1205 if (glheight < g.height - g.y) glheight = g.height - g.y; 1315 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 } 1316 }
1207 1317
1208 if (!width) 1318 if (!width)
1209 { 1319 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1320 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1211 1321 width = f->max_advance_width;
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break; 1322 break;
1217 } 1323 }
1218 1324
1219 if (prop.height == rxvt_fontprop::unset 1325 if (prop.height == rxvt_fontprop::unset
1220 || (height <= prop.height && glheight <= prop.height) 1326 || (height <= prop.height && glheight <= prop.height)
… …
1247 clear (); 1353 clear ();
1248 success = false; 1354 success = false;
1249 } 1355 }
1250#endif 1356#endif
1251 1357
1358#if XFT_CHAR_CACHE
1359 // populate char cache
1360 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1361 {
1362 FT_UInt glyph = XftCharIndex (disp, f, ch);
1363 glyph_cache [ch - char_cache_min] = glyph;
1364
1365 XGlyphInfo g;
1366 XftGlyphExtents (disp, f, &glyph, 1, &g);
1367 xoff_cache [ch - char_cache_min] = g.xOff;
1368 }
1369#endif
1370
1252 return success; 1371 return success;
1253} 1372}
1254 1373
1255bool 1374bool
1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1375rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1257{ 1376{
1258 careful = false; 1377 careful = false;
1259 1378
1379 // handle non-bmp chars when text_t is 16 bit
1380#if ENABLE_COMBINING && !UNICODE_3
1381 if (ecb_expect_false (IS_COMPOSE (unicode)))
1382 if (compose_char *cc = rxvt_composite [unicode])
1383 if (cc->c2 == NOCHAR)
1384 unicode = cc->c1;
1385 else
1386 return false;
1387 else
1388 return false;
1389#endif
1390
1391 FcChar32 chr = unicode;
1392
1260 if (!XftCharExists (term->dpy, f, unicode)) 1393 if (!XftCharExists (term->dpy, f, chr))
1261 return false; 1394 return false;
1262 1395
1263 if (!prop || prop->width == rxvt_fontprop::unset) 1396 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true; 1397 return true;
1265 1398
1266 // check character against base font bounding box 1399 int wcw = max (WCWIDTH (chr), 1);
1267 FcChar32 ch = unicode; 1400
1268 XGlyphInfo g; 1401 XGlyphInfo g;
1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1402 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1403
1404 int cwidth = prop->width * wcw;
1405
1406 // use same adjustments as in ->draw, see there
1407 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1408 g.x += g.xOff ? 0 : cwidth;
1270 1409
1271 int w = g.width - g.x; 1410 int w = g.width - g.x;
1272 int wcw = max (WCWIDTH (unicode), 1);
1273 1411
1274 careful = g.x > 0 || w > prop->width * wcw; 1412 careful = g.x > 0 || w > cwidth;
1275 1413
1276 if (careful && !OVERLAP_OK (w, wcw, prop)) 1414 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false; 1415 return false;
1278 1416
1279 // this weeds out _totally_ broken fonts, or glyphs 1417 // this weeds out _totally_ broken fonts, or glyphs
… …
1286void 1424void
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1425rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1426 const text_t *text, int len,
1289 int fg, int bg) 1427 int fg, int bg)
1290{ 1428{
1291 XGlyphInfo extents; 1429 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1293 XftGlyphSpec *ep = enc; 1430 XftGlyphSpec *ep = enc;
1294 1431
1295 dTermDisplay; 1432 dTermDisplay;
1296 dTermGC; 1433 dTermGC;
1297 1434
1298 int w = term->fwidth * len; 1435 int w = term->fwidth * len;
1299 int h = term->fheight; 1436 int h = term->fheight;
1300 1437
1301 /* 1438 bool buffered = bg >= Color_transparent
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1439 && term->option (Opt_buffered);
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= 0;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309 1440
1310 // cut trailing spaces 1441 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1442 while (len && text [len - 1] == ' ')
1312 len--; 1443 len--;
1313 1444
… …
1315 int y_ = buffered ? 0 : y; 1446 int y_ = buffered ? 0 : y;
1316 1447
1317 while (len) 1448 while (len)
1318 { 1449 {
1319 int cwidth = term->fwidth; 1450 int cwidth = term->fwidth;
1320 FcChar32 fc = *text++; len--; 1451 FcChar32 chr = *text++; len--;
1321 1452
1322 while (len && *text == NOCHAR) 1453 while (len && *text == NOCHAR)
1323 text++, len--, cwidth += term->fwidth; 1454 text++, len--, cwidth += term->fwidth;
1324 1455
1325 if (fc != ' ') // skip spaces 1456 if (chr != ' ') // skip spaces
1457 {
1458 // handle non-bmp chars when text_t is 16 bit
1459 #if ENABLE_COMBINING && !UNICODE_3
1460 if (ecb_expect_false (IS_COMPOSE (chr)))
1461 if (compose_char *cc = rxvt_composite [chr])
1462 if (cc->c2 == NOCHAR)
1463 chr = cc->c1;
1464 #endif
1465
1466 #if 0
1467 FT_UInt glyphs [decltype (exp)::max_size];
1468
1469 for (int i = 0; i < nchrs; ++i)
1470 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1471
1472 for (int i = 0; i < nchrs; ++i)
1326 { 1473 {
1474 XGlyphInfo ep;
1475 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1476 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1477 }
1478 #endif
1479
1480 FT_UInt glyph;
1481 int xOff;
1482
1483 #if XFT_CHAR_CACHE
1484 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1485 {
1486 glyph = glyph_cache [chr - char_cache_min];
1487 xOff = xoff_cache [chr - char_cache_min];
1488 }
1489 else
1490 #endif
1491 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc); 1492 glyph = XftCharIndex (disp, f, chr);
1493 XGlyphInfo extents;
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1494 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1495 xOff = extents.xOff;
1496 }
1329 1497
1330 ep->glyph = glyph; 1498 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1); 1499 ep->x = x_;
1332 ep->y = y_ + ascent; 1500 ep->y = y_ + ascent;
1333 1501
1334 if (extents.xOff == 0) 1502 // the xft font cell might differ from the terminal font cell,
1503 // in which case we use the average between the two.
1504 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1505
1506 // xft/freetype represent combining characters as characters with zero
1507 // width rendered over the previous character with some fonts, while
1508 // in other fonts, they are considered normal characters, while yet
1509 // in other fonts, they are shifted all over the place.
1510 // we handle the first two cases by keying off on xOff being 0
1511 // for zero-width chars. normally, we would add extents.xOff
1512 // of the base character here, but we don't have that, so we use cwidth.
1335 ep->x = x_ + cwidth; 1513 ep->x += xOff ? 0 : cwidth;
1336 1514
1337 ep++; 1515 ++ep;
1338 } 1516 }
1339 1517
1340 x_ += cwidth; 1518 x_ += cwidth;
1341 } 1519 }
1342 1520
1343 if (buffered) 1521 if (buffered)
1344 { 1522 {
1345 if (ep != enc) 1523 if (ep != enc)
1346 { 1524 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1525 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1526
1350#ifdef HAVE_BG_PIXMAP 1527#ifdef HAVE_IMG
1528 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1529
1351 if (term->bgPixmap.pixmap) 1530 if (term->bg_img
1531 && (bg == Color_transparent || bg == Color_bg
1532 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1533 {
1353 Picture dst = 0; 1534 int src_x = x, src_y = y;
1354 1535
1355 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0xff00) 1536 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1356 dst = XftDrawPicture (d2);
1357
1358 if (bg < 0 || dst != 0)
1359 { 1537 {
1360 int src_x = x, src_y = y ;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x; 1538 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1539 src_y += term->window_vt_y;
1366 } 1540 }
1367 1541
1368 if (term->bgPixmap.pmap_width >= src_x+w 1542 if (term->bg_img->w >= src_x + w
1369 && term->bgPixmap.pmap_height >= src_y+h) 1543 && term->bg_img->h >= src_y + h)
1370 { 1544 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1545 XCopyArea (disp, term->bg_img->pm, d2, gc,
1372 src_x, src_y, w, h, 0, 0); 1546 src_x, src_y, w, h, 0, 0);
1373 } 1547 }
1374 else 1548 else
1375 { 1549 {
1376 XGCValues gcv; 1550 XGCValues gcv;
1377 1551
1378 gcv.fill_style = FillTiled; 1552 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap; 1553 gcv.tile = term->bg_img->pm;
1380 gcv.ts_x_origin = -src_x; 1554 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y; 1555 gcv.ts_y_origin = -src_y;
1382 1556
1383 XChangeGC (disp, gc, 1557 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1558 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv); 1559 &gcv);
1386 1560
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1561 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388 1562
1389 gcv.fill_style = FillSolid; 1563 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1564 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1565 }
1392 1566
1567 if (dst)
1568 {
1393 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1569 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1570
1571 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1572 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395
1396 back_rendered = true;
1397 } 1573 }
1398 } 1574 }
1575 else
1399#endif 1576#endif
1400
1401 if (!back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1577 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1403 1578
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1579 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1580 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1581 }
1407 else 1582 else
… …
1435 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1610 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1436 = rxvt_fontprop::unset; 1611 = rxvt_fontprop::unset;
1437 force_prop = false; 1612 force_prop = false;
1438 1613
1439 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1614 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1440 FONT_UNREF (*i); 1615 (*i)->unref ();
1441 1616
1442 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1617 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1443 delete *p; 1618 delete *p;
1444 1619
1445 free (fontdesc); fontdesc = 0; 1620 free (fontdesc); fontdesc = 0;
… …
1447 fonts.clear (); 1622 fonts.clear ();
1448 1623
1449 fallback = fallback_fonts; 1624 fallback = fallback_fonts;
1450} 1625}
1451 1626
1627void
1628rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1629{
1630 font->set_term (term);
1631
1632 font->cs = cs;
1633 font->loaded = false;
1634}
1635
1452rxvt_font * 1636rxvt_font *
1453rxvt_fontset::new_font (const char *name, codeset cs) 1637rxvt_fontset::new_font (const char *name, codeset cs)
1454{ 1638{
1455 rxvt_font *f; 1639 rxvt_font *f;
1456 1640
… …
1472 f = new rxvt_font_x11; 1656 f = new rxvt_font_x11;
1473 } 1657 }
1474 else 1658 else
1475 f = new rxvt_font_x11; 1659 f = new rxvt_font_x11;
1476 1660
1477 f->set_term (term);
1478 f->set_name (strdup (name)); 1661 f->set_name (strdup (name));
1479 1662 prepare_font (f, cs);
1480 f->cs = cs;
1481 f->loaded = false;
1482 1663
1483 return f; 1664 return f;
1484} 1665}
1485 1666
1486///////////////////////////////////////////////////////////////////////////// 1667/////////////////////////////////////////////////////////////////////////////
1668
1669void
1670rxvt_fontset::push_font (rxvt_font *font)
1671{
1672 // the fontCount index is reserved for the overflow font, it is only
1673 // necessary when we get fontCount or more fonts, as they cannot be
1674 // represented in the rendition.
1675 if (fonts.size () == fontCount)
1676 {
1677 rxvt_font *f = new rxvt_font_overflow (this);
1678
1679 prepare_font (f, CS_UNICODE);
1680 fonts.push_back (f);
1681 }
1682
1683 fonts.push_back (font);
1684}
1487 1685
1488void 1686void
1489rxvt_fontset::add_fonts (const char *desc) 1687rxvt_fontset::add_fonts (const char *desc)
1490{ 1688{
1491 if (desc) 1689 if (desc)
… …
1520 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1718 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1521 else 1719 else
1522 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1720 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1523 1721
1524 desc++; 1722 desc++;
1525 while (*desc <= ' ') desc++; 1723 while (*desc <= ' ' && *desc) desc++;
1526 } 1724 }
1527 1725
1528 end = strchr (desc, ','); 1726 end = strchr (desc, ',');
1529 if (!end) 1727 if (!end)
1530 end = desc + strlen (desc); 1728 end = desc + strlen (desc);
… …
1532 if (end - desc < 511) 1730 if (end - desc < 511)
1533 { 1731 {
1534 memcpy (buf, desc, end - desc); 1732 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1733 buf[end - desc] = 0;
1536 1734
1537 fonts.push_back (new_font (buf, cs)); 1735 push_font (new_font (buf, cs));
1538 } 1736 }
1539 else 1737 else
1540 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1738 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1541 1739
1542 desc = end + 1; 1740 desc = end + 1;
1543 } 1741 }
1544 while (*end); 1742 while (*end);
1545 } 1743 }
… …
1570{ 1768{
1571 clear (); 1769 clear ();
1572 1770
1573 fontdesc = strdup (desc); 1771 fontdesc = strdup (desc);
1574 1772
1575 fonts.push_back (new_font (0, CS_UNICODE)); 1773 push_font (new_font (0, CS_UNICODE));
1576 realize_font (0); 1774 realize_font (0);
1577 1775
1578 add_fonts (desc); 1776 add_fonts (desc);
1579 1777
1580 return true; 1778 return true;
… …
1589 1787
1590 return -1; 1788 return -1;
1591} 1789}
1592 1790
1593int 1791int
1594rxvt_fontset::find_font (unicode_t unicode) 1792rxvt_fontset::find_font_idx (unicode_t unicode)
1595{ 1793{
1596 if (unicode >= 1<<20) 1794 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1795 if (unicode > 0x1fffff)
1597 return 0; 1796 return 0;
1598 1797
1599 unicode_t hi = unicode >> 8; 1798 unicode_t hi = unicode >> 8;
1600 1799
1601 if (hi < fmap.size () 1800 if (hi < fmap.size ())
1602 && fmap[hi] 1801 if (pagemap *pm = fmap[hi])
1603 && (*fmap[hi])[unicode & 0xff] != 0xff) 1802 if ((*pm)[unicode & 0xff] != 0xff)
1604 return (*fmap[hi])[unicode & 0xff]; 1803 return (*pm)[unicode & 0xff];
1605 1804
1606 unsigned int i; 1805 unsigned int i;
1607 1806
1608 for (i = 0; i < fonts.size (); i++) 1807 for (i = 0; i < fonts.size (); i++)
1609 { 1808 {
… …
1625 goto next_font; 1824 goto next_font;
1626 1825
1627 bool careful; 1826 bool careful;
1628 if (f->has_char (unicode, &prop, careful)) 1827 if (f->has_char (unicode, &prop, careful))
1629 { 1828 {
1630 if (careful) 1829 i = (i << 1) | careful;
1631 i |= 128;
1632 1830
1633 goto found; 1831 goto found;
1634 } 1832 }
1635 1833
1636 next_font: 1834 next_font:
1637 if (i == fonts.size () - 1) 1835 if (i == fonts.size () - 1)
1638 { 1836 {
1837 // compose characters are handled by the default font, unless another font takes over
1838 // we do not go via the fallback list for speed reasons.
1839 if (IS_COMPOSE (unicode))
1840 return 0;
1841
1639 if (fallback->name) 1842 if (fallback->name)
1640 { 1843 {
1641 // search through the fallback list 1844 // search through the fallback list
1642 fonts.push_back (new_font (fallback->name, fallback->cs)); 1845 push_font (new_font (fallback->name, fallback->cs));
1643 fallback++; 1846 fallback++;
1644 } 1847 }
1645 else 1848 else
1646 { 1849 {
1647 // try to find a new font. 1850 // try to find a new font.
… …
1649 // way to configure this and xft is easier to hack in, 1852 // way to configure this and xft is easier to hack in,
1650 // while x11 has more framework in place already. 1853 // while x11 has more framework in place already.
1651 // TODO: this is a real resource hog, xft takes ages(?) 1854 // TODO: this is a real resource hog, xft takes ages(?)
1652#if XFT && USE_SLOW_LOOKUP 1855#if XFT && USE_SLOW_LOOKUP
1653 // grab the first xft font that seems suitable 1856 // grab the first xft font that seems suitable
1857 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1654 FcPattern *p = FcPatternCreate (); 1858 FcPattern *p = FcPatternCreate ();
1655 1859
1656 FcCharSet *s = FcCharSetCreate (); 1860 FcCharSet *s = FcCharSetCreate ();
1657 FcCharSetAddChar (s, unicode); 1861 FcCharSetAddChar (s, unicode);
1658 FcPatternAddCharSet (p, FC_CHARSET, s); 1862 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1678 FcPatternDestroy (match); 1882 FcPatternDestroy (match);
1679 1883
1680 if (find_font (font) < 0) 1884 if (find_font (font) < 0)
1681 { 1885 {
1682 char fontname[4096]; 1886 char fontname[4096];
1683 sprintf (fontname, "xft:%-.4090s", font); 1887 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1684 1888
1685 fonts.push_back (new_font (fontname, CS_UNICODE)); 1889 push_font (new_font (fontname, CS_UNICODE));
1686 } 1890 }
1687 1891
1688 free (font); 1892 free (font);
1689 } 1893 }
1690#endif 1894#endif
… …
1702 while (hi >= fmap.size ()) 1906 while (hi >= fmap.size ())
1703 fmap.push_back (0); 1907 fmap.push_back (0);
1704 1908
1705 if (!fmap[hi]) 1909 if (!fmap[hi])
1706 { 1910 {
1707 fmap[hi] = (pagemap *)new pagemap; 1911 fmap[hi] = new pagemap;
1708 memset (fmap[hi], 0xff, sizeof (pagemap)); 1912 memset (fmap[hi], 0xff, sizeof (pagemap));
1709 } 1913 }
1710 1914
1711 (*fmap[hi])[unicode & 0xff] = i; 1915 (*fmap[hi])[unicode & 0xff] = i;
1712 } 1916 }
1713 1917
1714 return i; 1918 return i;
1715} 1919}
1716 1920
1717
1718

Diff Legend

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