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

Diff Legend

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