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.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.192 by root, Thu May 22 18:54:33 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" },
… …
159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
161 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
162}; 161};
163 162
164#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
165
166#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
167#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
168 165
169///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
170 167
… …
243 { 240 {
244#if XFT 241#if XFT
245 Picture dst; 242 Picture dst;
246 243
247# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
248 if (term->bgPixmap.pixmap 245 if (term->bg_img
249 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
250 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
251 { 248 {
252 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
253 250
… …
526 523
527 void draw (rxvt_drawable &d, int x, int y, 524 void draw (rxvt_drawable &d, int x, int y,
528 const text_t *text, int len, 525 const text_t *text, int len,
529 int fg, int bg) 526 int fg, int bg)
530 { 527 {
531 while (len--) 528 while (len)
532 { 529 {
533 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++;
534 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 ++text; 535 text += w;
536 len -= w;
536 x += term->fwidth; 537 x += term->fwidth * w;
537 } 538 }
538 } 539 }
539}; 540};
540 541
541///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
… …
720 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
721 722
722 if (!f) 723 if (!f)
723 return false; 724 return false;
724 725
725 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
726 727
727 if (new_name) 728 if (new_name)
728 set_name (new_name); 729 set_name (new_name);
729 else 730 else
730 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
731 732
732 XFreeFont (disp, f); 733 XFreeFont (disp, f);
733 f = 0; 734 f = 0;
734 } 735 }
735 736
… …
792 free (fname); 793 free (fname);
793 if (replace_field (&fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
794 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
795 } 796 }
796 797
797 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
798 continue; 804 continue;
799 805 }
800 if (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height) // weed out too large fonts
802 continue;
803 806
804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 808 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 809 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
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;
… …
864 free (registry); 867 free (registry);
865 free (encoding); 868 free (encoding);
866 869
867 if (cs == CS_UNKNOWN) 870 if (cs == CS_UNKNOWN)
868 { 871 {
869 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
870 874
871 if (!charset) 875 if (!charset)
872 charset = name; 876 charset = name;
873 877
874 int count = 13; 878 int count = 13;
… …
877 break; 881 break;
878 882
879 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 884 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
882 } 888 }
883 889
884 if (cs == CS_UNKNOWN) 890 if (cs == CS_UNKNOWN)
885 { 891 {
886 clear (); 892 clear ();
… …
918 } 924 }
919#endif 925#endif
920 926
921 width = 1; 927 width = 1;
922 928
923 for (uint16_t *t = extent_test_chars + NUM_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++)
924 { 930 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 932 continue;
927 933
928 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
964} 970}
965 971
966bool 972bool
967rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
968{ 974{
975 careful = false;
976
969 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
970 978
971 if (ch == NOCHAR) 979 if (ch == NOCHAR)
972 return false; 980 return false;
973 981
… …
1215 int ftheight = 0; 1223 int ftheight = 0;
1216 bool success = true; 1224 bool success = true;
1217 1225
1218 for (;;) 1226 for (;;)
1219 { 1227 {
1228 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1221 1230
1222 if (!f) 1231 if (!f)
1223 { 1232 {
1233 FcPatternDestroy (p);
1224 success = false; 1234 success = false;
1225 break; 1235 break;
1226 } 1236 }
1227 1237
1228 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1236 1246
1237 XftUnlockFace (f); 1247 XftUnlockFace (f);
1238 1248
1239 int glheight = height; 1249 int glheight = height;
1240 1250
1241 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1251 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1242 { 1252 {
1243 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1244 1254
1245 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1246 && ch > 0x100 1256 && ch > 0x100
… …
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1412
1403#ifdef HAVE_BG_PIXMAP 1413#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1415
1406 if (term->bgPixmap.pixmap 1416 if (term->bg_img
1407 && (bg == Color_transparent || bg == Color_bg 1417 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1419 {
1410 int src_x = x, src_y = y; 1420 int src_x = x, src_y = y;
1411 1421
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1423 {
1414 src_x += term->window_vt_x; 1424 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1425 src_y += term->window_vt_y;
1416 } 1426 }
1417 1427
1418 if (term->bgPixmap.pmap_width >= src_x + w 1428 if (term->bg_img->w >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1429 && term->bg_img->h >= src_y + h)
1420 { 1430 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1431 XCopyArea (disp, term->bg_img->pm, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1432 src_x, src_y, w, h, 0, 0);
1423 } 1433 }
1424 else 1434 else
1425 { 1435 {
1426 XGCValues gcv; 1436 XGCValues gcv;
1427 1437
1428 gcv.fill_style = FillTiled; 1438 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1439 gcv.tile = term->bg_img->pm;
1430 gcv.ts_x_origin = -src_x; 1440 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1441 gcv.ts_y_origin = -src_y;
1432 1442
1433 XChangeGC (disp, gc, 1443 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1609 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1610 1620
1611 push_font (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1612 } 1622 }
1613 else 1623 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1625
1616 desc = end + 1; 1626 desc = end + 1;
1617 } 1627 }
1618 while (*end); 1628 while (*end);
1619 } 1629 }
… …
1775 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1776 fmap.push_back (0); 1786 fmap.push_back (0);
1777 1787
1778 if (!fmap[hi]) 1788 if (!fmap[hi])
1779 { 1789 {
1780 fmap[hi] = (pagemap *)new pagemap; 1790 fmap[hi] = new pagemap;
1781 memset (fmap[hi], 0xff, sizeof (pagemap)); 1791 memset (fmap[hi], 0xff, sizeof (pagemap));
1782 } 1792 }
1783 1793
1784 (*fmap[hi])[unicode & 0xff] = i; 1794 (*fmap[hi])[unicode & 0xff] = i;
1785 } 1795 }

Diff Legend

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