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.124 by ayin, Sat Nov 24 11:41:11 2007 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 2021 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
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#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
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ 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.
136#if XFT 138#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
159}; 161};
160 162
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165 165
166///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
167 167
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
… …
237 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false; 242 Picture dst;
243#ifdef HAVE_BG_PIXMAP 243
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
245 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 253 }
254 } 254 else
255#endif 255# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
315#endif 316#endif
316 317
317 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
318 return true; 319 // rob other fonts from taking over.
319 320
320 switch (unicode) 321 switch (unicode)
321 { 322 {
322 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
323 case NOCHAR: 324 case NOCHAR:
… …
344 345
345 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
346 347
347 while (len) 348 while (len)
348 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
349#if ENABLE_COMBINING 356#if ENABLE_COMBINING
350 compose_char *cc; 357 compose_char *cc;
351#endif 358#endif
352 const text_t *tp = text;
353 text_t t = *tp;
354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
361#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
362 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
444#endif 445#endif
445#if ENABLE_COMBINING 446#if ENABLE_COMBINING
446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
447 { 448 {
448 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
449
450 text_t chrs[2]; 450 text_t chrs[2];
451 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
452 452
453 *chrs = cc->c1; 453 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
456 456
457 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
458 { 458 {
459 bool careful; 459 bool careful;
460 460
461 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 462 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 464 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
466 466
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 468 }
469 } 469 }
470#endif 470#endif
… …
474 case '\t': 474 case '\t':
475 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
476 case NOCHAR: 476 case NOCHAR:
477 break; 477 break;
478 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
479 default: 488 default:
480 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
481 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
482 } 491 }
483 492
484 x += fwidth; 493 x += fwidth;
485 } 494 }
486} 495}
487 496
497struct rxvt_font_overflow : rxvt_font
498{
499 struct rxvt_fontset *fs;
500
501 rxvt_font_overflow (rxvt_fontset *fs)
502 : rxvt_font ()
503 {
504 this->fs = fs;
505 }
506
507 rxvt_fontprop properties ()
508 {
509 rxvt_fontprop p;
510
511 p.width = p.height = 1;
512 p.ascent = rxvt_fontprop::unset;
513 p.weight = rxvt_fontprop::medium;
514 p.slant = rxvt_fontprop::roman;
515
516 return p;
517 }
518
519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 {
521 width = 1; height = 1;
522 ascent = 1; descent = 0;
523
524 set_name (strdup ("built-in rendition overflow font"));
525
526 return true;
527 }
528
529 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
530 {
531 return false;
532 }
533
534 void draw (rxvt_drawable &d, int x, int y,
535 const text_t *text, int len,
536 int fg, int bg)
537 {
538 while (len)
539 {
540 int fid = fs->find_font_idx (*text);
541 int w = 1;
542 while (w < len && text[w] == NOCHAR)
543 w++;
544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
545 text += w;
546 len -= w;
547 x += term->fwidth * w;
548 }
549 }
550};
551
488///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
489 553
490struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
491 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
492 557
493 void clear (); 558 void clear ();
494 559
495 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
500 565
501 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 567 const text_t *text, int len,
503 int fg, int bg); 568 int fg, int bg);
504 569
505 bool slow; // wether this is a proportional font or has other funny characteristics 570 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 571 XFontStruct *f;
507 bool enc2b, encm; 572 bool enc2b, encm;
508 573
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
510 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 575 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
610 return false; 675 return false;
611} 676}
612 677
613// fix the size of scalable fonts 678// fix the size of scalable fonts
614static bool 679static bool
615replace_field (char *buf, const char *name, int index, const char old, const char *replace) 680replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
616{ 681{
617 int slashes = 0; 682 int slashes = 0;
618 const char *field, *end; 683 const char *field, *end;
619 684
620 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
630 break; 695 break;
631 } 696 }
632 697
633 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
634 { 699 {
635 // TODO: check for overflow in font-name 700 size_t len = field - name;
636 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 buf += field - name; 702 memcpy (*ptr, name, len);
638 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
639 strcat (buf, end); 704 strcat (*ptr, end);
640 705
641 return true; 706 return true;
642 } 707 }
643 else 708 else
644 { 709 {
645 strcpy (buf, name); 710 *ptr = strdup (name);
646 711
647 return false; 712 return false;
648 } 713 }
649} 714}
650 715
… …
658 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
659 724
660 // first morph the font if required 725 // first morph the font if required
661 if (force_prop) 726 if (force_prop)
662 { 727 {
663 char fname[1024]; 728 char *fname;
664 729
665 if (name[0] != '-') 730 if (name[0] != '-')
666 { 731 {
667 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
668 733
669 if (!f) 734 if (!f)
670 return false; 735 return false;
671 736
672 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
673 738
674 if (new_name) 739 if (new_name)
675 set_name (new_name); 740 set_name (new_name);
676 else 741 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
678 743
679 XFreeFont (disp, f); 744 XFreeFont (disp, f);
680 f = 0; 745 f = 0;
681 } 746 }
682 747
683 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
684 { 749 {
685 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
686 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
687 ? "medium" : "bold"); 752 ? "medium" : "bold");
688 set_name (strdup (fname)); 753 set_name (fname);
689 } 754 }
690 755
691 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
692 { 757 {
693 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
694 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
695 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
696 set_name (strdup (fname)); 761 set_name (fname);
697 } 762 }
698 } 763 }
699 764
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 765 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height); 766 ? 0 : prop.height);
… …
726 font_weight *fonts = new font_weight[count]; 791 font_weight *fonts = new font_weight[count];
727 792
728 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
729 { 794 {
730 rxvt_fontprop p; 795 rxvt_fontprop p;
731 char fname[1024]; 796 char *fname;
732 797
733 int diff = 0; 798 int diff = 0;
734 799
735 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
736 diff += 10; // slightly penalize scalable fonts 801 diff += 10; // slightly penalize scalable fonts
802 else
803 {
804 free (fname);
737 else if (replace_field (fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
807 }
739 808
740 if (!set_properties (p, fname)) 809 if (!set_properties (p, fname)
810 // also weed out too large fonts
811 || (prop.height != rxvt_fontprop::unset
812 && p.height > prop.height))
813 {
814 free (fname);
741 continue; 815 continue;
742 816 }
743 if (prop.height != rxvt_fontprop::unset
744 && p.height > prop.height) // weed out too large fonts
745 continue;
746 817
747 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 818 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
748 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 819 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
749 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 820 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
750 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 821 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
751 822
752 fonts[i].name = strdup (fname); 823 fonts[i].name = fname;
753 fonts[i].diff = diff; 824 fonts[i].diff = diff;
754 } 825 }
755 826
756 XFreeFontNames (list); 827 XFreeFontNames (list);
757 828
758 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
759 for (;;) 830 for (;;)
760 { 831 {
761 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
762 833
763 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
764 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
765 best = w; 836 best = w;
766 837
767 if (!best->name 838 if (!best->name
768 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
769 break; 840 break;
… …
789 return false; 860 return false;
790 861
791 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
792 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
793 864
865 cs = CS_UNKNOWN;
866
794 if (registry && encoding) 867 if (registry && encoding)
795 { 868 {
796 char charset[64]; 869 char charset[64];
797 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
798 871
799 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
800 } 873
801 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
802 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
803 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
804 885
805 if (!charset) 886 if (!charset)
806 charset = name; 887 charset = name;
807 888
808 int count = 13; 889 int count = 13;
809 while (*charset) 890 while (*charset)
810 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
811 break; 892 break;
812 893
813 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
895 if (cs == CS_UNKNOWN)
896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
899 }
900
901 if (cs == CS_UNKNOWN)
814 } 902 {
815 903 clear ();
816 free (registry); 904 return false;
817 free (encoding); 905 }
818 906
819 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
820 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 908 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
821 909
822 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
847 } 935 }
848#endif 936#endif
849 937
850 width = 1; 938 width = 1;
851 939
852 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 940 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
853 { 941 {
854 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
855 continue; 943 continue;
856 944
857 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
858 bool careful; 946 bool careful;
859 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
860 continue; 948 continue;
861 949
862 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
863 952
864 XCharStruct g; 953 XCharStruct g;
865 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
866 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
867 956
… …
869 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
870 959
871 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
872 } 961 }
873 962
874 if (cs == CS_UNKNOWN) 963#if 0 // do it per-character
964 if (prop && width > prop->width)
875 { 965 {
876 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
877
878 clear (); 966 clear ();
879 return false; 967 return false;
880 } 968 }
881
882#if 0 // do it per-character
883 if (prop && width > prop->width)
884 {
885 clear ();
886 return false;
887 }
888#endif 969#endif
889 970
890 return true; 971 return true;
891} 972}
892 973
… …
901} 982}
902 983
903bool 984bool
904rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 985rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
905{ 986{
987 careful = false;
988
906 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
907 990
908 if (ch == NOCHAR) 991 if (ch == NOCHAR)
909 return false; 992 return false;
910 993
911 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
912 XCharStruct *xcs; 995 XCharStruct *xcs;
913 996
914 if (encm) 997 if (encm)
915 { 998 {
916 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
946 return false; 1029 return false;
947 1030
948 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
949 return true; 1032 return true;
950 1033
951 // check wether character overlaps previous/next character 1034 // check whether character overlaps previous/next character
952 int w = xcs->rbearing - xcs->lbearing; 1035 int w = xcs->rbearing - xcs->lbearing;
953 int wcw = max (WCWIDTH (unicode), 1); 1036 int wcw = max (WCWIDTH (unicode), 1);
954 1037
955 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
956 1039
… …
973 dTermDisplay; 1056 dTermDisplay;
974 dTermGC; 1057 dTermGC;
975 1058
976 bool slow = this->slow 1059 bool slow = this->slow
977 || width != term->fwidth 1060 || width != term->fwidth
978 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
979 1063
980 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
981 1065
982 XGCValues v; 1066 XGCValues v;
983 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1051 1135
1052///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1053 1137
1054#if XFT 1138#if XFT
1055 1139
1056struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1057 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1058 1146
1059 void clear (); 1147 void clear ();
1060 1148
1061 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1062 1150
… …
1130 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1131 1219
1132#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1133 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1135 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1136#endif 1224#endif
1137 1225
1138 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1139 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1140 1228
… …
1152 int ftheight = 0; 1240 int ftheight = 0;
1153 bool success = true; 1241 bool success = true;
1154 1242
1155 for (;;) 1243 for (;;)
1156 { 1244 {
1245 p = FcPatternDuplicate (match);
1157 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1158 1247
1159 if (!f) 1248 if (!f)
1160 { 1249 {
1250 FcPatternDestroy (p);
1161 success = false; 1251 success = false;
1162 break; 1252 break;
1163 } 1253 }
1164 1254
1165 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1173 1263
1174 XftUnlockFace (f); 1264 XftUnlockFace (f);
1175 1265
1176 int glheight = height; 1266 int glheight = height;
1177 1267
1178 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1268 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1179 { 1269 {
1180 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1181 1271
1182 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1183 && ch > 0x100 1273 && ch > 0x100
… …
1202 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1203 } 1293 }
1204 1294
1205 if (!width) 1295 if (!width)
1206 { 1296 {
1207 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1208 1298 width = f->max_advance_width;
1209 XftFontClose (disp, f);
1210 f = 0;
1211
1212 success = false;
1213 break; 1299 break;
1214 } 1300 }
1215 1301
1216 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1217 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1252bool 1338bool
1253rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1254{ 1340{
1255 careful = false; 1341 careful = false;
1256 1342
1343 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // allm chars in sequence must be available
1348 for (int i = 0; i < nchrs; ++i)
1257 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1258 return false; 1350 return false;
1259 1351
1260 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1261 return true; 1353 return true;
1262 1354
1263 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1264 FcChar32 ch = unicode; 1356
1357 // we check against all glyph sizes. this is probably wrong,
1358 // due to the way ->draw positions these glyphs.
1359 for (int i = 0; i < nchrs; ++i)
1360 {
1265 XGlyphInfo g; 1361 XGlyphInfo g;
1266 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1267 1363
1268 int w = g.width - g.x; 1364 int w = g.width - g.x;
1269 int wcw = max (WCWIDTH (unicode), 1);
1270 1365
1271 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1272 1367
1273 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1274 return false; 1369 return false;
1275 1370
1276 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1277 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1278 return false; 1373 return false;
1374 }
1279 1375
1280 return true; 1376 return true;
1281} 1377}
1282 1378
1283void 1379void
1284rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1285 const text_t *text, int len, 1381 const text_t *text, int len,
1286 int fg, int bg) 1382 int fg, int bg)
1287{ 1383{
1288 XGlyphInfo extents; 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1289 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1290 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1291 1387
1292 dTermDisplay; 1388 dTermDisplay;
1293 dTermGC; 1389 dTermGC;
1294 1390
1295 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
1296 int h = term->fheight; 1392 int h = term->fheight;
1297 1393
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1394 bool buffered = bg >= Color_transparent
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1395 && term->option (Opt_buffered);
1300 * good idea from the perspective of packaging for wide variety of user configs. 1396
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces 1397 // cut trailing spaces
1308 while (len && text [len - 1] == ' ') 1398 while (len && text [len - 1] == ' ')
1309 len--; 1399 len--;
1310 1400
1311 int x_ = buffered ? 0 : x; 1401 int x_ = buffered ? 0 : x;
1312 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1313 1403
1314 while (len) 1404 while (len)
1315 { 1405 {
1316 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1317 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1318 1411
1319 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1320 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1321 1414
1322 if (fc != ' ') // skip spaces 1415 if (chrs [0] != ' ') // skip spaces
1416 {
1417 #if 1
1418 FT_UInt glyphs [decltype (exp)::max_size];
1419
1420 for (int i = 0; i < nchrs; ++i)
1421 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1422
1423 for (int i = 0; i < nchrs; ++i)
1323 { 1424 {
1425 XGlyphInfo ep;
1426 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1427 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);
1428 }
1429 #endif
1430
1324 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1325 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1326 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1327 ep->glyph = glyph; 1439 ep.glyph = glyph;
1328 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1329 ep->y = y_ + ascent; 1441 ep.y = cy;
1330 1442
1331 if (extents.xOff == 0) 1443 enc.push_back (ep);
1332 ep->x = x_ + cwidth;
1333 1444
1334 ep++; 1445 for (int i = 1; ecb_expect_false (i < nchrs); ++i)
1446 {
1447 FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
1448 XGlyphInfo extents;
1449 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1450
1451 ep.glyph = glyph;
1452 ep.x = cx + (extents.xOff ? 0 : extents0.xOff);
1453
1454 enc.push_back (ep);
1455 }
1335 } 1456 }
1336 1457
1337 x_ += cwidth; 1458 x_ += cwidth;
1338 } 1459 }
1339 1460
1340 if (buffered) 1461 if (buffered)
1341 { 1462 {
1342 bool back_rendered = false; 1463 if (!enc.empty ())
1343 if (ep != enc)
1344 { 1464 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1466
1347#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_IMG
1468 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1469
1348 if (term->bgPixmap.pixmap) 1470 if (term->bg_img
1471 && (bg == Color_transparent || bg == Color_bg
1472 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349 { 1473 {
1350 Picture dst = 0; 1474 int src_x = x, src_y = y;
1351 1475
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1476 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 { 1477 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x; 1478 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1479 src_y += term->window_vt_y;
1363 } 1480 }
1364 1481
1365 if (term->bgPixmap.pmap_width >= src_x+w 1482 if (term->bg_img->w >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1483 && term->bg_img->h >= src_y + h)
1367 { 1484 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1485 XCopyArea (disp, term->bg_img->pm, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1486 src_x, src_y, w, h, 0, 0);
1370 } 1487 }
1371 else 1488 else
1372 { 1489 {
1373 XGCValues gcv; 1490 XGCValues gcv;
1374 1491
1375 gcv.fill_style = FillTiled; 1492 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1493 gcv.tile = term->bg_img->pm;
1377 gcv.ts_x_origin = -src_x; 1494 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1495 gcv.ts_y_origin = -src_y;
1379 1496
1380 XChangeGC (disp, gc, 1497 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1498 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv); 1499 &gcv);
1383 1500
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1501 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385 1502
1386 gcv.fill_style = FillSolid; 1503 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1504 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1505 }
1389 1506
1390 if (bg >= 0) 1507 if (dst)
1391 { 1508 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1509 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1510
1511 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1512 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 } 1513 }
1398 } 1514 }
1515 else
1399#endif 1516#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1517 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1403 1518
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1521 }
1407 else 1522 else
1408 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1409 } 1524 }
1410 else 1525 else
1411 { 1526 {
1412 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1413 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1414 } 1529 }
1415} 1530}
1416 1531
1417#endif 1532#endif
1418 1533
… …
1435 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1550 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1436 = rxvt_fontprop::unset; 1551 = rxvt_fontprop::unset;
1437 force_prop = false; 1552 force_prop = false;
1438 1553
1439 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1554 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1440 FONT_UNREF (*i); 1555 (*i)->unref ();
1441 1556
1442 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1557 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1443 delete *p; 1558 delete *p;
1444 1559
1445 free (fontdesc); fontdesc = 0; 1560 free (fontdesc); fontdesc = 0;
… …
1447 fonts.clear (); 1562 fonts.clear ();
1448 1563
1449 fallback = fallback_fonts; 1564 fallback = fallback_fonts;
1450} 1565}
1451 1566
1567void
1568rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1569{
1570 font->set_term (term);
1571
1572 font->cs = cs;
1573 font->loaded = false;
1574}
1575
1452rxvt_font * 1576rxvt_font *
1453rxvt_fontset::new_font (const char *name, codeset cs) 1577rxvt_fontset::new_font (const char *name, codeset cs)
1454{ 1578{
1455 rxvt_font *f; 1579 rxvt_font *f;
1456 1580
… …
1472 f = new rxvt_font_x11; 1596 f = new rxvt_font_x11;
1473 } 1597 }
1474 else 1598 else
1475 f = new rxvt_font_x11; 1599 f = new rxvt_font_x11;
1476 1600
1477 f->set_term (term);
1478 f->set_name (strdup (name)); 1601 f->set_name (strdup (name));
1479 1602 prepare_font (f, cs);
1480 f->cs = cs;
1481 f->loaded = false;
1482 1603
1483 return f; 1604 return f;
1484} 1605}
1485 1606
1486///////////////////////////////////////////////////////////////////////////// 1607/////////////////////////////////////////////////////////////////////////////
1608
1609void
1610rxvt_fontset::push_font (rxvt_font *font)
1611{
1612 // the fontCount index is reserved for the overflow font, it is only
1613 // necessary when we get fontCount or more fonts, as they cannot be
1614 // represented in the rendition.
1615 if (fonts.size () == fontCount)
1616 {
1617 rxvt_font *f = new rxvt_font_overflow (this);
1618
1619 prepare_font (f, CS_UNICODE);
1620 fonts.push_back (f);
1621 }
1622
1623 fonts.push_back (font);
1624}
1487 1625
1488void 1626void
1489rxvt_fontset::add_fonts (const char *desc) 1627rxvt_fontset::add_fonts (const char *desc)
1490{ 1628{
1491 if (desc) 1629 if (desc)
… …
1520 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1658 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1521 else 1659 else
1522 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1660 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1523 1661
1524 desc++; 1662 desc++;
1525 while (*desc <= ' ') desc++; 1663 while (*desc <= ' ' && *desc) desc++;
1526 } 1664 }
1527 1665
1528 end = strchr (desc, ','); 1666 end = strchr (desc, ',');
1529 if (!end) 1667 if (!end)
1530 end = desc + strlen (desc); 1668 end = desc + strlen (desc);
1531 1669
1532 if (end - desc < 511) 1670 if (end - desc < 511)
1533 { 1671 {
1534 strncpy (buf, desc, end - desc); 1672 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1673 buf[end - desc] = 0;
1536 1674
1537 fonts.push_back (new_font (buf, cs)); 1675 push_font (new_font (buf, cs));
1538 } 1676 }
1539 else 1677 else
1540 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1678 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1541 1679
1542 desc = end + 1; 1680 desc = end + 1;
1543 } 1681 }
1544 while (*end); 1682 while (*end);
1545 } 1683 }
… …
1570{ 1708{
1571 clear (); 1709 clear ();
1572 1710
1573 fontdesc = strdup (desc); 1711 fontdesc = strdup (desc);
1574 1712
1575 fonts.push_back (new_font (0, CS_UNICODE)); 1713 push_font (new_font (0, CS_UNICODE));
1576 realize_font (0); 1714 realize_font (0);
1577 1715
1578 add_fonts (desc); 1716 add_fonts (desc);
1579 1717
1580 return true; 1718 return true;
… …
1589 1727
1590 return -1; 1728 return -1;
1591} 1729}
1592 1730
1593int 1731int
1594rxvt_fontset::find_font (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1595{ 1733{
1596 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1597 return 0; 1736 return 0;
1598 1737
1599 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1600 1739
1601 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1602 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1603 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1604 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1605 1744
1606 unsigned int i; 1745 unsigned int i;
1607 1746
1608 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1609 { 1748 {
… …
1625 goto next_font; 1764 goto next_font;
1626 1765
1627 bool careful; 1766 bool careful;
1628 if (f->has_char (unicode, &prop, careful)) 1767 if (f->has_char (unicode, &prop, careful))
1629 { 1768 {
1630 if (careful) 1769 i = (i << 1) | careful;
1631 i |= 128;
1632 1770
1633 goto found; 1771 goto found;
1634 } 1772 }
1635 1773
1636 next_font: 1774 next_font:
1637 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1638 { 1776 {
1777 // compose characters are handled by the default font, unless another font takes over
1778 // we do not go via the fallback list for speed reasons.
1779 if (IS_COMPOSE (unicode))
1780 return 0;
1781
1639 if (fallback->name) 1782 if (fallback->name)
1640 { 1783 {
1641 // search through the fallback list 1784 // search through the fallback list
1642 fonts.push_back (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1643 fallback++; 1786 fallback++;
1644 } 1787 }
1645 else 1788 else
1646 { 1789 {
1647 // try to find a new font. 1790 // try to find a new font.
… …
1649 // way to configure this and xft is easier to hack in, 1792 // way to configure this and xft is easier to hack in,
1650 // while x11 has more framework in place already. 1793 // while x11 has more framework in place already.
1651 // TODO: this is a real resource hog, xft takes ages(?) 1794 // TODO: this is a real resource hog, xft takes ages(?)
1652#if XFT && USE_SLOW_LOOKUP 1795#if XFT && USE_SLOW_LOOKUP
1653 // grab the first xft font that seems suitable 1796 // grab the first xft font that seems suitable
1797 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1654 FcPattern *p = FcPatternCreate (); 1798 FcPattern *p = FcPatternCreate ();
1655 1799
1656 FcCharSet *s = FcCharSetCreate (); 1800 FcCharSet *s = FcCharSetCreate ();
1657 FcCharSetAddChar (s, unicode); 1801 FcCharSetAddChar (s, unicode);
1658 FcPatternAddCharSet (p, FC_CHARSET, s); 1802 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1678 FcPatternDestroy (match); 1822 FcPatternDestroy (match);
1679 1823
1680 if (find_font (font) < 0) 1824 if (find_font (font) < 0)
1681 { 1825 {
1682 char fontname[4096]; 1826 char fontname[4096];
1683 sprintf (fontname, "xft:%-.4090s", font); 1827 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1684 1828
1685 fonts.push_back (new_font (fontname, CS_UNICODE)); 1829 push_font (new_font (fontname, CS_UNICODE));
1686 } 1830 }
1687 1831
1688 free (font); 1832 free (font);
1689 } 1833 }
1690#endif 1834#endif
… …
1702 while (hi >= fmap.size ()) 1846 while (hi >= fmap.size ())
1703 fmap.push_back (0); 1847 fmap.push_back (0);
1704 1848
1705 if (!fmap[hi]) 1849 if (!fmap[hi])
1706 { 1850 {
1707 fmap[hi] = (pagemap *)new pagemap; 1851 fmap[hi] = new pagemap;
1708 memset (fmap[hi], 0xff, sizeof (pagemap)); 1852 memset (fmap[hi], 0xff, sizeof (pagemap));
1709 } 1853 }
1710 1854
1711 (*fmap[hi])[unicode & 0xff] = i; 1855 (*fmap[hi])[unicode & 0xff] = i;
1712 } 1856 }
1713 1857
1714 return i; 1858 return i;
1715} 1859}
1716 1860
1717
1718

Diff Legend

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