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.178 by root, Mon Feb 21 07:41:03 2011 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 2021 UTC

… …
4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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
… …
1041 dTermDisplay; 1056 dTermDisplay;
1042 dTermGC; 1057 dTermGC;
1043 1058
1044 bool slow = this->slow 1059 bool slow = this->slow
1045 || width != term->fwidth 1060 || width != term->fwidth
1046 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1047 1063
1048 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1049 1065
1050 XGCValues v; 1066 XGCValues v;
1051 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1119 1135
1120///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1121 1137
1122#if XFT 1138#if XFT
1123 1139
1124struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1125 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1126 1146
1127 void clear (); 1147 void clear ();
1128 1148
1129 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1130 1150
… …
1243 1263
1244 XftUnlockFace (f); 1264 XftUnlockFace (f);
1245 1265
1246 int glheight = height; 1266 int glheight = height;
1247 1267
1248 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++)
1249 { 1269 {
1250 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1251 1271
1252 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1253 && ch > 0x100 1273 && ch > 0x100
… …
1272 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1273 } 1293 }
1274 1294
1275 if (!width) 1295 if (!width)
1276 { 1296 {
1277 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);
1278 1298 width = f->max_advance_width;
1279 XftFontClose (disp, f);
1280 f = 0;
1281
1282 success = false;
1283 break; 1299 break;
1284 } 1300 }
1285 1301
1286 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1287 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1322bool 1338bool
1323rxvt_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
1324{ 1340{
1325 careful = false; 1341 careful = false;
1326 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)
1327 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1328 return false; 1350 return false;
1329 1351
1330 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1331 return true; 1353 return true;
1332 1354
1333 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1334 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 {
1335 XGlyphInfo g; 1361 XGlyphInfo g;
1336 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1337 1363
1338 int w = g.width - g.x; 1364 int w = g.width - g.x;
1339 int wcw = max (WCWIDTH (unicode), 1);
1340 1365
1341 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1342 1367
1343 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1344 return false; 1369 return false;
1345 1370
1346 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1347 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1348 return false; 1373 return false;
1374 }
1349 1375
1350 return true; 1376 return true;
1351} 1377}
1352 1378
1353void 1379void
1354rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1355 const text_t *text, int len, 1381 const text_t *text, int len,
1356 int fg, int bg) 1382 int fg, int bg)
1357{ 1383{
1358 XGlyphInfo extents;
1359 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1360 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1361 1387
1362 dTermDisplay; 1388 dTermDisplay;
1363 dTermGC; 1389 dTermGC;
1364 1390
1365 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1376 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1377 1403
1378 while (len) 1404 while (len)
1379 { 1405 {
1380 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1381 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1382 1411
1383 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1384 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1385 1414
1386 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)
1387 { 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
1388 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1389 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1390 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1391 ep->glyph = glyph; 1439 ep.glyph = glyph;
1392 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1393 ep->y = y_ + ascent; 1441 ep.y = cy;
1394 1442
1395 if (extents.xOff == 0) 1443 enc.push_back (ep);
1396 ep->x = x_ + cwidth;
1397 1444
1398 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 }
1399 } 1456 }
1400 1457
1401 x_ += cwidth; 1458 x_ += cwidth;
1402 } 1459 }
1403 1460
1404 if (buffered) 1461 if (buffered)
1405 { 1462 {
1406 if (ep != enc) 1463 if (!enc.empty ())
1407 { 1464 {
1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1409 1466
1410#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_IMG
1411 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
1412 1469
1413 if (term->bg_pixmap 1470 if (term->bg_img
1414 && (bg == Color_transparent || bg == Color_bg 1471 && (bg == Color_transparent || bg == Color_bg
1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1472 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1416 { 1473 {
1417 int src_x = x, src_y = y; 1474 int src_x = x, src_y = y;
1418 1475
… …
1420 { 1477 {
1421 src_x += term->window_vt_x; 1478 src_x += term->window_vt_x;
1422 src_y += term->window_vt_y; 1479 src_y += term->window_vt_y;
1423 } 1480 }
1424 1481
1425 if (term->bg_pmap_width >= src_x + w 1482 if (term->bg_img->w >= src_x + w
1426 && term->bg_pmap_height >= src_y + h) 1483 && term->bg_img->h >= src_y + h)
1427 { 1484 {
1428 XCopyArea (disp, term->bg_pixmap, d2, gc, 1485 XCopyArea (disp, term->bg_img->pm, d2, gc,
1429 src_x, src_y, w, h, 0, 0); 1486 src_x, src_y, w, h, 0, 0);
1430 } 1487 }
1431 else 1488 else
1432 { 1489 {
1433 XGCValues gcv; 1490 XGCValues gcv;
1434 1491
1435 gcv.fill_style = FillTiled; 1492 gcv.fill_style = FillTiled;
1436 gcv.tile = term->bg_pixmap; 1493 gcv.tile = term->bg_img->pm;
1437 gcv.ts_x_origin = -src_x; 1494 gcv.ts_x_origin = -src_x;
1438 gcv.ts_y_origin = -src_y; 1495 gcv.ts_y_origin = -src_y;
1439 1496
1440 XChangeGC (disp, gc, 1497 XChangeGC (disp, gc,
1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1498 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1457 } 1514 }
1458 else 1515 else
1459#endif 1516#endif
1460 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);
1461 1518
1462 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1463 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1464 } 1521 }
1465 else 1522 else
1466 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1467 } 1524 }
1468 else 1525 else
1469 { 1526 {
1470 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1471 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1472 } 1529 }
1473} 1530}
1474 1531
1475#endif 1532#endif
1476 1533
… …
1601 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1658 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1602 else 1659 else
1603 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1660 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1604 1661
1605 desc++; 1662 desc++;
1606 while (*desc <= ' ') desc++; 1663 while (*desc <= ' ' && *desc) desc++;
1607 } 1664 }
1608 1665
1609 end = strchr (desc, ','); 1666 end = strchr (desc, ',');
1610 if (!end) 1667 if (!end)
1611 end = desc + strlen (desc); 1668 end = desc + strlen (desc);
… …
1672} 1729}
1673 1730
1674int 1731int
1675rxvt_fontset::find_font_idx (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1676{ 1733{
1677 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1678 return 0; 1736 return 0;
1679 1737
1680 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1681 1739
1682 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1683 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1684 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1685 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1686 1744
1687 unsigned int i; 1745 unsigned int i;
1688 1746
1689 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1690 { 1748 {
… …
1714 } 1772 }
1715 1773
1716 next_font: 1774 next_font:
1717 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1718 { 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
1719 if (fallback->name) 1782 if (fallback->name)
1720 { 1783 {
1721 // search through the fallback list 1784 // search through the fallback list
1722 push_font (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1723 fallback++; 1786 fallback++;
… …
1729 // way to configure this and xft is easier to hack in, 1792 // way to configure this and xft is easier to hack in,
1730 // while x11 has more framework in place already. 1793 // while x11 has more framework in place already.
1731 // TODO: this is a real resource hog, xft takes ages(?) 1794 // TODO: this is a real resource hog, xft takes ages(?)
1732#if XFT && USE_SLOW_LOOKUP 1795#if XFT && USE_SLOW_LOOKUP
1733 // 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
1734 FcPattern *p = FcPatternCreate (); 1798 FcPattern *p = FcPatternCreate ();
1735 1799
1736 FcCharSet *s = FcCharSetCreate (); 1800 FcCharSet *s = FcCharSetCreate ();
1737 FcCharSetAddChar (s, unicode); 1801 FcCharSetAddChar (s, unicode);
1738 FcPatternAddCharSet (p, FC_CHARSET, s); 1802 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1782 while (hi >= fmap.size ()) 1846 while (hi >= fmap.size ())
1783 fmap.push_back (0); 1847 fmap.push_back (0);
1784 1848
1785 if (!fmap[hi]) 1849 if (!fmap[hi])
1786 { 1850 {
1787 fmap[hi] = (pagemap *)new pagemap; 1851 fmap[hi] = new pagemap;
1788 memset (fmap[hi], 0xff, sizeof (pagemap)); 1852 memset (fmap[hi], 0xff, sizeof (pagemap));
1789 } 1853 }
1790 1854
1791 (*fmap[hi])[unicode & 0xff] = i; 1855 (*fmap[hi])[unicode & 0xff] = i;
1792 } 1856 }

Diff Legend

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