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.157 by root, Tue Mar 30 23:38:02 2010 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 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" },
… …
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:Bitstream Vera 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" },
… …
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, // が本
158}; 161};
159 162
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164 165
165///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
166 167
… …
211} 212}
212 213
213///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
214 215
215rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
217{ 218{
218} 219}
219 220
220void 221void
221rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
238 else if (color >= 0) 239 else if (color >= 0)
239 { 240 {
240#if XFT 241#if XFT
241 Picture dst; 242 Picture dst;
242 243
243# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
244 if (term->bgPixmap.pixmap 245 if (term->bg_img
245 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
247 { 248 {
248 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
249 250
… …
261 } 262 }
262} 263}
263 264
264///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
265 266
266struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
267 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
268 270
269 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
270 : rxvt_font () 272 : rxvt_font ()
271 { 273 {
… …
343 345
344 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
345 347
346 while (len) 348 while (len)
347 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
348#if ENABLE_COMBINING 356#if ENABLE_COMBINING
349 compose_char *cc; 357 compose_char *cc;
350#endif 358#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; 359 int width = text - tp;
358 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
359 361
360#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
440#else 442#else
441 if (0) 443 if (0)
442 ; 444 ;
443#endif 445#endif
444#if ENABLE_COMBINING 446#if ENABLE_COMBINING
445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
446 { 448 {
447 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
448 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
449 text_t chrs[2]; 473 text_t chrs[2];
450 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
451 475
452 *chrs = cc->c1; 476 *chrs = cc->c1;
453 rxvt_font *f1 = fs->get (cc->c1); 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
455 479
456 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
457 { 481 {
458 bool careful; 482 bool careful;
459 483
460 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 485 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 487 ? f1
464 : fs->get (cc->c2); 488 : (*fs)[fs->find_font_idx (cc->c2)];
465 489
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 491 }
492 #endif
468 } 493 }
469#endif 494#endif
470 else 495 else
471 switch (t) 496 switch (t)
472 { 497 {
473 case '\t': 498 case '\t':
474 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 500 case NOCHAR:
476 break; 501 break;
477 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
478 default: 512 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
481 } 515 }
482 516
483 x += fwidth; 517 x += fwidth;
484 } 518 }
485} 519}
486 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
487///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
488 577
489struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
490 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
491 581
492 void clear (); 582 void clear ();
493 583
494 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
499 589
500 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 591 const text_t *text, int len,
502 int fg, int bg); 592 int fg, int bg);
503 593
504 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 595 XFontStruct *f;
506 bool enc2b, encm; 596 bool enc2b, encm;
507 597
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 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); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
667 757
668 if (!f) 758 if (!f)
669 return false; 759 return false;
670 760
671 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
672 762
673 if (new_name) 763 if (new_name)
674 set_name (new_name); 764 set_name (new_name);
675 else 765 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 767
678 XFreeFont (disp, f); 768 XFreeFont (disp, f);
679 f = 0; 769 f = 0;
680 } 770 }
681 771
… …
738 free (fname); 828 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 831 }
742 832
743 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
744 continue; 839 continue;
745 840 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 841
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 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); 843 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); 844 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); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 851 XFreeFontNames (list);
760 852
761 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
762 for (;;) 854 for (;;)
763 { 855 {
764 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
765 857
766 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
768 best = w; 860 best = w;
769 861
770 if (!best->name 862 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 864 break;
… …
810 free (registry); 902 free (registry);
811 free (encoding); 903 free (encoding);
812 904
813 if (cs == CS_UNKNOWN) 905 if (cs == CS_UNKNOWN)
814 { 906 {
815 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
816 909
817 if (!charset) 910 if (!charset)
818 charset = name; 911 charset = name;
819 912
820 int count = 13; 913 int count = 13;
… …
823 break; 916 break;
824 917
825 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
826 if (cs == CS_UNKNOWN) 919 if (cs == CS_UNKNOWN)
827 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
828 } 923 }
829 924
830 if (cs == CS_UNKNOWN) 925 if (cs == CS_UNKNOWN)
831 { 926 {
832 clear (); 927 clear ();
… …
864 } 959 }
865#endif 960#endif
866 961
867 width = 1; 962 width = 1;
868 963
869 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
870 { 965 {
871 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
872 continue; 967 continue;
873 968
874 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
875 bool careful; 970 bool careful;
876 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
877 continue; 972 continue;
878 973
879 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
880 976
881 XCharStruct g; 977 XCharStruct g;
882 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
883 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
884 980
… …
910} 1006}
911 1007
912bool 1008bool
913rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
914{ 1010{
1011 careful = false;
1012
915 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
916 1014
917 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
918 return false; 1016 return false;
919 1017
920 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
921 XCharStruct *xcs; 1019 XCharStruct *xcs;
922 1020
923 if (encm) 1021 if (encm)
924 { 1022 {
925 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
955 return false; 1053 return false;
956 1054
957 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
958 return true; 1056 return true;
959 1057
960 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
961 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
962 int wcw = max (WCWIDTH (unicode), 1); 1060 int wcw = max (WCWIDTH (unicode), 1);
963 1061
964 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
965 1063
… …
982 dTermDisplay; 1080 dTermDisplay;
983 dTermGC; 1081 dTermGC;
984 1082
985 bool slow = this->slow 1083 bool slow = this->slow
986 || width != term->fwidth 1084 || width != term->fwidth
987 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
988 1087
989 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
990 1089
991 XGCValues v; 1090 XGCValues v;
992 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1060 1159
1061///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1062 1161
1063#if XFT 1162#if XFT
1064 1163
1065struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1066 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1067 1171
1068 void clear (); 1172 void clear ();
1069 1173
1070 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1071 1175
… …
1161 int ftheight = 0; 1265 int ftheight = 0;
1162 bool success = true; 1266 bool success = true;
1163 1267
1164 for (;;) 1268 for (;;)
1165 { 1269 {
1270 p = FcPatternDuplicate (match);
1166 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1167 1272
1168 if (!f) 1273 if (!f)
1169 { 1274 {
1275 FcPatternDestroy (p);
1170 success = false; 1276 success = false;
1171 break; 1277 break;
1172 } 1278 }
1173 1279
1174 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1182 1288
1183 XftUnlockFace (f); 1289 XftUnlockFace (f);
1184 1290
1185 int glheight = height; 1291 int glheight = height;
1186 1292
1187 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1188 { 1294 {
1189 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1190 1296
1191 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1192 && ch > 0x100 1298 && ch > 0x100
… …
1344 { 1450 {
1345 if (ep != enc) 1451 if (ep != enc)
1346 { 1452 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348 1454
1349#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_IMG
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1457
1352 if (term->bgPixmap.pixmap 1458 if (term->bg_img
1353 && (bg == Color_transparent || bg == Color_bg 1459 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1461 {
1356 int src_x = x, src_y = y; 1462 int src_x = x, src_y = y;
1357 1463
1358 if (term->bgPixmap.is_parentOrigin ()) 1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1359 { 1465 {
1360 src_x += term->window_vt_x; 1466 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y; 1467 src_y += term->window_vt_y;
1362 } 1468 }
1363 1469
1364 if (term->bgPixmap.pmap_width >= src_x + w 1470 if (term->bg_img->w >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h) 1471 && term->bg_img->h >= src_y + h)
1366 { 1472 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1368 src_x, src_y, w, h, 0, 0); 1474 src_x, src_y, w, h, 0, 0);
1369 } 1475 }
1370 else 1476 else
1371 { 1477 {
1372 XGCValues gcv; 1478 XGCValues gcv;
1373 1479
1374 gcv.fill_style = FillTiled; 1480 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap; 1481 gcv.tile = term->bg_img->pm;
1376 gcv.ts_x_origin = -src_x; 1482 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y; 1483 gcv.ts_y_origin = -src_y;
1378 1484
1379 XChangeGC (disp, gc, 1485 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1433 = rxvt_fontprop::unset; 1539 = rxvt_fontprop::unset;
1434 force_prop = false; 1540 force_prop = false;
1435 1541
1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1437 FONT_UNREF (*i); 1543 (*i)->unref ();
1438 1544
1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1440 delete *p; 1546 delete *p;
1441 1547
1442 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1444 fonts.clear (); 1550 fonts.clear ();
1445 1551
1446 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1447} 1553}
1448 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1449rxvt_font * 1564rxvt_font *
1450rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1451{ 1566{
1452 rxvt_font *f; 1567 rxvt_font *f;
1453 1568
… …
1469 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1470 } 1585 }
1471 else 1586 else
1472 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1473 1588
1474 f->set_term (term);
1475 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1476 1590 prepare_font (f, cs);
1477 f->cs = cs;
1478 f->loaded = false;
1479 1591
1480 return f; 1592 return f;
1481} 1593}
1482 1594
1483///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1484 1613
1485void 1614void
1486rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1487{ 1616{
1488 if (desc) 1617 if (desc)
… …
1517 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1518 else 1647 else
1519 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1520 1649
1521 desc++; 1650 desc++;
1522 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1523 } 1652 }
1524 1653
1525 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1526 if (!end) 1655 if (!end)
1527 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
… …
1529 if (end - desc < 511) 1658 if (end - desc < 511)
1530 { 1659 {
1531 memcpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1532 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1533 1662
1534 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1535 } 1664 }
1536 else 1665 else
1537 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1538 1667
1539 desc = end + 1; 1668 desc = end + 1;
1540 } 1669 }
1541 while (*end); 1670 while (*end);
1542 } 1671 }
… …
1567{ 1696{
1568 clear (); 1697 clear ();
1569 1698
1570 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1571 1700
1572 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1573 realize_font (0); 1702 realize_font (0);
1574 1703
1575 add_fonts (desc); 1704 add_fonts (desc);
1576 1705
1577 return true; 1706 return true;
… …
1586 1715
1587 return -1; 1716 return -1;
1588} 1717}
1589 1718
1590int 1719int
1591rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1592{ 1721{
1593 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1594 return 0; 1723 return 0;
1595 1724
1596 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
1597 1726
1598 if (hi < fmap.size () && fmap[hi]) 1727 if (hi < fmap.size ()
1599 { 1728 && fmap[hi]
1729 && (*fmap[hi])[unicode & 0xff] != 0xff)
1600 unsigned char m = (*fmap[hi])[unicode & 0xff]; 1730 return (*fmap[hi])[unicode & 0xff];
1601
1602 if (m != 0xff)
1603 {
1604 careful = m & 128;
1605 return m & 127;
1606 }
1607 }
1608 1731
1609 unsigned int i; 1732 unsigned int i;
1610 1733
1611 for (i = 0; i < fonts.size (); i++) 1734 for (i = 0; i < fonts.size (); i++)
1612 { 1735 {
… …
1625 } 1748 }
1626 1749
1627 if (f->cs == CS_UNKNOWN) 1750 if (f->cs == CS_UNKNOWN)
1628 goto next_font; 1751 goto next_font;
1629 1752
1753 bool careful;
1630 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1755 {
1756 i = (i << 1) | careful;
1757
1631 goto found; 1758 goto found;
1759 }
1632 1760
1633 next_font: 1761 next_font:
1634 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1635 { 1763 {
1636 if (fallback->name) 1764 if (fallback->name)
1637 { 1765 {
1638 // search through the fallback list 1766 // search through the fallback list
1639 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1640 fallback++; 1768 fallback++;
1641 } 1769 }
1642 else 1770 else
1643 { 1771 {
1644 // try to find a new font. 1772 // try to find a new font.
… …
1646 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1647 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1648 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1649#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1650 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1651 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1652 1781
1653 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1654 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1655 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1677 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1678 { 1807 {
1679 char fontname[4096]; 1808 char fontname[4096];
1680 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1681 1810
1682 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1683 } 1812 }
1684 1813
1685 free (font); 1814 free (font);
1686 } 1815 }
1687#endif 1816#endif
… …
1689 } 1818 }
1690 } 1819 }
1691 1820
1692 /* we must return SOME font */ 1821 /* we must return SOME font */
1693 i = 0; 1822 i = 0;
1694 careful = false;
1695 1823
1696found: 1824found:
1697 // found a font, cache it 1825 // found a font, cache it
1698 if (i < 127) 1826 if (i < 255)
1699 { 1827 {
1700 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1701 fmap.push_back (0); 1829 fmap.push_back (0);
1702 1830
1703 if (!fmap[hi]) 1831 if (!fmap[hi])
1704 { 1832 {
1705 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1706 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1707 } 1835 }
1708 1836
1709 (*fmap[hi])[unicode & 0xff] = i | (careful ? 128 : 0); 1837 (*fmap[hi])[unicode & 0xff] = i;
1710 } 1838 }
1711 1839
1712 return i; 1840 return i;
1713} 1841}
1714 1842
1715int
1716rxvt_fontset::find_font (unicode_t unicode)
1717{
1718 bool careful;
1719 int id = find_font_idx (unicode, careful);
1720
1721 return min<int> (fontCount, id) | (careful ? Careful : 0);
1722}
1723

Diff Legend

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