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.176 by sf-exg, Fri Jan 28 00:08:58 2011 UTC vs.
Revision 1.206 by root, Thu Jun 17 19:37:28 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 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->bg_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 ();
… …
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
… …
1241 1263
1242 XftUnlockFace (f); 1264 XftUnlockFace (f);
1243 1265
1244 int glheight = height; 1266 int glheight = height;
1245 1267
1246 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++)
1247 { 1269 {
1248 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1249 1271
1250 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1251 && ch > 0x100 1273 && ch > 0x100
… …
1270 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1271 } 1293 }
1272 1294
1273 if (!width) 1295 if (!width)
1274 { 1296 {
1275 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);
1276 1298 width = f->max_advance_width;
1277 XftFontClose (disp, f);
1278 f = 0;
1279
1280 success = false;
1281 break; 1299 break;
1282 } 1300 }
1283 1301
1284 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1285 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1320bool 1338bool
1321rxvt_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
1322{ 1340{
1323 careful = false; 1341 careful = false;
1324 1342
1343 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // we handle the sequence if the first char is available
1325 if (!XftCharExists (term->dpy, f, unicode)) 1348 if (!XftCharExists (term->dpy, f, chrs [0]))
1326 return false; 1349 return false;
1327 1350
1328 if (!prop || prop->width == rxvt_fontprop::unset) 1351 if (!prop || prop->width == rxvt_fontprop::unset)
1329 return true; 1352 return true;
1353
1354 // but we check against the whoile sequence bounding box
1330 1355
1331 // check character against base font bounding box 1356 // check character against base font bounding box
1332 FcChar32 ch = unicode; 1357 FcChar32 ch = unicode;
1333 XGlyphInfo g; 1358 XGlyphInfo g;
1334 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1359 XftTextExtents32 (term->dpy, f, chrs, nchrs, &g);
1335 1360
1336 int w = g.width - g.x; 1361 int w = g.width - g.x;
1337 int wcw = max (WCWIDTH (unicode), 1); 1362 int wcw = max (WCWIDTH (chrs [0]), 1);
1338 1363
1339 careful = g.x > 0 || w > prop->width * wcw; 1364 careful = g.x > 0 || w > prop->width * wcw;
1340 1365
1341 if (careful && !OVERLAP_OK (w, wcw, prop)) 1366 if (careful && !OVERLAP_OK (w, wcw, prop))
1342 return false; 1367 return false;
… …
1352rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1377rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1353 const text_t *text, int len, 1378 const text_t *text, int len,
1354 int fg, int bg) 1379 int fg, int bg)
1355{ 1380{
1356 XGlyphInfo extents; 1381 XGlyphInfo extents;
1357 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1382 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1358 XftGlyphSpec *ep = enc; 1383 //XftGlyphSpec *ep = enc;//D
1384 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1359 1385
1360 dTermDisplay; 1386 dTermDisplay;
1361 dTermGC; 1387 dTermGC;
1362 1388
1363 int w = term->fwidth * len; 1389 int w = term->fwidth * len;
… …
1374 int y_ = buffered ? 0 : y; 1400 int y_ = buffered ? 0 : y;
1375 1401
1376 while (len) 1402 while (len)
1377 { 1403 {
1378 int cwidth = term->fwidth; 1404 int cwidth = term->fwidth;
1405
1406 rxvt_compose_expand_static<FcChar32> exp;
1379 FcChar32 fc = *text++; len--; 1407 FcChar32 *chrs = exp (*text++); len--;
1408 int nchrs = exp.length (chrs);
1380 1409
1381 while (len && *text == NOCHAR) 1410 while (len && *text == NOCHAR)
1382 text++, len--, cwidth += term->fwidth; 1411 text++, len--, cwidth += term->fwidth;
1383 1412
1384 if (fc != ' ') // skip spaces 1413 if (chrs [0] != ' ') // skip spaces
1385 { 1414 {
1415 FT_UInt glyphs [rxvt_compose_expand_static<FcChar32>::max_size];
1416
1417 for (int i = 0; i < nchrs; ++i)
1386 FT_UInt glyph = XftCharIndex (disp, f, fc); 1418 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1419
1387 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1420 XftGlyphExtents (disp, f, glyphs, nchrs, &extents);
1388 1421
1389 ep->glyph = glyph; 1422 XftGlyphSpec ep;
1423
1390 ep->x = x_ + (cwidth - extents.xOff >> 1); 1424 ep.x = x_ + (cwidth - extents.xOff >> 1);
1391 ep->y = y_ + ascent; 1425 ep.y = y_ + ascent;
1392 1426
1393 if (extents.xOff == 0) 1427 if (extents.xOff == 0)
1394 ep->x = x_ + cwidth; 1428 ep.x = x_ + cwidth;
1395 1429
1396 ep++; 1430 for (int i = 0; i < nchrs; ++i)
1431 {
1432 ep.glyph = glyphs [i];
1433 enc.push_back (ep);
1434 }
1397 } 1435 }
1398 1436
1399 x_ += cwidth; 1437 x_ += cwidth;
1400 } 1438 }
1401 1439
1402 if (buffered) 1440 if (buffered)
1403 { 1441 {
1404 if (ep != enc) 1442 if (!enc.empty ())
1405 { 1443 {
1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1444 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1407 1445
1408#ifdef HAVE_BG_PIXMAP 1446#ifdef HAVE_IMG
1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1447 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1410 1448
1411 if (term->bg_pixmap 1449 if (term->bg_img
1412 && (bg == Color_transparent || bg == Color_bg 1450 && (bg == Color_transparent || bg == Color_bg
1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1451 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1414 { 1452 {
1415 int src_x = x, src_y = y; 1453 int src_x = x, src_y = y;
1416 1454
… …
1418 { 1456 {
1419 src_x += term->window_vt_x; 1457 src_x += term->window_vt_x;
1420 src_y += term->window_vt_y; 1458 src_y += term->window_vt_y;
1421 } 1459 }
1422 1460
1423 if (term->bg_pmap_width >= src_x + w 1461 if (term->bg_img->w >= src_x + w
1424 && term->bg_pmap_height >= src_y + h) 1462 && term->bg_img->h >= src_y + h)
1425 { 1463 {
1426 XCopyArea (disp, term->bg_pixmap, d2, gc, 1464 XCopyArea (disp, term->bg_img->pm, d2, gc,
1427 src_x, src_y, w, h, 0, 0); 1465 src_x, src_y, w, h, 0, 0);
1428 } 1466 }
1429 else 1467 else
1430 { 1468 {
1431 XGCValues gcv; 1469 XGCValues gcv;
1432 1470
1433 gcv.fill_style = FillTiled; 1471 gcv.fill_style = FillTiled;
1434 gcv.tile = term->bg_pixmap; 1472 gcv.tile = term->bg_img->pm;
1435 gcv.ts_x_origin = -src_x; 1473 gcv.ts_x_origin = -src_x;
1436 gcv.ts_y_origin = -src_y; 1474 gcv.ts_y_origin = -src_y;
1437 1475
1438 XChangeGC (disp, gc, 1476 XChangeGC (disp, gc,
1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1477 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1455 } 1493 }
1456 else 1494 else
1457#endif 1495#endif
1458 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1496 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1459 1497
1460 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1498 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1461 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1499 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1462 } 1500 }
1463 else 1501 else
1464 clear_rect (d, x, y, w, h, bg); 1502 clear_rect (d, x, y, w, h, bg);
1465 } 1503 }
1466 else 1504 else
1467 { 1505 {
1468 clear_rect (d, x, y, w, h, bg); 1506 clear_rect (d, x, y, w, h, bg);
1469 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1507 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1470 } 1508 }
1471} 1509}
1472 1510
1473#endif 1511#endif
1474 1512
… …
1599 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1637 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1600 else 1638 else
1601 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1639 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1602 1640
1603 desc++; 1641 desc++;
1604 while (*desc <= ' ') desc++; 1642 while (*desc <= ' ' && *desc) desc++;
1605 } 1643 }
1606 1644
1607 end = strchr (desc, ','); 1645 end = strchr (desc, ',');
1608 if (!end) 1646 if (!end)
1609 end = desc + strlen (desc); 1647 end = desc + strlen (desc);
… …
1670} 1708}
1671 1709
1672int 1710int
1673rxvt_fontset::find_font_idx (unicode_t unicode) 1711rxvt_fontset::find_font_idx (unicode_t unicode)
1674{ 1712{
1675 if (unicode >= 1<<20) 1713 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1714 if (unicode > 0x1fffff)
1676 return 0; 1715 return 0;
1677 1716
1678 unicode_t hi = unicode >> 8; 1717 unicode_t hi = unicode >> 8;
1679 1718
1680 if (hi < fmap.size () 1719 if (hi < fmap.size ())
1681 && fmap[hi] 1720 if (pagemap *pm = fmap[hi])
1682 && (*fmap[hi])[unicode & 0xff] != 0xff) 1721 if ((*pm)[unicode & 0xff] != 0xff)
1683 return (*fmap[hi])[unicode & 0xff]; 1722 return (*pm)[unicode & 0xff];
1684 1723
1685 unsigned int i; 1724 unsigned int i;
1686 1725
1687 for (i = 0; i < fonts.size (); i++) 1726 for (i = 0; i < fonts.size (); i++)
1688 { 1727 {
… …
1712 } 1751 }
1713 1752
1714 next_font: 1753 next_font:
1715 if (i == fonts.size () - 1) 1754 if (i == fonts.size () - 1)
1716 { 1755 {
1756 // compose characters are handled by the default font, unless another font takes over
1757 // we do not go via the fallback list for speed reasons.
1758 if (IS_COMPOSE (unicode))
1759 return 0;
1760
1717 if (fallback->name) 1761 if (fallback->name)
1718 { 1762 {
1719 // search through the fallback list 1763 // search through the fallback list
1720 push_font (new_font (fallback->name, fallback->cs)); 1764 push_font (new_font (fallback->name, fallback->cs));
1721 fallback++; 1765 fallback++;
… …
1727 // way to configure this and xft is easier to hack in, 1771 // way to configure this and xft is easier to hack in,
1728 // while x11 has more framework in place already. 1772 // while x11 has more framework in place already.
1729 // TODO: this is a real resource hog, xft takes ages(?) 1773 // TODO: this is a real resource hog, xft takes ages(?)
1730#if XFT && USE_SLOW_LOOKUP 1774#if XFT && USE_SLOW_LOOKUP
1731 // grab the first xft font that seems suitable 1775 // grab the first xft font that seems suitable
1776 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1732 FcPattern *p = FcPatternCreate (); 1777 FcPattern *p = FcPatternCreate ();
1733 1778
1734 FcCharSet *s = FcCharSetCreate (); 1779 FcCharSet *s = FcCharSetCreate ();
1735 FcCharSetAddChar (s, unicode); 1780 FcCharSetAddChar (s, unicode);
1736 FcPatternAddCharSet (p, FC_CHARSET, s); 1781 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1780 while (hi >= fmap.size ()) 1825 while (hi >= fmap.size ())
1781 fmap.push_back (0); 1826 fmap.push_back (0);
1782 1827
1783 if (!fmap[hi]) 1828 if (!fmap[hi])
1784 { 1829 {
1785 fmap[hi] = (pagemap *)new pagemap; 1830 fmap[hi] = new pagemap;
1786 memset (fmap[hi], 0xff, sizeof (pagemap)); 1831 memset (fmap[hi], 0xff, sizeof (pagemap));
1787 } 1832 }
1788 1833
1789 (*fmap[hi])[unicode & 0xff] = i; 1834 (*fmap[hi])[unicode & 0xff] = i;
1790 } 1835 }

Diff Legend

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