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.174 by sf-exg, Mon Jan 10 10:36:16 2011 UTC vs.
Revision 1.193 by sf-exg, Fri Nov 7 13:45:55 2014 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
… …
1241 1247
1242 XftUnlockFace (f); 1248 XftUnlockFace (f);
1243 1249
1244 int glheight = height; 1250 int glheight = height;
1245 1251
1246 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1252 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1247 { 1253 {
1248 FcChar16 ch = *t; 1254 FcChar16 ch = *t;
1249 1255
1250 if (cs != CS_UNICODE 1256 if (cs != CS_UNICODE
1251 && ch > 0x100 1257 && ch > 0x100
… …
1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1407 1413
1408#ifdef HAVE_BG_PIXMAP 1414#ifdef HAVE_BG_PIXMAP
1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1410 1416
1411 if (term->bgPixmap.pixmap 1417 if (term->bg_img
1412 && (bg == Color_transparent || bg == Color_bg 1418 && (bg == Color_transparent || bg == Color_bg
1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1414 { 1420 {
1415 int src_x = x, src_y = y; 1421 int src_x = x, src_y = y;
1416 1422
1417 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1423 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1418 { 1424 {
1419 src_x += term->window_vt_x; 1425 src_x += term->window_vt_x;
1420 src_y += term->window_vt_y; 1426 src_y += term->window_vt_y;
1421 } 1427 }
1422 1428
1423 if (term->bgPixmap.pmap_width >= src_x + w 1429 if (term->bg_img->w >= src_x + w
1424 && term->bgPixmap.pmap_height >= src_y + h) 1430 && term->bg_img->h >= src_y + h)
1425 { 1431 {
1426 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1432 XCopyArea (disp, term->bg_img->pm, d2, gc,
1427 src_x, src_y, w, h, 0, 0); 1433 src_x, src_y, w, h, 0, 0);
1428 } 1434 }
1429 else 1435 else
1430 { 1436 {
1431 XGCValues gcv; 1437 XGCValues gcv;
1432 1438
1433 gcv.fill_style = FillTiled; 1439 gcv.fill_style = FillTiled;
1434 gcv.tile = term->bgPixmap.pixmap; 1440 gcv.tile = term->bg_img->pm;
1435 gcv.ts_x_origin = -src_x; 1441 gcv.ts_x_origin = -src_x;
1436 gcv.ts_y_origin = -src_y; 1442 gcv.ts_y_origin = -src_y;
1437 1443
1438 XChangeGC (disp, gc, 1444 XChangeGC (disp, gc,
1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1780 while (hi >= fmap.size ()) 1786 while (hi >= fmap.size ())
1781 fmap.push_back (0); 1787 fmap.push_back (0);
1782 1788
1783 if (!fmap[hi]) 1789 if (!fmap[hi])
1784 { 1790 {
1785 fmap[hi] = (pagemap *)new pagemap; 1791 fmap[hi] = new pagemap;
1786 memset (fmap[hi], 0xff, sizeof (pagemap)); 1792 memset (fmap[hi], 0xff, sizeof (pagemap));
1787 } 1793 }
1788 1794
1789 (*fmap[hi])[unicode & 0xff] = i; 1795 (*fmap[hi])[unicode & 0xff] = i;
1790 } 1796 }

Diff Legend

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