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.170 by sf-exg, Thu Dec 30 01:13:24 2010 UTC vs.
Revision 1.216 by root, Sat Jun 19 10:08:10 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" },
… …
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)
… …
445#endif 445#endif
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
451 text_t chrs[2]; 450 text_t chrs[2];
452 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
453 452
454 *chrs = cc->c1; 453 *chrs = cc->c1;
455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
475 case '\t': 474 case '\t':
476 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
477 case NOCHAR: 476 case NOCHAR:
478 break; 477 break;
479 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
480 default: 488 default:
481 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
482 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
483 } 491 }
484 492
485 x += fwidth; 493 x += fwidth;
486 } 494 }
487} 495}
488 496
489struct rxvt_font_overflow : rxvt_font { 497struct rxvt_font_overflow : rxvt_font
498{
490 struct rxvt_fontset *fs; 499 struct rxvt_fontset *fs;
491 500
492 rxvt_font_overflow (rxvt_fontset *fs) 501 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font () 502 : rxvt_font ()
494 { 503 {
… …
524 533
525 void draw (rxvt_drawable &d, int x, int y, 534 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 535 const text_t *text, int len,
527 int fg, int bg) 536 int fg, int bg)
528 { 537 {
529 while (len--) 538 while (len)
530 { 539 {
531 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++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 545 text += w;
546 len -= w;
534 x += term->fwidth; 547 x += term->fwidth * w;
535 } 548 }
536 } 549 }
537}; 550};
538 551
539///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
540 553
541struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
542 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
543 557
544 void clear (); 558 void clear ();
545 559
546 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
718 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
719 733
720 if (!f) 734 if (!f)
721 return false; 735 return false;
722 736
723 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
724 738
725 if (new_name) 739 if (new_name)
726 set_name (new_name); 740 set_name (new_name);
727 else 741 else
728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
729 743
730 XFreeFont (disp, f); 744 XFreeFont (disp, f);
731 f = 0; 745 f = 0;
732 } 746 }
733 747
… …
813 XFreeFontNames (list); 827 XFreeFontNames (list);
814 828
815 // 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
816 for (;;) 830 for (;;)
817 { 831 {
818 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
819 833
820 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
822 best = w; 836 best = w;
823 837
824 if (!best->name 838 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 840 break;
… …
864 free (registry); 878 free (registry);
865 free (encoding); 879 free (encoding);
866 880
867 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
868 { 882 {
869 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
870 885
871 if (!charset) 886 if (!charset)
872 charset = name; 887 charset = name;
873 888
874 int count = 13; 889 int count = 13;
… …
877 break; 892 break;
878 893
879 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 895 if (cs == CS_UNKNOWN)
881 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);
882 } 899 }
883 900
884 if (cs == CS_UNKNOWN) 901 if (cs == CS_UNKNOWN)
885 { 902 {
886 clear (); 903 clear ();
… …
918 } 935 }
919#endif 936#endif
920 937
921 width = 1; 938 width = 1;
922 939
923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(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++)
924 { 941 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 943 continue;
927 944
928 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
929 bool careful; 946 bool careful;
930 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
931 continue; 948 continue;
932 949
933 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 };
934 952
935 XCharStruct g; 953 XCharStruct g;
936 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
937 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
938 956
… …
964} 982}
965 983
966bool 984bool
967rxvt_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
968{ 986{
987 careful = false;
988
969 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
970 990
971 if (ch == NOCHAR) 991 if (ch == NOCHAR)
972 return false; 992 return false;
973 993
… …
1036 dTermDisplay; 1056 dTermDisplay;
1037 dTermGC; 1057 dTermGC;
1038 1058
1039 bool slow = this->slow 1059 bool slow = this->slow
1040 || width != term->fwidth 1060 || width != term->fwidth
1041 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1042 1063
1043 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1044 1065
1045 XGCValues v; 1066 XGCValues v;
1046 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1114 1135
1115///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1116 1137
1117#if XFT 1138#if XFT
1118 1139
1119struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1120 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1121 1146
1122 void clear (); 1147 void clear ();
1123 1148
1124 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1125 1150
… …
1215 int ftheight = 0; 1240 int ftheight = 0;
1216 bool success = true; 1241 bool success = true;
1217 1242
1218 for (;;) 1243 for (;;)
1219 { 1244 {
1245 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1221 1247
1222 if (!f) 1248 if (!f)
1223 { 1249 {
1250 FcPatternDestroy (p);
1224 success = false; 1251 success = false;
1225 break; 1252 break;
1226 } 1253 }
1227 1254
1228 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1236 1263
1237 XftUnlockFace (f); 1264 XftUnlockFace (f);
1238 1265
1239 int glheight = height; 1266 int glheight = height;
1240 1267
1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(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++)
1242 { 1269 {
1243 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1244 1271
1245 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1246 && ch > 0x100 1273 && ch > 0x100
… …
1265 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1266 } 1293 }
1267 1294
1268 if (!width) 1295 if (!width)
1269 { 1296 {
1270 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);
1271 1298 width = f->max_advance_width;
1272 XftFontClose (disp, f);
1273 f = 0;
1274
1275 success = false;
1276 break; 1299 break;
1277 } 1300 }
1278 1301
1279 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1280 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1315bool 1338bool
1316rxvt_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
1317{ 1340{
1318 careful = false; 1341 careful = false;
1319 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1320 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1321 return false; 1358 return false;
1322 1359
1323 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1324 return true; 1361 return true;
1325 1362
1326 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1327 FcChar32 ch = unicode; 1364
1328 XGlyphInfo g; 1365 XGlyphInfo g;
1329 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1330 1367
1331 int w = g.width - g.x; 1368 int w = g.width - g.x;
1332 int wcw = max (WCWIDTH (unicode), 1);
1333 1369
1334 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1335 1371
1336 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1337 return false; 1373 return false;
… …
1346void 1382void
1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1348 const text_t *text, int len, 1384 const text_t *text, int len,
1349 int fg, int bg) 1385 int fg, int bg)
1350{ 1386{
1351 XGlyphInfo extents;
1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1353 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1354 1389
1355 dTermDisplay; 1390 dTermDisplay;
1356 dTermGC; 1391 dTermGC;
… …
1369 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1370 1405
1371 while (len) 1406 while (len)
1372 { 1407 {
1373 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1374 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1375 1410
1376 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1377 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1378 1413
1379 if (fc != ' ') // skip spaces 1414 if (chr != ' ') // skip spaces
1415 {
1416 // handle non-bmp chars when text_t is 16 bit
1417 #if ENABLE_COMBINING && !UNICODE_3
1418 if (ecb_expect_false (IS_COMPOSE (chr)))
1419 if (compose_char *cc = rxvt_composite [chr])
1420 if (cc->c2 == NOCHAR)
1421 chr = cc->c1;
1422 #endif
1423
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1380 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1435 }
1436 #endif
1437
1381 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1382 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1383 1441
1384 ep->glyph = glyph; 1442 ep->glyph = glyph;
1385 ep->x = x_ + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1386 ep->y = y_ + ascent; 1444 ep->y = y_ + ascent;
1387 1445
1388 if (extents.xOff == 0) 1446 // the xft font cell might differ from the terminal font cell,
1389 ep->x = x_ + cwidth; 1447 // in which case we use the average between the two.
1448 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1390 1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1391 ep++; 1459 ++ep;
1392 } 1460 }
1393 1461
1394 x_ += cwidth; 1462 x_ += cwidth;
1395 } 1463 }
1396 1464
… …
1398 { 1466 {
1399 if (ep != enc) 1467 if (ep != enc)
1400 { 1468 {
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1470
1403#ifdef HAVE_BG_PIXMAP 1471#ifdef HAVE_IMG
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1473
1406 if (term->bgPixmap.pixmap 1474 if (term->bg_img
1407 && (bg == Color_transparent || bg == Color_bg 1475 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1477 {
1410 int src_x = x, src_y = y; 1478 int src_x = x, src_y = y;
1411 1479
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1481 {
1414 src_x += term->window_vt_x; 1482 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1483 src_y += term->window_vt_y;
1416 } 1484 }
1417 1485
1418 if (term->bgPixmap.pmap_width >= src_x + w 1486 if (term->bg_img->w >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1487 && term->bg_img->h >= src_y + h)
1420 { 1488 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1490 src_x, src_y, w, h, 0, 0);
1423 } 1491 }
1424 else 1492 else
1425 { 1493 {
1426 XGCValues gcv; 1494 XGCValues gcv;
1427 1495
1428 gcv.fill_style = FillTiled; 1496 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1497 gcv.tile = term->bg_img->pm;
1430 gcv.ts_x_origin = -src_x; 1498 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1499 gcv.ts_y_origin = -src_y;
1432 1500
1433 XChangeGC (disp, gc, 1501 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1594 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1595 else 1663 else
1596 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1597 1665
1598 desc++; 1666 desc++;
1599 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1600 } 1668 }
1601 1669
1602 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1603 if (!end) 1671 if (!end)
1604 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
… …
1609 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1610 1678
1611 push_font (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1612 } 1680 }
1613 else 1681 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1683
1616 desc = end + 1; 1684 desc = end + 1;
1617 } 1685 }
1618 while (*end); 1686 while (*end);
1619 } 1687 }
… …
1665} 1733}
1666 1734
1667int 1735int
1668rxvt_fontset::find_font_idx (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1669{ 1737{
1670 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1671 return 0; 1740 return 0;
1672 1741
1673 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1674 1743
1675 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1676 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1677 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1678 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1679 1748
1680 unsigned int i; 1749 unsigned int i;
1681 1750
1682 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1683 { 1752 {
… …
1707 } 1776 }
1708 1777
1709 next_font: 1778 next_font:
1710 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1711 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1712 if (fallback->name) 1786 if (fallback->name)
1713 { 1787 {
1714 // search through the fallback list 1788 // search through the fallback list
1715 push_font (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1716 fallback++; 1790 fallback++;
… …
1722 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1723 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1724 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1725#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1726 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1727 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1728 1803
1729 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1730 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1731 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1775 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1776 fmap.push_back (0); 1851 fmap.push_back (0);
1777 1852
1778 if (!fmap[hi]) 1853 if (!fmap[hi])
1779 { 1854 {
1780 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1781 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1782 } 1857 }
1783 1858
1784 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1785 } 1860 }

Diff Legend

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