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.165 by root, Sat May 22 23:55:56 2010 UTC vs.
Revision 1.202 by root, Thu Jun 17 10:49:01 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 {
… …
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)
… …
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 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)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
463 ? f1 487 ? f1
464 : (*fs)[fs->find_font_idx (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
487struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
488 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
489 524
490 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
491 : rxvt_font () 526 : rxvt_font ()
492 { 527 {
… …
522 557
523 void draw (rxvt_drawable &d, int x, int y, 558 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len, 559 const text_t *text, int len,
525 int fg, int bg) 560 int fg, int bg)
526 { 561 {
527 while (len--) 562 while (len)
528 { 563 {
529 int fid = fs->find_font_idx (*text); 564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
531 ++text; 569 text += w;
570 len -= w;
532 x += term->fwidth; 571 x += term->fwidth * w;
533 } 572 }
534 } 573 }
535}; 574};
536 575
537///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
538 577
539struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
540 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
541 581
542 void clear (); 582 void clear ();
543 583
544 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
716 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
717 757
718 if (!f) 758 if (!f)
719 return false; 759 return false;
720 760
721 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
722 762
723 if (new_name) 763 if (new_name)
724 set_name (new_name); 764 set_name (new_name);
725 else 765 else
726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
727 767
728 XFreeFont (disp, f); 768 XFreeFont (disp, f);
729 f = 0; 769 f = 0;
730 } 770 }
731 771
… …
788 free (fname); 828 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 } 831 }
792 832
793 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);
794 continue; 839 continue;
795 840 }
796 if (prop.height != rxvt_fontprop::unset
797 && p.height > prop.height) // weed out too large fonts
798 continue;
799 841
800 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;
801 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);
802 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);
803 //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);
… …
809 XFreeFontNames (list); 851 XFreeFontNames (list);
810 852
811 // 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
812 for (;;) 854 for (;;)
813 { 855 {
814 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
815 857
816 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
817 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
818 best = w; 860 best = w;
819 861
820 if (!best->name 862 if (!best->name
821 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
822 break; 864 break;
… …
860 free (registry); 902 free (registry);
861 free (encoding); 903 free (encoding);
862 904
863 if (cs == CS_UNKNOWN) 905 if (cs == CS_UNKNOWN)
864 { 906 {
865 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
866 909
867 if (!charset) 910 if (!charset)
868 charset = name; 911 charset = name;
869 912
870 int count = 13; 913 int count = 13;
… …
873 break; 916 break;
874 917
875 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN) 919 if (cs == CS_UNKNOWN)
877 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);
878 } 923 }
879 924
880 if (cs == CS_UNKNOWN) 925 if (cs == CS_UNKNOWN)
881 { 926 {
882 clear (); 927 clear ();
… …
914 } 959 }
915#endif 960#endif
916 961
917 width = 1; 962 width = 1;
918 963
919 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++)
920 { 965 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 967 continue;
923 968
924 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
925 bool careful; 970 bool careful;
926 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
927 continue; 972 continue;
928 973
929 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 };
930 976
931 XCharStruct g; 977 XCharStruct g;
932 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
934 980
… …
960} 1006}
961 1007
962bool 1008bool
963rxvt_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
964{ 1010{
1011 careful = false;
1012
965 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
966 1014
967 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
968 return false; 1016 return false;
969 1017
… …
1032 dTermDisplay; 1080 dTermDisplay;
1033 dTermGC; 1081 dTermGC;
1034 1082
1035 bool slow = this->slow 1083 bool slow = this->slow
1036 || width != term->fwidth 1084 || width != term->fwidth
1037 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1038 1087
1039 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1040 1089
1041 XGCValues v; 1090 XGCValues v;
1042 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1110 1159
1111///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1112 1161
1113#if XFT 1162#if XFT
1114 1163
1115struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1116 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1117 1171
1118 void clear (); 1172 void clear ();
1119 1173
1120 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1121 1175
… …
1211 int ftheight = 0; 1265 int ftheight = 0;
1212 bool success = true; 1266 bool success = true;
1213 1267
1214 for (;;) 1268 for (;;)
1215 { 1269 {
1270 p = FcPatternDuplicate (match);
1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1217 1272
1218 if (!f) 1273 if (!f)
1219 { 1274 {
1275 FcPatternDestroy (p);
1220 success = false; 1276 success = false;
1221 break; 1277 break;
1222 } 1278 }
1223 1279
1224 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1232 1288
1233 XftUnlockFace (f); 1289 XftUnlockFace (f);
1234 1290
1235 int glheight = height; 1291 int glheight = height;
1236 1292
1237 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++)
1238 { 1294 {
1239 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1240 1296
1241 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1242 && ch > 0x100 1298 && ch > 0x100
… …
1311bool 1367bool
1312rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1368rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1313{ 1369{
1314 careful = false; 1370 careful = false;
1315 1371
1372#if ENABLE_COMBINING && !UNICODE_3
1373 if (ecb_expect_false (IS_COMPOSE (unicode)))
1374 if (compose_char *cc = rxvt_composite[unicode])
1375 if (cc->c2 == NOCHAR)
1376 unicode = cc->c1;
1377#endif
1378
1316 if (!XftCharExists (term->dpy, f, unicode)) 1379 if (!XftCharExists (term->dpy, f, unicode))
1317 return false; 1380 return false;
1318 1381
1319 if (!prop || prop->width == rxvt_fontprop::unset) 1382 if (!prop || prop->width == rxvt_fontprop::unset)
1320 return true; 1383 return true;
… …
1367 while (len) 1430 while (len)
1368 { 1431 {
1369 int cwidth = term->fwidth; 1432 int cwidth = term->fwidth;
1370 FcChar32 fc = *text++; len--; 1433 FcChar32 fc = *text++; len--;
1371 1434
1435#if ENABLE_COMBINING && !UNICODE_3
1436 if (ecb_expect_false (IS_COMPOSE (fc)))
1437 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1438 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1439#endif
1440
1372 while (len && *text == NOCHAR) 1441 while (len && *text == NOCHAR)
1373 text++, len--, cwidth += term->fwidth; 1442 text++, len--, cwidth += term->fwidth;
1374 1443
1375 if (fc != ' ') // skip spaces 1444 if (fc != ' ') // skip spaces
1376 { 1445 {
… …
1394 { 1463 {
1395 if (ep != enc) 1464 if (ep != enc)
1396 { 1465 {
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1466 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398 1467
1399#ifdef HAVE_BG_PIXMAP 1468#ifdef HAVE_IMG
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1469 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401 1470
1402 if (term->bgPixmap.pixmap 1471 if (term->bg_img
1403 && (bg == Color_transparent || bg == Color_bg 1472 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1473 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1474 {
1406 int src_x = x, src_y = y; 1475 int src_x = x, src_y = y;
1407 1476
1408 if (term->bgPixmap.is_parentOrigin ()) 1477 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1409 { 1478 {
1410 src_x += term->window_vt_x; 1479 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1480 src_y += term->window_vt_y;
1412 } 1481 }
1413 1482
1414 if (term->bgPixmap.pmap_width >= src_x + w 1483 if (term->bg_img->w >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h) 1484 && term->bg_img->h >= src_y + h)
1416 { 1485 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1486 XCopyArea (disp, term->bg_img->pm, d2, gc,
1418 src_x, src_y, w, h, 0, 0); 1487 src_x, src_y, w, h, 0, 0);
1419 } 1488 }
1420 else 1489 else
1421 { 1490 {
1422 XGCValues gcv; 1491 XGCValues gcv;
1423 1492
1424 gcv.fill_style = FillTiled; 1493 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap; 1494 gcv.tile = term->bg_img->pm;
1426 gcv.ts_x_origin = -src_x; 1495 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y; 1496 gcv.ts_y_origin = -src_y;
1428 1497
1429 XChangeGC (disp, gc, 1498 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1499 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1590 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1659 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1591 else 1660 else
1592 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1661 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1593 1662
1594 desc++; 1663 desc++;
1595 while (*desc <= ' ') desc++; 1664 while (*desc <= ' ' && *desc) desc++;
1596 } 1665 }
1597 1666
1598 end = strchr (desc, ','); 1667 end = strchr (desc, ',');
1599 if (!end) 1668 if (!end)
1600 end = desc + strlen (desc); 1669 end = desc + strlen (desc);
… …
1605 buf[end - desc] = 0; 1674 buf[end - desc] = 0;
1606 1675
1607 push_font (new_font (buf, cs)); 1676 push_font (new_font (buf, cs));
1608 } 1677 }
1609 else 1678 else
1610 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1679 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1611 1680
1612 desc = end + 1; 1681 desc = end + 1;
1613 } 1682 }
1614 while (*end); 1683 while (*end);
1615 } 1684 }
… …
1661} 1730}
1662 1731
1663int 1732int
1664rxvt_fontset::find_font_idx (unicode_t unicode) 1733rxvt_fontset::find_font_idx (unicode_t unicode)
1665{ 1734{
1666 if (unicode >= 1<<20) 1735 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1736 if (unicode > 0x1fffff)
1667 return 0; 1737 return 0;
1668 1738
1669 unicode_t hi = unicode >> 8; 1739 unicode_t hi = unicode >> 8;
1670 1740
1671 if (hi < fmap.size () 1741 if (hi < fmap.size ())
1672 && fmap[hi] 1742 if (pagemap *pm = fmap[hi])
1673 && (*fmap[hi])[unicode & 0xff] != 0xff) 1743 if ((*pm)[unicode & 0xff] != 0xff)
1674 return (*fmap[hi])[unicode & 0xff]; 1744 return (*pm)[unicode & 0xff];
1675 1745
1676 unsigned int i; 1746 unsigned int i;
1677 1747
1678 for (i = 0; i < fonts.size (); i++) 1748 for (i = 0; i < fonts.size (); i++)
1679 { 1749 {
… …
1703 } 1773 }
1704 1774
1705 next_font: 1775 next_font:
1706 if (i == fonts.size () - 1) 1776 if (i == fonts.size () - 1)
1707 { 1777 {
1778 // compose characters are handled by the default font, unless another font takes over
1779 // we do not go via the fallback list for speed reasons.
1780 if (IS_COMPOSE (unicode))
1781 return 0;
1782
1708 if (fallback->name) 1783 if (fallback->name)
1709 { 1784 {
1710 // search through the fallback list 1785 // search through the fallback list
1711 push_font (new_font (fallback->name, fallback->cs)); 1786 push_font (new_font (fallback->name, fallback->cs));
1712 fallback++; 1787 fallback++;
… …
1718 // way to configure this and xft is easier to hack in, 1793 // way to configure this and xft is easier to hack in,
1719 // while x11 has more framework in place already. 1794 // while x11 has more framework in place already.
1720 // TODO: this is a real resource hog, xft takes ages(?) 1795 // TODO: this is a real resource hog, xft takes ages(?)
1721#if XFT && USE_SLOW_LOOKUP 1796#if XFT && USE_SLOW_LOOKUP
1722 // grab the first xft font that seems suitable 1797 // grab the first xft font that seems suitable
1798 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1723 FcPattern *p = FcPatternCreate (); 1799 FcPattern *p = FcPatternCreate ();
1724 1800
1725 FcCharSet *s = FcCharSetCreate (); 1801 FcCharSet *s = FcCharSetCreate ();
1726 FcCharSetAddChar (s, unicode); 1802 FcCharSetAddChar (s, unicode);
1727 FcPatternAddCharSet (p, FC_CHARSET, s); 1803 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1771 while (hi >= fmap.size ()) 1847 while (hi >= fmap.size ())
1772 fmap.push_back (0); 1848 fmap.push_back (0);
1773 1849
1774 if (!fmap[hi]) 1850 if (!fmap[hi])
1775 { 1851 {
1776 fmap[hi] = (pagemap *)new pagemap; 1852 fmap[hi] = new pagemap;
1777 memset (fmap[hi], 0xff, sizeof (pagemap)); 1853 memset (fmap[hi], 0xff, sizeof (pagemap));
1778 } 1854 }
1779 1855
1780 (*fmap[hi])[unicode & 0xff] = i; 1856 (*fmap[hi])[unicode & 0xff] = i;
1781 } 1857 }

Diff Legend

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