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.1 by root, Sun Aug 15 00:37:04 2004 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h"
24#include "rxvtfont.h" 26#include "rxvtfont.h"
25 27
26#include <cstdlib> 28#include <cstdlib>
27 29
28#define DISPLAY r->display->display 30#include <inttypes.h>
29#define TGC r->TermWin.gc 31
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
30 40
31const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
32 codeset cs; 42 codeset cs;
33 const char *name; 43 const char *name;
34} fallback_fonts[] = { 44} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 48
39#if ENCODING_EU 49#if ENCODING_EU
40 // cyrillic 50 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 53
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 62 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 63 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67
68# if XFT
69 { CS_KOI8_U, "xft::lang=ru" },
70
71 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" },
76 { CS_ISO8859_10, "xft::lang=se" },
77 { CS_ISO8859_11, "xft::lang=th" },
78# endif
57#endif 79#endif
58 80
59 // japanese 81 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 83# if XFT
62 // prefer xft for complex scripts 84 // prefer xft for complex scripts
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
64# endif 89# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
71#endif 96#endif
72 97
73#if ENCODING_CN || ENCODING_CN_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
74# if XFT 99# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::lang=zh" },
75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
107 { CS_GB2312_1980_0, "xft::lang=zh" },
79# endif 108# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
80 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
113 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 114 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 115 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 116 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 117 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 118 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 120 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 121 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 122 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
92#endif 123#endif
93 124
125#if ENCODING_KR
126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
128# if XFT
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif
132#endif
133
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
94#if XFT 136#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
141
142 // FreeMono is usually uglier than x fonts, so try after the others
95 { CS_UNICODE, "xft:Andale Mono" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
96 { CS_UNICODE, "xft:Arial Unicode MS" },
97#endif 144#endif
98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 145
99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
102#if XFT
103 // FreeMono is usually uglier than x fonts, so try last only.
104 //{ CS_UNICODE, "xft:FreeMono" },
105#endif
106
107 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
108}; 151};
109 152
153// these characters are used to guess the font height and width
154// pango uses a similar algorithm and doesn't trust the font either.
155static uint16_t extent_test_chars[] = {
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本
159};
160
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
110///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
111
112#if XFT
113rxvt_drawable::~rxvt_drawable ()
114{
115 if (xftdrawable)
116 XftDrawDestroy (xftdrawable);
117}
118
119rxvt_drawable::operator XftDraw *()
120{
121 if (!xftdrawable)
122 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
123
124 return xftdrawable;
125}
126#endif
127
128/////////////////////////////////////////////////////////////////////////////
129
130static void *enc_buf;
131static uint32_t enc_len;
132
133static inline void *
134get_enc_buf (uint32_t len)
135{
136 if (len > enc_len)
137 {
138 free (enc_buf);
139 enc_buf = malloc (len);
140 enc_len = len;
141 }
142
143 return enc_buf;
144}
145 167
146static const char * 168static const char *
147enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
148{ 170{
149 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
150 173
151 while (len--) 174 while (len--)
152 { 175 {
153 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
154 177
… …
159 } 182 }
160 183
161 *buf++ = c; 184 *buf++ = c;
162 } 185 }
163 186
164 return (const char *)enc_buf; 187 return (const char *)res;
165} 188}
166 189
167static const XChar2b * 190static const XChar2b *
168enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 191enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
169{ 192{
170 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
171 195
172 while (len--) 196 while (len--)
173 { 197 {
174 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
175 199
… …
182 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
183 buf->byte2 = c; 207 buf->byte2 = c;
184 buf++; 208 buf++;
185 } 209 }
186 210
187 return (XChar2b *)enc_buf; 211 return res;
188} 212}
189 213
190///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
191 215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
220
192void 221void
222rxvt_font::set_name (char *name)
223{
224 if (this->name == name)
225 return;
226
227 if (this->name) free (this->name); // let the compiler optimize
228 this->name = name;
229}
230
231void
193rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
194{ 233{
195 if (color == Color_bg) 234 dTermDisplay;
196 XClearArea (d.display->display, d, x, y, w, h, FALSE); 235 dTermGC;
236
237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false);
197 else if (color >= 0) 239 else if (color >= 0)
198 { 240 {
199#if XFT 241#if XFT
242 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 }
254 }
255#endif
256 if (!done)
200 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
201#else 258#else
202 XSetForeground (d.display->display, TGC, r->PixColors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
203 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
204#endif 261#endif
205 } 262 }
206} 263}
207 264
208#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
209 266
210struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs;
269
270 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font ()
272 {
273 this->fs = fs;
274 }
211 275
212 rxvt_fontprop properties () 276 rxvt_fontprop properties ()
213 { 277 {
214 rxvt_fontprop p; 278 rxvt_fontprop p;
215 279
216 p.width = p.height = 1; 280 p.width = p.height = 1;
281 p.ascent = rxvt_fontprop::unset;
217 p.weight = rxvt_fontprop::medium; 282 p.weight = rxvt_fontprop::medium;
218 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
219 284
220 return p; 285 return p;
221 } 286 }
222 287
223 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
224 { 289 {
225 width = 1; height = 1; 290 width = 1; height = 1;
226 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
227 292
228 set_name (strdup ("built-in pseudofont")); 293 set_name (strdup ("built-in support font"));
229 294
230 return true; 295 return true;
231 } 296 }
232 297
233 bool has_codepoint (unicode_t unicode) 298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
234 { 299 {
300 careful = false;
301
235 if (unicode <= 0x001f) 302 if (unicode <= 0x001f)
236 return true; 303 return true;
237 304
238 if (unicode <= 0x007f) 305 if (unicode <= 0x007f)
239 return false; 306 return false;
240 307
241 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
242 return true; 309 return true;
243 310
244 if (unicode >= 0x2500 && unicode <= 0x259f) 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs))
245 return true; 313 return true;
246 314
247 if (IS_COMPOSE (unicode)) 315 if (IS_COMPOSE (unicode))
248 return true; 316 return true;
249 317
250 switch (unicode) 318 switch (unicode)
251 { 319 {
252 case ZERO_WIDTH_CHAR: 320 case ZERO_WIDTH_CHAR:
321 case NOCHAR:
253 return true; 322 return true;
254 } 323 }
255 324
256 return false; 325 return false;
257 } 326 }
… …
264void 333void
265rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 334rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266 const text_t *text, int len, 335 const text_t *text, int len,
267 int fg, int bg) 336 int fg, int bg)
268{ 337{
338 dTermDisplay;
339 dTermGC;
340
269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 341 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
270 342
271 XSetForeground (d.display->display, TGC, r->PixColors[fg]); 343 XSetForeground (disp, gc, term->pix_colors[fg]);
272 344
273 while (len--) 345 while (len)
274 { 346 {
275#if ENABLE_COMBINING 347#if ENABLE_COMBINING
276 compose_char *cc; 348 compose_char *cc;
277#endif 349#endif
350 const text_t *tp = text;
278 text_t t = *text++; 351 text_t t = *tp;
279 352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
356 int width = text - tp;
357 int fwidth = term->fwidth * width;
358
359#ifdef BUILTIN_GLYPHS
280 if (0x2500 <= t && t <= 0x259f) 360 if (0x2500 <= t && t <= 0x259f)
281 { 361 {
362# include "table/linedraw.h"
282 uint16_t offs = linedraw_offs[t - 0x2500]; 363 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4); 364 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15); 365 uint32_t *b = a + (offs & 15);
285 366
286 int W = r->TermWin.fwidth; 367 int W = fwidth;
287 int H = r->TermWin.fheight; 368 int H = term->fheight;
288 369
289 int x_[16]; 370 int x_[16];
290 int y_[16]; 371 int y_[16];
291 372
292 for (int i = 0; i <= 8; i++) 373 for (int i = 0; i <= 8; i++)
… …
300 381
301 XGCValues gcv; 382 XGCValues gcv;
302 383
303 gcv.cap_style = CapButt; 384 gcv.cap_style = CapButt;
304 gcv.line_width = 0; 385 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 386 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
306 387
307 while (a < b) 388 while (a < b)
308 { 389 {
309 uint32_t command = *a++; 390 uint32_t command = *a++;
310 391
… …
317 int y2 = y_[(command >> 0) & 15]; 398 int y2 = y_[(command >> 0) & 15];
318 399
319 switch (op) 400 switch (op)
320 { 401 {
321 case 0: // line 402 case 0: // line
322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 403 XDrawLine (disp, d, gc, x1, y1, x2, y2);
323 break; 404 break;
324 405
325 case 1: // rectangle, possibly stippled 406 case 1: // rectangle, possibly stippled
326 if (a) 407 if (a)
327 { 408 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329 410
330 gcv.fill_style = FillStippled; 411 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x; 413 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y; 414 gcv.ts_y_origin = y;
334 415
335 XChangeGC (d.display->display, TGC, 416 XChangeGC (disp, gc,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 417 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv); 418 &gcv);
338 } 419 }
339 420
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 421 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 422
342 if (a) 423 if (a)
343 { 424 {
344 XFreePixmap (d.display->display, gcv.stipple); 425 XFreePixmap (disp, gcv.stipple);
345 gcv.stipple = 0; 426 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 427 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 428 XChangeGC (disp, gc, GCFillStyle, &gcv);
348 } 429 }
349 break; 430 break;
350 case 2: // arc 431 case 2: // arc
351 XDrawArc (d.display->display, d, TGC, 432 XDrawArc (disp, d, gc,
352 x1 - W/2, y1 - H/2, W-1, H-1, 433 x1 - W/2, y1 - H/2, W-1, H-1,
353 (a - 1) * 90*64, (b - 1) * 90*64); 434 (a - 1) * 90*64, (b - 1) * 90*64);
354 break; 435 break;
355 } 436 }
356 } 437 }
357 } 438 }
439#else
440 if (0)
441 ;
442#endif
358#if ENABLE_COMBINING 443#if ENABLE_COMBINING
359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 444 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360 { 445 {
446 min_it (width, 2); // we only support wcwidth up to 2
447
448 text_t chrs[2];
449 chrs [1] = NOCHAR;
450
451 *chrs = cc->c1;
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 452 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 453 f1->draw (d, x, y, chrs, width, fg, bg);
454
363 if (cc->c2 != NOCHAR) 455 if (cc->c2 != NOCHAR)
364 { 456 {
457 bool careful;
458
365 // prefer font of first character, for no good reasons 459 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2) 460 *chrs = cc->c2;
461 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367 ? f1 462 ? f1
368 : (*fs)[fs->find_font (cc->c2)]; 463 : (*fs)[fs->find_font (cc->c2)];
369 464
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 465 f2->draw (d, x, y, chrs, width, fg, Color_none);
371 } 466 }
372 } 467 }
373#endif 468#endif
374 else 469 else
375 switch (t) 470 switch (t)
376 { 471 {
472 case '\t':
377 case ZERO_WIDTH_CHAR: 473 case ZERO_WIDTH_CHAR:
474 case NOCHAR:
378 break; 475 break;
379 476
380 default: 477 default:
381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 478 XDrawRectangle (disp, d, gc, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 479 fwidth - 4, term->fheight - 4);
391 x += w;
392 } 480 }
393 481
394 x += r->TermWin.fwidth; 482 x += fwidth;
395 } 483 }
396} 484}
397 485
398///////////////////////////////////////////////////////////////////////////// 486/////////////////////////////////////////////////////////////////////////////
399 487
… …
402 490
403 void clear (); 491 void clear ();
404 492
405 rxvt_fontprop properties (); 493 rxvt_fontprop properties ();
406 494
407 bool load (const rxvt_fontprop &prop); 495 bool load (const rxvt_fontprop &prop, bool force_prop);
408 496
409 bool has_codepoint (unicode_t unicode); 497 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
410 498
411 void draw (rxvt_drawable &d, int x, int y, 499 void draw (rxvt_drawable &d, int x, int y,
412 const text_t *text, int len, 500 const text_t *text, int len,
413 int fg, int bg); 501 int fg, int bg);
414 502
503 bool slow; // wether this is a proportional font or has other funny characteristics
415 XFontStruct *f; 504 XFontStruct *f;
416 codeset cs;
417 bool enc2b, encm; 505 bool enc2b, encm;
418 506
419 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
420 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
421 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
423}; 511};
424 512
425char * 513char *
426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
427{ 515{
428 unsigned long value; 516 unsigned long value;
429 517
430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
431 return XGetAtomName (DISPLAY, value); 519 return XGetAtomName (term->dpy, value);
432 else 520 else
433 return rxvt_strdup (repl); 521 return repl ? strdup (repl) : 0;
434} 522}
435 523
436rxvt_fontprop 524rxvt_fontprop
437rxvt_font_x11::properties () 525rxvt_font_x11::properties ()
438{ 526{
… …
442} 530}
443 531
444bool 532bool
445rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 533rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
446{ 534{
447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 535 p.width = width != rxvt_fontprop::unset ? width
536 : avgwidth ? (avgwidth + 1) / 10
537 : (height + 1) / 2;
448 p.height = height; 538 p.height = height;
539 p.ascent = rxvt_fontprop::unset;
449 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 540 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
450 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 541 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451 542
452 return true; 543 return true;
453} 544}
454 545
455bool 546bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 548{
458 unsigned long height; 549 unsigned long height;
550
551#if 0
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
460 return false; 553 return false;
554#else
555 height = f->ascent + f->descent;
556#endif
461 557
462 unsigned long avgwidth; 558 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
464 avgwidth = 0; 560 avgwidth = 0;
465 561
466 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
467 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
468 564
469 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
470 566
471 free (weight); 567 free (weight);
472 free (slant); 568 free (slant);
473 569
570 p.ascent = f->ascent;
571
474 return true; 572 return true;
475} 573}
476 574
477bool 575bool
478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 576rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
479{ 577{
578 dTermDisplay;
480 int slashes = 0; 579 int slashes = 0;
481 const char *comp[13]; 580 const char *comp[13];
482 581
483 for (const char *c = name; *c; c++) 582 for (const char *c = name; *c; c++)
484 if (*c == '-') 583 if (*c == '-')
… …
492 if (slashes >= 13 591 if (slashes >= 13
493 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 592 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
494 && (*comp[11] >= '0' && *comp[11] <= '9')) 593 && (*comp[11] >= '0' && *comp[11] <= '9'))
495 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 594 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
496 595
497 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 596 XFontStruct *f = XLoadQueryFont (disp, name);
498 597
499 if (f) 598 if (f)
500 { 599 {
501 // the font should really exist now. if not, we have a problem 600 // the font should really exist now. if not, we have a problem
502 // (e.g. if the user did xset fp rehash just when we were searching fonts). 601 // (e.g. if the user did xset fp rehash just when we were searching fonts).
503 // in that case, just return garbage. 602 // in that case, just return garbage.
504 bool ret = set_properties (p, f); 603 bool ret = set_properties (p, f);
505 XFreeFont (DISPLAY, f); 604 XFreeFont (disp, f);
506 return ret; 605 return ret;
507 } 606 }
508 else 607 else
509 return false; 608 return false;
510} 609}
511 610
512// fix the size of scalable fonts 611// fix the size of scalable fonts
513static void 612static bool
514fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) 613replace_field (char *buf, const char *name, int index, const char old, const char *replace)
515{ 614{
516 int slashes = 0; 615 int slashes = 0;
517 const char *size; 616 const char *field, *end;
518 617
519 for (const char *c = name; *c; c++) 618 for (const char *c = name; *c; c++)
520 if (*c == '-') 619 if (*c == '-')
521 { 620 {
522 if (slashes == 6) 621 if (slashes == index)
523 size = c + 1; 622 field = c + 1;
623
624 if (slashes == index + 1)
625 end = c;
524 626
525 if (++slashes >= 13) 627 if (++slashes >= 13)
526 break; 628 break;
527 } 629 }
528 630
529 if (slashes >= 13 && size[0] == '0') 631 if (slashes >= 13 && (!old || *field == old))
530 { 632 {
633 // TODO: check for overflow in font-name
531 strncpy (buf, name, size - name); 634 strncpy (buf, name, field - name);
532 buf += size - name; 635 buf += field - name;
533 buf += sprintf (buf, "%d", prop.height);
534 strcpy (buf, size + 1); 636 strcpy (buf, replace);
637 strcat (buf, end);
638
639 return true;
535 } 640 }
536 else 641 else
642 {
537 strcpy (buf, name); 643 strcpy (buf, name);
644
645 return false;
646 }
538} 647}
539 648
540bool 649bool
541rxvt_font_x11::load (const rxvt_fontprop &prop) 650rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
542{ 651{
652 dTermDisplay;
653
543 clear (); 654 clear ();
655
656 char field_str[64]; // enough for 128 bits
657
658 // first morph the font if required
659 if (force_prop)
660 {
661 char fname[1024];
662
663 if (name[0] != '-')
664 {
665 f = XLoadQueryFont (disp, name);
666
667 if (!f)
668 return false;
669
670 char *new_name = get_property (f, XA_FONT, name);
671
672 if (new_name)
673 set_name (new_name);
674 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
676
677 XFreeFont (disp, f);
678 f = 0;
679 }
680
681 if (prop.weight != rxvt_fontprop::unset)
682 {
683 replace_field (fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold");
686 set_name (strdup (fname));
687 }
688
689 if (prop.slant != rxvt_fontprop::unset)
690 {
691 replace_field (fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname));
695 }
696 }
697
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height);
700
701 struct font_weight {
702 char *name;
703 int diff;
704
705 void clear ()
706 {
707 name = 0;
708 diff = 0x7fffffff;
709 }
710
711 font_weight () { clear (); }
712 ~font_weight () { free (name); }
713 };
544 714
545 char **list; 715 char **list;
546 int count; 716 int count;
547 list = XListFonts (DISPLAY, name, 1024, &count); 717 list = XListFonts (disp, name, 4000, &count);
718
548 set_name (0); 719 set_name (0);
549 720
550 if (!list) 721 if (!list)
551 return false; 722 return false;
552 723
553 int bestdiff = 0x7fffffff; 724 font_weight *fonts = new font_weight[count];
725
554 for (int i = 0; i < count; i++) 726 for (int i = 0; i < count; i++)
555 { 727 {
556 rxvt_fontprop p; 728 rxvt_fontprop p;
557 char fname[1024]; 729 char fname[1024];
558 fix_scalable (fname, list[i], prop); 730
731 int diff = 0;
732
733 if (replace_field (fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts
735 else if (replace_field (fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
559 737
560 if (!set_properties (p, fname)) 738 if (!set_properties (p, fname))
561 continue; 739 continue;
562 740
741 if (prop.height != rxvt_fontprop::unset
563 if (p.height > prop.height) // weed out too large fonts 742 && p.height > prop.height) // weed out too large fonts
564 continue; 743 continue;
565 744
566 int diff = (prop.height - p.height) * 32 745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567 + abs (prop.weight - p.weight) 746 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568 + abs (prop.slant - p.slant ); 747 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569 749
570 if (!name // compare against best found so far 750 fonts[i].name = strdup (fname);
571 || diff < bestdiff) 751 fonts[i].diff = diff;
572 {
573 set_name (strdup (fname));
574 bestdiff = diff;
575 }
576 } 752 }
577 753
578 XFreeFontNames (list); 754 XFreeFontNames (list);
579 755
580 if (!name) 756 // this loop only iterates when the guessed font-size is too small
581 return false; 757 for (;;)
758 {
759 font_weight *best = fonts + count - 1;
582 760
583 f = XLoadQueryFont (DISPLAY, name); 761 for (font_weight *w = best; w-- > fonts; )
762 if (w->diff <= best->diff)
763 best = w;
764
765 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name)))
767 break;
768
769 set_name (best->name);
770 best->clear ();
771
772 ascent = f->ascent;
773 descent = f->descent;
774 height = ascent + descent;
775
776 if (prop.height == rxvt_fontprop::unset
777 || height <= prop.height)
778 break; // font is ready for use
779
780 // PIXEL_SIZE small enough, but real height too large
781 clear ();
782 }
783
784 delete [] fonts;
584 785
585 if (!f) 786 if (!f)
586 return false; 787 return false;
587 788
588 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
589 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
590 791
591 if (registry && encoding) 792 if (registry && encoding)
592 { 793 {
593 char charset[64]; 794 char charset[64];
594 snprintf (charset, 64, "%s-%s", registry, encoding); 795 snprintf (charset, 64, "%s-%s", registry, encoding);
595 796
596 cs = codeset_from_name (charset); 797 cs = codeset_from_name (charset);
597 } 798 }
598 else 799 else
599 { 800 {
600 const char *charset = get_property (f, "FONT", 0); 801 const char *charset = get_property (f, XA_FONT, 0);
601 802
602 if (!charset) 803 if (!charset)
603 charset = name; 804 charset = name;
604 805
605 int count = 13; 806 int count = 13;
… …
617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618 819
619 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 820 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620 enc2b = encm || f->max_char_or_byte2 > 255; 821 enc2b = encm || f->max_char_or_byte2 > 255;
621 822
622 ascent = f->ascent;
623 descent = f->descent;
624 height = ascent + descent;
625
626 slow = false; 823 slow = false;
627 824
825#if 1 // only used for slow detection, TODO optimize
628 if (f->min_bounds.width == f->max_bounds.width) 826 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
629 width = f->min_bounds.width;
630 else if (f->per_char == NULL)
631 width = f->max_bounds.width; 827 width = f->max_bounds.width;
632 else 828 else
633 { 829 {
634 slow = true; 830 slow = true;
635 831
636 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 832 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
637 833
638 if (encm) 834 if (encm)
639 N += (f->max_byte1 - f->min_byte1) 835 N += (f->max_byte1 - f->min_byte1)
640 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
641 837
642 while (N) 838 while (N)
643 { 839 {
644 if (f->per_char[N].width > width) 840 if (f->per_char[N].width > width)
645 width = f->per_char[N].width; 841 width = f->per_char[N].width;
646 842
647 --N; 843 --N;
648 } 844 }
649 } 845 }
846#endif
847
848 width = 1;
849
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
851 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue;
854
855 // ignore characters we wouldn't use anyways
856 bool careful;
857 if (!has_char (*t, &prop, careful))
858 continue;
859
860 XChar2b ch = { *t >> 8, *t };
861
862 XCharStruct g;
863 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865
866 int wcw = WCWIDTH (*t);
867 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868
869 if (width < g.width) width = g.width;
870 }
650 871
651 if (cs == CS_UNKNOWN) 872 if (cs == CS_UNKNOWN)
652 { 873 {
653 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654 875
655 clear (); 876 clear ();
656
657 return false; 877 return false;
658 } 878 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif
659 887
660 return true; 888 return true;
661} 889}
662 890
663void 891void
664rxvt_font_x11::clear () 892rxvt_font_x11::clear ()
665{ 893{
666 if (f) 894 if (f)
667 { 895 {
668 XFreeFont (DISPLAY, f); 896 XFreeFont (term->dpy, f);
669 f = 0; 897 f = 0;
670 } 898 }
671} 899}
672 900
673bool 901bool
674rxvt_font_x11::has_codepoint (unicode_t unicode) 902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
675{ 903{
676 uint32_t ch = FROM_UNICODE (cs, unicode); 904 uint32_t ch = FROM_UNICODE (cs, unicode);
677 905
678 if (ch == NOCHAR) 906 if (ch == NOCHAR)
679 return false; 907 return false;
… …
688 916
689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 917 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 918 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691 return false; 919 return false;
692 920
693 if (!f->per_char) 921 if (f->per_char)
694 return true; 922 {
695
696 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; 923 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; 924 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698 925
699 xcs = f->per_char + N; 926 xcs = f->per_char + N;
927 }
928 else
929 xcs = &f->max_bounds;
700 } 930 }
701 else 931 else
702 { 932 {
703 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) 933 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704 return false; 934 return false;
705 935
706 if (!f->per_char) 936 if (f->per_char)
707 return true;
708
709 xcs = f->per_char + (ch - f->min_char_or_byte2); 937 xcs = f->per_char + (ch - f->min_char_or_byte2);
938 else
939 xcs = &f->max_bounds;
710 } 940 }
711 941
712 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 942 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713 && xcs->ascent == 0 && xcs->descent == 0) 943 && xcs->ascent == 0 && xcs->descent == 0)
944 return false;
945
946 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true;
948
949 // check wether character overlaps previous/next character
950 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = max (WCWIDTH (unicode), 1);
952
953 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
954
955 if (careful && !OVERLAP_OK (w, wcw, prop))
714 return false; 956 return false;
715 957
716 return true; 958 return true;
717} 959}
718 960
… …
724 // this looks like a mess /. 966 // this looks like a mess /.
725 // and it is a mess /. 967 // and it is a mess /.
726 // yet we are trying to be perfect /. 968 // yet we are trying to be perfect /.
727 // but the result still isn't perfect /. 969 // but the result still isn't perfect /.
728 970
971 dTermDisplay;
972 dTermGC;
973
729 bool slow = this->slow 974 bool slow = this->slow
730 || width != r->TermWin.fwidth 975 || width != term->fwidth
731 || height != r->TermWin.fheight; 976 || height != term->fheight;
732 977
733 int base = r->TermWin.fbase; 978 int base = ascent; // sorry, incorrect: term->fbase;
734 979
735 XGCValues v; 980 XGCValues v;
736 v.foreground = r->PixColors[fg]; 981 v.foreground = term->pix_colors[fg];
737 v.font = f->fid; 982 v.font = f->fid;
738 983
739 if (enc2b) 984 if (enc2b)
740 { 985 {
741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 986 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742 987
743 if (bg == Color_bg && !slow) 988 if (bg == Color_bg && !slow)
744 { 989 {
745 v.background = r->PixColors[bg]; 990 v.background = term->pix_colors[bg];
746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 991 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 992 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
748 } 993 }
749 else 994 else
750 { 995 {
751 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
752 997
753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 998 XChangeGC (disp, gc, GCForeground | GCFont, &v);
754 999
755 if (slow) 1000 if (slow)
756 { 1001 {
757 do 1002 do
758 { 1003 {
759 if (xc->byte1 || xc->byte2) 1004 if (xc->byte1 || xc->byte2)
760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1005 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
761 1006
762 x += r->TermWin.fwidth; 1007 x += term->fwidth;
763 xc++; len--; 1008 xc++; len--;
764 } 1009 }
765 while (len); 1010 while (len);
766 } 1011 }
767 else 1012 else
768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1013 XDrawString16 (disp, d, gc, x, y + base, xc, len);
769 } 1014 }
770 } 1015 }
771 else 1016 else
772 { 1017 {
773 const char *xc = enc_char (text, len, cs, slow); 1018 const char *xc = enc_char (text, len, cs, slow);
774 1019
775 if (bg == Color_bg && !slow) 1020 if (bg == Color_bg && !slow)
776 { 1021 {
777 v.background = r->PixColors[bg]; 1022 v.background = term->pix_colors[bg];
778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1023 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1024 XDrawImageString (disp, d, gc, x, y + base, xc, len);
780 } 1025 }
781 else 1026 else
782 { 1027 {
783 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
784 1029
785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1030 XChangeGC (disp, gc, GCForeground | GCFont, &v);
786 1031
787 if (slow) 1032 if (slow)
788 { 1033 {
789 do 1034 do
790 { 1035 {
791 if (*xc) 1036 if (*xc)
792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1037 XDrawString (disp, d, gc, x, y + base, xc, 1);
793 1038
794 x += r->TermWin.fwidth; 1039 x += term->fwidth;
795 xc++; len--; 1040 xc++; len--;
796 } 1041 }
797 while (len); 1042 while (len);
798 } 1043 }
799 else 1044 else
800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1045 XDrawString (disp, d, gc, x, y + base, xc, len);
801 } 1046 }
802 } 1047 }
803} 1048}
804 1049
805///////////////////////////////////////////////////////////////////////////// 1050/////////////////////////////////////////////////////////////////////////////
806 1051
807#if XFT 1052#if XFT
808#if 0
809#define UNIBITS 21
810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811#define SWATHBITS 8
812#endif
813 1053
814struct rxvt_font_xft : rxvt_font { 1054struct rxvt_font_xft : rxvt_font {
815 rxvt_font_xft () { f = 0; } 1055 rxvt_font_xft () { f = 0; }
816 1056
817 void clear (); 1057 void clear ();
818 1058
819 rxvt_fontprop properties (); 1059 rxvt_fontprop properties ();
820 1060
821 bool load (const rxvt_fontprop &prop); 1061 bool load (const rxvt_fontprop &prop, bool force_prop);
822 1062
823 void draw (rxvt_drawable &d, int x, int y, 1063 void draw (rxvt_drawable &d, int x, int y,
824 const text_t *text, int len, 1064 const text_t *text, int len,
825 int fg, int bg); 1065 int fg, int bg);
826 1066
827 bool has_codepoint (unicode_t unicode); 1067 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
828 1068
829protected: 1069protected:
830 XftFont *f; 1070 XftFont *f;
831}; 1071};
832 1072
833void 1073void
834rxvt_font_xft::clear () 1074rxvt_font_xft::clear ()
835{ 1075{
836 if (f) 1076 if (f)
837 { 1077 {
838 XftFontClose (DISPLAY, f); 1078 XftFontClose (term->dpy, f);
839 f = 0; 1079 f = 0;
840 } 1080 }
841} 1081}
842 1082
843rxvt_fontprop 1083rxvt_fontprop
… …
847 1087
848 FT_Face face = XftLockFace (f); 1088 FT_Face face = XftLockFace (f);
849 1089
850 p.width = width; 1090 p.width = width;
851 p.height = height; 1091 p.height = height;
1092 p.ascent = ascent;
852 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1093 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1094 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
854 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1095 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1096 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
856 1097
… …
858 1099
859 return p; 1100 return p;
860} 1101}
861 1102
862bool 1103bool
863rxvt_font_xft::load (const rxvt_fontprop &prop) 1104rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
864{ 1105{
865#if 0 1106 dTermDisplay;
866 for (int i = 0; i < SWATHCOUNT; i++)
867 cvr[i] = 0;
868#endif
869 1107
870 clear (); 1108 clear ();
871 1109
872 FcPattern *p = FcNameParse ((FcChar8 *) name); 1110 FcPattern *p = FcNameParse ((FcChar8 *) name);
873 1111
874 if (!p) 1112 if (!p)
875 return false; 1113 return false;
876 1114
877 FcValue v; 1115 FcValue v;
878 1116
1117 if (prop.height != rxvt_fontprop::unset
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1118 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1120 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881 1121
1122 if (prop.weight != rxvt_fontprop::unset
882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1123 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1124 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884 1125
1126 if (prop.slant != rxvt_fontprop::unset
885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1127 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
886 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1128 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890 1129
891#if 0 // clipping unfortunately destroys our precious double-width-characters 1130#if 0 // clipping unfortunately destroys our precious double-width-characters
892 // clip width, we can't do better, or can we? 1131 // clip width, we can't do better, or can we?
893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895#endif 1134#endif
1135
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1);
1138
1139 // store generated name so iso14755 view gives better results
1140 set_name ((char *)FcNameUnparse (p));
896 1141
897 XftResult result; 1142 XftResult result;
898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1143 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
899 1144
900 FcPatternDestroy (p); 1145 FcPatternDestroy (p);
901 1146
902 if (!match) 1147 if (!match)
903 return false; 1148 return false;
904 1149
905 f = XftFontOpenPattern (DISPLAY, match);
906
907 if (!f)
908 {
909 FcPatternDestroy (match);
910 return false;
911 }
912
913 FT_Face face = XftLockFace (f);
914
915 slow = !FT_IS_FIXED_WIDTH (face);
916
917 int ftheight = 0; 1150 int ftheight = 0;
1151 bool success = true;
918 1152
919 for (;;) 1153 for (;;)
920 { 1154 {
921 XGlyphInfo g1, g2; 1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922 FcChar8 c;
923 1156
924 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 1157 if (!f)
925 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 1158 {
1159 success = false;
1160 break;
1161 }
926 1162
927 if (g1.xOff != g2.xOff) // don't simply trust the font 1163 FT_Face face = XftLockFace (f);
928 slow = true;
929 1164
930 width = g2.xOff;
931 ascent = (face->size->metrics.ascender + 63) >> 6; 1165 ascent = (face->size->metrics.ascender + 63) >> 6;
932 descent = (-face->size->metrics.descender + 63) >> 6; 1166 descent = (-face->size->metrics.descender + 63) >> 6;
933 height = ascent + descent; 1167 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1168 width = 0;
934 1169
1170 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1171
1172 XftUnlockFace (f);
1173
1174 int glheight = height;
1175
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1177 {
1178 FcChar16 ch = *t;
1179
1180 if (cs != CS_UNICODE
1181 && ch > 0x100
1182 && FROM_UNICODE (cs, ch) == NOCHAR)
1183 continue;
1184
1185 // ignore characters we wouldn't use anyways
1186 bool careful;
1187 if (!has_char (*t, &prop, careful))
1188 continue;
1189
1190 XGlyphInfo g;
1191 XftTextExtents16 (disp, f, &ch, 1, &g);
1192
1193 g.width -= g.x;
1194
1195 int wcw = WCWIDTH (ch);
1196 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197
1198 if (width < g.width ) width = g.width;
1199 if (height < g.height ) height = g.height;
1200 if (glheight < g.height - g.y) glheight = g.height - g.y;
1201 }
1202
1203 if (!width)
1204 {
1205 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1206
1207 XftFontClose (disp, f);
1208 f = 0;
1209
1210 success = false;
1211 break;
1212 }
1213
1214 if (prop.height == rxvt_fontprop::unset
935 if (height <= prop.height || !prop.height) 1215 || (height <= prop.height && glheight <= prop.height)
1216 || height <= 2
1217 || !scalable)
936 break; 1218 break;
937 1219
938 if (ftheight) 1220 if (ftheight)
939 { 1221 {
940 // take smaller steps near the end 1222 // take smaller steps near the end
941 if (height > prop.height + 1) ftheight++; 1223 if (height > prop.height + 1) ftheight++;
942 if (height > prop.height + 2) ftheight++; 1224 if (height > prop.height + 2) ftheight++;
943 if (height > prop.height + 3) ftheight++; 1225 if (height > prop.height + 3) ftheight++;
944 1226
945 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); 1227 ftheight -= height - prop.height;
946 } 1228 }
947 else 1229 else
948 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); 1230 ftheight = prop.height - 1;
1231
1232 XftFontClose (disp, f);
1233 FcPatternDel (match, FC_PIXEL_SIZE);
1234 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1235 }
1236
1237 FcPatternDestroy (match);
1238
1239#if 0 // do it per-character
1240 if (prop.width != rxvt_fontprop::unset && width > prop.width)
949 } 1241 {
1242 clear ();
1243 success = false;
1244 }
1245#endif
950 1246
951 XftUnlockFace (f); 1247 return success;
1248}
1249
1250bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{
1253 careful = false;
1254
1255 if (!XftCharExists (term->dpy, f, unicode))
1256 return false;
1257
1258 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true;
1260
1261 // check character against base font bounding box
1262 FcChar32 ch = unicode;
1263 XGlyphInfo g;
1264 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265
1266 int w = g.width - g.x;
1267 int wcw = max (WCWIDTH (unicode), 1);
1268
1269 careful = g.x > 0 || w > prop->width * wcw;
1270
1271 if (careful && !OVERLAP_OK (w, wcw, prop))
1272 return false;
1273
1274 // this weeds out _totally_ broken fonts, or glyphs
1275 if (!OVERLAP_OK (g.xOff, wcw, prop))
1276 return false;
952 1277
953 return true; 1278 return true;
954}
955
956bool
957rxvt_font_xft::has_codepoint (unicode_t unicode)
958{
959 return XftCharExists (DISPLAY, f, unicode);
960} 1279}
961 1280
962void 1281void
963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1282rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964 const text_t *text, int len, 1283 const text_t *text, int len,
965 int fg, int bg) 1284 int fg, int bg)
966{ 1285{
967 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1286 XGlyphInfo extents;
1287 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1288 XftGlyphSpec *ep = enc;
968 1289
969 if (!slow && width == r->TermWin.fwidth && 0) 1290 dTermDisplay;
970 { 1291 dTermGC;
971 if (sizeof (text_t) == sizeof (FcChar16)) 1292
972 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1293 int w = term->fwidth * len;
973 else 1294 int h = term->fheight;
974 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 1295
975 } 1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
976 else 1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
977 { 1298 * good idea from the perspective of packaging for wide variety of user configs.
1299 */
1300 bool buffered = true
1301#ifdef FORCE_UNBUFFERED_XFT
1302 && bg >= 0
1303#endif
1304 ;
1305 // cut trailing spaces
1306 while (len && text [len - 1] == ' ')
1307 len--;
1308
1309 int x_ = buffered ? 0 : x;
1310 int y_ = buffered ? 0 : y;
1311
978 while (len) 1312 while (len)
1313 {
1314 int cwidth = term->fwidth;
1315 FcChar32 fc = *text++; len--;
1316
1317 while (len && *text == NOCHAR)
1318 text++, len--, cwidth += term->fwidth;
1319
1320 if (fc != ' ') // skip spaces
1321 {
1322 FT_UInt glyph = XftCharIndex (disp, f, fc);
1323 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1324
1325 ep->glyph = glyph;
1326 ep->x = x_ + (cwidth - extents.xOff >> 1);
1327 ep->y = y_ + ascent;
1328
1329 if (extents.xOff == 0)
1330 ep->x = x_ + cwidth;
1331
1332 ep++;
979 { 1333 }
980 if (*text != NOCHAR && *text != ' ') 1334
1335 x_ += cwidth;
1336 }
1337
1338 if (buffered)
1339 {
1340 bool back_rendered = false;
1341 if (ep != enc)
1342 {
1343 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344
1345#ifdef HAVE_BG_PIXMAP
1346 if (term->bgPixmap.pixmap)
981 { 1347 {
982 int fwidth = r->TermWin.fwidth; 1348 Picture dst = 0;
983 if (len >= 2 && text[1] == NOCHAR)
984 fwidth *= 2;
985 1349
986 XGlyphInfo extents; 1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
987 if (sizeof (text_t) == sizeof (FcChar16)) 1351 dst = XftDrawPicture (d2);
1352
1353 if (bg < 0 || dst != 0)
988 { 1354 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); 1355 int src_x = x, src_y = y ;
990 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1356
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 1357 if (term->bgPixmap.is_parentOrigin ())
1358 {
1359 src_x += term->window_vt_x;
1360 src_y += term->window_vt_y;
992 } 1361 }
1362
1363 if (term->bgPixmap.pmap_width >= src_x+w
1364 && term->bgPixmap.pmap_height >= src_y+h)
1365 {
1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1367 src_x, src_y, w, h, 0, 0);
1368 }
993 else 1369 else
994 { 1370 {
995 XGlyphInfo extents; 1371 XGCValues gcv;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); 1372
997 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1373 gcv.fill_style = FillTiled;
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 1374 gcv.tile = term->bgPixmap.pixmap;
1375 gcv.ts_x_origin = -src_x;
1376 gcv.ts_y_origin = -src_y;
1377
1378 XChangeGC (disp, gc,
1379 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1380 &gcv);
1381
1382 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383
1384 gcv.fill_style = FillSolid;
1385 XChangeGC (disp, gc, GCFillStyle, &gcv);
1386 }
1387
1388 if (bg >= 0)
1389 {
1390 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1391 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392 }
1393
1394 back_rendered = true;
999 } 1395 }
1000 } 1396 }
1397#endif
1001 1398
1002 x += r->TermWin.fwidth; 1399 if (bg >= 0 && !back_rendered)
1003 text++; 1400 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1004 len--; 1401
1402 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1005 } 1404 }
1405 else
1406 clear_rect (d, x, y, w, h, bg);
1407 }
1408 else
1006 } 1409 {
1410 clear_rect (d, x, y, w, h, bg);
1411 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1412 }
1007} 1413}
1414
1008#endif 1415#endif
1009 1416
1010///////////////////////////////////////////////////////////////////////////// 1417/////////////////////////////////////////////////////////////////////////////
1011 1418
1012rxvt_fontset::rxvt_fontset (rxvt_t r) 1419rxvt_fontset::rxvt_fontset (rxvt_term *term)
1013: r (r), fontdesc (0) 1420: fontdesc (0), term (term)
1014{ 1421{
1015 clear (); 1422 clear ();
1016} 1423}
1017 1424
1018rxvt_fontset::~rxvt_fontset () 1425rxvt_fontset::~rxvt_fontset ()
… …
1021} 1428}
1022 1429
1023void 1430void
1024rxvt_fontset::clear () 1431rxvt_fontset::clear ()
1025{ 1432{
1433 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1434 = rxvt_fontprop::unset;
1435 force_prop = false;
1436
1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1437 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027 FONT_UNREF (*i); 1438 FONT_UNREF (*i);
1028 1439
1440 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1441 delete *p;
1442
1029 free (fontdesc); fontdesc = 0; 1443 free (fontdesc); fontdesc = 0;
1030 1444
1031 fonts.clear (); 1445 fonts.clear ();
1032 base_id = 0;
1033 base_prop.height = 0x7fffffff;
1034 base_prop.weight = rxvt_fontprop::medium;
1035 base_prop.slant = rxvt_fontprop::roman;
1036 1446
1037 fallback = fallback_fonts; 1447 fallback = fallback_fonts;
1038} 1448}
1039 1449
1040rxvt_font * 1450rxvt_font *
1041rxvt_fontset::new_font (const char *name, codeset cs) 1451rxvt_fontset::new_font (const char *name, codeset cs)
1042{ 1452{
1043 rxvt_font *f; 1453 rxvt_font *f;
1044 1454
1045 if (!name || !*name) 1455 if (!name || !*name)
1046 { 1456 {
1047 name = ""; 1457 name = "";
1048 f = new rxvt_font_default; 1458 f = new rxvt_font_default (this);
1049 } 1459 }
1050#if XFT 1460#if XFT
1051 else if (!strncmp (name, "xft:", 4)) 1461 else if (!strncmp (name, "xft:", 4))
1052 { 1462 {
1053 name += 4; 1463 name += 4;
1054 f = new rxvt_font_xft; 1464 f = new rxvt_font_xft ();
1055 } 1465 }
1056#endif 1466#endif
1057 else if (!strncmp (name, "x:", 2)) 1467 else if (!strncmp (name, "x:", 2))
1058 { 1468 {
1059 name += 2; 1469 name += 2;
1060 f = new rxvt_font_x11; 1470 f = new rxvt_font_x11;
1061 } 1471 }
1062 else 1472 else
1063 f = new rxvt_font_x11; 1473 f = new rxvt_font_x11;
1064 1474
1065 f->fs = this;
1066 f->set_term (r); 1475 f->set_term (term);
1067 f->set_name (strdup (name)); 1476 f->set_name (strdup (name));
1068 1477
1069 f->cs = cs; 1478 f->cs = cs;
1070 f->loaded = false; 1479 f->loaded = false;
1071 1480
… …
1082 char buf[512]; 1491 char buf[512];
1083 const char *end; 1492 const char *end;
1084 1493
1085 do 1494 do
1086 { 1495 {
1087 while (*desc <= ' ') desc++; 1496 while (*desc && *desc <= ' ')
1497 desc++;
1498
1499 codeset cs = CS_UNICODE;
1088 1500
1089 if (*desc == '[') 1501 if (*desc == '[')
1090 { 1502 {
1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1503 char spec[256];
1092
1093 //const char *extra = desc++; // not yet used 1504 const char *extra = ++desc; // not yet used
1094 1505
1095 desc = strchr (desc, ']'); 1506 desc = strchr (desc, ']');
1096 1507
1097 if (!desc) 1508 if (!desc)
1098 { 1509 {
1099 fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); 1510 rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100 break; 1511 break;
1101 } 1512 }
1513
1514 memcpy (spec, extra, min (desc - extra, 255));
1515 spec[min (desc - extra, 255)] = 0;
1516
1517 if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
1518 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1519 else
1520 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102 1521
1103 desc++; 1522 desc++;
1104 while (*desc <= ' ') desc++; 1523 while (*desc <= ' ') desc++;
1105 } 1524 }
1106 1525
… …
1111 if (end - desc < 511) 1530 if (end - desc < 511)
1112 { 1531 {
1113 strncpy (buf, desc, end - desc); 1532 strncpy (buf, desc, end - desc);
1114 buf[end - desc] = 0; 1533 buf[end - desc] = 0;
1115 1534
1116 fonts.push_back (new_font (buf, CS_UNICODE)); 1535 fonts.push_back (new_font (buf, cs));
1117 } 1536 }
1537 else
1538 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118 1539
1119 desc = end + 1; 1540 desc = end + 1;
1120 } 1541 }
1121 while (*end); 1542 while (*end);
1122 } 1543 }
1123} 1544}
1124 1545
1125bool 1546bool
1126rxvt_fontset::realize_font (int i) 1547rxvt_fontset::realize_font (int i)
1127{ 1548{
1549 if (i < 0 || i >= fonts.size ())
1550 return false;
1551
1128 if (fonts[i]->loaded) 1552 if (fonts[i]->loaded)
1129 return true; 1553 return true;
1130 1554
1131 fonts[i]->loaded = true; 1555 fonts[i]->loaded = true;
1132 1556
1133 if (!fonts[i]->load (base_prop)) 1557 if (!fonts[i]->load (prop, force_prop))
1134 { 1558 {
1135 fonts[i]->cs = CS_UNKNOWN; 1559 fonts[i]->cs = CS_UNKNOWN;
1136 return false; 1560 return false;
1137 } 1561 }
1138 1562
… …
1148 1572
1149 fonts.push_back (new_font (0, CS_UNICODE)); 1573 fonts.push_back (new_font (0, CS_UNICODE));
1150 realize_font (0); 1574 realize_font (0);
1151 1575
1152 add_fonts (desc); 1576 add_fonts (desc);
1153
1154 if (!base_id)
1155 base_id = 1;
1156
1157 // we currently need a base-font, no matter what
1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1159 {
1160 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161 add_fonts ("fixed");
1162 base_id = fonts.size () - 1;
1163 }
1164
1165 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1166 return false;
1167
1168 base_prop = fonts[base_id]->properties ();
1169 1577
1170 return true; 1578 return true;
1171} 1579}
1172 1580
1173int 1581int
… …
1179 1587
1180 return -1; 1588 return -1;
1181} 1589}
1182 1590
1183int 1591int
1184rxvt_fontset::find_font (unicode_t unicode, bool bold) 1592rxvt_fontset::find_font (unicode_t unicode)
1185{ 1593{
1594 if (unicode >= 1<<20)
1595 return 0;
1186 1596
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1597 unicode_t hi = unicode >> 8;
1188 i < fonts.size (); 1598
1189 i++) 1599 if (hi < fmap.size ()
1600 && fmap[hi]
1601 && (*fmap[hi])[unicode & 0xff] != 0xff)
1602 return (*fmap[hi])[unicode & 0xff];
1603
1604 unsigned int i;
1605
1606 for (i = 0; i < fonts.size (); i++)
1190 { 1607 {
1191 rxvt_font *f = fonts[i]; 1608 rxvt_font *f = fonts[i];
1192 1609
1193 if (!f->loaded) 1610 if (!f->loaded)
1194 { 1611 {
1195 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1612 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1196 goto next_font; 1613 goto next_font;
1197 1614
1198 if (!realize_font (i)) 1615 if (!realize_font (i))
1199 goto next_font; 1616 goto next_font;
1617
1618 if (prop.ascent != rxvt_fontprop::unset)
1619 max_it (f->ascent, prop.ascent);
1200 } 1620 }
1201 1621
1202 if (f->cs == CS_UNKNOWN) 1622 if (f->cs == CS_UNKNOWN)
1203 goto next_font; 1623 goto next_font;
1204 1624
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold) 1625 bool careful;
1626 if (f->has_char (unicode, &prop, careful))
1627 {
1628 if (careful)
1629 i |= 128;
1630
1206 goto next_font; 1631 goto found;
1207 1632 }
1208 if (f->has_codepoint (unicode))
1209 return i;
1210 1633
1211 next_font: 1634 next_font:
1212 if (i == fonts.size () - 1) 1635 if (i == fonts.size () - 1)
1213 { 1636 {
1214 if (fallback->name) 1637 if (fallback->name)
… …
1221 { 1644 {
1222 // try to find a new font. 1645 // try to find a new font.
1223 // only xft currently supported, as there is no 1646 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in, 1647 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already. 1648 // while x11 has more framework in place already.
1226#if XFT 1649 // TODO: this is a real resource hog, xft takes ages(?)
1650#if XFT && USE_SLOW_LOOKUP
1227 // grab the first xft font that seems suitable 1651 // grab the first xft font that seems suitable
1228 FcPattern *p = FcPatternCreate (); 1652 FcPattern *p = FcPatternCreate ();
1229 1653
1230 FcCharSet *s = FcCharSetCreate (); 1654 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode); 1655 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s); 1656 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return 1657 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/ 1658 // a non-matching font even if a better font is available :/
1235 1659
1660 x x x x TODO prop might have unset contents
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); 1661 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); 1662 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant); 1663 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1); 1664 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1665 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241 1666
1242 XftResult result; 1667 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1668 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1244 1669
1245 FcPatternDestroy (p); 1670 FcPatternDestroy (p);
1246 1671
1247 if (match) 1672 if (match)
1248 { 1673 {
… …
1253 if (find_font (font) < 0) 1678 if (find_font (font) < 0)
1254 { 1679 {
1255 char fontname[4096]; 1680 char fontname[4096];
1256 sprintf (fontname, "xft:%-.4090s", font); 1681 sprintf (fontname, "xft:%-.4090s", font);
1257 1682
1258 fonts.push_back (new_font (fontname, CS_UNICODE)); 1683 fonts.push_back (new_font (fontname, CS_UNICODE));
1259 } 1684 }
1260 1685
1261 free (font); 1686 free (font);
1262 } 1687 }
1263#endif 1688#endif
1264 } 1689 }
1265 } 1690 }
1266 } 1691 }
1267 1692
1268 // if no bold font found, use a regular one 1693 /* we must return SOME font */
1269 if (bold) 1694 i = 0;
1270 return find_font (unicode);
1271 1695
1272 return 0; /* we must return SOME font */ 1696found:
1273} 1697 // found a font, cache it
1698 if (i < 255)
1699 {
1700 while (hi >= fmap.size ())
1701 fmap.push_back (0);
1274 1702
1703 if (!fmap[hi])
1704 {
1705 fmap[hi] = (pagemap *)new pagemap;
1706 memset (fmap[hi], 0xff, sizeof (pagemap));
1707 }
1275 1708
1709 (*fmap[hi])[unicode & 0xff] = i;
1710 }
1276 1711
1712 return i;
1713}
1714
1715
1716

Diff Legend

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