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.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 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;
… …
921 } 935 }
922#endif 936#endif
923 937
924 width = 1; 938 width = 1;
925 939
926 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++)
927 { 941 {
928 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
929 continue; 943 continue;
930 944
931 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
932 bool careful; 946 bool careful;
933 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
934 continue; 948 continue;
935 949
936 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 };
937 952
938 XCharStruct g; 953 XCharStruct g;
939 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
941 956
… …
967} 982}
968 983
969bool 984bool
970rxvt_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
971{ 986{
987 careful = false;
988
972 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
973 990
974 if (ch == NOCHAR) 991 if (ch == NOCHAR)
975 return false; 992 return false;
976 993
… …
1039 dTermDisplay; 1056 dTermDisplay;
1040 dTermGC; 1057 dTermGC;
1041 1058
1042 bool slow = this->slow 1059 bool slow = this->slow
1043 || width != term->fwidth 1060 || width != term->fwidth
1044 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1045 1063
1046 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1047 1065
1048 XGCValues v; 1066 XGCValues v;
1049 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1117 1135
1118///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1119 1137
1120#if XFT 1138#if XFT
1121 1139
1122struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1123 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1124 1146
1125 void clear (); 1147 void clear ();
1126 1148
1127 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1128 1150
… …
1218 int ftheight = 0; 1240 int ftheight = 0;
1219 bool success = true; 1241 bool success = true;
1220 1242
1221 for (;;) 1243 for (;;)
1222 { 1244 {
1245 p = FcPatternDuplicate (match);
1223 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1224 1247
1225 if (!f) 1248 if (!f)
1226 { 1249 {
1250 FcPatternDestroy (p);
1227 success = false; 1251 success = false;
1228 break; 1252 break;
1229 } 1253 }
1230 1254
1231 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1239 1263
1240 XftUnlockFace (f); 1264 XftUnlockFace (f);
1241 1265
1242 int glheight = height; 1266 int glheight = height;
1243 1267
1244 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++)
1245 { 1269 {
1246 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1247 1271
1248 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1249 && ch > 0x100 1273 && ch > 0x100
… …
1268 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1269 } 1293 }
1270 1294
1271 if (!width) 1295 if (!width)
1272 { 1296 {
1273 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);
1274 1298 width = f->max_advance_width;
1275 XftFontClose (disp, f);
1276 f = 0;
1277
1278 success = false;
1279 break; 1299 break;
1280 } 1300 }
1281 1301
1282 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1283 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1318bool 1338bool
1319rxvt_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
1320{ 1340{
1321 careful = false; 1341 careful = false;
1322 1342
1343 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // allm chars in sequence must be available
1348 for (int i = 0; i < nchrs; ++i)
1323 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1324 return false; 1350 return false;
1325 1351
1326 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1327 return true; 1353 return true;
1328 1354
1329 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1330 FcChar32 ch = unicode; 1356
1357 // we check against all glyph sizes. this is probably wrong,
1358 // due to the way ->draw positions these glyphs.
1359 for (int i = 0; i < nchrs; ++i)
1360 {
1331 XGlyphInfo g; 1361 XGlyphInfo g;
1332 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1333 1363
1334 int w = g.width - g.x; 1364 int w = g.width - g.x;
1335 int wcw = max (WCWIDTH (unicode), 1);
1336 1365
1337 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1338 1367
1339 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1340 return false; 1369 return false;
1341 1370
1342 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1343 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1344 return false; 1373 return false;
1374 }
1345 1375
1346 return true; 1376 return true;
1347} 1377}
1348 1378
1349void 1379void
1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1351 const text_t *text, int len, 1381 const text_t *text, int len,
1352 int fg, int bg) 1382 int fg, int bg)
1353{ 1383{
1354 XGlyphInfo extents;
1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1356 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1357 1387
1358 dTermDisplay; 1388 dTermDisplay;
1359 dTermGC; 1389 dTermGC;
1360 1390
1361 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1372 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1373 1403
1374 while (len) 1404 while (len)
1375 { 1405 {
1376 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1377 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1378 1411
1379 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1380 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1381 1414
1382 if (fc != ' ') // skip spaces 1415 if (chrs [0] != ' ') // skip spaces
1416 {
1417 #if 1
1418 FT_UInt glyphs [decltype (exp)::max_size];
1419
1420 for (int i = 0; i < nchrs; ++i)
1421 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1422
1423 for (int i = 0; i < nchrs; ++i)
1383 { 1424 {
1425 XGlyphInfo ep;
1426 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1427 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);
1428 }
1429 #endif
1430
1384 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1385 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1386 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1387 ep->glyph = glyph; 1439 ep.glyph = glyph;
1388 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1389 ep->y = y_ + ascent; 1441 ep.y = cy;
1390 1442
1391 if (extents.xOff == 0) 1443 enc.push_back (ep);
1392 ep->x = x_ + cwidth;
1393 1444
1394 ep++; 1445 for (int i = 1; ecb_expect_false (i < nchrs); ++i)
1446 {
1447 FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
1448 XGlyphInfo extents;
1449 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1450
1451 ep.glyph = glyph;
1452 ep.x = cx + (extents.xOff ? 0 : extents0.xOff);
1453
1454 enc.push_back (ep);
1455 }
1395 } 1456 }
1396 1457
1397 x_ += cwidth; 1458 x_ += cwidth;
1398 } 1459 }
1399 1460
1400 if (buffered) 1461 if (buffered)
1401 { 1462 {
1402 if (ep != enc) 1463 if (!enc.empty ())
1403 { 1464 {
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1405 1466
1406#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_IMG
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1468 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408 1469
1409 if (term->bgPixmap.pixmap 1470 if (term->bg_img
1410 && (bg == Color_transparent || bg == Color_bg 1471 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1472 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1412 { 1473 {
1413 int src_x = x, src_y = y; 1474 int src_x = x, src_y = y;
1414 1475
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1476 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1416 { 1477 {
1417 src_x += term->window_vt_x; 1478 src_x += term->window_vt_x;
1418 src_y += term->window_vt_y; 1479 src_y += term->window_vt_y;
1419 } 1480 }
1420 1481
1421 if (term->bgPixmap.pmap_width >= src_x + w 1482 if (term->bg_img->w >= src_x + w
1422 && term->bgPixmap.pmap_height >= src_y + h) 1483 && term->bg_img->h >= src_y + h)
1423 { 1484 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1485 XCopyArea (disp, term->bg_img->pm, d2, gc,
1425 src_x, src_y, w, h, 0, 0); 1486 src_x, src_y, w, h, 0, 0);
1426 } 1487 }
1427 else 1488 else
1428 { 1489 {
1429 XGCValues gcv; 1490 XGCValues gcv;
1430 1491
1431 gcv.fill_style = FillTiled; 1492 gcv.fill_style = FillTiled;
1432 gcv.tile = term->bgPixmap.pixmap; 1493 gcv.tile = term->bg_img->pm;
1433 gcv.ts_x_origin = -src_x; 1494 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y; 1495 gcv.ts_y_origin = -src_y;
1435 1496
1436 XChangeGC (disp, gc, 1497 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1498 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1453 } 1514 }
1454 else 1515 else
1455#endif 1516#endif
1456 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1517 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1457 1518
1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1460 } 1521 }
1461 else 1522 else
1462 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1463 } 1524 }
1464 else 1525 else
1465 { 1526 {
1466 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1467 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1468 } 1529 }
1469} 1530}
1470 1531
1471#endif 1532#endif
1472 1533
… …
1597 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1658 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1598 else 1659 else
1599 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1660 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1600 1661
1601 desc++; 1662 desc++;
1602 while (*desc <= ' ') desc++; 1663 while (*desc <= ' ' && *desc) desc++;
1603 } 1664 }
1604 1665
1605 end = strchr (desc, ','); 1666 end = strchr (desc, ',');
1606 if (!end) 1667 if (!end)
1607 end = desc + strlen (desc); 1668 end = desc + strlen (desc);
… …
1612 buf[end - desc] = 0; 1673 buf[end - desc] = 0;
1613 1674
1614 push_font (new_font (buf, cs)); 1675 push_font (new_font (buf, cs));
1615 } 1676 }
1616 else 1677 else
1617 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1678 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1618 1679
1619 desc = end + 1; 1680 desc = end + 1;
1620 } 1681 }
1621 while (*end); 1682 while (*end);
1622 } 1683 }
… …
1668} 1729}
1669 1730
1670int 1731int
1671rxvt_fontset::find_font_idx (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1672{ 1733{
1673 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1674 return 0; 1736 return 0;
1675 1737
1676 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1677 1739
1678 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1679 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1680 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1681 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1682 1744
1683 unsigned int i; 1745 unsigned int i;
1684 1746
1685 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1686 { 1748 {
… …
1710 } 1772 }
1711 1773
1712 next_font: 1774 next_font:
1713 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1714 { 1776 {
1777 // compose characters are handled by the default font, unless another font takes over
1778 // we do not go via the fallback list for speed reasons.
1779 if (IS_COMPOSE (unicode))
1780 return 0;
1781
1715 if (fallback->name) 1782 if (fallback->name)
1716 { 1783 {
1717 // search through the fallback list 1784 // search through the fallback list
1718 push_font (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1719 fallback++; 1786 fallback++;
… …
1725 // way to configure this and xft is easier to hack in, 1792 // way to configure this and xft is easier to hack in,
1726 // while x11 has more framework in place already. 1793 // while x11 has more framework in place already.
1727 // TODO: this is a real resource hog, xft takes ages(?) 1794 // TODO: this is a real resource hog, xft takes ages(?)
1728#if XFT && USE_SLOW_LOOKUP 1795#if XFT && USE_SLOW_LOOKUP
1729 // grab the first xft font that seems suitable 1796 // grab the first xft font that seems suitable
1797 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1730 FcPattern *p = FcPatternCreate (); 1798 FcPattern *p = FcPatternCreate ();
1731 1799
1732 FcCharSet *s = FcCharSetCreate (); 1800 FcCharSet *s = FcCharSetCreate ();
1733 FcCharSetAddChar (s, unicode); 1801 FcCharSetAddChar (s, unicode);
1734 FcPatternAddCharSet (p, FC_CHARSET, s); 1802 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1778 while (hi >= fmap.size ()) 1846 while (hi >= fmap.size ())
1779 fmap.push_back (0); 1847 fmap.push_back (0);
1780 1848
1781 if (!fmap[hi]) 1849 if (!fmap[hi])
1782 { 1850 {
1783 fmap[hi] = (pagemap *)new pagemap; 1851 fmap[hi] = new pagemap;
1784 memset (fmap[hi], 0xff, sizeof (pagemap)); 1852 memset (fmap[hi], 0xff, sizeof (pagemap));
1785 } 1853 }
1786 1854
1787 (*fmap[hi])[unicode & 0xff] = i; 1855 (*fmap[hi])[unicode & 0xff] = i;
1788 } 1856 }

Diff Legend

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