… | |
… | |
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 | |
268 | struct rxvt_font_default : rxvt_font { |
267 | struct 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 | |
489 | struct rxvt_font_overflow : rxvt_font { |
497 | struct 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 | { |
… | |
… | |
540 | } |
549 | } |
541 | }; |
550 | }; |
542 | |
551 | |
543 | ///////////////////////////////////////////////////////////////////////////// |
552 | ///////////////////////////////////////////////////////////////////////////// |
544 | |
553 | |
545 | struct rxvt_font_x11 : rxvt_font { |
554 | struct rxvt_font_x11 : rxvt_font |
|
|
555 | { |
546 | rxvt_font_x11 () { f = 0; } |
556 | rxvt_font_x11 () { f = 0; } |
547 | |
557 | |
548 | void clear (); |
558 | void clear (); |
549 | |
559 | |
550 | rxvt_fontprop properties (); |
560 | rxvt_fontprop properties (); |
… | |
… | |
817 | XFreeFontNames (list); |
827 | XFreeFontNames (list); |
818 | |
828 | |
819 | // 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 |
820 | for (;;) |
830 | for (;;) |
821 | { |
831 | { |
822 | font_weight *best = fonts + count - 1; |
832 | font_weight *best = fonts; |
823 | |
833 | |
824 | for (font_weight *w = best; w-- > fonts; ) |
834 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
825 | if (w->diff <= best->diff) |
835 | if (w->diff < best->diff) |
826 | best = w; |
836 | best = w; |
827 | |
837 | |
828 | if (!best->name |
838 | if (!best->name |
829 | || !(f = XLoadQueryFont (disp, best->name))) |
839 | || !(f = XLoadQueryFont (disp, best->name))) |
830 | break; |
840 | break; |
… | |
… | |
925 | } |
935 | } |
926 | #endif |
936 | #endif |
927 | |
937 | |
928 | width = 1; |
938 | width = 1; |
929 | |
939 | |
930 | 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++) |
931 | { |
941 | { |
932 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
942 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
933 | continue; |
943 | continue; |
934 | |
944 | |
935 | // ignore characters we wouldn't use anyways |
945 | // ignore characters we wouldn't use anyways |
936 | bool careful; |
946 | bool careful; |
937 | if (!has_char (*t, &prop, careful)) |
947 | if (!has_char (*t, &prop, careful)) |
938 | continue; |
948 | continue; |
939 | |
949 | |
940 | 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 }; |
941 | |
952 | |
942 | XCharStruct g; |
953 | XCharStruct g; |
943 | int dir_ret, asc_ret, des_ret; |
954 | int dir_ret, asc_ret, des_ret; |
944 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
955 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
945 | |
956 | |
… | |
… | |
1045 | dTermDisplay; |
1056 | dTermDisplay; |
1046 | dTermGC; |
1057 | dTermGC; |
1047 | |
1058 | |
1048 | bool slow = this->slow |
1059 | bool slow = this->slow |
1049 | || width != term->fwidth |
1060 | || width != term->fwidth |
1050 | || height != term->fheight; |
1061 | || height != term->fheight |
|
|
1062 | || ascent != f->ascent; |
1051 | |
1063 | |
1052 | int base = ascent; // sorry, incorrect: term->fbase; |
1064 | int base = ascent; // sorry, incorrect: term->fbase; |
1053 | |
1065 | |
1054 | XGCValues v; |
1066 | XGCValues v; |
1055 | v.foreground = term->pix_colors[fg]; |
1067 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1123 | |
1135 | |
1124 | ///////////////////////////////////////////////////////////////////////////// |
1136 | ///////////////////////////////////////////////////////////////////////////// |
1125 | |
1137 | |
1126 | #if XFT |
1138 | #if XFT |
1127 | |
1139 | |
1128 | struct rxvt_font_xft : rxvt_font { |
1140 | struct rxvt_font_xft : rxvt_font |
|
|
1141 | { |
1129 | rxvt_font_xft () { f = 0; } |
1142 | rxvt_font_xft () |
|
|
1143 | { |
|
|
1144 | f = 0; |
|
|
1145 | } |
1130 | |
1146 | |
1131 | void clear (); |
1147 | void clear (); |
1132 | |
1148 | |
1133 | rxvt_fontprop properties (); |
1149 | rxvt_fontprop properties (); |
1134 | |
1150 | |
… | |
… | |
1247 | |
1263 | |
1248 | XftUnlockFace (f); |
1264 | XftUnlockFace (f); |
1249 | |
1265 | |
1250 | int glheight = height; |
1266 | int glheight = height; |
1251 | |
1267 | |
1252 | 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++) |
1253 | { |
1269 | { |
1254 | FcChar16 ch = *t; |
1270 | FcChar16 ch = *t; |
1255 | |
1271 | |
1256 | if (cs != CS_UNICODE |
1272 | if (cs != CS_UNICODE |
1257 | && ch > 0x100 |
1273 | && ch > 0x100 |
… | |
… | |
1276 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1292 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1277 | } |
1293 | } |
1278 | |
1294 | |
1279 | if (!width) |
1295 | if (!width) |
1280 | { |
1296 | { |
1281 | 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); |
1282 | |
1298 | width = f->max_advance_width; |
1283 | XftFontClose (disp, f); |
|
|
1284 | f = 0; |
|
|
1285 | |
|
|
1286 | success = false; |
|
|
1287 | break; |
1299 | break; |
1288 | } |
1300 | } |
1289 | |
1301 | |
1290 | if (prop.height == rxvt_fontprop::unset |
1302 | if (prop.height == rxvt_fontprop::unset |
1291 | || (height <= prop.height && glheight <= prop.height) |
1303 | || (height <= prop.height && glheight <= prop.height) |
… | |
… | |
1326 | bool |
1338 | bool |
1327 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1339 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1328 | { |
1340 | { |
1329 | careful = false; |
1341 | careful = false; |
1330 | |
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) |
1331 | if (!XftCharExists (term->dpy, f, unicode)) |
1349 | if (!XftCharExists (term->dpy, f, chrs [i])) |
1332 | return false; |
1350 | return false; |
1333 | |
1351 | |
1334 | if (!prop || prop->width == rxvt_fontprop::unset) |
1352 | if (!prop || prop->width == rxvt_fontprop::unset) |
1335 | return true; |
1353 | return true; |
1336 | |
1354 | |
1337 | // check character against base font bounding box |
1355 | int wcw = max (WCWIDTH (chrs [0]), 1); |
1338 | 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 | { |
1339 | XGlyphInfo g; |
1361 | XGlyphInfo g; |
1340 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1362 | XftTextExtents32 (term->dpy, f, chrs + i, 1, &g); |
1341 | |
1363 | |
1342 | int w = g.width - g.x; |
1364 | int w = g.width - g.x; |
1343 | int wcw = max (WCWIDTH (unicode), 1); |
|
|
1344 | |
1365 | |
1345 | careful = g.x > 0 || w > prop->width * wcw; |
1366 | careful = g.x > 0 || w > prop->width * wcw; |
1346 | |
1367 | |
1347 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1368 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1348 | return false; |
1369 | return false; |
1349 | |
1370 | |
1350 | // this weeds out _totally_ broken fonts, or glyphs |
1371 | // this weeds out _totally_ broken fonts, or glyphs |
1351 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1372 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1352 | return false; |
1373 | return false; |
|
|
1374 | } |
1353 | |
1375 | |
1354 | return true; |
1376 | return true; |
1355 | } |
1377 | } |
1356 | |
1378 | |
1357 | void |
1379 | void |
1358 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1380 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1359 | const text_t *text, int len, |
1381 | const text_t *text, int len, |
1360 | int fg, int bg) |
1382 | int fg, int bg) |
1361 | { |
1383 | { |
1362 | XGlyphInfo extents; |
|
|
1363 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1384 | //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D |
1364 | XftGlyphSpec *ep = enc; |
1385 | //XftGlyphSpec *ep = enc;//D |
|
|
1386 | static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow |
1365 | |
1387 | |
1366 | dTermDisplay; |
1388 | dTermDisplay; |
1367 | dTermGC; |
1389 | dTermGC; |
1368 | |
1390 | |
1369 | int w = term->fwidth * len; |
1391 | int w = term->fwidth * len; |
… | |
… | |
1380 | int y_ = buffered ? 0 : y; |
1402 | int y_ = buffered ? 0 : y; |
1381 | |
1403 | |
1382 | while (len) |
1404 | while (len) |
1383 | { |
1405 | { |
1384 | int cwidth = term->fwidth; |
1406 | int cwidth = term->fwidth; |
|
|
1407 | |
|
|
1408 | rxvt_compose_expand_static<FcChar32> exp; |
1385 | FcChar32 fc = *text++; len--; |
1409 | FcChar32 *chrs = exp (*text++); len--; |
|
|
1410 | int nchrs = exp.length (chrs); |
1386 | |
1411 | |
1387 | while (len && *text == NOCHAR) |
1412 | while (len && *text == NOCHAR) |
1388 | text++, len--, cwidth += term->fwidth; |
1413 | text++, len--, cwidth += term->fwidth; |
1389 | |
1414 | |
1390 | 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) |
1391 | { |
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 | |
1392 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1431 | FT_UInt glyph = XftCharIndex (disp, f, chrs [0]); |
|
|
1432 | XGlyphInfo extents0; |
1393 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1433 | XftGlyphExtents (disp, f, &glyph, 1, &extents0); |
1394 | |
1434 | |
|
|
1435 | int cx = x_ + (cwidth - extents0.xOff >> 1); |
|
|
1436 | int cy = y_ + ascent; |
|
|
1437 | |
|
|
1438 | XftGlyphSpec ep; |
1395 | ep->glyph = glyph; |
1439 | ep.glyph = glyph; |
1396 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1440 | ep.x = cx + (extents0.xOff ? 0 : extents0.xOff); |
1397 | ep->y = y_ + ascent; |
1441 | ep.y = cy; |
1398 | |
1442 | |
1399 | if (extents.xOff == 0) |
1443 | enc.push_back (ep); |
1400 | ep->x = x_ + cwidth; |
|
|
1401 | |
1444 | |
1402 | 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 | } |
1403 | } |
1456 | } |
1404 | |
1457 | |
1405 | x_ += cwidth; |
1458 | x_ += cwidth; |
1406 | } |
1459 | } |
1407 | |
1460 | |
1408 | if (buffered) |
1461 | if (buffered) |
1409 | { |
1462 | { |
1410 | if (ep != enc) |
1463 | if (!enc.empty ()) |
1411 | { |
1464 | { |
1412 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1465 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1413 | |
1466 | |
1414 | #ifdef HAVE_BG_PIXMAP |
1467 | #ifdef HAVE_IMG |
1415 | 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 |
1416 | |
1469 | |
1417 | if (term->bg_pixmap |
1470 | if (term->bg_img |
1418 | && (bg == Color_transparent || bg == Color_bg |
1471 | && (bg == Color_transparent || bg == Color_bg |
1419 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1472 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1420 | { |
1473 | { |
1421 | int src_x = x, src_y = y; |
1474 | int src_x = x, src_y = y; |
1422 | |
1475 | |
… | |
… | |
1424 | { |
1477 | { |
1425 | src_x += term->window_vt_x; |
1478 | src_x += term->window_vt_x; |
1426 | src_y += term->window_vt_y; |
1479 | src_y += term->window_vt_y; |
1427 | } |
1480 | } |
1428 | |
1481 | |
1429 | if (term->bg_pmap_width >= src_x + w |
1482 | if (term->bg_img->w >= src_x + w |
1430 | && term->bg_pmap_height >= src_y + h) |
1483 | && term->bg_img->h >= src_y + h) |
1431 | { |
1484 | { |
1432 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1485 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1433 | src_x, src_y, w, h, 0, 0); |
1486 | src_x, src_y, w, h, 0, 0); |
1434 | } |
1487 | } |
1435 | else |
1488 | else |
1436 | { |
1489 | { |
1437 | XGCValues gcv; |
1490 | XGCValues gcv; |
1438 | |
1491 | |
1439 | gcv.fill_style = FillTiled; |
1492 | gcv.fill_style = FillTiled; |
1440 | gcv.tile = term->bg_pixmap; |
1493 | gcv.tile = term->bg_img->pm; |
1441 | gcv.ts_x_origin = -src_x; |
1494 | gcv.ts_x_origin = -src_x; |
1442 | gcv.ts_y_origin = -src_y; |
1495 | gcv.ts_y_origin = -src_y; |
1443 | |
1496 | |
1444 | XChangeGC (disp, gc, |
1497 | XChangeGC (disp, gc, |
1445 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1498 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1461 | } |
1514 | } |
1462 | else |
1515 | else |
1463 | #endif |
1516 | #endif |
1464 | 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); |
1465 | |
1518 | |
1466 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1519 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1467 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1520 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1468 | } |
1521 | } |
1469 | else |
1522 | else |
1470 | clear_rect (d, x, y, w, h, bg); |
1523 | clear_rect (d, x, y, w, h, bg); |
1471 | } |
1524 | } |
1472 | else |
1525 | else |
1473 | { |
1526 | { |
1474 | clear_rect (d, x, y, w, h, bg); |
1527 | clear_rect (d, x, y, w, h, bg); |
1475 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1528 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1476 | } |
1529 | } |
1477 | } |
1530 | } |
1478 | |
1531 | |
1479 | #endif |
1532 | #endif |
1480 | |
1533 | |
… | |
… | |
1605 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1658 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1606 | else |
1659 | else |
1607 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1660 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1608 | |
1661 | |
1609 | desc++; |
1662 | desc++; |
1610 | while (*desc <= ' ') desc++; |
1663 | while (*desc <= ' ' && *desc) desc++; |
1611 | } |
1664 | } |
1612 | |
1665 | |
1613 | end = strchr (desc, ','); |
1666 | end = strchr (desc, ','); |
1614 | if (!end) |
1667 | if (!end) |
1615 | end = desc + strlen (desc); |
1668 | end = desc + strlen (desc); |
… | |
… | |
1676 | } |
1729 | } |
1677 | |
1730 | |
1678 | int |
1731 | int |
1679 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1732 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1680 | { |
1733 | { |
1681 | if (unicode >= 1<<20) |
1734 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
|
|
1735 | if (unicode > 0x1fffff) |
1682 | return 0; |
1736 | return 0; |
1683 | |
1737 | |
1684 | unicode_t hi = unicode >> 8; |
1738 | unicode_t hi = unicode >> 8; |
1685 | |
1739 | |
1686 | if (hi < fmap.size () |
1740 | if (hi < fmap.size ()) |
1687 | && fmap[hi] |
1741 | if (pagemap *pm = fmap[hi]) |
1688 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1742 | if ((*pm)[unicode & 0xff] != 0xff) |
1689 | return (*fmap[hi])[unicode & 0xff]; |
1743 | return (*pm)[unicode & 0xff]; |
1690 | |
1744 | |
1691 | unsigned int i; |
1745 | unsigned int i; |
1692 | |
1746 | |
1693 | for (i = 0; i < fonts.size (); i++) |
1747 | for (i = 0; i < fonts.size (); i++) |
1694 | { |
1748 | { |
… | |
… | |
1718 | } |
1772 | } |
1719 | |
1773 | |
1720 | next_font: |
1774 | next_font: |
1721 | if (i == fonts.size () - 1) |
1775 | if (i == fonts.size () - 1) |
1722 | { |
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 | |
1723 | if (fallback->name) |
1782 | if (fallback->name) |
1724 | { |
1783 | { |
1725 | // search through the fallback list |
1784 | // search through the fallback list |
1726 | push_font (new_font (fallback->name, fallback->cs)); |
1785 | push_font (new_font (fallback->name, fallback->cs)); |
1727 | fallback++; |
1786 | fallback++; |
… | |
… | |
1733 | // way to configure this and xft is easier to hack in, |
1792 | // way to configure this and xft is easier to hack in, |
1734 | // while x11 has more framework in place already. |
1793 | // while x11 has more framework in place already. |
1735 | // TODO: this is a real resource hog, xft takes ages(?) |
1794 | // TODO: this is a real resource hog, xft takes ages(?) |
1736 | #if XFT && USE_SLOW_LOOKUP |
1795 | #if XFT && USE_SLOW_LOOKUP |
1737 | // 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 |
1738 | FcPattern *p = FcPatternCreate (); |
1798 | FcPattern *p = FcPatternCreate (); |
1739 | |
1799 | |
1740 | FcCharSet *s = FcCharSetCreate (); |
1800 | FcCharSet *s = FcCharSetCreate (); |
1741 | FcCharSetAddChar (s, unicode); |
1801 | FcCharSetAddChar (s, unicode); |
1742 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1802 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1786 | while (hi >= fmap.size ()) |
1846 | while (hi >= fmap.size ()) |
1787 | fmap.push_back (0); |
1847 | fmap.push_back (0); |
1788 | |
1848 | |
1789 | if (!fmap[hi]) |
1849 | if (!fmap[hi]) |
1790 | { |
1850 | { |
1791 | fmap[hi] = (pagemap *)new pagemap; |
1851 | fmap[hi] = new pagemap; |
1792 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1852 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1793 | } |
1853 | } |
1794 | |
1854 | |
1795 | (*fmap[hi])[unicode & 0xff] = i; |
1855 | (*fmap[hi])[unicode & 0xff] = i; |
1796 | } |
1856 | } |