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

Diff Legend

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