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.3 by root, Sun Aug 15 21:55:45 2004 UTC vs.
Revision 1.125 by ayin, Sun Nov 25 11:23:18 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->pix_colors[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->pix_colors[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
311#ifdef BUILTIN_GLYPHS
244 if (unicode >= 0x2500 && unicode <= 0x259f) 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !term->option (Opt_skipBuiltinGlyphs))
245 return true; 314 return true;
315#endif
246 316
247 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
248 return true; 318 return true;
249 319
250 switch (unicode) 320 switch (unicode)
251 { 321 {
252 case ZERO_WIDTH_CHAR: 322 case ZERO_WIDTH_CHAR:
323 case NOCHAR:
253 return true; 324 return true;
254 } 325 }
255 326
256 return false; 327 return false;
257 } 328 }
… …
264void 335void
265rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 336rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266 const text_t *text, int len, 337 const text_t *text, int len,
267 int fg, int bg) 338 int fg, int bg)
268{ 339{
340 dTermDisplay;
341 dTermGC;
342
269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 343 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
270 344
271 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
272 346
273 while (len--) 347 while (len)
274 { 348 {
275#if ENABLE_COMBINING 349#if ENABLE_COMBINING
276 compose_char *cc; 350 compose_char *cc;
277#endif 351#endif
352 const text_t *tp = text;
278 text_t t = *text++; 353 text_t t = *tp;
279 354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp;
359 int fwidth = term->fwidth * width;
360
361#ifdef BUILTIN_GLYPHS
280 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
281 { 363 {
364# include "table/linedraw.h"
282 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
285 368
286 int W = r->TermWin.fwidth; 369 int W = fwidth;
287 int H = r->TermWin.fheight; 370 int H = term->fheight;
288 371
289 int x_[16]; 372 int x_[16];
290 int y_[16]; 373 int y_[16];
291 374
292 for (int i = 0; i <= 8; i++) 375 for (int i = 0; i <= 8; i++)
… …
300 383
301 XGCValues gcv; 384 XGCValues gcv;
302 385
303 gcv.cap_style = CapButt; 386 gcv.cap_style = CapButt;
304 gcv.line_width = 0; 387 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 388 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
306 389
307 while (a < b) 390 while (a < b)
308 { 391 {
309 uint32_t command = *a++; 392 uint32_t command = *a++;
310 393
… …
317 int y2 = y_[(command >> 0) & 15]; 400 int y2 = y_[(command >> 0) & 15];
318 401
319 switch (op) 402 switch (op)
320 { 403 {
321 case 0: // line 404 case 0: // line
322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 405 XDrawLine (disp, d, gc, x1, y1, x2, y2);
323 break; 406 break;
324 407
325 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
326 if (a) 409 if (a)
327 { 410 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329 412
330 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
334 417
335 XChangeGC (d.display->display, TGC, 418 XChangeGC (disp, gc,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 419 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv); 420 &gcv);
338 } 421 }
339 422
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 423 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 424
342 if (a) 425 if (a)
343 { 426 {
344 XFreePixmap (d.display->display, gcv.stipple); 427 XFreePixmap (disp, gcv.stipple);
345 gcv.stipple = 0; 428 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 429 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 430 XChangeGC (disp, gc, GCFillStyle, &gcv);
348 } 431 }
349 break; 432 break;
350 case 2: // arc 433 case 2: // arc
351 XDrawArc (d.display->display, d, TGC, 434 XDrawArc (disp, d, gc,
352 x1 - W/2, y1 - H/2, W-1, H-1, 435 x1 - W/2, y1 - H/2, W-1, H-1,
353 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
354 break; 437 break;
355 } 438 }
356 } 439 }
357 } 440 }
441#else
442 if (0)
443 ;
444#endif
358#if ENABLE_COMBINING 445#if ENABLE_COMBINING
359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360 { 447 {
448 min_it (width, 2); // we only support wcwidth up to 2
449
450 text_t chrs[2];
451 chrs [1] = NOCHAR;
452
453 *chrs = cc->c1;
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
456
363 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
364 { 458 {
459 bool careful;
460
365 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2) 462 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367 ? f1 464 ? f1
368 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font (cc->c2)];
369 466
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
371 } 468 }
372 } 469 }
373#endif 470#endif
374 else 471 else
375 switch (t) 472 switch (t)
376 { 473 {
474 case '\t':
377 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
476 case NOCHAR:
378 break; 477 break;
379 478
380 default: 479 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, 480 XDrawRectangle (disp, d, gc, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 481 fwidth - 4, term->fheight - 4);
391 x += w;
392 } 482 }
393 483
394 x += r->TermWin.fwidth; 484 x += fwidth;
395 } 485 }
396} 486}
397 487
398///////////////////////////////////////////////////////////////////////////// 488/////////////////////////////////////////////////////////////////////////////
399 489
… …
402 492
403 void clear (); 493 void clear ();
404 494
405 rxvt_fontprop properties (); 495 rxvt_fontprop properties ();
406 496
407 bool load (const rxvt_fontprop &prop); 497 bool load (const rxvt_fontprop &prop, bool force_prop);
408 498
409 bool has_codepoint (unicode_t unicode); 499 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
410 500
411 void draw (rxvt_drawable &d, int x, int y, 501 void draw (rxvt_drawable &d, int x, int y,
412 const text_t *text, int len, 502 const text_t *text, int len,
413 int fg, int bg); 503 int fg, int bg);
414 504
505 bool slow; // wether this is a proportional font or has other funny characteristics
415 XFontStruct *f; 506 XFontStruct *f;
416 codeset cs;
417 bool enc2b, encm; 507 bool enc2b, encm;
418 508
419 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 509 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); 510 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); 511 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422 bool set_properties (rxvt_fontprop &p, const char *name); 512 bool set_properties (rxvt_fontprop &p, const char *name);
423}; 513};
424 514
425char * 515char *
426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 516rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
427{ 517{
428 unsigned long value; 518 unsigned long value;
429 519
430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 520 if (XGetFontProperty (f, property, &value))
431 return XGetAtomName (DISPLAY, value); 521 return XGetAtomName (term->dpy, value);
432 else 522 else
433 return rxvt_strdup (repl); 523 return repl ? strdup (repl) : 0;
434} 524}
435 525
436rxvt_fontprop 526rxvt_fontprop
437rxvt_font_x11::properties () 527rxvt_font_x11::properties ()
438{ 528{
… …
442} 532}
443 533
444bool 534bool
445rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 535rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
446{ 536{
447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 537 p.width = width != rxvt_fontprop::unset ? width
538 : avgwidth ? (avgwidth + 1) / 10
539 : (height + 1) / 2;
448 p.height = height; 540 p.height = height;
541 p.ascent = rxvt_fontprop::unset;
449 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 542 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; 543 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451 544
452 return true; 545 return true;
453} 546}
454 547
455bool 548bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 549rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 550{
458 unsigned long height; 551 unsigned long height;
552
553#if 0
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 554 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
460 return false; 555 return false;
556#else
557 height = f->ascent + f->descent;
558#endif
461 559
462 unsigned long avgwidth; 560 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 561 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
464 avgwidth = 0; 562 avgwidth = 0;
465 563
466 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 564 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
467 char *slant = get_property (f, "SLANT", "r"); 565 char *slant = get_property (f, term->xa [XA_SLANT], "r");
468 566
469 set_properties (p, height, weight, slant, avgwidth); 567 set_properties (p, height, weight, slant, avgwidth);
470 568
471 free (weight); 569 free (weight);
472 free (slant); 570 free (slant);
473 571
572 p.ascent = f->ascent;
573
474 return true; 574 return true;
475} 575}
476 576
477bool 577bool
478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 578rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
479{ 579{
580 dTermDisplay;
480 int slashes = 0; 581 int slashes = 0;
481 const char *comp[13]; 582 const char *comp[13];
482 583
483 for (const char *c = name; *c; c++) 584 for (const char *c = name; *c; c++)
484 if (*c == '-') 585 if (*c == '-')
… …
492 if (slashes >= 13 593 if (slashes >= 13
493 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 594 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
494 && (*comp[11] >= '0' && *comp[11] <= '9')) 595 && (*comp[11] >= '0' && *comp[11] <= '9'))
495 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 596 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
496 597
497 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 598 XFontStruct *f = XLoadQueryFont (disp, name);
498 599
499 if (f) 600 if (f)
500 { 601 {
501 // the font should really exist now. if not, we have a problem 602 // 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). 603 // (e.g. if the user did xset fp rehash just when we were searching fonts).
503 // in that case, just return garbage. 604 // in that case, just return garbage.
504 bool ret = set_properties (p, f); 605 bool ret = set_properties (p, f);
505 XFreeFont (DISPLAY, f); 606 XFreeFont (disp, f);
506 return ret; 607 return ret;
507 } 608 }
508 else 609 else
509 return false; 610 return false;
510} 611}
511 612
512// fix the size of scalable fonts 613// fix the size of scalable fonts
513static void 614static bool
514fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) 615replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
515{ 616{
516 int slashes = 0; 617 int slashes = 0;
517 const char *size; 618 const char *field, *end;
518 619
519 for (const char *c = name; *c; c++) 620 for (const char *c = name; *c; c++)
520 if (*c == '-') 621 if (*c == '-')
521 { 622 {
522 if (slashes == 6) 623 if (slashes == index)
523 size = c + 1; 624 field = c + 1;
625
626 if (slashes == index + 1)
627 end = c;
524 628
525 if (++slashes >= 13) 629 if (++slashes >= 13)
526 break; 630 break;
527 } 631 }
528 632
529 if (slashes >= 13 && size[0] == '0') 633 if (slashes >= 13 && (!old || *field == old))
530 { 634 {
635 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
531 strncpy (buf, name, size - name); 637 strncpy (*ptr, name, len);
532 buf += size - name; 638 strcpy (*ptr + len, replace);
533 buf += sprintf (buf, "%d", prop.height); 639 strcat (*ptr, end);
534 strcpy (buf, size + 1); 640
641 return true;
535 } 642 }
536 else 643 else
537 strcpy (buf, name); 644 {
645 *ptr = strdup (name);
646
647 return false;
648 }
538} 649}
539 650
540bool 651bool
541rxvt_font_x11::load (const rxvt_fontprop &prop) 652rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
542{ 653{
654 dTermDisplay;
655
543 clear (); 656 clear ();
657
658 char field_str[64]; // enough for 128 bits
659
660 // first morph the font if required
661 if (force_prop)
662 {
663 char *fname;
664
665 if (name[0] != '-')
666 {
667 f = XLoadQueryFont (disp, name);
668
669 if (!f)
670 return false;
671
672 char *new_name = get_property (f, XA_FONT, name);
673
674 if (new_name)
675 set_name (new_name);
676 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
678
679 XFreeFont (disp, f);
680 f = 0;
681 }
682
683 if (prop.weight != rxvt_fontprop::unset)
684 {
685 replace_field (&fname, name, 2, 0,
686 prop.weight < rxvt_fontprop::bold
687 ? "medium" : "bold");
688 set_name (fname);
689 }
690
691 if (prop.slant != rxvt_fontprop::unset)
692 {
693 replace_field (&fname, name, 3, 0,
694 prop.slant < rxvt_fontprop::italic
695 ? "r" : "i"); // TODO: handle "o"blique, too
696 set_name (fname);
697 }
698 }
699
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height);
702
703 struct font_weight {
704 char *name;
705 int diff;
706
707 void clear ()
708 {
709 name = 0;
710 diff = 0x7fffffff;
711 }
712
713 font_weight () { clear (); }
714 ~font_weight () { free (name); }
715 };
544 716
545 char **list; 717 char **list;
546 int count; 718 int count;
547 list = XListFonts (DISPLAY, name, 1024, &count); 719 list = XListFonts (disp, name, 4000, &count);
720
548 set_name (0); 721 set_name (0);
549 722
550 if (!list) 723 if (!list)
551 return false; 724 return false;
552 725
553 int bestdiff = 0x7fffffff; 726 font_weight *fonts = new font_weight[count];
727
554 for (int i = 0; i < count; i++) 728 for (int i = 0; i < count; i++)
555 { 729 {
556 rxvt_fontprop p; 730 rxvt_fontprop p;
557 char fname[1024]; 731 char *fname;
558 fix_scalable (fname, list[i], prop); 732
733 int diff = 0;
734
735 if (replace_field (&fname, list[i], 6, '0', field_str))
736 diff += 10; // slightly penalize scalable fonts
737 else
738 {
739 free (fname);
740 if (replace_field (&fname, list[i], 11, '0', "0"))
741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 }
559 743
560 if (!set_properties (p, fname)) 744 if (!set_properties (p, fname))
561 continue; 745 continue;
562 746
747 if (prop.height != rxvt_fontprop::unset
563 if (p.height > prop.height) // weed out too large fonts 748 && p.height > prop.height) // weed out too large fonts
564 continue; 749 continue;
565 750
566 int diff = (prop.height - p.height) * 32 751 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567 + abs (prop.weight - p.weight) 752 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568 + abs (prop.slant - p.slant ); 753 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
754 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569 755
570 if (!name // compare against best found so far 756 fonts[i].name = fname;
571 || diff < bestdiff) 757 fonts[i].diff = diff;
572 {
573 set_name (strdup (fname));
574 bestdiff = diff;
575 }
576 } 758 }
577 759
578 XFreeFontNames (list); 760 XFreeFontNames (list);
579 761
580 if (!name) 762 // this loop only iterates when the guessed font-size is too small
581 return false; 763 for (;;)
764 {
765 font_weight *best = fonts + count - 1;
582 766
583 f = XLoadQueryFont (DISPLAY, name); 767 for (font_weight *w = best; w-- > fonts; )
768 if (w->diff <= best->diff)
769 best = w;
770
771 if (!best->name
772 || !(f = XLoadQueryFont (disp, best->name)))
773 break;
774
775 set_name (best->name);
776 best->clear ();
777
778 ascent = f->ascent;
779 descent = f->descent;
780 height = ascent + descent;
781
782 if (prop.height == rxvt_fontprop::unset
783 || height <= prop.height)
784 break; // font is ready for use
785
786 // PIXEL_SIZE small enough, but real height too large
787 clear ();
788 }
789
790 delete [] fonts;
584 791
585 if (!f) 792 if (!f)
586 return false; 793 return false;
587 794
588 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
589 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
590 797
591 if (registry && encoding) 798 if (registry && encoding)
592 { 799 {
593 char charset[64]; 800 char charset[64];
594 snprintf (charset, 64, "%s-%s", registry, encoding); 801 snprintf (charset, 64, "%s-%s", registry, encoding);
595 802
596 cs = codeset_from_name (charset); 803 cs = codeset_from_name (charset);
597 } 804 }
598 else 805 else
599 { 806 {
600 const char *charset = get_property (f, "FONT", 0); 807 const char *charset = get_property (f, XA_FONT, 0);
601 808
602 if (!charset) 809 if (!charset)
603 charset = name; 810 charset = name;
604 811
605 int count = 13; 812 int count = 13;
… …
617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 824 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618 825
619 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 826 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620 enc2b = encm || f->max_char_or_byte2 > 255; 827 enc2b = encm || f->max_char_or_byte2 > 255;
621 828
622 ascent = f->ascent;
623 descent = f->descent;
624 height = ascent + descent;
625
626 slow = false; 829 slow = false;
627 830
831#if 1 // only used for slow detection, TODO optimize
628 if (f->min_bounds.width == f->max_bounds.width) 832 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; 833 width = f->max_bounds.width;
632 else 834 else
633 { 835 {
634 slow = true; 836 slow = true;
635 837
636 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 838 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
637 839
638 if (encm) 840 if (encm)
639 N += (f->max_byte1 - f->min_byte1) 841 N += (f->max_byte1 - f->min_byte1)
640 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 842 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
641 843
642 while (N) 844 while (N)
643 { 845 {
644 if (f->per_char[N].width > width) 846 if (f->per_char[N].width > width)
645 width = f->per_char[N].width; 847 width = f->per_char[N].width;
646 848
647 --N; 849 --N;
648 } 850 }
649 } 851 }
852#endif
853
854 width = 1;
855
856 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
857 {
858 if (FROM_UNICODE (cs, *t) == NOCHAR)
859 continue;
860
861 // ignore characters we wouldn't use anyways
862 bool careful;
863 if (!has_char (*t, &prop, careful))
864 continue;
865
866 XChar2b ch = { *t >> 8, *t };
867
868 XCharStruct g;
869 int dir_ret, asc_ret, des_ret;
870 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
871
872 int wcw = WCWIDTH (*t);
873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
874
875 if (width < g.width) width = g.width;
876 }
650 877
651 if (cs == CS_UNKNOWN) 878 if (cs == CS_UNKNOWN)
652 { 879 {
653 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654 881
655 clear (); 882 clear ();
656
657 return false; 883 return false;
658 } 884 }
885
886#if 0 // do it per-character
887 if (prop && width > prop->width)
888 {
889 clear ();
890 return false;
891 }
892#endif
659 893
660 return true; 894 return true;
661} 895}
662 896
663void 897void
664rxvt_font_x11::clear () 898rxvt_font_x11::clear ()
665{ 899{
666 if (f) 900 if (f)
667 { 901 {
668 XFreeFont (DISPLAY, f); 902 XFreeFont (term->dpy, f);
669 f = 0; 903 f = 0;
670 } 904 }
671} 905}
672 906
673bool 907bool
674rxvt_font_x11::has_codepoint (unicode_t unicode) 908rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
675{ 909{
676 uint32_t ch = FROM_UNICODE (cs, unicode); 910 uint32_t ch = FROM_UNICODE (cs, unicode);
677 911
678 if (ch == NOCHAR) 912 if (ch == NOCHAR)
679 return false; 913 return false;
… …
688 922
689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 923 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 924 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691 return false; 925 return false;
692 926
693 if (!f->per_char) 927 if (f->per_char)
694 return true; 928 {
695
696 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; 929 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; 930 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698 931
699 xcs = f->per_char + N; 932 xcs = f->per_char + N;
933 }
934 else
935 xcs = &f->max_bounds;
700 } 936 }
701 else 937 else
702 { 938 {
703 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) 939 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704 return false; 940 return false;
705 941
706 if (!f->per_char) 942 if (f->per_char)
707 return true;
708
709 xcs = f->per_char + (ch - f->min_char_or_byte2); 943 xcs = f->per_char + (ch - f->min_char_or_byte2);
944 else
945 xcs = &f->max_bounds;
710 } 946 }
711 947
712 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 948 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713 && xcs->ascent == 0 && xcs->descent == 0) 949 && xcs->ascent == 0 && xcs->descent == 0)
950 return false;
951
952 if (!prop || prop->width == rxvt_fontprop::unset)
953 return true;
954
955 // check wether character overlaps previous/next character
956 int w = xcs->rbearing - xcs->lbearing;
957 int wcw = max (WCWIDTH (unicode), 1);
958
959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
960
961 if (careful && !OVERLAP_OK (w, wcw, prop))
714 return false; 962 return false;
715 963
716 return true; 964 return true;
717} 965}
718 966
… …
724 // this looks like a mess /. 972 // this looks like a mess /.
725 // and it is a mess /. 973 // and it is a mess /.
726 // yet we are trying to be perfect /. 974 // yet we are trying to be perfect /.
727 // but the result still isn't perfect /. 975 // but the result still isn't perfect /.
728 976
977 dTermDisplay;
978 dTermGC;
979
729 bool slow = this->slow 980 bool slow = this->slow
730 || width != r->TermWin.fwidth 981 || width != term->fwidth
731 || height != r->TermWin.fheight; 982 || height != term->fheight;
732 983
733 int base = r->TermWin.fbase; 984 int base = ascent; // sorry, incorrect: term->fbase;
734 985
735 XGCValues v; 986 XGCValues v;
736 v.foreground = r->pix_colors[fg]; 987 v.foreground = term->pix_colors[fg];
737 v.font = f->fid; 988 v.font = f->fid;
738 989
739 if (enc2b) 990 if (enc2b)
740 { 991 {
741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 992 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742 993
743 if (bg == Color_bg && !slow) 994 if (bg == Color_bg && !slow)
744 { 995 {
745 v.background = r->pix_colors[bg]; 996 v.background = term->pix_colors[bg];
746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 997 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 998 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
748 } 999 }
749 else 1000 else
750 { 1001 {
751 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1002 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
752 1003
753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCFont, &v);
754 1005
755 if (slow) 1006 if (slow)
756 { 1007 {
757 do 1008 do
758 { 1009 {
759 if (xc->byte1 || xc->byte2) 1010 if (xc->byte1 || xc->byte2)
760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1011 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
761 1012
762 x += r->TermWin.fwidth; 1013 x += term->fwidth;
763 xc++; len--; 1014 xc++; len--;
764 } 1015 }
765 while (len); 1016 while (len);
766 } 1017 }
767 else 1018 else
768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1019 XDrawString16 (disp, d, gc, x, y + base, xc, len);
769 } 1020 }
770 } 1021 }
771 else 1022 else
772 { 1023 {
773 const char *xc = enc_char (text, len, cs, slow); 1024 const char *xc = enc_char (text, len, cs, slow);
774 1025
775 if (bg == Color_bg && !slow) 1026 if (bg == Color_bg && !slow)
776 { 1027 {
777 v.background = r->pix_colors[bg]; 1028 v.background = term->pix_colors[bg];
778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1029 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1030 XDrawImageString (disp, d, gc, x, y + base, xc, len);
780 } 1031 }
781 else 1032 else
782 { 1033 {
783 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1034 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
784 1035
785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1036 XChangeGC (disp, gc, GCForeground | GCFont, &v);
786 1037
787 if (slow) 1038 if (slow)
788 { 1039 {
789 do 1040 do
790 { 1041 {
791 if (*xc) 1042 if (*xc)
792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1043 XDrawString (disp, d, gc, x, y + base, xc, 1);
793 1044
794 x += r->TermWin.fwidth; 1045 x += term->fwidth;
795 xc++; len--; 1046 xc++; len--;
796 } 1047 }
797 while (len); 1048 while (len);
798 } 1049 }
799 else 1050 else
800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1051 XDrawString (disp, d, gc, x, y + base, xc, len);
801 } 1052 }
802 } 1053 }
803} 1054}
804 1055
805///////////////////////////////////////////////////////////////////////////// 1056/////////////////////////////////////////////////////////////////////////////
806 1057
807#if XFT 1058#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 1059
814struct rxvt_font_xft : rxvt_font { 1060struct rxvt_font_xft : rxvt_font {
815 rxvt_font_xft () { f = 0; } 1061 rxvt_font_xft () { f = 0; }
816 1062
817 void clear (); 1063 void clear ();
818 1064
819 rxvt_fontprop properties (); 1065 rxvt_fontprop properties ();
820 1066
821 bool load (const rxvt_fontprop &prop); 1067 bool load (const rxvt_fontprop &prop, bool force_prop);
822 1068
823 void draw (rxvt_drawable &d, int x, int y, 1069 void draw (rxvt_drawable &d, int x, int y,
824 const text_t *text, int len, 1070 const text_t *text, int len,
825 int fg, int bg); 1071 int fg, int bg);
826 1072
827 bool has_codepoint (unicode_t unicode); 1073 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
828 1074
829protected: 1075protected:
830 XftFont *f; 1076 XftFont *f;
831}; 1077};
832 1078
833void 1079void
834rxvt_font_xft::clear () 1080rxvt_font_xft::clear ()
835{ 1081{
836 if (f) 1082 if (f)
837 { 1083 {
838 XftFontClose (DISPLAY, f); 1084 XftFontClose (term->dpy, f);
839 f = 0; 1085 f = 0;
840 } 1086 }
841} 1087}
842 1088
843rxvt_fontprop 1089rxvt_fontprop
… …
847 1093
848 FT_Face face = XftLockFace (f); 1094 FT_Face face = XftLockFace (f);
849 1095
850 p.width = width; 1096 p.width = width;
851 p.height = height; 1097 p.height = height;
1098 p.ascent = ascent;
852 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1099 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1100 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
854 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1101 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1102 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
856 1103
… …
858 1105
859 return p; 1106 return p;
860} 1107}
861 1108
862bool 1109bool
863rxvt_font_xft::load (const rxvt_fontprop &prop) 1110rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
864{ 1111{
865#if 0 1112 dTermDisplay;
866 for (int i = 0; i < SWATHCOUNT; i++)
867 cvr[i] = 0;
868#endif
869 1113
870 clear (); 1114 clear ();
871 1115
872 FcPattern *p = FcNameParse ((FcChar8 *) name); 1116 FcPattern *p = FcNameParse ((FcChar8 *) name);
873 1117
874 if (!p) 1118 if (!p)
875 return false; 1119 return false;
876 1120
877 FcValue v; 1121 FcValue v;
878 1122
1123 if (prop.height != rxvt_fontprop::unset
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1124 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1125 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1126 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881 1127
1128 if (prop.weight != rxvt_fontprop::unset
882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1129 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1130 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884 1131
1132 if (prop.slant != rxvt_fontprop::unset
885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1133 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
886 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1134 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890 1135
891#if 0 // clipping unfortunately destroys our precious double-width-characters 1136#if 0 // clipping unfortunately destroys our precious double-width-characters
892 // clip width, we can't do better, or can we? 1137 // clip width, we can't do better, or can we?
893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 1139 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895#endif 1140#endif
1141
1142 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1143 FcPatternAddBool (p, FC_MINSPACE, 1);
1144
1145 // store generated name so iso14755 view gives better results
1146 set_name ((char *)FcNameUnparse (p));
896 1147
897 XftResult result; 1148 XftResult result;
898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1149 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
899 1150
900 FcPatternDestroy (p); 1151 FcPatternDestroy (p);
901 1152
902 if (!match) 1153 if (!match)
903 return false; 1154 return false;
904 1155
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; 1156 int ftheight = 0;
1157 bool success = true;
918 1158
919 for (;;) 1159 for (;;)
920 { 1160 {
921 XGlyphInfo g1, g2; 1161 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922 FcChar8 c;
923 1162
924 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 1163 if (!f)
925 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 1164 {
1165 success = false;
1166 break;
1167 }
926 1168
927 if (g1.xOff != g2.xOff) // don't simply trust the font 1169 FT_Face face = XftLockFace (f);
928 slow = true;
929 1170
930 width = g2.xOff;
931 ascent = (face->size->metrics.ascender + 63) >> 6; 1171 ascent = (face->size->metrics.ascender + 63) >> 6;
932 descent = (-face->size->metrics.descender + 63) >> 6; 1172 descent = (-face->size->metrics.descender + 63) >> 6;
933 height = ascent + descent; 1173 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1174 width = 0;
934 1175
1176 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1177
1178 XftUnlockFace (f);
1179
1180 int glheight = height;
1181
1182 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1183 {
1184 FcChar16 ch = *t;
1185
1186 if (cs != CS_UNICODE
1187 && ch > 0x100
1188 && FROM_UNICODE (cs, ch) == NOCHAR)
1189 continue;
1190
1191 // ignore characters we wouldn't use anyways
1192 bool careful;
1193 if (!has_char (*t, &prop, careful))
1194 continue;
1195
1196 XGlyphInfo g;
1197 XftTextExtents16 (disp, f, &ch, 1, &g);
1198
1199 g.width -= g.x;
1200
1201 int wcw = WCWIDTH (ch);
1202 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1203
1204 if (width < g.width ) width = g.width;
1205 if (height < g.height ) height = g.height;
1206 if (glheight < g.height - g.y) glheight = g.height - g.y;
1207 }
1208
1209 if (!width)
1210 {
1211 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1212
1213 XftFontClose (disp, f);
1214 f = 0;
1215
1216 success = false;
1217 break;
1218 }
1219
1220 if (prop.height == rxvt_fontprop::unset
935 if (height <= prop.height || !prop.height) 1221 || (height <= prop.height && glheight <= prop.height)
1222 || height <= 2
1223 || !scalable)
936 break; 1224 break;
937 1225
938 if (ftheight) 1226 if (ftheight)
939 { 1227 {
940 // take smaller steps near the end 1228 // take smaller steps near the end
941 if (height > prop.height + 1) ftheight++; 1229 if (height > prop.height + 1) ftheight++;
942 if (height > prop.height + 2) ftheight++; 1230 if (height > prop.height + 2) ftheight++;
943 if (height > prop.height + 3) ftheight++; 1231 if (height > prop.height + 3) ftheight++;
944 1232
945 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); 1233 ftheight -= height - prop.height;
946 } 1234 }
947 else 1235 else
948 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); 1236 ftheight = prop.height - 1;
1237
1238 XftFontClose (disp, f);
1239 FcPatternDel (match, FC_PIXEL_SIZE);
1240 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1241 }
1242
1243 FcPatternDestroy (match);
1244
1245#if 0 // do it per-character
1246 if (prop.width != rxvt_fontprop::unset && width > prop.width)
949 } 1247 {
1248 clear ();
1249 success = false;
1250 }
1251#endif
950 1252
951 XftUnlockFace (f); 1253 return success;
1254}
1255
1256bool
1257rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1258{
1259 careful = false;
1260
1261 if (!XftCharExists (term->dpy, f, unicode))
1262 return false;
1263
1264 if (!prop || prop->width == rxvt_fontprop::unset)
1265 return true;
1266
1267 // check character against base font bounding box
1268 FcChar32 ch = unicode;
1269 XGlyphInfo g;
1270 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1271
1272 int w = g.width - g.x;
1273 int wcw = max (WCWIDTH (unicode), 1);
1274
1275 careful = g.x > 0 || w > prop->width * wcw;
1276
1277 if (careful && !OVERLAP_OK (w, wcw, prop))
1278 return false;
1279
1280 // this weeds out _totally_ broken fonts, or glyphs
1281 if (!OVERLAP_OK (g.xOff, wcw, prop))
1282 return false;
952 1283
953 return true; 1284 return true;
954}
955
956bool
957rxvt_font_xft::has_codepoint (unicode_t unicode)
958{
959 return XftCharExists (DISPLAY, f, unicode);
960} 1285}
961 1286
962void 1287void
963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964 const text_t *text, int len, 1289 const text_t *text, int len,
965 int fg, int bg) 1290 int fg, int bg)
966{ 1291{
967 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1292 XGlyphInfo extents;
1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1294 XftGlyphSpec *ep = enc;
968 1295
969 if (!slow && width == r->TermWin.fwidth && 0) 1296 dTermDisplay;
970 { 1297 dTermGC;
971 if (sizeof (text_t) == sizeof (FcChar16)) 1298
972 XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1299 int w = term->fwidth * len;
973 else 1300 int h = term->fheight;
974 XftDrawString32 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 1301
975 } 1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
976 else 1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
977 { 1304 * good idea from the perspective of packaging for wide variety of user configs.
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1311 // cut trailing spaces
1312 while (len && text [len - 1] == ' ')
1313 len--;
1314
1315 int x_ = buffered ? 0 : x;
1316 int y_ = buffered ? 0 : y;
1317
978 while (len) 1318 while (len)
1319 {
1320 int cwidth = term->fwidth;
1321 FcChar32 fc = *text++; len--;
1322
1323 while (len && *text == NOCHAR)
1324 text++, len--, cwidth += term->fwidth;
1325
1326 if (fc != ' ') // skip spaces
1327 {
1328 FT_UInt glyph = XftCharIndex (disp, f, fc);
1329 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1330
1331 ep->glyph = glyph;
1332 ep->x = x_ + (cwidth - extents.xOff >> 1);
1333 ep->y = y_ + ascent;
1334
1335 if (extents.xOff == 0)
1336 ep->x = x_ + cwidth;
1337
1338 ep++;
979 { 1339 }
980 if (*text != NOCHAR && *text != ' ') 1340
1341 x_ += cwidth;
1342 }
1343
1344 if (buffered)
1345 {
1346 bool back_rendered = false;
1347 if (ep != enc)
1348 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350
1351#ifdef HAVE_BG_PIXMAP
1352 if (term->bgPixmap.pixmap)
981 { 1353 {
982 int fwidth = r->TermWin.fwidth; 1354 Picture dst = 0;
983 if (len >= 2 && text[1] == NOCHAR)
984 fwidth *= 2;
985 1355
986 XGlyphInfo extents; 1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
987 if (sizeof (text_t) == sizeof (FcChar16)) 1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
988 { 1360 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); 1361 int src_x = x, src_y = y ;
990 XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1362
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y;
992 } 1367 }
1368
1369 if (term->bgPixmap.pmap_width >= src_x+w
1370 && term->bgPixmap.pmap_height >= src_y+h)
1371 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1373 src_x, src_y, w, h, 0, 0);
1374 }
993 else 1375 else
994 { 1376 {
995 XGlyphInfo extents; 1377 XGCValues gcv;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); 1378
997 XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1379 gcv.fill_style = FillTiled;
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 1380 gcv.tile = term->bgPixmap.pixmap;
1381 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y;
1383
1384 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv);
1387
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389
1390 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 }
1393
1394 if (bg >= 0)
1395 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1397 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
999 } 1401 }
1000 } 1402 }
1403#endif
1001 1404
1002 x += r->TermWin.fwidth; 1405 if (bg >= 0 && !back_rendered)
1003 text++; 1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1004 len--; 1407
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1005 } 1410 }
1411 else
1412 clear_rect (d, x, y, w, h, bg);
1413 }
1414 else
1006 } 1415 {
1416 clear_rect (d, x, y, w, h, bg);
1417 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1418 }
1007} 1419}
1420
1008#endif 1421#endif
1009 1422
1010///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
1011 1424
1012rxvt_fontset::rxvt_fontset (rxvt_t r) 1425rxvt_fontset::rxvt_fontset (rxvt_term *term)
1013: r (r), fontdesc (0) 1426: fontdesc (0), term (term)
1014{ 1427{
1015 clear (); 1428 clear ();
1016} 1429}
1017 1430
1018rxvt_fontset::~rxvt_fontset () 1431rxvt_fontset::~rxvt_fontset ()
… …
1021} 1434}
1022 1435
1023void 1436void
1024rxvt_fontset::clear () 1437rxvt_fontset::clear ()
1025{ 1438{
1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1440 = rxvt_fontprop::unset;
1441 force_prop = false;
1442
1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027 FONT_UNREF (*i); 1444 FONT_UNREF (*i);
1028 1445
1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1447 delete *p;
1448
1029 free (fontdesc); fontdesc = 0; 1449 free (fontdesc); fontdesc = 0;
1030 1450
1031 fonts.clear (); 1451 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 1452
1037 fallback = fallback_fonts; 1453 fallback = fallback_fonts;
1038} 1454}
1039 1455
1040rxvt_font * 1456rxvt_font *
1041rxvt_fontset::new_font (const char *name, codeset cs) 1457rxvt_fontset::new_font (const char *name, codeset cs)
1042{ 1458{
1043 rxvt_font *f; 1459 rxvt_font *f;
1044 1460
1045 if (!name || !*name) 1461 if (!name || !*name)
1046 { 1462 {
1047 name = ""; 1463 name = "";
1048 f = new rxvt_font_default; 1464 f = new rxvt_font_default (this);
1049 } 1465 }
1050#if XFT 1466#if XFT
1051 else if (!strncmp (name, "xft:", 4)) 1467 else if (!strncmp (name, "xft:", 4))
1052 { 1468 {
1053 name += 4; 1469 name += 4;
1054 f = new rxvt_font_xft; 1470 f = new rxvt_font_xft ();
1055 } 1471 }
1056#endif 1472#endif
1057 else if (!strncmp (name, "x:", 2)) 1473 else if (!strncmp (name, "x:", 2))
1058 { 1474 {
1059 name += 2; 1475 name += 2;
1060 f = new rxvt_font_x11; 1476 f = new rxvt_font_x11;
1061 } 1477 }
1062 else 1478 else
1063 f = new rxvt_font_x11; 1479 f = new rxvt_font_x11;
1064 1480
1065 f->fs = this;
1066 f->set_term (r); 1481 f->set_term (term);
1067 f->set_name (strdup (name)); 1482 f->set_name (strdup (name));
1068 1483
1069 f->cs = cs; 1484 f->cs = cs;
1070 f->loaded = false; 1485 f->loaded = false;
1071 1486
… …
1082 char buf[512]; 1497 char buf[512];
1083 const char *end; 1498 const char *end;
1084 1499
1085 do 1500 do
1086 { 1501 {
1087 while (*desc <= ' ') desc++; 1502 while (*desc && *desc <= ' ')
1503 desc++;
1504
1505 codeset cs = CS_UNICODE;
1088 1506
1089 if (*desc == '[') 1507 if (*desc == '[')
1090 { 1508 {
1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1509 char spec[256];
1092
1093 //const char *extra = desc++; // not yet used 1510 const char *extra = ++desc; // not yet used
1094 1511
1095 desc = strchr (desc, ']'); 1512 desc = strchr (desc, ']');
1096 1513
1097 if (!desc) 1514 if (!desc)
1098 { 1515 {
1099 fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); 1516 rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100 break; 1517 break;
1101 } 1518 }
1519
1520 memcpy (spec, extra, min (desc - extra, 255));
1521 spec[min (desc - extra, 255)] = 0;
1522
1523 if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
1524 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1525 else
1526 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102 1527
1103 desc++; 1528 desc++;
1104 while (*desc <= ' ') desc++; 1529 while (*desc <= ' ') desc++;
1105 } 1530 }
1106 1531
… …
1111 if (end - desc < 511) 1536 if (end - desc < 511)
1112 { 1537 {
1113 strncpy (buf, desc, end - desc); 1538 strncpy (buf, desc, end - desc);
1114 buf[end - desc] = 0; 1539 buf[end - desc] = 0;
1115 1540
1116 fonts.push_back (new_font (buf, CS_UNICODE)); 1541 fonts.push_back (new_font (buf, cs));
1117 } 1542 }
1543 else
1544 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118 1545
1119 desc = end + 1; 1546 desc = end + 1;
1120 } 1547 }
1121 while (*end); 1548 while (*end);
1122 } 1549 }
1123} 1550}
1124 1551
1125bool 1552bool
1126rxvt_fontset::realize_font (int i) 1553rxvt_fontset::realize_font (int i)
1127{ 1554{
1555 if (i < 0 || i >= fonts.size ())
1556 return false;
1557
1128 if (fonts[i]->loaded) 1558 if (fonts[i]->loaded)
1129 return true; 1559 return true;
1130 1560
1131 fonts[i]->loaded = true; 1561 fonts[i]->loaded = true;
1132 1562
1133 if (!fonts[i]->load (base_prop)) 1563 if (!fonts[i]->load (prop, force_prop))
1134 { 1564 {
1135 fonts[i]->cs = CS_UNKNOWN; 1565 fonts[i]->cs = CS_UNKNOWN;
1136 return false; 1566 return false;
1137 } 1567 }
1138 1568
… …
1148 1578
1149 fonts.push_back (new_font (0, CS_UNICODE)); 1579 fonts.push_back (new_font (0, CS_UNICODE));
1150 realize_font (0); 1580 realize_font (0);
1151 1581
1152 add_fonts (desc); 1582 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 1583
1170 return true; 1584 return true;
1171} 1585}
1172 1586
1173int 1587int
… …
1179 1593
1180 return -1; 1594 return -1;
1181} 1595}
1182 1596
1183int 1597int
1184rxvt_fontset::find_font (unicode_t unicode, bool bold) 1598rxvt_fontset::find_font (unicode_t unicode)
1185{ 1599{
1600 if (unicode >= 1<<20)
1601 return 0;
1186 1602
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1603 unicode_t hi = unicode >> 8;
1188 i < fonts.size (); 1604
1189 i++) 1605 if (hi < fmap.size ()
1606 && fmap[hi]
1607 && (*fmap[hi])[unicode & 0xff] != 0xff)
1608 return (*fmap[hi])[unicode & 0xff];
1609
1610 unsigned int i;
1611
1612 for (i = 0; i < fonts.size (); i++)
1190 { 1613 {
1191 rxvt_font *f = fonts[i]; 1614 rxvt_font *f = fonts[i];
1192 1615
1193 if (!f->loaded) 1616 if (!f->loaded)
1194 { 1617 {
1195 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1618 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1196 goto next_font; 1619 goto next_font;
1197 1620
1198 if (!realize_font (i)) 1621 if (!realize_font (i))
1199 goto next_font; 1622 goto next_font;
1623
1624 if (prop.ascent != rxvt_fontprop::unset)
1625 max_it (f->ascent, prop.ascent);
1200 } 1626 }
1201 1627
1202 if (f->cs == CS_UNKNOWN) 1628 if (f->cs == CS_UNKNOWN)
1203 goto next_font; 1629 goto next_font;
1204 1630
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold) 1631 bool careful;
1632 if (f->has_char (unicode, &prop, careful))
1633 {
1634 if (careful)
1635 i |= 128;
1636
1206 goto next_font; 1637 goto found;
1207 1638 }
1208 if (f->has_codepoint (unicode))
1209 return i;
1210 1639
1211 next_font: 1640 next_font:
1212 if (i == fonts.size () - 1) 1641 if (i == fonts.size () - 1)
1213 { 1642 {
1214 if (fallback->name) 1643 if (fallback->name)
… …
1221 { 1650 {
1222 // try to find a new font. 1651 // try to find a new font.
1223 // only xft currently supported, as there is no 1652 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in, 1653 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already. 1654 // while x11 has more framework in place already.
1226#if XFT 1655 // TODO: this is a real resource hog, xft takes ages(?)
1656#if XFT && USE_SLOW_LOOKUP
1227 // grab the first xft font that seems suitable 1657 // grab the first xft font that seems suitable
1228 FcPattern *p = FcPatternCreate (); 1658 FcPattern *p = FcPatternCreate ();
1229 1659
1230 FcCharSet *s = FcCharSetCreate (); 1660 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode); 1661 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s); 1662 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return 1663 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/ 1664 // a non-matching font even if a better font is available :/
1235 1665
1666 x x x x TODO prop might have unset contents
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); 1667 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); 1668 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant); 1669 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1); 1670 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1671 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241 1672
1242 XftResult result; 1673 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1674 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1244 1675
1245 FcPatternDestroy (p); 1676 FcPatternDestroy (p);
1246 1677
1247 if (match) 1678 if (match)
1248 { 1679 {
… …
1253 if (find_font (font) < 0) 1684 if (find_font (font) < 0)
1254 { 1685 {
1255 char fontname[4096]; 1686 char fontname[4096];
1256 sprintf (fontname, "xft:%-.4090s", font); 1687 sprintf (fontname, "xft:%-.4090s", font);
1257 1688
1258 fonts.push_back (new_font (fontname, CS_UNICODE)); 1689 fonts.push_back (new_font (fontname, CS_UNICODE));
1259 } 1690 }
1260 1691
1261 free (font); 1692 free (font);
1262 } 1693 }
1263#endif 1694#endif
1264 } 1695 }
1265 } 1696 }
1266 } 1697 }
1267 1698
1268 // if no bold font found, use a regular one 1699 /* we must return SOME font */
1269 if (bold) 1700 i = 0;
1270 return find_font (unicode);
1271 1701
1272 return 0; /* we must return SOME font */ 1702found:
1273} 1703 // found a font, cache it
1704 if (i < 255)
1705 {
1706 while (hi >= fmap.size ())
1707 fmap.push_back (0);
1274 1708
1709 if (!fmap[hi])
1710 {
1711 fmap[hi] = (pagemap *)new pagemap;
1712 memset (fmap[hi], 0xff, sizeof (pagemap));
1713 }
1275 1714
1715 (*fmap[hi])[unicode & 0xff] = i;
1716 }
1276 1717
1718 return i;
1719}
1720
1721
1722

Diff Legend

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