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.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.96 by root, Sat Feb 18 15:24:39 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtfont.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[] = {
… …
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" },
… …
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 108# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 125#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 128# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 131# endif
127#endif 132#endif
128 133
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { 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.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 136#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 141
140 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 144#endif
143 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" },
144 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
145}; 151};
146 152
147// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
152 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
153}; 159};
154 160
155#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]))
156 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
157///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
158
159#if XFT
160rxvt_drawable::~rxvt_drawable ()
161{
162 if (xftdrawable)
163 XftDrawDestroy (xftdrawable);
164}
165
166rxvt_drawable::operator XftDraw *()
167{
168 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
170
171 return xftdrawable;
172}
173#endif
174
175/////////////////////////////////////////////////////////////////////////////
176
177static void *enc_buf;
178static uint32_t enc_len;
179
180static inline void *
181get_enc_buf (uint32_t len)
182{
183 if (len > enc_len)
184 {
185 free (enc_buf);
186 enc_buf = malloc (len);
187 enc_len = len;
188 }
189
190 return enc_buf;
191}
192 167
193static const char * 168static const char *
194enc_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)
195{ 170{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
197 173
198 while (len--) 174 while (len--)
199 { 175 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
201 177
… …
206 } 182 }
207 183
208 *buf++ = c; 184 *buf++ = c;
209 } 185 }
210 186
211 return (const char *)enc_buf; 187 return (const char *)res;
212} 188}
213 189
214static const XChar2b * 190static const XChar2b *
215enc_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)
216{ 192{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
218 195
219 while (len--) 196 while (len--)
220 { 197 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
222 199
… …
229 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
230 buf->byte2 = c; 207 buf->byte2 = c;
231 buf++; 208 buf++;
232 } 209 }
233 210
234 return (XChar2b *)enc_buf; 211 return res;
235} 212}
236 213
237///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
238 220
239void 221void
240rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
241{ 223{
242 if (this->name == name) 224 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 228 this->name = name;
247} 229}
248 230
249void 231void
250rxvt_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
251{ 233{
234 dTermDisplay;
235 dTermGC;
236
252 if (color == Color_bg) 237 if (color < 0 || color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 239 else
255 { 240 {
256#if XFT 241#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 243#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 245 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 246#endif
262 } 247 }
263} 248}
249
250/////////////////////////////////////////////////////////////////////////////
264 251
265#include "table/linedraw.h" 252#include "table/linedraw.h"
266 253
267struct rxvt_font_default : rxvt_font { 254struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 255 struct rxvt_fontset *fs;
… …
276 rxvt_fontprop properties () 263 rxvt_fontprop properties ()
277 { 264 {
278 rxvt_fontprop p; 265 rxvt_fontprop p;
279 266
280 p.width = p.height = 1; 267 p.width = p.height = 1;
268 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 269 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 270 p.slant = rxvt_fontprop::roman;
283 271
284 return p; 272 return p;
285 } 273 }
… …
292 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
293 281
294 return true; 282 return true;
295 } 283 }
296 284
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 285 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 286 {
299 careful = false; 287 careful = false;
300 288
301 if (unicode <= 0x001f) 289 if (unicode <= 0x001f)
302 return true; 290 return true;
… …
305 return false; 293 return false;
306 294
307 if (unicode <= 0x009f) 295 if (unicode <= 0x009f)
308 return true; 296 return true;
309 297
310 if (unicode >= 0x2500 && unicode <= 0x259f) 298 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 300 return true;
312 301
313 if (IS_COMPOSE (unicode)) 302 if (IS_COMPOSE (unicode))
314 return true; 303 return true;
315 304
… …
331void 320void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 321rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 322 const text_t *text, int len,
334 int fg, int bg) 323 int fg, int bg)
335{ 324{
336 Display *disp = d.display->display; 325 dTermDisplay;
326 dTermGC;
337 327
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 328 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 329
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 330 XSetForeground (disp, gc, term->pix_colors[fg]);
341 331
342 while (len) 332 while (len)
343 { 333 {
344#if ENABLE_COMBINING 334#if ENABLE_COMBINING
345 compose_char *cc; 335 compose_char *cc;
… …
349 339
350 while (++text, --len && *text == NOCHAR) 340 while (++text, --len && *text == NOCHAR)
351 ; 341 ;
352 342
353 int width = text - tp; 343 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 344 int fwidth = term->fwidth * width;
355 345
356 if (0x2500 <= t && t <= 0x259f) 346 if (0x2500 <= t && t <= 0x259f)
357 { 347 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 348 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 349 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 350 uint32_t *b = a + (offs & 15);
361 351
362 int W = fwidth; 352 int W = fwidth;
363 int H = r->TermWin.fheight; 353 int H = term->fheight;
364 354
365 int x_[16]; 355 int x_[16];
366 int y_[16]; 356 int y_[16];
367 357
368 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
376 366
377 XGCValues gcv; 367 XGCValues gcv;
378 368
379 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 370 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 372
383 while (a < b) 373 while (a < b)
384 { 374 {
385 uint32_t command = *a++; 375 uint32_t command = *a++;
386 376
… …
393 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
394 384
395 switch (op) 385 switch (op)
396 { 386 {
397 case 0: // line 387 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 389 break;
400 390
401 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
402 if (a) 392 if (a)
403 { 393 {
… …
406 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
410 400
411 XChangeGC (disp, TGC, 401 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 403 &gcv);
414 } 404 }
415 405
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 406 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 407
418 if (a) 408 if (a)
419 { 409 {
420 XFreePixmap (disp, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 411 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 414 }
425 break; 415 break;
426 case 2: // arc 416 case 2: // arc
427 XDrawArc (disp, d, TGC, 417 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 420 break;
431 } 421 }
432 } 422 }
433 } 423 }
434#if ENABLE_COMBINING 424#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
437 text_t chrs[2]; 429 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 430 chrs [1] = NOCHAR;
440 431
441 *chrs = cc->c1; 432 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
… …
463 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 455 case NOCHAR:
465 break; 456 break;
466 457
467 default: 458 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 460 fwidth - 4, term->fheight - 4);
470 } 461 }
471 462
472 x += fwidth; 463 x += fwidth;
473 } 464 }
474} 465}
… …
482 473
483 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
484 475
485 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop);
486 477
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 479
489 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 481 const text_t *text, int len,
491 int fg, int bg); 482 int fg, int bg);
492 483
493 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 485 XFontStruct *f;
495 codeset cs; 486 codeset cs;
496 bool enc2b, encm; 487 bool enc2b, encm;
497 488
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 489 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 491 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 492 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 493};
503 494
504char * 495char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 496rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 497{
507 unsigned long value; 498 unsigned long value;
508 499
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 500 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 501 return XGetAtomName (term->dpy, value);
511 else 502 else
512 return rxvt_strdup (repl); 503 return rxvt_strdup (repl);
513} 504}
514 505
515rxvt_fontprop 506rxvt_fontprop
… …
521} 512}
522 513
523bool 514bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 515rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 516{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 517 p.width = width != rxvt_fontprop::unset ? width
518 : avgwidth ? (avgwidth + 1) / 10
519 : (height + 1) / 2;
527 p.height = height; 520 p.height = height;
521 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 524
531 return true; 525 return true;
532} 526}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 530{
537 unsigned long height; 531 unsigned long height;
538 532
539#if 0 533#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 535 return false;
542#else 536#else
543 height = f->ascent + f->descent; 537 height = f->ascent + f->descent;
544#endif 538#endif
545 539
546 unsigned long avgwidth; 540 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 541 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 542 avgwidth = 0;
549 543
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 544 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 545 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 546
553 set_properties (p, height, weight, slant, avgwidth); 547 set_properties (p, height, weight, slant, avgwidth);
554 548
555 free (weight); 549 free (weight);
556 free (slant); 550 free (slant);
557 551
552 p.ascent = f->ascent;
553
558 return true; 554 return true;
559} 555}
560 556
561bool 557bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 559{
560 dTermDisplay;
564 int slashes = 0; 561 int slashes = 0;
565 const char *comp[13]; 562 const char *comp[13];
566 563
567 for (const char *c = name; *c; c++) 564 for (const char *c = name; *c; c++)
568 if (*c == '-') 565 if (*c == '-')
… …
576 if (slashes >= 13 573 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 574 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 575 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 576 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 577
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 578 XFontStruct *f = XLoadQueryFont (disp, name);
582 579
583 if (f) 580 if (f)
584 { 581 {
585 // the font should really exist now. if not, we have a problem 582 // the font should really exist now. if not, we have a problem
586 // (e.g. if the user did xset fp rehash just when we were searching fonts). 583 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 584 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 585 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 586 XFreeFont (disp, f);
590 return ret; 587 return ret;
591 } 588 }
592 else 589 else
593 return false; 590 return false;
594} 591}
… …
632} 629}
633 630
634bool 631bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop)
636{ 633{
637 Display *disp = DISPLAY; 634 dTermDisplay;
638 635
639 clear (); 636 clear ();
640 637
641 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
642 639
… …
651 f = XLoadQueryFont (disp, name); 648 f = XLoadQueryFont (disp, name);
652 649
653 if (!f) 650 if (!f)
654 return false; 651 return false;
655 652
656 char *new_name = get_property (f, "FONT", name); 653 char *new_name = get_property (f, XA_FONT, name);
657 654
658 if (new_name) 655 if (new_name)
659 set_name (new_name); 656 set_name (new_name);
660 else 657 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
716 713
717 int diff = 0; 714 int diff = 0;
718 715
719 if (replace_field (fname, list[i], 6, '0', field_str)) 716 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 717 diff += 10; // slightly penalize scalable fonts
718 else if (replace_field (fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
721 720
722 if (!set_properties (p, fname)) 721 if (!set_properties (p, fname))
723 continue; 722 continue;
724 723
725 if (prop.height != rxvt_fontprop::unset 724 if (prop.height != rxvt_fontprop::unset
… …
741 for (;;) 740 for (;;)
742 { 741 {
743 font_weight *best = fonts + count - 1; 742 font_weight *best = fonts + count - 1;
744 743
745 for (font_weight *w = best; w-- > fonts; ) 744 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff) 745 if (w->diff <= best->diff)
747 best = w; 746 best = w;
748 747
749 if (!best->name 748 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 749 || !(f = XLoadQueryFont (disp, best->name)))
751 break; 750 break;
… …
768 delete [] fonts; 767 delete [] fonts;
769 768
770 if (!f) 769 if (!f)
771 return false; 770 return false;
772 771
773 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 772 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
774 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 773 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
775 774
776 if (registry && encoding) 775 if (registry && encoding)
777 { 776 {
778 char charset[64]; 777 char charset[64];
779 snprintf (charset, 64, "%s-%s", registry, encoding); 778 snprintf (charset, 64, "%s-%s", registry, encoding);
780 779
781 cs = codeset_from_name (charset); 780 cs = codeset_from_name (charset);
782 } 781 }
783 else 782 else
784 { 783 {
785 const char *charset = get_property (f, "FONT", 0); 784 const char *charset = get_property (f, XA_FONT, 0);
786 785
787 if (!charset) 786 if (!charset)
788 charset = name; 787 charset = name;
789 788
790 int count = 13; 789 int count = 13;
… …
805 enc2b = encm || f->max_char_or_byte2 > 255; 804 enc2b = encm || f->max_char_or_byte2 > 255;
806 805
807 slow = false; 806 slow = false;
808 807
809#if 1 // only used for slow detection, TODO optimize 808#if 1 // only used for slow detection, TODO optimize
810 if (f->min_bounds.width == f->max_bounds.width) 809 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
811 width = f->min_bounds.width;
812 else if (f->per_char == NULL)
813 width = f->max_bounds.width; 810 width = f->max_bounds.width;
814 else 811 else
815 { 812 {
816 slow = true; 813 slow = true;
817 814
… …
833 830
834 width = 1; 831 width = 1;
835 832
836 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 833 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
837 { 834 {
838 if (cs != CS_UNICODE
839 && *t > 0x100
840 && FROM_UNICODE (cs, *t) == NOCHAR) 835 if (FROM_UNICODE (cs, *t) == NOCHAR)
841 continue; 836 continue;
842 837
843 // ignore characters we wouldn't use anyways 838 // ignore characters we wouldn't use anyways
844 bool careful; 839 bool careful;
845 if (!has_char (*t, &prop, careful)) 840 if (!has_char (*t, &prop, careful))
… …
849 844
850 XCharStruct g; 845 XCharStruct g;
851 int dir_ret, asc_ret, des_ret; 846 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 847 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853 848
854 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 849 int wcw = WCWIDTH (*t);
850 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
855 851
856 if (width < g.width) width = g.width; 852 if (width < g.width) width = g.width;
857 } 853 }
858 854
859 if (cs == CS_UNKNOWN) 855 if (cs == CS_UNKNOWN)
860 { 856 {
861 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
878void 874void
879rxvt_font_x11::clear () 875rxvt_font_x11::clear ()
880{ 876{
881 if (f) 877 if (f)
882 { 878 {
883 XFreeFont (DISPLAY, f); 879 XFreeFont (term->dpy, f);
884 f = 0; 880 f = 0;
885 } 881 }
886} 882}
887 883
888bool 884bool
889rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
890{ 886{
891 uint32_t ch = FROM_UNICODE (cs, unicode); 887 uint32_t ch = FROM_UNICODE (cs, unicode);
892 888
893 if (ch == NOCHAR) 889 if (ch == NOCHAR)
894 return false; 890 return false;
… …
931 return false; 927 return false;
932 928
933 if (!prop || prop->width == rxvt_fontprop::unset) 929 if (!prop || prop->width == rxvt_fontprop::unset)
934 return true; 930 return true;
935 931
936 // check character against base font bounding box 932 // check wether character overlaps previous/next character
937 int w = xcs->width; 933 int w = xcs->rbearing - xcs->lbearing;
938 int wcw = wcwidth (unicode); 934 int wcw = max (WCWIDTH (unicode), 1);
939 if (wcw > 0) w /= wcw;
940 935
941 careful = w > prop->width; 936 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2) 937
938 if (careful && !OVERLAP_OK (w, wcw, prop))
943 return false; 939 return false;
944 940
945 return true; 941 return true;
946} 942}
947 943
… …
953 // this looks like a mess /. 949 // this looks like a mess /.
954 // and it is a mess /. 950 // and it is a mess /.
955 // yet we are trying to be perfect /. 951 // yet we are trying to be perfect /.
956 // but the result still isn't perfect /. 952 // but the result still isn't perfect /.
957 953
954 dTermDisplay;
955 dTermGC;
956
958 bool slow = this->slow 957 bool slow = this->slow
959 || width != r->TermWin.fwidth 958 || width != term->fwidth
960 || height != r->TermWin.fheight; 959 || height != term->fheight;
961 960
962 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 961 int base = ascent; // sorry, incorrect: term->fbase;
963 962
964 XGCValues v; 963 XGCValues v;
965 v.foreground = r->pix_colors[fg]; 964 v.foreground = term->pix_colors[fg];
966 v.font = f->fid; 965 v.font = f->fid;
967 966
968 if (enc2b) 967 if (enc2b)
969 { 968 {
970 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 969 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971 970
972 if (bg == Color_bg && !slow) 971 if (bg == Color_bg && !slow)
973 { 972 {
974 v.background = r->pix_colors[bg]; 973 v.background = term->pix_colors[bg];
975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 974 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 975 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977 } 976 }
978 else 977 else
979 { 978 {
980 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
981 980
982 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 981 XChangeGC (disp, gc, GCForeground | GCFont, &v);
983 982
984 if (slow) 983 if (slow)
985 { 984 {
986 do 985 do
987 { 986 {
988 if (xc->byte1 || xc->byte2) 987 if (xc->byte1 || xc->byte2)
989 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 988 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990 989
991 x += r->TermWin.fwidth; 990 x += term->fwidth;
992 xc++; len--; 991 xc++; len--;
993 } 992 }
994 while (len); 993 while (len);
995 } 994 }
996 else 995 else
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 996 XDrawString16 (disp, d, gc, x, y + base, xc, len);
998 } 997 }
999 } 998 }
1000 else 999 else
1001 { 1000 {
1002 const char *xc = enc_char (text, len, cs, slow); 1001 const char *xc = enc_char (text, len, cs, slow);
1003 1002
1004 if (bg == Color_bg && !slow) 1003 if (bg == Color_bg && !slow)
1005 { 1004 {
1006 v.background = r->pix_colors[bg]; 1005 v.background = term->pix_colors[bg];
1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1006 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1007 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009 } 1008 }
1010 else 1009 else
1011 { 1010 {
1012 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1013 1012
1014 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1013 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1015 1014
1016 if (slow) 1015 if (slow)
1017 { 1016 {
1018 do 1017 do
1019 { 1018 {
1020 if (*xc) 1019 if (*xc)
1021 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1020 XDrawString (disp, d, gc, x, y + base, xc, 1);
1022 1021
1023 x += r->TermWin.fwidth; 1022 x += term->fwidth;
1024 xc++; len--; 1023 xc++; len--;
1025 } 1024 }
1026 while (len); 1025 while (len);
1027 } 1026 }
1028 else 1027 else
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1028 XDrawString (disp, d, gc, x, y + base, xc, len);
1030 } 1029 }
1031 } 1030 }
1032} 1031}
1033 1032
1034///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
… …
1046 1045
1047 void draw (rxvt_drawable &d, int x, int y, 1046 void draw (rxvt_drawable &d, int x, int y,
1048 const text_t *text, int len, 1047 const text_t *text, int len,
1049 int fg, int bg); 1048 int fg, int bg);
1050 1049
1051 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1050 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1052 1051
1053protected: 1052protected:
1054 XftFont *f; 1053 XftFont *f;
1055}; 1054};
1056 1055
1057void 1056void
1058rxvt_font_xft::clear () 1057rxvt_font_xft::clear ()
1059{ 1058{
1060 if (f) 1059 if (f)
1061 { 1060 {
1062 XftFontClose (DISPLAY, f); 1061 XftFontClose (term->dpy, f);
1063 f = 0; 1062 f = 0;
1064 } 1063 }
1065} 1064}
1066 1065
1067rxvt_fontprop 1066rxvt_fontprop
… …
1071 1070
1072 FT_Face face = XftLockFace (f); 1071 FT_Face face = XftLockFace (f);
1073 1072
1074 p.width = width; 1073 p.width = width;
1075 p.height = height; 1074 p.height = height;
1075 p.ascent = ascent;
1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080 1080
… …
1084} 1084}
1085 1085
1086bool 1086bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1087rxvt_font_xft::load (const rxvt_fontprop &prop)
1088{ 1088{
1089 Display *disp = DISPLAY; 1089 dTermDisplay;
1090 1090
1091 clear (); 1091 clear ();
1092 1092
1093 FcPattern *p = FcNameParse ((FcChar8 *) name); 1093 FcPattern *p = FcNameParse ((FcChar8 *) name);
1094 1094
… …
1096 return false; 1096 return false;
1097 1097
1098 FcValue v; 1098 FcValue v;
1099 1099
1100 if (prop.height != rxvt_fontprop::unset 1100 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1104
1105 if (prop.weight != rxvt_fontprop::unset 1105 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1121 1121
1122 // store generated name so iso14755 view gives better results 1122 // store generated name so iso14755 view gives better results
1123 set_name ((char *)FcNameUnparse (p)); 1123 set_name ((char *)FcNameUnparse (p));
1124 1124
1125 XftResult result; 1125 XftResult result;
1126 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1126 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127 1127
1128 FcPatternDestroy (p); 1128 FcPatternDestroy (p);
1129 1129
1130 if (!match) 1130 if (!match)
1131 return false; 1131 return false;
… …
1152 1152
1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154 1154
1155 XftUnlockFace (f); 1155 XftUnlockFace (f);
1156 1156
1157 int glheight = height;
1158
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1158 { 1160 {
1159 FcChar16 ch = *t; 1161 FcChar16 ch = *t;
1160 1162
1161 if (cs != CS_UNICODE 1163 if (cs != CS_UNICODE
… …
1169 continue; 1171 continue;
1170 1172
1171 XGlyphInfo g; 1173 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g); 1174 XftTextExtents16 (disp, f, &ch, 1, &g);
1173 1175
1176 g.width -= g.x;
1177
1174 int wcw = wcwidth (ch); 1178 int wcw = WCWIDTH (ch);
1175 if (wcw > 0) g.width = g.width / wcw; 1179 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176 1180
1177 if (width < g.width) width = g.width; 1181 if (width < g.width ) width = g.width;
1178 if (height < g.height) height = g.height; 1182 if (height < g.height ) height = g.height;
1183 if (glheight < g.height - g.y) glheight = g.height - g.y;
1184 }
1185
1186 if (!width)
1187 {
1188 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1189
1190 XftFontClose (disp, f);
1191 f = 0;
1192
1193 success = false;
1194 break;
1179 } 1195 }
1180 1196
1181 if (prop.height == rxvt_fontprop::unset 1197 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height 1198 || (height <= prop.height && glheight <= prop.height)
1183 || height <= 2 1199 || height <= 2
1184 || !scalable) 1200 || !scalable)
1185 break; 1201 break;
1186 1202
1187 if (ftheight) 1203 if (ftheight)
… …
1194 ftheight -= height - prop.height; 1210 ftheight -= height - prop.height;
1195 } 1211 }
1196 else 1212 else
1197 ftheight = prop.height - 1; 1213 ftheight = prop.height - 1;
1198 1214
1199 XftFontClose (disp, f); 1215 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE); 1216 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1217 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 } 1218 }
1203 1219
1204 FcPatternDestroy (match); 1220 FcPatternDestroy (match);
1205 1221
1206#if 0 // do it per-character 1222#if 0 // do it per-character
… …
1213 1229
1214 return success; 1230 return success;
1215} 1231}
1216 1232
1217bool 1233bool
1218rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1234rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1219{ 1235{
1220 careful = false; 1236 careful = false;
1221 1237
1222 if (!XftCharExists (DISPLAY, f, unicode)) 1238 if (!XftCharExists (term->dpy, f, unicode))
1223 return false; 1239 return false;
1224 1240
1225 if (!prop || prop->width == rxvt_fontprop::unset) 1241 if (!prop || prop->width == rxvt_fontprop::unset)
1226 return true; 1242 return true;
1227 1243
1228 // check character against base font bounding box 1244 // check character against base font bounding box
1229 FcChar32 ch = unicode; 1245 FcChar32 ch = unicode;
1230 XGlyphInfo g; 1246 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1247 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1232 1248
1233 int w = g.width; 1249 int w = g.width - g.x;
1234 int wcw = wcwidth (unicode); 1250 int wcw = max (WCWIDTH (unicode), 1);
1235 if (wcw > 0) w /= wcw;
1236 1251
1237 careful = w > prop->width; 1252 careful = g.x > 0 || w > prop->width * wcw;
1238 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1253
1254 if (careful && !OVERLAP_OK (w, wcw, prop))
1255 return false;
1256
1257 // this weeds out _totally_ broken fonts, or glyphs
1258 if (!OVERLAP_OK (g.xOff, wcw, prop))
1239 return false; 1259 return false;
1240 1260
1241 return true; 1261 return true;
1242} 1262}
1243 1263
1244void 1264void
1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1265rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246 const text_t *text, int len, 1266 const text_t *text, int len,
1247 int fg, int bg) 1267 int fg, int bg)
1248{ 1268{
1249 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1250
1251 int base = ascent; // should be fbase, but that is incorrect
1252
1253 XGlyphInfo extents; 1269 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1270 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1255 FcChar32 *ep = enc; 1271 XftGlyphSpec *ep = enc;
1256 int ewidth = 0; 1272
1257 int xoff = 0; 1273 dTermDisplay;
1274 dTermGC;
1275
1276 int w = term->fwidth * len;
1277 int h = term->fheight;
1278
1279 bool buffered = !term->am_transparent // we aren't transparent
1280 || term->am_pixmap_trans // we have a pixmap
1281 || bg >= 0; // we don't use a transparent bg
1282
1283 // cut trailing spaces
1284 while (len && text [len - 1] == ' ')
1285 len--;
1286
1287 int x_ = buffered ? 0 : x;
1288 int y_ = buffered ? 0 : y;
1258 1289
1259 while (len) 1290 while (len)
1260 { 1291 {
1261 int cwidth = r->TermWin.fwidth; 1292 int cwidth = term->fwidth;
1262 FcChar32 fc = *text++; len--; 1293 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1294
1265 while (len && *text == NOCHAR) 1295 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1296 text++, len--, cwidth += term->fwidth;
1267 1297
1268 gl = XftCharIndex (d.display->display, f, fc); 1298 if (fc != ' ') // skip spaces
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270
1271 if (extents.xOff != cwidth && ep != enc)
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 } 1299 {
1300 FT_UInt glyph = XftCharIndex (disp, f, fc);
1301 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283 1302
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1303 ep->glyph = glyph;
1304 ep->x = x_ + (cwidth - extents.xOff >> 1);
1305 ep->y = y_ + ascent;
1306
1307 if (extents.xOff == 0)
1308 ep->x = x_ + cwidth;
1309
1310 ep++;
1285 { 1311 }
1312
1286 x += cwidth; 1313 x_ += cwidth;
1287 continue; 1314 }
1315
1316 if (buffered)
1317 {
1318 if (ep != enc)
1288 } 1319 {
1320 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1289 1321
1322 if (bg < 0 && term->am_pixmap_trans)
1323 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
1324 else if (bg < 0 && term->bgPixmap.pixmap)
1325 {
1326 XGCValues gcv;
1327
1328 gcv.fill_style = FillTiled;
1329 gcv.tile = term->pixmap;
1330 gcv.ts_x_origin = -x;
1331 gcv.ts_y_origin = -y;
1332
1333 GC gc2 = XCreateGC (disp, d2,
1334 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1335 &gcv);
1336
1337 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1338
1339 XFreeGC (disp, gc2);
1340 }
1341 else
1342 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1343
1344 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1345 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1346 }
1290 else 1347 else
1291 { 1348 clear_rect (d, x, y, w, h, bg);
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 }
1297
1298 if (ep != enc)
1299 { 1349 }
1300 if (xoff > ewidth) xoff = ewidth; 1350 else
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1304 } 1351 {
1352 clear_rect (d, x, y, w, h, bg);
1353 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1354 }
1305} 1355}
1356
1306#endif 1357#endif
1307 1358
1308///////////////////////////////////////////////////////////////////////////// 1359/////////////////////////////////////////////////////////////////////////////
1309 1360
1310rxvt_fontset::rxvt_fontset (rxvt_t r) 1361rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311: r (r), fontdesc (0) 1362: fontdesc (0), term (term)
1312{ 1363{
1313 clear (); 1364 clear ();
1314} 1365}
1315 1366
1316rxvt_fontset::~rxvt_fontset () 1367rxvt_fontset::~rxvt_fontset ()
… …
1319} 1370}
1320 1371
1321void 1372void
1322rxvt_fontset::clear () 1373rxvt_fontset::clear ()
1323{ 1374{
1324 prop.width = prop.height = prop.weight = prop.slant 1375 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1376 = rxvt_fontprop::unset;
1326 1377
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1378 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1379 FONT_UNREF (*i);
1329 1380
… …
1360 f = new rxvt_font_x11; 1411 f = new rxvt_font_x11;
1361 } 1412 }
1362 else 1413 else
1363 f = new rxvt_font_x11; 1414 f = new rxvt_font_x11;
1364 1415
1365 f->set_term (r); 1416 f->set_term (term);
1366 f->set_name (strdup (name)); 1417 f->set_name (strdup (name));
1367 1418
1368 f->cs = cs; 1419 f->cs = cs;
1369 f->loaded = false; 1420 f->loaded = false;
1370 1421
… …
1502 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1553 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1503 goto next_font; 1554 goto next_font;
1504 1555
1505 if (!realize_font (i)) 1556 if (!realize_font (i))
1506 goto next_font; 1557 goto next_font;
1558
1559 if (prop.ascent != rxvt_fontprop::unset)
1560 max_it (f->ascent, prop.ascent);
1507 } 1561 }
1508 1562
1509 if (f->cs == CS_UNKNOWN) 1563 if (f->cs == CS_UNKNOWN)
1510 goto next_font; 1564 goto next_font;
1511 1565
… …
1550 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1604 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1551 FcPatternAddBool (p, FC_MINSPACE, 1); 1605 FcPatternAddBool (p, FC_MINSPACE, 1);
1552 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1606 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1553 1607
1554 XftResult result; 1608 XftResult result;
1555 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1609 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1556 1610
1557 FcPatternDestroy (p); 1611 FcPatternDestroy (p);
1558 1612
1559 if (match) 1613 if (match)
1560 { 1614 {

Diff Legend

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