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.180 by sf-exg, Mon May 30 18:39:03 2011 UTC vs.
Revision 1.222 by sf-exg, Sun Nov 21 15:49:49 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:DejaVu 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" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 143
145 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 146#endif
148 147
… …
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 {
… …
508 } 517 }
509 518
510 bool load (const rxvt_fontprop &prop, bool force_prop) 519 bool load (const rxvt_fontprop &prop, bool force_prop)
511 { 520 {
512 width = 1; height = 1; 521 width = 1; height = 1;
513 ascent = 1; descent = 0; 522 ascent = 1;
523 descent = (*fs)[2]->descent;
514 524
515 set_name (strdup ("built-in rendition overflow font")); 525 set_name (strdup ("built-in rendition overflow font"));
516 526
517 return true; 527 return true;
518 } 528 }
… …
540 } 550 }
541}; 551};
542 552
543///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
544 554
545struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
546 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
547 558
548 void clear (); 559 void clear ();
549 560
550 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
… …
817 XFreeFontNames (list); 828 XFreeFontNames (list);
818 829
819 // this loop only iterates when the guessed font-size is too small 830 // this loop only iterates when the guessed font-size is too small
820 for (;;) 831 for (;;)
821 { 832 {
822 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
823 834
824 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
825 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
826 best = w; 837 best = w;
827 838
828 if (!best->name 839 if (!best->name
829 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
830 break; 841 break;
… …
925 } 936 }
926#endif 937#endif
927 938
928 width = 1; 939 width = 1;
929 940
930 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) 941 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
931 { 942 {
932 if (FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
933 continue; 944 continue;
934 945
935 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
936 bool careful; 947 bool careful;
937 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
938 continue; 949 continue;
939 950
940 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
941 953
942 XCharStruct g; 954 XCharStruct g;
943 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
945 957
… …
1045 dTermDisplay; 1057 dTermDisplay;
1046 dTermGC; 1058 dTermGC;
1047 1059
1048 bool slow = this->slow 1060 bool slow = this->slow
1049 || width != term->fwidth 1061 || width != term->fwidth
1050 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
1051 1064
1052 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
1053 1066
1054 XGCValues v; 1067 XGCValues v;
1055 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
1123 1136
1124///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1125 1138
1126#if XFT 1139#if XFT
1127 1140
1128struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1143#if XFT_CHAR_CACHE
1144 // we cache the qascii range xoffsets in the name of speed,
1145 // expecting terminals to deal mostly with these characters
1146 // we also assume the xoff always fits into uint8_t,
1147 // which is questionable, but let's see...
1148 // also, it is uncomfortably big, due to the uints.
1149 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1150 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1151 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1152#endif
1153
1129 rxvt_font_xft () { f = 0; } 1154 rxvt_font_xft ()
1155 {
1156 f = 0;
1157 }
1130 1158
1131 void clear (); 1159 void clear ();
1132 1160
1133 rxvt_fontprop properties (); 1161 rxvt_fontprop properties ();
1134 1162
… …
1236 break; 1264 break;
1237 } 1265 }
1238 1266
1239 FT_Face face = XftLockFace (f); 1267 FT_Face face = XftLockFace (f);
1240 1268
1269 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1270 // we also assume blindly that if the first lock succeeeds, then subsequent
1271 // locks will also succeed.
1272 if (!face)
1273 {
1274 XftFontClose (disp, f);
1275 success = false;
1276 break;
1277 }
1278
1241 ascent = (face->size->metrics.ascender + 63) >> 6; 1279 ascent = (face->size->metrics.ascender + 63) >> 6;
1242 descent = (-face->size->metrics.descender + 63) >> 6; 1280 descent = (-face->size->metrics.descender + 63) >> 6;
1243 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1281 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1244 width = 0; 1282 width = 0;
1245 1283
… …
1247 1285
1248 XftUnlockFace (f); 1286 XftUnlockFace (f);
1249 1287
1250 int glheight = height; 1288 int glheight = height;
1251 1289
1252 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) 1290 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1253 { 1291 {
1254 FcChar16 ch = *t; 1292 FcChar16 ch = *t;
1255 1293
1256 if (cs != CS_UNICODE 1294 if (cs != CS_UNICODE
1257 && ch > 0x100 1295 && ch > 0x100
… …
1276 if (glheight < g.height - g.y) glheight = g.height - g.y; 1314 if (glheight < g.height - g.y) glheight = g.height - g.y;
1277 } 1315 }
1278 1316
1279 if (!width) 1317 if (!width)
1280 { 1318 {
1281 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1319 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1282 1320 width = f->max_advance_width;
1283 XftFontClose (disp, f);
1284 f = 0;
1285
1286 success = false;
1287 break; 1321 break;
1288 } 1322 }
1289 1323
1290 if (prop.height == rxvt_fontprop::unset 1324 if (prop.height == rxvt_fontprop::unset
1291 || (height <= prop.height && glheight <= prop.height) 1325 || (height <= prop.height && glheight <= prop.height)
… …
1318 clear (); 1352 clear ();
1319 success = false; 1353 success = false;
1320 } 1354 }
1321#endif 1355#endif
1322 1356
1357#if XFT_CHAR_CACHE
1358 // populate char cache
1359 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1360 {
1361 FT_UInt glyph = XftCharIndex (disp, f, ch);
1362 glyph_cache [ch - char_cache_min] = glyph;
1363
1364 XGlyphInfo g;
1365 XftGlyphExtents (disp, f, &glyph, 1, &g);
1366 xoff_cache [ch - char_cache_min] = g.xOff;
1367 }
1368#endif
1369
1323 return success; 1370 return success;
1324} 1371}
1325 1372
1326bool 1373bool
1327rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1374rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1328{ 1375{
1329 careful = false; 1376 careful = false;
1330 1377
1378 // handle non-bmp chars when text_t is 16 bit
1379#if ENABLE_COMBINING && !UNICODE_3
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1381 if (compose_char *cc = rxvt_composite [unicode])
1382 if (cc->c2 == NOCHAR)
1383 unicode = cc->c1;
1384 else
1385 return false;
1386 else
1387 return false;
1388#endif
1389
1390 FcChar32 chr = unicode;
1391
1331 if (!XftCharExists (term->dpy, f, unicode)) 1392 if (!XftCharExists (term->dpy, f, chr))
1332 return false; 1393 return false;
1333 1394
1334 if (!prop || prop->width == rxvt_fontprop::unset) 1395 if (!prop || prop->width == rxvt_fontprop::unset)
1335 return true; 1396 return true;
1336 1397
1337 // check character against base font bounding box 1398 int wcw = max (WCWIDTH (chr), 1);
1338 FcChar32 ch = unicode; 1399
1339 XGlyphInfo g; 1400 XGlyphInfo g;
1340 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1401 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1402
1403 int cwidth = prop->width * wcw;
1404
1405 // use same adjustments as in ->draw, see there
1406 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1407 g.x += g.xOff ? 0 : cwidth;
1341 1408
1342 int w = g.width - g.x; 1409 int w = g.width - g.x;
1343 int wcw = max (WCWIDTH (unicode), 1);
1344 1410
1345 careful = g.x > 0 || w > prop->width * wcw; 1411 careful = g.x > 0 || w > cwidth;
1346 1412
1347 if (careful && !OVERLAP_OK (w, wcw, prop)) 1413 if (careful && !OVERLAP_OK (w, wcw, prop))
1348 return false; 1414 return false;
1349 1415
1350 // this weeds out _totally_ broken fonts, or glyphs 1416 // this weeds out _totally_ broken fonts, or glyphs
… …
1357void 1423void
1358rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1424rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1359 const text_t *text, int len, 1425 const text_t *text, int len,
1360 int fg, int bg) 1426 int fg, int bg)
1361{ 1427{
1362 XGlyphInfo extents;
1363 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1428 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1364 XftGlyphSpec *ep = enc; 1429 XftGlyphSpec *ep = enc;
1365 1430
1366 dTermDisplay; 1431 dTermDisplay;
1367 dTermGC; 1432 dTermGC;
… …
1380 int y_ = buffered ? 0 : y; 1445 int y_ = buffered ? 0 : y;
1381 1446
1382 while (len) 1447 while (len)
1383 { 1448 {
1384 int cwidth = term->fwidth; 1449 int cwidth = term->fwidth;
1385 FcChar32 fc = *text++; len--; 1450 FcChar32 chr = *text++; len--;
1386 1451
1387 while (len && *text == NOCHAR) 1452 while (len && *text == NOCHAR)
1388 text++, len--, cwidth += term->fwidth; 1453 text++, len--, cwidth += term->fwidth;
1389 1454
1390 if (fc != ' ') // skip spaces 1455 if (chr != ' ') // skip spaces
1456 {
1457 // handle non-bmp chars when text_t is 16 bit
1458 #if ENABLE_COMBINING && !UNICODE_3
1459 if (ecb_expect_false (IS_COMPOSE (chr)))
1460 if (compose_char *cc = rxvt_composite [chr])
1461 if (cc->c2 == NOCHAR)
1462 chr = cc->c1;
1463 #endif
1464
1465 #if 0
1466 FT_UInt glyphs [decltype (exp)::max_size];
1467
1468 for (int i = 0; i < nchrs; ++i)
1469 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1470
1471 for (int i = 0; i < nchrs; ++i)
1391 { 1472 {
1473 XGlyphInfo ep;
1474 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1475 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);
1476 }
1477 #endif
1478
1479 FT_UInt glyph;
1480 int xOff;
1481
1482 #if XFT_CHAR_CACHE
1483 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1484 {
1485 glyph = glyph_cache [chr - char_cache_min];
1486 xOff = xoff_cache [chr - char_cache_min];
1487 }
1488 else
1489 #endif
1490 {
1392 FT_UInt glyph = XftCharIndex (disp, f, fc); 1491 glyph = XftCharIndex (disp, f, chr);
1492 XGlyphInfo extents;
1393 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1493 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1494 xOff = extents.xOff;
1495 }
1394 1496
1395 ep->glyph = glyph; 1497 ep->glyph = glyph;
1396 ep->x = x_ + (cwidth - extents.xOff >> 1); 1498 ep->x = x_;
1397 ep->y = y_ + ascent; 1499 ep->y = y_ + ascent;
1398 1500
1399 if (extents.xOff == 0) 1501 // the xft font cell might differ from the terminal font cell,
1502 // in which case we use the average between the two.
1503 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1504
1505 // xft/freetype represent combining characters as characters with zero
1506 // width rendered over the previous character with some fonts, while
1507 // in other fonts, they are considered normal characters, while yet
1508 // in other fonts, they are shifted all over the place.
1509 // we handle the first two cases by keying off on xOff being 0
1510 // for zero-width chars. normally, we would add extents.xOff
1511 // of the base character here, but we don't have that, so we use cwidth.
1400 ep->x = x_ + cwidth; 1512 ep->x += xOff ? 0 : cwidth;
1401 1513
1402 ep++; 1514 ++ep;
1403 } 1515 }
1404 1516
1405 x_ += cwidth; 1517 x_ += cwidth;
1406 } 1518 }
1407 1519
… …
1409 { 1521 {
1410 if (ep != enc) 1522 if (ep != enc)
1411 { 1523 {
1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1524 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1413 1525
1414#ifdef HAVE_BG_PIXMAP 1526#ifdef HAVE_IMG
1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1527 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1416 1528
1417 if (term->bg_pixmap 1529 if (term->bg_img
1418 && (bg == Color_transparent || bg == Color_bg 1530 && (bg == Color_transparent || bg == Color_bg
1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1531 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1420 { 1532 {
1421 int src_x = x, src_y = y; 1533 int src_x = x, src_y = y;
1422 1534
… …
1424 { 1536 {
1425 src_x += term->window_vt_x; 1537 src_x += term->window_vt_x;
1426 src_y += term->window_vt_y; 1538 src_y += term->window_vt_y;
1427 } 1539 }
1428 1540
1429 if (term->bg_pmap_width >= src_x + w 1541 if (term->bg_img->w >= src_x + w
1430 && term->bg_pmap_height >= src_y + h) 1542 && term->bg_img->h >= src_y + h)
1431 { 1543 {
1432 XCopyArea (disp, term->bg_pixmap, d2, gc, 1544 XCopyArea (disp, term->bg_img->pm, d2, gc,
1433 src_x, src_y, w, h, 0, 0); 1545 src_x, src_y, w, h, 0, 0);
1434 } 1546 }
1435 else 1547 else
1436 { 1548 {
1437 XGCValues gcv; 1549 XGCValues gcv;
1438 1550
1439 gcv.fill_style = FillTiled; 1551 gcv.fill_style = FillTiled;
1440 gcv.tile = term->bg_pixmap; 1552 gcv.tile = term->bg_img->pm;
1441 gcv.ts_x_origin = -src_x; 1553 gcv.ts_x_origin = -src_x;
1442 gcv.ts_y_origin = -src_y; 1554 gcv.ts_y_origin = -src_y;
1443 1555
1444 XChangeGC (disp, gc, 1556 XChangeGC (disp, gc,
1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1557 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1605 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1717 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1606 else 1718 else
1607 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1719 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1608 1720
1609 desc++; 1721 desc++;
1610 while (*desc <= ' ') desc++; 1722 while (*desc <= ' ' && *desc) desc++;
1611 } 1723 }
1612 1724
1613 end = strchr (desc, ','); 1725 end = strchr (desc, ',');
1614 if (!end) 1726 if (!end)
1615 end = desc + strlen (desc); 1727 end = desc + strlen (desc);
… …
1676} 1788}
1677 1789
1678int 1790int
1679rxvt_fontset::find_font_idx (unicode_t unicode) 1791rxvt_fontset::find_font_idx (unicode_t unicode)
1680{ 1792{
1681 if (unicode >= 1<<20) 1793 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1794 if (unicode > 0x1fffff)
1682 return 0; 1795 return 0;
1683 1796
1684 unicode_t hi = unicode >> 8; 1797 unicode_t hi = unicode >> 8;
1685 1798
1686 if (hi < fmap.size () 1799 if (hi < fmap.size ())
1687 && fmap[hi] 1800 if (pagemap *pm = fmap[hi])
1688 && (*fmap[hi])[unicode & 0xff] != 0xff) 1801 if ((*pm)[unicode & 0xff] != 0xff)
1689 return (*fmap[hi])[unicode & 0xff]; 1802 return (*pm)[unicode & 0xff];
1690 1803
1691 unsigned int i; 1804 unsigned int i;
1692 1805
1693 for (i = 0; i < fonts.size (); i++) 1806 for (i = 0; i < fonts.size (); i++)
1694 { 1807 {
… …
1718 } 1831 }
1719 1832
1720 next_font: 1833 next_font:
1721 if (i == fonts.size () - 1) 1834 if (i == fonts.size () - 1)
1722 { 1835 {
1836 // compose characters are handled by the default font, unless another font takes over
1837 // we do not go via the fallback list for speed reasons.
1838 if (IS_COMPOSE (unicode))
1839 return 0;
1840
1723 if (fallback->name) 1841 if (fallback->name)
1724 { 1842 {
1725 // search through the fallback list 1843 // search through the fallback list
1726 push_font (new_font (fallback->name, fallback->cs)); 1844 push_font (new_font (fallback->name, fallback->cs));
1727 fallback++; 1845 fallback++;
… …
1733 // way to configure this and xft is easier to hack in, 1851 // way to configure this and xft is easier to hack in,
1734 // while x11 has more framework in place already. 1852 // while x11 has more framework in place already.
1735 // TODO: this is a real resource hog, xft takes ages(?) 1853 // TODO: this is a real resource hog, xft takes ages(?)
1736#if XFT && USE_SLOW_LOOKUP 1854#if XFT && USE_SLOW_LOOKUP
1737 // grab the first xft font that seems suitable 1855 // grab the first xft font that seems suitable
1856 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1738 FcPattern *p = FcPatternCreate (); 1857 FcPattern *p = FcPatternCreate ();
1739 1858
1740 FcCharSet *s = FcCharSetCreate (); 1859 FcCharSet *s = FcCharSetCreate ();
1741 FcCharSetAddChar (s, unicode); 1860 FcCharSetAddChar (s, unicode);
1742 FcPatternAddCharSet (p, FC_CHARSET, s); 1861 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1786 while (hi >= fmap.size ()) 1905 while (hi >= fmap.size ())
1787 fmap.push_back (0); 1906 fmap.push_back (0);
1788 1907
1789 if (!fmap[hi]) 1908 if (!fmap[hi])
1790 { 1909 {
1791 fmap[hi] = (pagemap *)new pagemap; 1910 fmap[hi] = new pagemap;
1792 memset (fmap[hi], 0xff, sizeof (pagemap)); 1911 memset (fmap[hi], 0xff, sizeof (pagemap));
1793 } 1912 }
1794 1913
1795 (*fmap[hi])[unicode & 0xff] = i; 1914 (*fmap[hi])[unicode & 0xff] = i;
1796 } 1915 }

Diff Legend

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