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.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.208 by root, Fri Jun 18 01:50:14 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" },
… …
159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
161 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
162}; 161};
163 162
164#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
165
166#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
167#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
168 165
169///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
170 167
… …
242 else if (color >= 0) 239 else if (color >= 0)
243 { 240 {
244#if XFT 241#if XFT
245 Picture dst; 242 Picture dst;
246 243
247# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
248 if (term->bgPixmap.pixmap 245 if (term->bg_img
249 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
250 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
251 { 248 {
252 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
253 250
… …
265 } 262 }
266} 263}
267 264
268///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
269 266
270struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
271 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
272 270
273 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
274 : rxvt_font () 272 : rxvt_font ()
275 { 273 {
… …
315 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 315 return true;
318#endif 316#endif
319 317
320 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
321 return true; 319 // rob other fonts from taking over.
322 320
323 switch (unicode) 321 switch (unicode)
324 { 322 {
325 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
326 case NOCHAR: 324 case NOCHAR:
… …
347 345
348 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
349 347
350 while (len) 348 while (len)
351 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
352#if ENABLE_COMBINING 356#if ENABLE_COMBINING
353 compose_char *cc; 357 compose_char *cc;
354#endif 358#endif
355 const text_t *tp = text;
356 text_t t = *tp;
357
358 while (++text, --len && *text == NOCHAR)
359 ;
360
361 int width = text - tp; 359 int width = text - tp;
362 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
363 361
364#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
365 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
447#endif 445#endif
448#if ENABLE_COMBINING 446#if ENABLE_COMBINING
449 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
450 { 448 {
451 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
452
453 text_t chrs[2]; 450 text_t chrs[2];
454 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
455 452
456 *chrs = cc->c1; 453 *chrs = cc->c1;
457 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
477 case '\t': 474 case '\t':
478 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
479 case NOCHAR: 476 case NOCHAR:
480 break; 477 break;
481 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
482 default: 488 default:
483 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
484 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
485 } 491 }
486 492
487 x += fwidth; 493 x += fwidth;
488 } 494 }
489} 495}
490 496
491struct rxvt_font_overflow : rxvt_font { 497struct rxvt_font_overflow : rxvt_font
498{
492 struct rxvt_fontset *fs; 499 struct rxvt_fontset *fs;
493 500
494 rxvt_font_overflow (rxvt_fontset *fs) 501 rxvt_font_overflow (rxvt_fontset *fs)
495 : rxvt_font () 502 : rxvt_font ()
496 { 503 {
… …
526 533
527 void draw (rxvt_drawable &d, int x, int y, 534 void draw (rxvt_drawable &d, int x, int y,
528 const text_t *text, int len, 535 const text_t *text, int len,
529 int fg, int bg) 536 int fg, int bg)
530 { 537 {
531 while (len--) 538 while (len)
532 { 539 {
533 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++;
534 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 ++text; 545 text += w;
546 len -= w;
536 x += term->fwidth; 547 x += term->fwidth * w;
537 } 548 }
538 } 549 }
539}; 550};
540 551
541///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
542 553
543struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
544 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
545 557
546 void clear (); 558 void clear ();
547 559
548 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
720 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
721 733
722 if (!f) 734 if (!f)
723 return false; 735 return false;
724 736
725 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
726 738
727 if (new_name) 739 if (new_name)
728 set_name (new_name); 740 set_name (new_name);
729 else 741 else
730 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
731 743
732 XFreeFont (disp, f); 744 XFreeFont (disp, f);
733 f = 0; 745 f = 0;
734 } 746 }
735 747
… …
792 free (fname); 804 free (fname);
793 if (replace_field (&fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
794 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
795 } 807 }
796 808
797 if (!set_properties (p, fname)) 809 if (!set_properties (p, fname)
810 // also weed out too large fonts
811 || (prop.height != rxvt_fontprop::unset
812 && p.height > prop.height))
813 {
814 free (fname);
798 continue; 815 continue;
799 816 }
800 if (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height) // weed out too large fonts
802 continue;
803 817
804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 818 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 819 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 820 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 821 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
813 XFreeFontNames (list); 827 XFreeFontNames (list);
814 828
815 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
816 for (;;) 830 for (;;)
817 { 831 {
818 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
819 833
820 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
822 best = w; 836 best = w;
823 837
824 if (!best->name 838 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 840 break;
… …
864 free (registry); 878 free (registry);
865 free (encoding); 879 free (encoding);
866 880
867 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
868 { 882 {
869 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
870 885
871 if (!charset) 886 if (!charset)
872 charset = name; 887 charset = name;
873 888
874 int count = 13; 889 int count = 13;
… …
877 break; 892 break;
878 893
879 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 895 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
882 } 899 }
883 900
884 if (cs == CS_UNKNOWN) 901 if (cs == CS_UNKNOWN)
885 { 902 {
886 clear (); 903 clear ();
… …
918 } 935 }
919#endif 936#endif
920 937
921 width = 1; 938 width = 1;
922 939
923 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 940 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
924 { 941 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 943 continue;
927 944
928 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
929 bool careful; 946 bool careful;
930 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
931 continue; 948 continue;
932 949
933 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
934 952
935 XCharStruct g; 953 XCharStruct g;
936 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
937 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
938 956
… …
964} 982}
965 983
966bool 984bool
967rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 985rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
968{ 986{
987 careful = false;
988
969 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
970 990
971 if (ch == NOCHAR) 991 if (ch == NOCHAR)
972 return false; 992 return false;
973 993
… …
1036 dTermDisplay; 1056 dTermDisplay;
1037 dTermGC; 1057 dTermGC;
1038 1058
1039 bool slow = this->slow 1059 bool slow = this->slow
1040 || width != term->fwidth 1060 || width != term->fwidth
1041 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1042 1063
1043 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1044 1065
1045 XGCValues v; 1066 XGCValues v;
1046 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1114 1135
1115///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1116 1137
1117#if XFT 1138#if XFT
1118 1139
1119struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1120 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1121 1146
1122 void clear (); 1147 void clear ();
1123 1148
1124 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1125 1150
… …
1215 int ftheight = 0; 1240 int ftheight = 0;
1216 bool success = true; 1241 bool success = true;
1217 1242
1218 for (;;) 1243 for (;;)
1219 { 1244 {
1245 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1221 1247
1222 if (!f) 1248 if (!f)
1223 { 1249 {
1250 FcPatternDestroy (p);
1224 success = false; 1251 success = false;
1225 break; 1252 break;
1226 } 1253 }
1227 1254
1228 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1236 1263
1237 XftUnlockFace (f); 1264 XftUnlockFace (f);
1238 1265
1239 int glheight = height; 1266 int glheight = height;
1240 1267
1241 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1268 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1242 { 1269 {
1243 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1244 1271
1245 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1246 && ch > 0x100 1273 && ch > 0x100
… …
1265 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1266 } 1293 }
1267 1294
1268 if (!width) 1295 if (!width)
1269 { 1296 {
1270 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1271 1298 width = f->max_advance_width;
1272 XftFontClose (disp, f);
1273 f = 0;
1274
1275 success = false;
1276 break; 1299 break;
1277 } 1300 }
1278 1301
1279 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1280 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1315bool 1338bool
1316rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1317{ 1340{
1318 careful = false; 1341 careful = false;
1319 1342
1343 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)
1320 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1321 return false; 1350 return false;
1322 1351
1323 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1324 return true; 1353 return true;
1325 1354
1326 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1327 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 {
1328 XGlyphInfo g; 1361 XGlyphInfo g;
1329 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1330 1363
1331 int w = g.width - g.x; 1364 int w = g.width - g.x;
1332 int wcw = max (WCWIDTH (unicode), 1);
1333 1365
1334 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1335 1367
1336 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1337 return false; 1369 return false;
1338 1370
1339 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1340 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1341 return false; 1373 return false;
1374 }
1342 1375
1343 return true; 1376 return true;
1344} 1377}
1345 1378
1346void 1379void
1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1348 const text_t *text, int len, 1381 const text_t *text, int len,
1349 int fg, int bg) 1382 int fg, int bg)
1350{ 1383{
1351 XGlyphInfo extents;
1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1353 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1354 1387
1355 dTermDisplay; 1388 dTermDisplay;
1356 dTermGC; 1389 dTermGC;
1357 1390
1358 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1369 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1370 1403
1371 while (len) 1404 while (len)
1372 { 1405 {
1373 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1374 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1375 1411
1376 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1377 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1378 1414
1379 if (fc != ' ') // skip spaces 1415 if (chrs [0] != ' ') // skip spaces
1416 {
1417 #if 0
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)
1380 { 1424 {
1425 XGlyphInfo ep;
1426 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1427 printf ("gs %x g %x + %d,%d o %d,%d wh %d,%d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1428 }
1429 #endif
1430
1431 for (int i = 0; i < nchrs; ++i)
1432 {
1381 FT_UInt glyph = XftCharIndex (disp, f, fc); 1433 FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
1434 XGlyphInfo extents;
1382 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1435 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1383 1436
1384 ep->glyph = glyph; 1437 XftGlyphSpec ep;
1438
1385 ep->x = x_ + (cwidth - extents.xOff >> 1); 1439 int cx = x_ + (cwidth - extents.xOff >> 1);
1386 ep->y = y_ + ascent; 1440 int cy = y_ + ascent;
1387 1441
1442 // lone combining char
1388 if (extents.xOff == 0) 1443 if (extents.xOff == 0)
1389 ep->x = x_ + cwidth; 1444 cx = x_ + cwidth;
1390 1445
1391 ep++; 1446 ep.glyph = glyph;
1447 ep.x = cx + extents.x;
1448 ep.y = cy;
1449
1450 enc.push_back (ep);
1451 }
1392 } 1452 }
1393 1453
1394 x_ += cwidth; 1454 x_ += cwidth;
1395 } 1455 }
1396 1456
1397 if (buffered) 1457 if (buffered)
1398 { 1458 {
1399 if (ep != enc) 1459 if (!enc.empty ())
1400 { 1460 {
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1461 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1462
1403#ifdef HAVE_BG_PIXMAP 1463#ifdef HAVE_IMG
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1464 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1465
1406 if (term->bgPixmap.pixmap 1466 if (term->bg_img
1407 && (bg == Color_transparent || bg == Color_bg 1467 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1468 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1469 {
1410 int src_x = x, src_y = y; 1470 int src_x = x, src_y = y;
1411 1471
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1472 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1473 {
1414 src_x += term->window_vt_x; 1474 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1475 src_y += term->window_vt_y;
1416 } 1476 }
1417 1477
1418 if (term->bgPixmap.pmap_width >= src_x + w 1478 if (term->bg_img->w >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1479 && term->bg_img->h >= src_y + h)
1420 { 1480 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1481 XCopyArea (disp, term->bg_img->pm, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1482 src_x, src_y, w, h, 0, 0);
1423 } 1483 }
1424 else 1484 else
1425 { 1485 {
1426 XGCValues gcv; 1486 XGCValues gcv;
1427 1487
1428 gcv.fill_style = FillTiled; 1488 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1489 gcv.tile = term->bg_img->pm;
1430 gcv.ts_x_origin = -src_x; 1490 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1491 gcv.ts_y_origin = -src_y;
1432 1492
1433 XChangeGC (disp, gc, 1493 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1494 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1450 } 1510 }
1451 else 1511 else
1452#endif 1512#endif
1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1513 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1454 1514
1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1515 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1516 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1457 } 1517 }
1458 else 1518 else
1459 clear_rect (d, x, y, w, h, bg); 1519 clear_rect (d, x, y, w, h, bg);
1460 } 1520 }
1461 else 1521 else
1462 { 1522 {
1463 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1464 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1524 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1465 } 1525 }
1466} 1526}
1467 1527
1468#endif 1528#endif
1469 1529
… …
1594 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1654 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1595 else 1655 else
1596 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1656 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1597 1657
1598 desc++; 1658 desc++;
1599 while (*desc <= ' ') desc++; 1659 while (*desc <= ' ' && *desc) desc++;
1600 } 1660 }
1601 1661
1602 end = strchr (desc, ','); 1662 end = strchr (desc, ',');
1603 if (!end) 1663 if (!end)
1604 end = desc + strlen (desc); 1664 end = desc + strlen (desc);
… …
1609 buf[end - desc] = 0; 1669 buf[end - desc] = 0;
1610 1670
1611 push_font (new_font (buf, cs)); 1671 push_font (new_font (buf, cs));
1612 } 1672 }
1613 else 1673 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1674 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1675
1616 desc = end + 1; 1676 desc = end + 1;
1617 } 1677 }
1618 while (*end); 1678 while (*end);
1619 } 1679 }
… …
1665} 1725}
1666 1726
1667int 1727int
1668rxvt_fontset::find_font_idx (unicode_t unicode) 1728rxvt_fontset::find_font_idx (unicode_t unicode)
1669{ 1729{
1670 if (unicode >= 1<<20) 1730 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1731 if (unicode > 0x1fffff)
1671 return 0; 1732 return 0;
1672 1733
1673 unicode_t hi = unicode >> 8; 1734 unicode_t hi = unicode >> 8;
1674 1735
1675 if (hi < fmap.size () 1736 if (hi < fmap.size ())
1676 && fmap[hi] 1737 if (pagemap *pm = fmap[hi])
1677 && (*fmap[hi])[unicode & 0xff] != 0xff) 1738 if ((*pm)[unicode & 0xff] != 0xff)
1678 return (*fmap[hi])[unicode & 0xff]; 1739 return (*pm)[unicode & 0xff];
1679 1740
1680 unsigned int i; 1741 unsigned int i;
1681 1742
1682 for (i = 0; i < fonts.size (); i++) 1743 for (i = 0; i < fonts.size (); i++)
1683 { 1744 {
… …
1707 } 1768 }
1708 1769
1709 next_font: 1770 next_font:
1710 if (i == fonts.size () - 1) 1771 if (i == fonts.size () - 1)
1711 { 1772 {
1773 // compose characters are handled by the default font, unless another font takes over
1774 // we do not go via the fallback list for speed reasons.
1775 if (IS_COMPOSE (unicode))
1776 return 0;
1777
1712 if (fallback->name) 1778 if (fallback->name)
1713 { 1779 {
1714 // search through the fallback list 1780 // search through the fallback list
1715 push_font (new_font (fallback->name, fallback->cs)); 1781 push_font (new_font (fallback->name, fallback->cs));
1716 fallback++; 1782 fallback++;
… …
1722 // way to configure this and xft is easier to hack in, 1788 // way to configure this and xft is easier to hack in,
1723 // while x11 has more framework in place already. 1789 // while x11 has more framework in place already.
1724 // TODO: this is a real resource hog, xft takes ages(?) 1790 // TODO: this is a real resource hog, xft takes ages(?)
1725#if XFT && USE_SLOW_LOOKUP 1791#if XFT && USE_SLOW_LOOKUP
1726 // grab the first xft font that seems suitable 1792 // grab the first xft font that seems suitable
1793 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1727 FcPattern *p = FcPatternCreate (); 1794 FcPattern *p = FcPatternCreate ();
1728 1795
1729 FcCharSet *s = FcCharSetCreate (); 1796 FcCharSet *s = FcCharSetCreate ();
1730 FcCharSetAddChar (s, unicode); 1797 FcCharSetAddChar (s, unicode);
1731 FcPatternAddCharSet (p, FC_CHARSET, s); 1798 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1775 while (hi >= fmap.size ()) 1842 while (hi >= fmap.size ())
1776 fmap.push_back (0); 1843 fmap.push_back (0);
1777 1844
1778 if (!fmap[hi]) 1845 if (!fmap[hi])
1779 { 1846 {
1780 fmap[hi] = (pagemap *)new pagemap; 1847 fmap[hi] = new pagemap;
1781 memset (fmap[hi], 0xff, sizeof (pagemap)); 1848 memset (fmap[hi], 0xff, sizeof (pagemap));
1782 } 1849 }
1783 1850
1784 (*fmap[hi])[unicode & 0xff] = i; 1851 (*fmap[hi])[unicode & 0xff] = i;
1785 } 1852 }

Diff Legend

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