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.195 by root, Mon Sep 7 14:50:56 2015 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" },
… …
241 { 240 {
242#if XFT 241#if XFT
243 Picture dst; 242 Picture dst;
244 243
245# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
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
… …
524 523
525 void draw (rxvt_drawable &d, int x, int y, 524 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 525 const text_t *text, int len,
527 int fg, int bg) 526 int fg, int bg)
528 { 527 {
529 while (len--) 528 while (len)
530 { 529 {
531 int fid = fs->find_font_idx (*text); 530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 535 text += w;
536 len -= w;
534 x += term->fwidth; 537 x += term->fwidth * w;
535 } 538 }
536 } 539 }
537}; 540};
538 541
539///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
… …
813 XFreeFontNames (list); 816 XFreeFontNames (list);
814 817
815 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
816 for (;;) 819 for (;;)
817 { 820 {
818 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
819 822
820 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
822 best = w; 825 best = w;
823 826
824 if (!best->name 827 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 829 break;
… …
921 } 924 }
922#endif 925#endif
923 926
924 width = 1; 927 width = 1;
925 928
926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
927 { 930 {
928 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
929 continue; 932 continue;
930 933
931 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
932 bool careful; 935 bool careful;
933 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
934 continue; 937 continue;
935 938
936 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
937 941
938 XCharStruct g; 942 XCharStruct g;
939 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
941 945
… …
967} 971}
968 972
969bool 973bool
970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
971{ 975{
976 careful = false;
977
972 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
973 979
974 if (ch == NOCHAR) 980 if (ch == NOCHAR)
975 return false; 981 return false;
976 982
… …
1039 dTermDisplay; 1045 dTermDisplay;
1040 dTermGC; 1046 dTermGC;
1041 1047
1042 bool slow = this->slow 1048 bool slow = this->slow
1043 || width != term->fwidth 1049 || width != term->fwidth
1044 || height != term->fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
1045 1052
1046 int base = ascent; // sorry, incorrect: term->fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
1047 1054
1048 XGCValues v; 1055 XGCValues v;
1049 v.foreground = term->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
… …
1218 int ftheight = 0; 1225 int ftheight = 0;
1219 bool success = true; 1226 bool success = true;
1220 1227
1221 for (;;) 1228 for (;;)
1222 { 1229 {
1230 p = FcPatternDuplicate (match);
1223 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1224 1232
1225 if (!f) 1233 if (!f)
1226 { 1234 {
1235 FcPatternDestroy (p);
1227 success = false; 1236 success = false;
1228 break; 1237 break;
1229 } 1238 }
1230 1239
1231 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1239 1248
1240 XftUnlockFace (f); 1249 XftUnlockFace (f);
1241 1250
1242 int glheight = height; 1251 int glheight = height;
1243 1252
1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1245 { 1254 {
1246 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1247 1256
1248 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1249 && ch > 0x100 1258 && ch > 0x100
… …
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1405 1414
1406#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_BG_PIXMAP
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408 1417
1409 if (term->bgPixmap.pixmap 1418 if (term->bg_img
1410 && (bg == Color_transparent || bg == Color_bg 1419 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1412 { 1421 {
1413 int src_x = x, src_y = y; 1422 int src_x = x, src_y = y;
1414 1423
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1416 { 1425 {
1417 src_x += term->window_vt_x; 1426 src_x += term->window_vt_x;
1418 src_y += term->window_vt_y; 1427 src_y += term->window_vt_y;
1419 } 1428 }
1420 1429
1421 if (term->bgPixmap.pmap_width >= src_x + w 1430 if (term->bg_img->w >= src_x + w
1422 && term->bgPixmap.pmap_height >= src_y + h) 1431 && term->bg_img->h >= src_y + h)
1423 { 1432 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1425 src_x, src_y, w, h, 0, 0); 1434 src_x, src_y, w, h, 0, 0);
1426 } 1435 }
1427 else 1436 else
1428 { 1437 {
1429 XGCValues gcv; 1438 XGCValues gcv;
1430 1439
1431 gcv.fill_style = FillTiled; 1440 gcv.fill_style = FillTiled;
1432 gcv.tile = term->bgPixmap.pixmap; 1441 gcv.tile = term->bg_img->pm;
1433 gcv.ts_x_origin = -src_x; 1442 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y; 1443 gcv.ts_y_origin = -src_y;
1435 1444
1436 XChangeGC (disp, gc, 1445 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1597 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1598 else 1607 else
1599 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1600 1609
1601 desc++; 1610 desc++;
1602 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1603 } 1612 }
1604 1613
1605 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1606 if (!end) 1615 if (!end)
1607 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
… …
1778 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1779 fmap.push_back (0); 1788 fmap.push_back (0);
1780 1789
1781 if (!fmap[hi]) 1790 if (!fmap[hi])
1782 { 1791 {
1783 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1784 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1785 } 1794 }
1786 1795
1787 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1788 } 1797 }

Diff Legend

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