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.162 by root, Wed Mar 31 22:46:40 2010 UTC vs.
Revision 1.206 by root, Thu Jun 17 19:37:28 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
… …
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 {
… …
311 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 315 return true;
314#endif 316#endif
315 317
316 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
317 return true; 319 // rob other fonts from taking over.
318 320
319 switch (unicode) 321 switch (unicode)
320 { 322 {
321 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
322 case NOCHAR: 324 case NOCHAR:
… …
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)
… …
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) && (cc = 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
449 text_t chrs[2]; 450 text_t chrs[2];
450 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
451 452
452 *chrs = cc->c1; 453 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
455 456
456 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
457 { 458 {
458 bool careful; 459 bool careful;
459 460
460 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 462 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 464 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
465 466
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 468 }
468 } 469 }
469#endif 470#endif
… …
473 case '\t': 474 case '\t':
474 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 476 case NOCHAR:
476 break; 477 break;
477 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
478 default: 488 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
481 } 491 }
482 492
483 x += fwidth; 493 x += fwidth;
484 } 494 }
485} 495}
486 496
487struct rxvt_font_overflow : rxvt_font { 497struct rxvt_font_overflow : rxvt_font
498{
488 struct rxvt_fontset *fs; 499 struct rxvt_fontset *fs;
489 500
490 rxvt_font_overflow (rxvt_fontset *fs) 501 rxvt_font_overflow (rxvt_fontset *fs)
491 : rxvt_font () 502 : rxvt_font ()
492 { 503 {
… …
522 533
523 void draw (rxvt_drawable &d, int x, int y, 534 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len, 535 const text_t *text, int len,
525 int fg, int bg) 536 int fg, int bg)
526 { 537 {
527 while (len--) 538 while (len)
528 { 539 {
529 int fid = fs->find_font_idx (*text); 540 int fid = fs->find_font_idx (*text);
541 int w = 1;
542 while (w < len && text[w] == NOCHAR)
543 w++;
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
531 ++text; 545 text += w;
546 len -= w;
532 x += term->fwidth; 547 x += term->fwidth * w;
533 } 548 }
534 } 549 }
535}; 550};
536 551
537///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
538 553
539struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
540 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
541 557
542 void clear (); 558 void clear ();
543 559
544 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
716 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
717 733
718 if (!f) 734 if (!f)
719 return false; 735 return false;
720 736
721 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
722 738
723 if (new_name) 739 if (new_name)
724 set_name (new_name); 740 set_name (new_name);
725 else 741 else
726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
727 743
728 XFreeFont (disp, f); 744 XFreeFont (disp, f);
729 f = 0; 745 f = 0;
730 } 746 }
731 747
… …
788 free (fname); 804 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 } 807 }
792 808
793 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);
794 continue; 815 continue;
795 816 }
796 if (prop.height != rxvt_fontprop::unset
797 && p.height > prop.height) // weed out too large fonts
798 continue;
799 817
800 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;
801 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);
802 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);
803 //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);
… …
809 XFreeFontNames (list); 827 XFreeFontNames (list);
810 828
811 // 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
812 for (;;) 830 for (;;)
813 { 831 {
814 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
815 833
816 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
817 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
818 best = w; 836 best = w;
819 837
820 if (!best->name 838 if (!best->name
821 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
822 break; 840 break;
… …
860 free (registry); 878 free (registry);
861 free (encoding); 879 free (encoding);
862 880
863 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
864 { 882 {
865 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
866 885
867 if (!charset) 886 if (!charset)
868 charset = name; 887 charset = name;
869 888
870 int count = 13; 889 int count = 13;
… …
873 break; 892 break;
874 893
875 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN) 895 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
878 } 899 }
879 900
880 if (cs == CS_UNKNOWN) 901 if (cs == CS_UNKNOWN)
881 { 902 {
882 clear (); 903 clear ();
… …
914 } 935 }
915#endif 936#endif
916 937
917 width = 1; 938 width = 1;
918 939
919 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++)
920 { 941 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 943 continue;
923 944
924 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
925 bool careful; 946 bool careful;
926 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
927 continue; 948 continue;
928 949
929 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 };
930 952
931 XCharStruct g; 953 XCharStruct g;
932 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
934 956
… …
960} 982}
961 983
962bool 984bool
963rxvt_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
964{ 986{
987 careful = false;
988
965 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
966 990
967 if (ch == NOCHAR) 991 if (ch == NOCHAR)
968 return false; 992 return false;
969 993
… …
1032 dTermDisplay; 1056 dTermDisplay;
1033 dTermGC; 1057 dTermGC;
1034 1058
1035 bool slow = this->slow 1059 bool slow = this->slow
1036 || width != term->fwidth 1060 || width != term->fwidth
1037 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1038 1063
1039 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1040 1065
1041 XGCValues v; 1066 XGCValues v;
1042 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1110 1135
1111///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1112 1137
1113#if XFT 1138#if XFT
1114 1139
1115struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1116 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1117 1146
1118 void clear (); 1147 void clear ();
1119 1148
1120 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1121 1150
… …
1211 int ftheight = 0; 1240 int ftheight = 0;
1212 bool success = true; 1241 bool success = true;
1213 1242
1214 for (;;) 1243 for (;;)
1215 { 1244 {
1245 p = FcPatternDuplicate (match);
1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1217 1247
1218 if (!f) 1248 if (!f)
1219 { 1249 {
1250 FcPatternDestroy (p);
1220 success = false; 1251 success = false;
1221 break; 1252 break;
1222 } 1253 }
1223 1254
1224 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1232 1263
1233 XftUnlockFace (f); 1264 XftUnlockFace (f);
1234 1265
1235 int glheight = height; 1266 int glheight = height;
1236 1267
1237 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++)
1238 { 1269 {
1239 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1240 1271
1241 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1242 && ch > 0x100 1273 && ch > 0x100
… …
1261 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1262 } 1293 }
1263 1294
1264 if (!width) 1295 if (!width)
1265 { 1296 {
1266 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);
1267 1298 width = f->max_advance_width;
1268 XftFontClose (disp, f);
1269 f = 0;
1270
1271 success = false;
1272 break; 1299 break;
1273 } 1300 }
1274 1301
1275 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1276 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1311bool 1338bool
1312rxvt_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
1313{ 1340{
1314 careful = false; 1341 careful = false;
1315 1342
1343 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // we handle the sequence if the first char is available
1316 if (!XftCharExists (term->dpy, f, unicode)) 1348 if (!XftCharExists (term->dpy, f, chrs [0]))
1317 return false; 1349 return false;
1318 1350
1319 if (!prop || prop->width == rxvt_fontprop::unset) 1351 if (!prop || prop->width == rxvt_fontprop::unset)
1320 return true; 1352 return true;
1353
1354 // but we check against the whoile sequence bounding box
1321 1355
1322 // check character against base font bounding box 1356 // check character against base font bounding box
1323 FcChar32 ch = unicode; 1357 FcChar32 ch = unicode;
1324 XGlyphInfo g; 1358 XGlyphInfo g;
1325 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1359 XftTextExtents32 (term->dpy, f, chrs, nchrs, &g);
1326 1360
1327 int w = g.width - g.x; 1361 int w = g.width - g.x;
1328 int wcw = max (WCWIDTH (unicode), 1); 1362 int wcw = max (WCWIDTH (chrs [0]), 1);
1329 1363
1330 careful = g.x > 0 || w > prop->width * wcw; 1364 careful = g.x > 0 || w > prop->width * wcw;
1331 1365
1332 if (careful && !OVERLAP_OK (w, wcw, prop)) 1366 if (careful && !OVERLAP_OK (w, wcw, prop))
1333 return false; 1367 return false;
… …
1343rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1377rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1344 const text_t *text, int len, 1378 const text_t *text, int len,
1345 int fg, int bg) 1379 int fg, int bg)
1346{ 1380{
1347 XGlyphInfo extents; 1381 XGlyphInfo extents;
1348 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1382 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1349 XftGlyphSpec *ep = enc; 1383 //XftGlyphSpec *ep = enc;//D
1384 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1350 1385
1351 dTermDisplay; 1386 dTermDisplay;
1352 dTermGC; 1387 dTermGC;
1353 1388
1354 int w = term->fwidth * len; 1389 int w = term->fwidth * len;
… …
1365 int y_ = buffered ? 0 : y; 1400 int y_ = buffered ? 0 : y;
1366 1401
1367 while (len) 1402 while (len)
1368 { 1403 {
1369 int cwidth = term->fwidth; 1404 int cwidth = term->fwidth;
1405
1406 rxvt_compose_expand_static<FcChar32> exp;
1370 FcChar32 fc = *text++; len--; 1407 FcChar32 *chrs = exp (*text++); len--;
1408 int nchrs = exp.length (chrs);
1371 1409
1372 while (len && *text == NOCHAR) 1410 while (len && *text == NOCHAR)
1373 text++, len--, cwidth += term->fwidth; 1411 text++, len--, cwidth += term->fwidth;
1374 1412
1375 if (fc != ' ') // skip spaces 1413 if (chrs [0] != ' ') // skip spaces
1376 { 1414 {
1415 FT_UInt glyphs [rxvt_compose_expand_static<FcChar32>::max_size];
1416
1417 for (int i = 0; i < nchrs; ++i)
1377 FT_UInt glyph = XftCharIndex (disp, f, fc); 1418 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1419
1378 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1420 XftGlyphExtents (disp, f, glyphs, nchrs, &extents);
1379 1421
1380 ep->glyph = glyph; 1422 XftGlyphSpec ep;
1423
1381 ep->x = x_ + (cwidth - extents.xOff >> 1); 1424 ep.x = x_ + (cwidth - extents.xOff >> 1);
1382 ep->y = y_ + ascent; 1425 ep.y = y_ + ascent;
1383 1426
1384 if (extents.xOff == 0) 1427 if (extents.xOff == 0)
1385 ep->x = x_ + cwidth; 1428 ep.x = x_ + cwidth;
1386 1429
1387 ep++; 1430 for (int i = 0; i < nchrs; ++i)
1431 {
1432 ep.glyph = glyphs [i];
1433 enc.push_back (ep);
1434 }
1388 } 1435 }
1389 1436
1390 x_ += cwidth; 1437 x_ += cwidth;
1391 } 1438 }
1392 1439
1393 if (buffered) 1440 if (buffered)
1394 { 1441 {
1395 if (ep != enc) 1442 if (!enc.empty ())
1396 { 1443 {
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1444 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398 1445
1399#ifdef HAVE_BG_PIXMAP 1446#ifdef HAVE_IMG
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1447 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401 1448
1402 if (term->bgPixmap.pixmap 1449 if (term->bg_img
1403 && (bg == Color_transparent || bg == Color_bg 1450 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1451 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1452 {
1406 int src_x = x, src_y = y; 1453 int src_x = x, src_y = y;
1407 1454
1408 if (term->bgPixmap.is_parentOrigin ()) 1455 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1409 { 1456 {
1410 src_x += term->window_vt_x; 1457 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1458 src_y += term->window_vt_y;
1412 } 1459 }
1413 1460
1414 if (term->bgPixmap.pmap_width >= src_x + w 1461 if (term->bg_img->w >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h) 1462 && term->bg_img->h >= src_y + h)
1416 { 1463 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1464 XCopyArea (disp, term->bg_img->pm, d2, gc,
1418 src_x, src_y, w, h, 0, 0); 1465 src_x, src_y, w, h, 0, 0);
1419 } 1466 }
1420 else 1467 else
1421 { 1468 {
1422 XGCValues gcv; 1469 XGCValues gcv;
1423 1470
1424 gcv.fill_style = FillTiled; 1471 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap; 1472 gcv.tile = term->bg_img->pm;
1426 gcv.ts_x_origin = -src_x; 1473 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y; 1474 gcv.ts_y_origin = -src_y;
1428 1475
1429 XChangeGC (disp, gc, 1476 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1477 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1446 } 1493 }
1447 else 1494 else
1448#endif 1495#endif
1449 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1496 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1450 1497
1451 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1498 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1452 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1499 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1453 } 1500 }
1454 else 1501 else
1455 clear_rect (d, x, y, w, h, bg); 1502 clear_rect (d, x, y, w, h, bg);
1456 } 1503 }
1457 else 1504 else
1458 { 1505 {
1459 clear_rect (d, x, y, w, h, bg); 1506 clear_rect (d, x, y, w, h, bg);
1460 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1507 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1461 } 1508 }
1462} 1509}
1463 1510
1464#endif 1511#endif
1465 1512
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1529 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1530 = rxvt_fontprop::unset;
1484 force_prop = false; 1531 force_prop = false;
1485 1532
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1533 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1534 (*i)->unref ();
1488 1535
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1536 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1537 delete *p;
1491 1538
1492 free (fontdesc); fontdesc = 0; 1539 free (fontdesc); fontdesc = 0;
… …
1539///////////////////////////////////////////////////////////////////////////// 1586/////////////////////////////////////////////////////////////////////////////
1540 1587
1541void 1588void
1542rxvt_fontset::push_font (rxvt_font *font) 1589rxvt_fontset::push_font (rxvt_font *font)
1543{ 1590{
1591 // the fontCount index is reserved for the overflow font, it is only
1592 // necessary when we get fontCount or more fonts, as they cannot be
1593 // represented in the rendition.
1544 if (fonts.size () == fontCount) 1594 if (fonts.size () == fontCount)
1545 { 1595 {
1546 rxvt_font *f = new rxvt_font_overflow (this); 1596 rxvt_font *f = new rxvt_font_overflow (this);
1547 1597
1548 prepare_font (f, CS_UNICODE); 1598 prepare_font (f, CS_UNICODE);
… …
1587 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1637 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1588 else 1638 else
1589 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1639 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1590 1640
1591 desc++; 1641 desc++;
1592 while (*desc <= ' ') desc++; 1642 while (*desc <= ' ' && *desc) desc++;
1593 } 1643 }
1594 1644
1595 end = strchr (desc, ','); 1645 end = strchr (desc, ',');
1596 if (!end) 1646 if (!end)
1597 end = desc + strlen (desc); 1647 end = desc + strlen (desc);
… …
1602 buf[end - desc] = 0; 1652 buf[end - desc] = 0;
1603 1653
1604 push_font (new_font (buf, cs)); 1654 push_font (new_font (buf, cs));
1605 } 1655 }
1606 else 1656 else
1607 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1657 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1608 1658
1609 desc = end + 1; 1659 desc = end + 1;
1610 } 1660 }
1611 while (*end); 1661 while (*end);
1612 } 1662 }
… …
1658} 1708}
1659 1709
1660int 1710int
1661rxvt_fontset::find_font_idx (unicode_t unicode) 1711rxvt_fontset::find_font_idx (unicode_t unicode)
1662{ 1712{
1663 if (unicode >= 1<<20) 1713 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1714 if (unicode > 0x1fffff)
1664 return 0; 1715 return 0;
1665 1716
1666 unicode_t hi = unicode >> 8; 1717 unicode_t hi = unicode >> 8;
1667 1718
1668 if (hi < fmap.size () 1719 if (hi < fmap.size ())
1669 && fmap[hi] 1720 if (pagemap *pm = fmap[hi])
1670 && (*fmap[hi])[unicode & 0xff] != 0xff) 1721 if ((*pm)[unicode & 0xff] != 0xff)
1671 return (*fmap[hi])[unicode & 0xff]; 1722 return (*pm)[unicode & 0xff];
1672 1723
1673 unsigned int i; 1724 unsigned int i;
1674 1725
1675 for (i = 0; i < fonts.size (); i++) 1726 for (i = 0; i < fonts.size (); i++)
1676 { 1727 {
… …
1700 } 1751 }
1701 1752
1702 next_font: 1753 next_font:
1703 if (i == fonts.size () - 1) 1754 if (i == fonts.size () - 1)
1704 { 1755 {
1756 // compose characters are handled by the default font, unless another font takes over
1757 // we do not go via the fallback list for speed reasons.
1758 if (IS_COMPOSE (unicode))
1759 return 0;
1760
1705 if (fallback->name) 1761 if (fallback->name)
1706 { 1762 {
1707 // search through the fallback list 1763 // search through the fallback list
1708 push_font (new_font (fallback->name, fallback->cs)); 1764 push_font (new_font (fallback->name, fallback->cs));
1709 fallback++; 1765 fallback++;
… …
1715 // way to configure this and xft is easier to hack in, 1771 // way to configure this and xft is easier to hack in,
1716 // while x11 has more framework in place already. 1772 // while x11 has more framework in place already.
1717 // TODO: this is a real resource hog, xft takes ages(?) 1773 // TODO: this is a real resource hog, xft takes ages(?)
1718#if XFT && USE_SLOW_LOOKUP 1774#if XFT && USE_SLOW_LOOKUP
1719 // grab the first xft font that seems suitable 1775 // grab the first xft font that seems suitable
1776 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1720 FcPattern *p = FcPatternCreate (); 1777 FcPattern *p = FcPatternCreate ();
1721 1778
1722 FcCharSet *s = FcCharSetCreate (); 1779 FcCharSet *s = FcCharSetCreate ();
1723 FcCharSetAddChar (s, unicode); 1780 FcCharSetAddChar (s, unicode);
1724 FcPatternAddCharSet (p, FC_CHARSET, s); 1781 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1768 while (hi >= fmap.size ()) 1825 while (hi >= fmap.size ())
1769 fmap.push_back (0); 1826 fmap.push_back (0);
1770 1827
1771 if (!fmap[hi]) 1828 if (!fmap[hi])
1772 { 1829 {
1773 fmap[hi] = (pagemap *)new pagemap; 1830 fmap[hi] = new pagemap;
1774 memset (fmap[hi], 0xff, sizeof (pagemap)); 1831 memset (fmap[hi], 0xff, sizeof (pagemap));
1775 } 1832 }
1776 1833
1777 (*fmap[hi])[unicode & 0xff] = i; 1834 (*fmap[hi])[unicode & 0xff] = i;
1778 } 1835 }

Diff Legend

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