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.173 by root, Fri Jan 7 21:17:08 2011 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 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" },
… …
213} 212}
214 213
215///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
216 215
217rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
219{ 218{
220} 219}
221 220
222void 221void
223rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
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->bgPixmap.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 {
… …
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)
… …
442#else 442#else
443 if (0) 443 if (0)
444 ; 444 ;
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) && 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 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
451 text_t chrs[2]; 473 text_t chrs[2];
452 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
453 475
454 *chrs = cc->c1; 476 *chrs = cc->c1;
455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
465 ? f1 487 ? f1
466 : (*fs)[fs->find_font_idx (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
467 489
468 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
469 } 491 }
492 #endif
470 } 493 }
471#endif 494#endif
472 else 495 else
473 switch (t) 496 switch (t)
474 { 497 {
475 case '\t': 498 case '\t':
476 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
477 case NOCHAR: 500 case NOCHAR:
478 break; 501 break;
479 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
480 default: 512 default:
481 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
482 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
483 } 515 }
484 516
485 x += fwidth; 517 x += fwidth;
486 } 518 }
487} 519}
488 520
489struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
490 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
491 524
492 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font () 526 : rxvt_font ()
494 { 527 {
… …
524 557
525 void draw (rxvt_drawable &d, int x, int y, 558 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 559 const text_t *text, int len,
527 int fg, int bg) 560 int fg, int bg)
528 { 561 {
529 while (len--) 562 while (len)
530 { 563 {
531 int fid = fs->find_font_idx (*text); 564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 569 text += w;
570 len -= w;
534 x += term->fwidth; 571 x += term->fwidth * w;
535 } 572 }
536 } 573 }
537}; 574};
538 575
539///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
540 577
541struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
542 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
543 581
544 void clear (); 582 void clear ();
545 583
546 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
813 XFreeFontNames (list); 851 XFreeFontNames (list);
814 852
815 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
816 for (;;) 854 for (;;)
817 { 855 {
818 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
819 857
820 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
822 best = w; 860 best = w;
823 861
824 if (!best->name 862 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 864 break;
… …
921 } 959 }
922#endif 960#endif
923 961
924 width = 1; 962 width = 1;
925 963
926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
927 { 965 {
928 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
929 continue; 967 continue;
930 968
931 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
932 bool careful; 970 bool careful;
933 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
934 continue; 972 continue;
935 973
936 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
937 976
938 XCharStruct g; 977 XCharStruct g;
939 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
941 980
… …
967} 1006}
968 1007
969bool 1008bool
970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
971{ 1010{
1011 careful = false;
1012
972 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
973 1014
974 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
975 return false; 1016 return false;
976 1017
… …
1039 dTermDisplay; 1080 dTermDisplay;
1040 dTermGC; 1081 dTermGC;
1041 1082
1042 bool slow = this->slow 1083 bool slow = this->slow
1043 || width != term->fwidth 1084 || width != term->fwidth
1044 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1045 1087
1046 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1047 1089
1048 XGCValues v; 1090 XGCValues v;
1049 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1117 1159
1118///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1119 1161
1120#if XFT 1162#if XFT
1121 1163
1122struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1123 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1124 1171
1125 void clear (); 1172 void clear ();
1126 1173
1127 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1128 1175
… …
1218 int ftheight = 0; 1265 int ftheight = 0;
1219 bool success = true; 1266 bool success = true;
1220 1267
1221 for (;;) 1268 for (;;)
1222 { 1269 {
1270 p = FcPatternDuplicate (match);
1223 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1224 1272
1225 if (!f) 1273 if (!f)
1226 { 1274 {
1275 FcPatternDestroy (p);
1227 success = false; 1276 success = false;
1228 break; 1277 break;
1229 } 1278 }
1230 1279
1231 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1239 1288
1240 XftUnlockFace (f); 1289 XftUnlockFace (f);
1241 1290
1242 int glheight = height; 1291 int glheight = height;
1243 1292
1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1245 { 1294 {
1246 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1247 1296
1248 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1249 && ch > 0x100 1298 && ch > 0x100
… …
1401 { 1450 {
1402 if (ep != enc) 1451 if (ep != enc)
1403 { 1452 {
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1405 1454
1406#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_IMG
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408 1457
1409 if (term->bgPixmap.pixmap 1458 if (term->bg_img
1410 && (bg == Color_transparent || bg == Color_bg 1459 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1412 { 1461 {
1413 int src_x = x, src_y = y; 1462 int src_x = x, src_y = y;
1414 1463
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1416 { 1465 {
1417 src_x += term->window_vt_x; 1466 src_x += term->window_vt_x;
1418 src_y += term->window_vt_y; 1467 src_y += term->window_vt_y;
1419 } 1468 }
1420 1469
1421 if (term->bgPixmap.pmap_width >= src_x + w 1470 if (term->bg_img->w >= src_x + w
1422 && term->bgPixmap.pmap_height >= src_y + h) 1471 && term->bg_img->h >= src_y + h)
1423 { 1472 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1425 src_x, src_y, w, h, 0, 0); 1474 src_x, src_y, w, h, 0, 0);
1426 } 1475 }
1427 else 1476 else
1428 { 1477 {
1429 XGCValues gcv; 1478 XGCValues gcv;
1430 1479
1431 gcv.fill_style = FillTiled; 1480 gcv.fill_style = FillTiled;
1432 gcv.tile = term->bgPixmap.pixmap; 1481 gcv.tile = term->bg_img->pm;
1433 gcv.ts_x_origin = -src_x; 1482 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y; 1483 gcv.ts_y_origin = -src_y;
1435 1484
1436 XChangeGC (disp, gc, 1485 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1597 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1598 else 1647 else
1599 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1600 1649
1601 desc++; 1650 desc++;
1602 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1603 } 1652 }
1604 1653
1605 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1606 if (!end) 1655 if (!end)
1607 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
… …
1725 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1726 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1727 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1728#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1729 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1730 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1731 1781
1732 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1733 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1734 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1778 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1779 fmap.push_back (0); 1829 fmap.push_back (0);
1780 1830
1781 if (!fmap[hi]) 1831 if (!fmap[hi])
1782 { 1832 {
1783 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1784 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1785 } 1835 }
1786 1836
1787 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1788 } 1838 }

Diff Legend

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