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.172 by sf-exg, Thu Dec 30 18:19:38 2010 UTC vs.
Revision 1.199 by root, Thu Jun 17 00:08:35 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" },
… …
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 {
… …
475 case '\t': 475 case '\t':
476 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
477 case NOCHAR: 477 case NOCHAR:
478 break; 478 break;
479 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
480 default: 489 default:
481 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
482 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
483 } 492 }
484 493
485 x += fwidth; 494 x += fwidth;
486 } 495 }
487} 496}
488 497
489struct rxvt_font_overflow : rxvt_font { 498struct rxvt_font_overflow : rxvt_font
499{
490 struct rxvt_fontset *fs; 500 struct rxvt_fontset *fs;
491 501
492 rxvt_font_overflow (rxvt_fontset *fs) 502 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font () 503 : rxvt_font ()
494 { 504 {
… …
524 534
525 void draw (rxvt_drawable &d, int x, int y, 535 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 536 const text_t *text, int len,
527 int fg, int bg) 537 int fg, int bg)
528 { 538 {
529 while (len--) 539 while (len)
530 { 540 {
531 int fid = fs->find_font_idx (*text); 541 int fid = fs->find_font_idx (*text);
542 int w = 1;
543 while (w < len && text[w] == NOCHAR)
544 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 545 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 546 text += w;
547 len -= w;
534 x += term->fwidth; 548 x += term->fwidth * w;
535 } 549 }
536 } 550 }
537}; 551};
538 552
539///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
540 554
541struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
542 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
543 558
544 void clear (); 559 void clear ();
545 560
546 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
… …
813 XFreeFontNames (list); 828 XFreeFontNames (list);
814 829
815 // 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
816 for (;;) 831 for (;;)
817 { 832 {
818 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
819 834
820 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
822 best = w; 837 best = w;
823 838
824 if (!best->name 839 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 841 break;
… …
921 } 936 }
922#endif 937#endif
923 938
924 width = 1; 939 width = 1;
925 940
926 for (uint16_t *t = extent_test_chars + 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++)
927 { 942 {
928 if (FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
929 continue; 944 continue;
930 945
931 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
932 bool careful; 947 bool careful;
933 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
934 continue; 949 continue;
935 950
936 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 };
937 953
938 XCharStruct g; 954 XCharStruct g;
939 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
941 957
… …
967} 983}
968 984
969bool 985bool
970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 986rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
971{ 987{
988 careful = false;
989
972 uint32_t ch = FROM_UNICODE (cs, unicode); 990 uint32_t ch = FROM_UNICODE (cs, unicode);
973 991
974 if (ch == NOCHAR) 992 if (ch == NOCHAR)
975 return false; 993 return false;
976 994
… …
1039 dTermDisplay; 1057 dTermDisplay;
1040 dTermGC; 1058 dTermGC;
1041 1059
1042 bool slow = this->slow 1060 bool slow = this->slow
1043 || width != term->fwidth 1061 || width != term->fwidth
1044 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
1045 1064
1046 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
1047 1066
1048 XGCValues v; 1067 XGCValues v;
1049 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
1117 1136
1118///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1119 1138
1120#if XFT 1139#if XFT
1121 1140
1122struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1123 rxvt_font_xft () { f = 0; } 1143 rxvt_font_xft ()
1144 {
1145 f = 0;
1146 }
1124 1147
1125 void clear (); 1148 void clear ();
1126 1149
1127 rxvt_fontprop properties (); 1150 rxvt_fontprop properties ();
1128 1151
… …
1218 int ftheight = 0; 1241 int ftheight = 0;
1219 bool success = true; 1242 bool success = true;
1220 1243
1221 for (;;) 1244 for (;;)
1222 { 1245 {
1246 p = FcPatternDuplicate (match);
1223 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1247 f = XftFontOpenPattern (disp, p);
1224 1248
1225 if (!f) 1249 if (!f)
1226 { 1250 {
1251 FcPatternDestroy (p);
1227 success = false; 1252 success = false;
1228 break; 1253 break;
1229 } 1254 }
1230 1255
1231 FT_Face face = XftLockFace (f); 1256 FT_Face face = XftLockFace (f);
… …
1239 1264
1240 XftUnlockFace (f); 1265 XftUnlockFace (f);
1241 1266
1242 int glheight = height; 1267 int glheight = height;
1243 1268
1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1269 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1245 { 1270 {
1246 FcChar16 ch = *t; 1271 FcChar16 ch = *t;
1247 1272
1248 if (cs != CS_UNICODE 1273 if (cs != CS_UNICODE
1249 && ch > 0x100 1274 && ch > 0x100
… …
1401 { 1426 {
1402 if (ep != enc) 1427 if (ep != enc)
1403 { 1428 {
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1429 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1405 1430
1406#ifdef HAVE_BG_PIXMAP 1431#ifdef HAVE_IMG
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1432 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408 1433
1409 if (term->bgPixmap.pixmap 1434 if (term->bg_img
1410 && (bg == Color_transparent || bg == Color_bg 1435 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1436 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1412 { 1437 {
1413 int src_x = x, src_y = y; 1438 int src_x = x, src_y = y;
1414 1439
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1440 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1416 { 1441 {
1417 src_x += term->window_vt_x; 1442 src_x += term->window_vt_x;
1418 src_y += term->window_vt_y; 1443 src_y += term->window_vt_y;
1419 } 1444 }
1420 1445
1421 if (term->bgPixmap.pmap_width >= src_x + w 1446 if (term->bg_img->w >= src_x + w
1422 && term->bgPixmap.pmap_height >= src_y + h) 1447 && term->bg_img->h >= src_y + h)
1423 { 1448 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1449 XCopyArea (disp, term->bg_img->pm, d2, gc,
1425 src_x, src_y, w, h, 0, 0); 1450 src_x, src_y, w, h, 0, 0);
1426 } 1451 }
1427 else 1452 else
1428 { 1453 {
1429 XGCValues gcv; 1454 XGCValues gcv;
1430 1455
1431 gcv.fill_style = FillTiled; 1456 gcv.fill_style = FillTiled;
1432 gcv.tile = term->bgPixmap.pixmap; 1457 gcv.tile = term->bg_img->pm;
1433 gcv.ts_x_origin = -src_x; 1458 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y; 1459 gcv.ts_y_origin = -src_y;
1435 1460
1436 XChangeGC (disp, gc, 1461 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1462 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1597 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1622 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1598 else 1623 else
1599 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1624 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1600 1625
1601 desc++; 1626 desc++;
1602 while (*desc <= ' ') desc++; 1627 while (*desc <= ' ' && *desc) desc++;
1603 } 1628 }
1604 1629
1605 end = strchr (desc, ','); 1630 end = strchr (desc, ',');
1606 if (!end) 1631 if (!end)
1607 end = desc + strlen (desc); 1632 end = desc + strlen (desc);
… …
1612 buf[end - desc] = 0; 1637 buf[end - desc] = 0;
1613 1638
1614 push_font (new_font (buf, cs)); 1639 push_font (new_font (buf, cs));
1615 } 1640 }
1616 else 1641 else
1617 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1642 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1618 1643
1619 desc = end + 1; 1644 desc = end + 1;
1620 } 1645 }
1621 while (*end); 1646 while (*end);
1622 } 1647 }
… …
1725 // way to configure this and xft is easier to hack in, 1750 // way to configure this and xft is easier to hack in,
1726 // while x11 has more framework in place already. 1751 // while x11 has more framework in place already.
1727 // TODO: this is a real resource hog, xft takes ages(?) 1752 // TODO: this is a real resource hog, xft takes ages(?)
1728#if XFT && USE_SLOW_LOOKUP 1753#if XFT && USE_SLOW_LOOKUP
1729 // grab the first xft font that seems suitable 1754 // grab the first xft font that seems suitable
1755 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1730 FcPattern *p = FcPatternCreate (); 1756 FcPattern *p = FcPatternCreate ();
1731 1757
1732 FcCharSet *s = FcCharSetCreate (); 1758 FcCharSet *s = FcCharSetCreate ();
1733 FcCharSetAddChar (s, unicode); 1759 FcCharSetAddChar (s, unicode);
1734 FcPatternAddCharSet (p, FC_CHARSET, s); 1760 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1778 while (hi >= fmap.size ()) 1804 while (hi >= fmap.size ())
1779 fmap.push_back (0); 1805 fmap.push_back (0);
1780 1806
1781 if (!fmap[hi]) 1807 if (!fmap[hi])
1782 { 1808 {
1783 fmap[hi] = (pagemap *)new pagemap; 1809 fmap[hi] = new pagemap;
1784 memset (fmap[hi], 0xff, sizeof (pagemap)); 1810 memset (fmap[hi], 0xff, sizeof (pagemap));
1785 } 1811 }
1786 1812
1787 (*fmap[hi])[unicode & 0xff] = i; 1813 (*fmap[hi])[unicode & 0xff] = i;
1788 } 1814 }

Diff Legend

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