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.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.203 by root, Thu Jun 17 11:21:52 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 30
31#if XFT 31#if XFT
32# include <fontconfig/fontconfig.h> 32# include <fontconfig/fontconfig.h>
… …
132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
134# endif 134# endif
135#endif 135#endif
136 136
137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
138 //{ 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.
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
213} 212}
214 213
215///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
216 215
217rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
219{ 218{
220} 219}
221 220
222void 221void
223rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
240 else if (color >= 0) 239 else if (color >= 0)
241 { 240 {
242#if XFT 241#if XFT
243 Picture dst; 242 Picture dst;
244 243
245# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
246 if (term->bgPixmap.pixmap 245 if (term->bg_img
247 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
249 { 248 {
250 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
251 250
… …
263 } 262 }
264} 263}
265 264
266///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
267 266
268struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
269 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
270 270
271 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
272 : rxvt_font () 272 : rxvt_font ()
273 { 273 {
… …
313 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 315 return true;
316#endif 316#endif
317 317
318 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
319 return true; 319 // rob other fonts from taking over.
320 320
321 switch (unicode) 321 switch (unicode)
322 { 322 {
323 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
324 case NOCHAR: 324 case NOCHAR:
… …
345 345
346 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
347 347
348 while (len) 348 while (len)
349 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
350#if ENABLE_COMBINING 356#if ENABLE_COMBINING
351 compose_char *cc; 357 compose_char *cc;
352#endif 358#endif
353 const text_t *tp = text;
354 text_t t = *tp;
355
356 while (++text, --len && *text == NOCHAR)
357 ;
358
359 int width = text - tp; 359 int width = text - tp;
360 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
361 361
362#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
446#if ENABLE_COMBINING 446#if ENABLE_COMBINING
447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
448 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
450 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
451 text_t chrs[2]; 473 text_t chrs[2];
452 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
453 475
454 *chrs = cc->c1; 476 *chrs = cc->c1;
455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
465 ? f1 487 ? f1
466 : (*fs)[fs->find_font_idx (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
467 489
468 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
469 } 491 }
492 #endif
470 } 493 }
471#endif 494#endif
472 else 495 else
473 switch (t) 496 switch (t)
474 { 497 {
475 case '\t': 498 case '\t':
476 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
477 case NOCHAR: 500 case NOCHAR:
478 break; 501 break;
479 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
480 default: 512 default:
481 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
482 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
483 } 515 }
484 516
485 x += fwidth; 517 x += fwidth;
486 } 518 }
487} 519}
488 520
489struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
490 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
491 524
492 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font () 526 : rxvt_font ()
494 { 527 {
… …
524 557
525 void draw (rxvt_drawable &d, int x, int y, 558 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 559 const text_t *text, int len,
527 int fg, int bg) 560 int fg, int bg)
528 { 561 {
529 while (len--) 562 while (len)
530 { 563 {
531 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++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 569 text += w;
570 len -= w;
534 x += term->fwidth; 571 x += term->fwidth * w;
535 } 572 }
536 } 573 }
537}; 574};
538 575
539///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
540 577
541struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
542 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
543 581
544 void clear (); 582 void clear ();
545 583
546 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
718 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
719 757
720 if (!f) 758 if (!f)
721 return false; 759 return false;
722 760
723 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
724 762
725 if (new_name) 763 if (new_name)
726 set_name (new_name); 764 set_name (new_name);
727 else 765 else
728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
729 767
730 XFreeFont (disp, f); 768 XFreeFont (disp, f);
731 f = 0; 769 f = 0;
732 } 770 }
733 771
… …
790 free (fname); 828 free (fname);
791 if (replace_field (&fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 } 831 }
794 832
795 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);
796 continue; 839 continue;
797 840 }
798 if (prop.height != rxvt_fontprop::unset
799 && p.height > prop.height) // weed out too large fonts
800 continue;
801 841
802 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;
803 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);
804 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);
805 //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);
… …
811 XFreeFontNames (list); 851 XFreeFontNames (list);
812 852
813 // 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
814 for (;;) 854 for (;;)
815 { 855 {
816 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
817 857
818 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
819 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
820 best = w; 860 best = w;
821 861
822 if (!best->name 862 if (!best->name
823 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
824 break; 864 break;
… …
862 free (registry); 902 free (registry);
863 free (encoding); 903 free (encoding);
864 904
865 if (cs == CS_UNKNOWN) 905 if (cs == CS_UNKNOWN)
866 { 906 {
867 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
868 909
869 if (!charset) 910 if (!charset)
870 charset = name; 911 charset = name;
871 912
872 int count = 13; 913 int count = 13;
… …
875 break; 916 break;
876 917
877 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
878 if (cs == CS_UNKNOWN) 919 if (cs == CS_UNKNOWN)
879 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);
880 } 923 }
881 924
882 if (cs == CS_UNKNOWN) 925 if (cs == CS_UNKNOWN)
883 { 926 {
884 clear (); 927 clear ();
… …
916 } 959 }
917#endif 960#endif
918 961
919 width = 1; 962 width = 1;
920 963
921 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(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++)
922 { 965 {
923 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
924 continue; 967 continue;
925 968
926 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
927 bool careful; 970 bool careful;
928 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
929 continue; 972 continue;
930 973
931 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 };
932 976
933 XCharStruct g; 977 XCharStruct g;
934 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
935 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
936 980
… …
962} 1006}
963 1007
964bool 1008bool
965rxvt_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
966{ 1010{
1011 careful = false;
1012
967 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
968 1014
969 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
970 return false; 1016 return false;
971 1017
… …
1034 dTermDisplay; 1080 dTermDisplay;
1035 dTermGC; 1081 dTermGC;
1036 1082
1037 bool slow = this->slow 1083 bool slow = this->slow
1038 || width != term->fwidth 1084 || width != term->fwidth
1039 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1040 1087
1041 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1042 1089
1043 XGCValues v; 1090 XGCValues v;
1044 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1112 1159
1113///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1114 1161
1115#if XFT 1162#if XFT
1116 1163
1117struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1118 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1119 1171
1120 void clear (); 1172 void clear ();
1121 1173
1122 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1123 1175
… …
1213 int ftheight = 0; 1265 int ftheight = 0;
1214 bool success = true; 1266 bool success = true;
1215 1267
1216 for (;;) 1268 for (;;)
1217 { 1269 {
1270 p = FcPatternDuplicate (match);
1218 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1219 1272
1220 if (!f) 1273 if (!f)
1221 { 1274 {
1275 FcPatternDestroy (p);
1222 success = false; 1276 success = false;
1223 break; 1277 break;
1224 } 1278 }
1225 1279
1226 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1234 1288
1235 XftUnlockFace (f); 1289 XftUnlockFace (f);
1236 1290
1237 int glheight = height; 1291 int glheight = height;
1238 1292
1239 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(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++)
1240 { 1294 {
1241 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1242 1296
1243 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1244 && ch > 0x100 1298 && ch > 0x100
… …
1263 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1264 } 1318 }
1265 1319
1266 if (!width) 1320 if (!width)
1267 { 1321 {
1268 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1322 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1269 1323 width = f->max_advance_width;
1270 XftFontClose (disp, f);
1271 f = 0;
1272
1273 success = false;
1274 break; 1324 break;
1275 } 1325 }
1276 1326
1277 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1278 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1313bool 1363bool
1314rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1315{ 1365{
1316 careful = false; 1366 careful = false;
1317 1367
1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite[unicode])
1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1;
1373#endif
1374
1318 if (!XftCharExists (term->dpy, f, unicode)) 1375 if (!XftCharExists (term->dpy, f, unicode))
1319 return false; 1376 return false;
1320 1377
1321 if (!prop || prop->width == rxvt_fontprop::unset) 1378 if (!prop || prop->width == rxvt_fontprop::unset)
1322 return true; 1379 return true;
… …
1369 while (len) 1426 while (len)
1370 { 1427 {
1371 int cwidth = term->fwidth; 1428 int cwidth = term->fwidth;
1372 FcChar32 fc = *text++; len--; 1429 FcChar32 fc = *text++; len--;
1373 1430
1431#if ENABLE_COMBINING && !UNICODE_3
1432 if (ecb_expect_false (IS_COMPOSE (fc)))
1433 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1434 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1435#endif
1436
1374 while (len && *text == NOCHAR) 1437 while (len && *text == NOCHAR)
1375 text++, len--, cwidth += term->fwidth; 1438 text++, len--, cwidth += term->fwidth;
1376 1439
1377 if (fc != ' ') // skip spaces 1440 if (fc != ' ') // skip spaces
1378 { 1441 {
… …
1396 { 1459 {
1397 if (ep != enc) 1460 if (ep != enc)
1398 { 1461 {
1399 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1462 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1400 1463
1401#ifdef HAVE_BG_PIXMAP 1464#ifdef HAVE_IMG
1402 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1465 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1403 1466
1404 if (term->bgPixmap.pixmap 1467 if (term->bg_img
1405 && (bg == Color_transparent || bg == Color_bg 1468 && (bg == Color_transparent || bg == Color_bg
1406 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1469 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1407 { 1470 {
1408 int src_x = x, src_y = y; 1471 int src_x = x, src_y = y;
1409 1472
1410 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1473 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1411 { 1474 {
1412 src_x += term->window_vt_x; 1475 src_x += term->window_vt_x;
1413 src_y += term->window_vt_y; 1476 src_y += term->window_vt_y;
1414 } 1477 }
1415 1478
1416 if (term->bgPixmap.pmap_width >= src_x + w 1479 if (term->bg_img->w >= src_x + w
1417 && term->bgPixmap.pmap_height >= src_y + h) 1480 && term->bg_img->h >= src_y + h)
1418 { 1481 {
1419 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1482 XCopyArea (disp, term->bg_img->pm, d2, gc,
1420 src_x, src_y, w, h, 0, 0); 1483 src_x, src_y, w, h, 0, 0);
1421 } 1484 }
1422 else 1485 else
1423 { 1486 {
1424 XGCValues gcv; 1487 XGCValues gcv;
1425 1488
1426 gcv.fill_style = FillTiled; 1489 gcv.fill_style = FillTiled;
1427 gcv.tile = term->bgPixmap.pixmap; 1490 gcv.tile = term->bg_img->pm;
1428 gcv.ts_x_origin = -src_x; 1491 gcv.ts_x_origin = -src_x;
1429 gcv.ts_y_origin = -src_y; 1492 gcv.ts_y_origin = -src_y;
1430 1493
1431 XChangeGC (disp, gc, 1494 XChangeGC (disp, gc,
1432 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1495 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1592 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1655 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1593 else 1656 else
1594 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1657 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1595 1658
1596 desc++; 1659 desc++;
1597 while (*desc <= ' ') desc++; 1660 while (*desc <= ' ' && *desc) desc++;
1598 } 1661 }
1599 1662
1600 end = strchr (desc, ','); 1663 end = strchr (desc, ',');
1601 if (!end) 1664 if (!end)
1602 end = desc + strlen (desc); 1665 end = desc + strlen (desc);
… …
1607 buf[end - desc] = 0; 1670 buf[end - desc] = 0;
1608 1671
1609 push_font (new_font (buf, cs)); 1672 push_font (new_font (buf, cs));
1610 } 1673 }
1611 else 1674 else
1612 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1675 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1613 1676
1614 desc = end + 1; 1677 desc = end + 1;
1615 } 1678 }
1616 while (*end); 1679 while (*end);
1617 } 1680 }
… …
1663} 1726}
1664 1727
1665int 1728int
1666rxvt_fontset::find_font_idx (unicode_t unicode) 1729rxvt_fontset::find_font_idx (unicode_t unicode)
1667{ 1730{
1668 if (unicode >= 1<<20) 1731 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1732 if (unicode > 0x1fffff)
1669 return 0; 1733 return 0;
1670 1734
1671 unicode_t hi = unicode >> 8; 1735 unicode_t hi = unicode >> 8;
1672 1736
1673 if (hi < fmap.size () 1737 if (hi < fmap.size ())
1674 && fmap[hi] 1738 if (pagemap *pm = fmap[hi])
1675 && (*fmap[hi])[unicode & 0xff] != 0xff) 1739 if ((*pm)[unicode & 0xff] != 0xff)
1676 return (*fmap[hi])[unicode & 0xff]; 1740 return (*pm)[unicode & 0xff];
1677 1741
1678 unsigned int i; 1742 unsigned int i;
1679 1743
1680 for (i = 0; i < fonts.size (); i++) 1744 for (i = 0; i < fonts.size (); i++)
1681 { 1745 {
… …
1705 } 1769 }
1706 1770
1707 next_font: 1771 next_font:
1708 if (i == fonts.size () - 1) 1772 if (i == fonts.size () - 1)
1709 { 1773 {
1774 // compose characters are handled by the default font, unless another font takes over
1775 // we do not go via the fallback list for speed reasons.
1776 if (IS_COMPOSE (unicode))
1777 return 0;
1778
1710 if (fallback->name) 1779 if (fallback->name)
1711 { 1780 {
1712 // search through the fallback list 1781 // search through the fallback list
1713 push_font (new_font (fallback->name, fallback->cs)); 1782 push_font (new_font (fallback->name, fallback->cs));
1714 fallback++; 1783 fallback++;
… …
1720 // way to configure this and xft is easier to hack in, 1789 // way to configure this and xft is easier to hack in,
1721 // while x11 has more framework in place already. 1790 // while x11 has more framework in place already.
1722 // TODO: this is a real resource hog, xft takes ages(?) 1791 // TODO: this is a real resource hog, xft takes ages(?)
1723#if XFT && USE_SLOW_LOOKUP 1792#if XFT && USE_SLOW_LOOKUP
1724 // grab the first xft font that seems suitable 1793 // grab the first xft font that seems suitable
1794 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1725 FcPattern *p = FcPatternCreate (); 1795 FcPattern *p = FcPatternCreate ();
1726 1796
1727 FcCharSet *s = FcCharSetCreate (); 1797 FcCharSet *s = FcCharSetCreate ();
1728 FcCharSetAddChar (s, unicode); 1798 FcCharSetAddChar (s, unicode);
1729 FcPatternAddCharSet (p, FC_CHARSET, s); 1799 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1773 while (hi >= fmap.size ()) 1843 while (hi >= fmap.size ())
1774 fmap.push_back (0); 1844 fmap.push_back (0);
1775 1845
1776 if (!fmap[hi]) 1846 if (!fmap[hi])
1777 { 1847 {
1778 fmap[hi] = (pagemap *)new pagemap; 1848 fmap[hi] = new pagemap;
1779 memset (fmap[hi], 0xff, sizeof (pagemap)); 1849 memset (fmap[hi], 0xff, sizeof (pagemap));
1780 } 1850 }
1781 1851
1782 (*fmap[hi])[unicode & 0xff] = i; 1852 (*fmap[hi])[unicode & 0xff] = i;
1783 } 1853 }

Diff Legend

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