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.71 by root, Sat Jun 18 10:02:35 2005 UTC vs.
Revision 1.93 by root, Tue Jan 31 00:25:16 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
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=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->xdisp
164#define dTermGC GC gc = term->gc
165
157///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
158 167
159#if XFT 168#if XFT
160rxvt_drawable::~rxvt_drawable () 169rxvt_drawable::~rxvt_drawable ()
161{ 170{
… …
164} 173}
165 174
166rxvt_drawable::operator XftDraw *() 175rxvt_drawable::operator XftDraw *()
167{ 176{
168 if (!xftdrawable) 177 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 178 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
170 179
171 return xftdrawable; 180 return xftdrawable;
172} 181}
173#endif 182#endif
174 183
175///////////////////////////////////////////////////////////////////////////// 184/////////////////////////////////////////////////////////////////////////////
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 185
193static const char * 186static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 187enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 188{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 189 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
190 uint8_t *res = buf;
197 191
198 while (len--) 192 while (len--)
199 { 193 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 194 uint32_t c = FROM_UNICODE (cs, *text++);
201 195
… …
206 } 200 }
207 201
208 *buf++ = c; 202 *buf++ = c;
209 } 203 }
210 204
211 return (const char *)enc_buf; 205 return (const char *)res;
212} 206}
213 207
214static const XChar2b * 208static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 209enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 210{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 211 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
212 XChar2b *res = buf;
218 213
219 while (len--) 214 while (len--)
220 { 215 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 216 uint32_t c = FROM_UNICODE (cs, *text++);
222 217
… …
229 buf->byte1 = c >> 8; 224 buf->byte1 = c >> 8;
230 buf->byte2 = c; 225 buf->byte2 = c;
231 buf++; 226 buf++;
232 } 227 }
233 228
234 return (XChar2b *)enc_buf; 229 return res;
235} 230}
236 231
237///////////////////////////////////////////////////////////////////////////// 232/////////////////////////////////////////////////////////////////////////////
233
234rxvt_font::rxvt_font ()
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{
237}
238 238
239void 239void
240rxvt_font::set_name (char *name) 240rxvt_font::set_name (char *name)
241{ 241{
242 if (this->name == name) 242 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 245 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 246 this->name = name;
247} 247}
248 248
249void 249void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 251{
252 dTermDisplay;
253 dTermGC;
254
252 if (color == Color_bg) 255 if (color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 256 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 257 else if (color >= 0)
255 { 258 {
256#if XFT 259#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 261#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 264#endif
262 } 265 }
263} 266}
267
268/////////////////////////////////////////////////////////////////////////////
264 269
265#include "table/linedraw.h" 270#include "table/linedraw.h"
266 271
267struct rxvt_font_default : rxvt_font { 272struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 273 struct rxvt_fontset *fs;
… …
276 rxvt_fontprop properties () 281 rxvt_fontprop properties ()
277 { 282 {
278 rxvt_fontprop p; 283 rxvt_fontprop p;
279 284
280 p.width = p.height = 1; 285 p.width = p.height = 1;
286 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 287 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 288 p.slant = rxvt_fontprop::roman;
283 289
284 return p; 290 return p;
285 } 291 }
… …
292 set_name (strdup ("built-in support font")); 298 set_name (strdup ("built-in support font"));
293 299
294 return true; 300 return true;
295 } 301 }
296 302
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 303 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 304 {
299 careful = false; 305 careful = false;
300 306
301 if (unicode <= 0x001f) 307 if (unicode <= 0x001f)
302 return true; 308 return true;
… …
305 return false; 311 return false;
306 312
307 if (unicode <= 0x009f) 313 if (unicode <= 0x009f)
308 return true; 314 return true;
309 315
310 if (unicode >= 0x2500 && unicode <= 0x259f) 316 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 318 return true;
312 319
313 if (IS_COMPOSE (unicode)) 320 if (IS_COMPOSE (unicode))
314 return true; 321 return true;
315 322
… …
331void 338void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 339rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 340 const text_t *text, int len,
334 int fg, int bg) 341 int fg, int bg)
335{ 342{
336 Display *disp = d.display->display; 343 dTermDisplay;
344 dTermGC;
337 345
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 346 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 347
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 348 XSetForeground (disp, gc, term->pix_colors[fg]);
341 349
342 while (len) 350 while (len)
343 { 351 {
344#if ENABLE_COMBINING 352#if ENABLE_COMBINING
345 compose_char *cc; 353 compose_char *cc;
… …
349 357
350 while (++text, --len && *text == NOCHAR) 358 while (++text, --len && *text == NOCHAR)
351 ; 359 ;
352 360
353 int width = text - tp; 361 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 362 int fwidth = term->fwidth * width;
355 363
356 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
357 { 365 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
361 369
362 int W = fwidth; 370 int W = fwidth;
363 int H = r->TermWin.fheight; 371 int H = term->fheight;
364 372
365 int x_[16]; 373 int x_[16];
366 int y_[16]; 374 int y_[16];
367 375
368 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
376 384
377 XGCValues gcv; 385 XGCValues gcv;
378 386
379 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 388 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 390
383 while (a < b) 391 while (a < b)
384 { 392 {
385 uint32_t command = *a++; 393 uint32_t command = *a++;
386 394
… …
393 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
394 402
395 switch (op) 403 switch (op)
396 { 404 {
397 case 0: // line 405 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 407 break;
400 408
401 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
402 if (a) 410 if (a)
403 { 411 {
… …
406 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
410 418
411 XChangeGC (disp, TGC, 419 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 421 &gcv);
414 } 422 }
415 423
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 425
418 if (a) 426 if (a)
419 { 427 {
420 XFreePixmap (disp, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 429 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 432 }
425 break; 433 break;
426 case 2: // arc 434 case 2: // arc
427 XDrawArc (disp, d, TGC, 435 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 438 break;
431 } 439 }
432 } 440 }
433 } 441 }
434#if ENABLE_COMBINING 442#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 444 {
445 min_it (width, 2); // we only support wcwidth up to 2
446
437 text_t chrs[2]; 447 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 448 chrs [1] = NOCHAR;
440 449
441 *chrs = cc->c1; 450 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 452 f1->draw (d, x, y, chrs, width, fg, bg);
… …
463 case ZERO_WIDTH_CHAR: 472 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 473 case NOCHAR:
465 break; 474 break;
466 475
467 default: 476 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 477 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 478 fwidth - 4, term->fheight - 4);
470 } 479 }
471 480
472 x += fwidth; 481 x += fwidth;
473 } 482 }
474} 483}
… …
482 491
483 rxvt_fontprop properties (); 492 rxvt_fontprop properties ();
484 493
485 bool load (const rxvt_fontprop &prop); 494 bool load (const rxvt_fontprop &prop);
486 495
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 496 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 497
489 void draw (rxvt_drawable &d, int x, int y, 498 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 499 const text_t *text, int len,
491 int fg, int bg); 500 int fg, int bg);
492 501
493 bool slow; // wether this is a proportional font or has other funny characteristics 502 bool slow; // wether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 503 XFontStruct *f;
495 codeset cs; 504 codeset cs;
496 bool enc2b, encm; 505 bool enc2b, encm;
497 506
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 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); 508 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); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 511};
503 512
504char * 513char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 515{
507 unsigned long value; 516 unsigned long value;
508 517
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 519 return XGetAtomName (term->xdisp, value);
511 else 520 else
512 return rxvt_strdup (repl); 521 return rxvt_strdup (repl);
513} 522}
514 523
515rxvt_fontprop 524rxvt_fontprop
… …
521} 530}
522 531
523bool 532bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 533rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 534{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 535 p.width = width != rxvt_fontprop::unset ? width
536 : avgwidth ? (avgwidth + 1) / 10
537 : (height + 1) / 2;
527 p.height = height; 538 p.height = height;
539 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 540 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 541 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 542
531 return true; 543 return true;
532} 544}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 548{
537 unsigned long height; 549 unsigned long height;
538 550
539#if 0 551#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
541 return false; 553 return false;
542#else 554#else
543 height = f->ascent + f->descent; 555 height = f->ascent + f->descent;
544#endif 556#endif
545 557
546 unsigned long avgwidth; 558 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 560 avgwidth = 0;
549 561
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 564
553 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
554 566
555 free (weight); 567 free (weight);
556 free (slant); 568 free (slant);
557 569
570 p.ascent = f->ascent;
571
558 return true; 572 return true;
559} 573}
560 574
561bool 575bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 576rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 577{
578 dTermDisplay;
564 int slashes = 0; 579 int slashes = 0;
565 const char *comp[13]; 580 const char *comp[13];
566 581
567 for (const char *c = name; *c; c++) 582 for (const char *c = name; *c; c++)
568 if (*c == '-') 583 if (*c == '-')
… …
576 if (slashes >= 13 591 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 592 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 593 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 594 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 595
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 596 XFontStruct *f = XLoadQueryFont (disp, name);
582 597
583 if (f) 598 if (f)
584 { 599 {
585 // the font should really exist now. if not, we have a problem 600 // the font should really exist now. if not, we have a problem
586 // (e.g. if the user did xset fp rehash just when we were searching fonts). 601 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 602 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 603 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 604 XFreeFont (disp, f);
590 return ret; 605 return ret;
591 } 606 }
592 else 607 else
593 return false; 608 return false;
594} 609}
… …
632} 647}
633 648
634bool 649bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 650rxvt_font_x11::load (const rxvt_fontprop &prop)
636{ 651{
637 Display *disp = DISPLAY; 652 dTermDisplay;
638 653
639 clear (); 654 clear ();
640 655
641 char field_str[64]; // enough for 128 bits 656 char field_str[64]; // enough for 128 bits
642 657
… …
651 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
652 667
653 if (!f) 668 if (!f)
654 return false; 669 return false;
655 670
656 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
657 672
658 if (new_name) 673 if (new_name)
659 set_name (new_name); 674 set_name (new_name);
660 else 675 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
717 int diff = 0; 732 int diff = 0;
718 733
719 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
721 else if (replace_field (fname, list[i], 11, '0', "0")) 736 else if (replace_field (fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
723 738
724 if (!set_properties (p, fname)) 739 if (!set_properties (p, fname))
725 continue; 740 continue;
726 741
727 if (prop.height != rxvt_fontprop::unset 742 if (prop.height != rxvt_fontprop::unset
… …
770 delete [] fonts; 785 delete [] fonts;
771 786
772 if (!f) 787 if (!f)
773 return false; 788 return false;
774 789
775 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
776 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
777 792
778 if (registry && encoding) 793 if (registry && encoding)
779 { 794 {
780 char charset[64]; 795 char charset[64];
781 snprintf (charset, 64, "%s-%s", registry, encoding); 796 snprintf (charset, 64, "%s-%s", registry, encoding);
782 797
783 cs = codeset_from_name (charset); 798 cs = codeset_from_name (charset);
784 } 799 }
785 else 800 else
786 { 801 {
787 const char *charset = get_property (f, "FONT", 0); 802 const char *charset = get_property (f, XA_FONT, 0);
788 803
789 if (!charset) 804 if (!charset)
790 charset = name; 805 charset = name;
791 806
792 int count = 13; 807 int count = 13;
… …
807 enc2b = encm || f->max_char_or_byte2 > 255; 822 enc2b = encm || f->max_char_or_byte2 > 255;
808 823
809 slow = false; 824 slow = false;
810 825
811#if 1 // only used for slow detection, TODO optimize 826#if 1 // only used for slow detection, TODO optimize
812 if (f->min_bounds.width == f->max_bounds.width) 827 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
813 width = f->min_bounds.width;
814 else if (f->per_char == NULL)
815 width = f->max_bounds.width; 828 width = f->max_bounds.width;
816 else 829 else
817 { 830 {
818 slow = true; 831 slow = true;
819 832
… …
835 848
836 width = 1; 849 width = 1;
837 850
838 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 851 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
839 { 852 {
840 if (cs != CS_UNICODE
841 && *t > 0x100
842 && FROM_UNICODE (cs, *t) == NOCHAR) 853 if (FROM_UNICODE (cs, *t) == NOCHAR)
843 continue; 854 continue;
844 855
845 // ignore characters we wouldn't use anyways 856 // ignore characters we wouldn't use anyways
846 bool careful; 857 bool careful;
847 if (!has_char (*t, &prop, careful)) 858 if (!has_char (*t, &prop, careful))
… …
851 862
852 XCharStruct g; 863 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 864 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 866
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 867 int wcw = WCWIDTH (*t);
868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 869
858 if (width < g.width) width = g.width; 870 if (width < g.width) width = g.width;
859 } 871 }
860 872
861 if (cs == CS_UNKNOWN) 873 if (cs == CS_UNKNOWN)
862 { 874 {
863 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
880void 892void
881rxvt_font_x11::clear () 893rxvt_font_x11::clear ()
882{ 894{
883 if (f) 895 if (f)
884 { 896 {
885 XFreeFont (DISPLAY, f); 897 XFreeFont (term->xdisp, f);
886 f = 0; 898 f = 0;
887 } 899 }
888} 900}
889 901
890bool 902bool
891rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 903rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
892{ 904{
893 uint32_t ch = FROM_UNICODE (cs, unicode); 905 uint32_t ch = FROM_UNICODE (cs, unicode);
894 906
895 if (ch == NOCHAR) 907 if (ch == NOCHAR)
896 return false; 908 return false;
… …
933 return false; 945 return false;
934 946
935 if (!prop || prop->width == rxvt_fontprop::unset) 947 if (!prop || prop->width == rxvt_fontprop::unset)
936 return true; 948 return true;
937 949
938 // check character against base font bounding box 950 // check wether character overlaps previous/next character
939 int w = xcs->width; 951 int w = xcs->rbearing - xcs->lbearing;
940 int wcw = wcwidth (unicode); 952 int wcw = max (WCWIDTH (unicode), 1);
941 if (wcw > 0) w /= wcw;
942 953
943 careful = w > prop->width; 954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 955
956 if (careful && !OVERLAP_OK (w, wcw, prop))
945 return false; 957 return false;
946 958
947 return true; 959 return true;
948} 960}
949 961
… …
955 // this looks like a mess /. 967 // this looks like a mess /.
956 // and it is a mess /. 968 // and it is a mess /.
957 // yet we are trying to be perfect /. 969 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 970 // but the result still isn't perfect /.
959 971
972 dTermDisplay;
973 dTermGC;
974
960 bool slow = this->slow 975 bool slow = this->slow
961 || width != r->TermWin.fwidth 976 || width != term->fwidth
962 || height != r->TermWin.fheight; 977 || height != term->fheight;
963 978
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 979 int base = ascent; // sorry, incorrect: term->fbase;
965 980
966 XGCValues v; 981 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 982 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 983 v.font = f->fid;
969 984
970 if (enc2b) 985 if (enc2b)
971 { 986 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 987 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 988
974 if (bg == Color_bg && !slow) 989 if (bg == Color_bg && !slow)
975 { 990 {
976 v.background = r->pix_colors[bg]; 991 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 992 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 993 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 994 }
980 else 995 else
981 { 996 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 998
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1000
986 if (slow) 1001 if (slow)
987 { 1002 {
988 do 1003 do
989 { 1004 {
990 if (xc->byte1 || xc->byte2) 1005 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 1007
993 x += r->TermWin.fwidth; 1008 x += term->fwidth;
994 xc++; len--; 1009 xc++; len--;
995 } 1010 }
996 while (len); 1011 while (len);
997 } 1012 }
998 else 1013 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1014 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 1015 }
1001 } 1016 }
1002 else 1017 else
1003 { 1018 {
1004 const char *xc = enc_char (text, len, cs, slow); 1019 const char *xc = enc_char (text, len, cs, slow);
1005 1020
1006 if (bg == Color_bg && !slow) 1021 if (bg == Color_bg && !slow)
1007 { 1022 {
1008 v.background = r->pix_colors[bg]; 1023 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1024 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1025 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1026 }
1012 else 1027 else
1013 { 1028 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1030
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1032
1018 if (slow) 1033 if (slow)
1019 { 1034 {
1020 do 1035 do
1021 { 1036 {
1022 if (*xc) 1037 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1038 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1039
1025 x += r->TermWin.fwidth; 1040 x += term->fwidth;
1026 xc++; len--; 1041 xc++; len--;
1027 } 1042 }
1028 while (len); 1043 while (len);
1029 } 1044 }
1030 else 1045 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1046 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1047 }
1033 } 1048 }
1034} 1049}
1035 1050
1036///////////////////////////////////////////////////////////////////////////// 1051/////////////////////////////////////////////////////////////////////////////
… …
1048 1063
1049 void draw (rxvt_drawable &d, int x, int y, 1064 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1065 const text_t *text, int len,
1051 int fg, int bg); 1066 int fg, int bg);
1052 1067
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1068 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1054 1069
1055protected: 1070protected:
1056 XftFont *f; 1071 XftFont *f;
1057}; 1072};
1058 1073
1059void 1074void
1060rxvt_font_xft::clear () 1075rxvt_font_xft::clear ()
1061{ 1076{
1062 if (f) 1077 if (f)
1063 { 1078 {
1064 XftFontClose (DISPLAY, f); 1079 XftFontClose (term->xdisp, f);
1065 f = 0; 1080 f = 0;
1066 } 1081 }
1067} 1082}
1068 1083
1069rxvt_fontprop 1084rxvt_fontprop
… …
1073 1088
1074 FT_Face face = XftLockFace (f); 1089 FT_Face face = XftLockFace (f);
1075 1090
1076 p.width = width; 1091 p.width = width;
1077 p.height = height; 1092 p.height = height;
1093 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1094 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1095 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1096 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1097 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1098
… …
1086} 1102}
1087 1103
1088bool 1104bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1105rxvt_font_xft::load (const rxvt_fontprop &prop)
1090{ 1106{
1091 Display *disp = DISPLAY; 1107 dTermDisplay;
1092 1108
1093 clear (); 1109 clear ();
1094 1110
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1111 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1112
… …
1123 1139
1124 // store generated name so iso14755 view gives better results 1140 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1141 set_name ((char *)FcNameUnparse (p));
1126 1142
1127 XftResult result; 1143 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1144 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1145
1130 FcPatternDestroy (p); 1146 FcPatternDestroy (p);
1131 1147
1132 if (!match) 1148 if (!match)
1133 return false; 1149 return false;
… …
1154 1170
1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1171 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1156 1172
1157 XftUnlockFace (f); 1173 XftUnlockFace (f);
1158 1174
1175 int glheight = height;
1176
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1177 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1160 { 1178 {
1161 FcChar16 ch = *t; 1179 FcChar16 ch = *t;
1162 1180
1163 if (cs != CS_UNICODE 1181 if (cs != CS_UNICODE
… …
1171 continue; 1189 continue;
1172 1190
1173 XGlyphInfo g; 1191 XGlyphInfo g;
1174 XftTextExtents16 (disp, f, &ch, 1, &g); 1192 XftTextExtents16 (disp, f, &ch, 1, &g);
1175 1193
1194 g.width -= g.x;
1195
1176 int wcw = wcwidth (ch); 1196 int wcw = WCWIDTH (ch);
1177 if (wcw > 0) g.width = g.width / wcw; 1197 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1178 1198
1179 if (width < g.width) width = g.width; 1199 if (width < g.width ) width = g.width;
1180 if (height < g.height) height = g.height; 1200 if (height < g.height ) height = g.height;
1201 if (glheight < g.height - g.y) glheight = g.height - g.y;
1202 }
1203
1204 if (!width)
1205 {
1206 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1207
1208 XftFontClose (disp, f);
1209 f = 0;
1210
1211 success = false;
1212 break;
1181 } 1213 }
1182 1214
1183 if (prop.height == rxvt_fontprop::unset 1215 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1216 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1217 || height <= 2
1186 || !scalable) 1218 || !scalable)
1187 break; 1219 break;
1188 1220
1189 if (ftheight) 1221 if (ftheight)
… …
1196 ftheight -= height - prop.height; 1228 ftheight -= height - prop.height;
1197 } 1229 }
1198 else 1230 else
1199 ftheight = prop.height - 1; 1231 ftheight = prop.height - 1;
1200 1232
1201 XftFontClose (disp, f); 1233 XftFontClose (disp, f);
1202 FcPatternDel (match, FC_PIXEL_SIZE); 1234 FcPatternDel (match, FC_PIXEL_SIZE);
1203 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1235 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1204 } 1236 }
1205 1237
1206 FcPatternDestroy (match); 1238 FcPatternDestroy (match);
1207 1239
1208#if 0 // do it per-character 1240#if 0 // do it per-character
… …
1215 1247
1216 return success; 1248 return success;
1217} 1249}
1218 1250
1219bool 1251bool
1220rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1221{ 1253{
1222 careful = false; 1254 careful = false;
1223 1255
1224 if (!XftCharExists (DISPLAY, f, unicode)) 1256 if (!XftCharExists (term->xdisp, f, unicode))
1225 return false; 1257 return false;
1226 1258
1227 if (!prop || prop->width == rxvt_fontprop::unset) 1259 if (!prop || prop->width == rxvt_fontprop::unset)
1228 return true; 1260 return true;
1229 1261
1230 // check character against base font bounding box 1262 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1263 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1264 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1265 XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1234 1266
1235 int w = g.width; 1267 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1268 int wcw = max (WCWIDTH (unicode), 1);
1237 if (wcw > 0) w /= wcw;
1238 1269
1239 careful = w > prop->width; 1270 careful = g.x > 0 || w > prop->width * wcw;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1271
1272 if (careful && !OVERLAP_OK (w, wcw, prop))
1273 return false;
1274
1275 // this weeds out _totally_ broken fonts, or glyphs
1276 if (!OVERLAP_OK (g.xOff, wcw, prop))
1241 return false; 1277 return false;
1242 1278
1243 return true; 1279 return true;
1244} 1280}
1245 1281
1246void 1282void
1247rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1248 const text_t *text, int len, 1284 const text_t *text, int len,
1249 int fg, int bg) 1285 int fg, int bg)
1250{ 1286{
1251 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1252
1253 int base = ascent; // should be fbase, but that is incorrect
1254 1288
1255 XGlyphInfo extents; 1289 XGlyphInfo extents;
1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1257 FcChar32 *ep = enc; 1291 XftGlyphSpec *ep = enc;
1258 int ewidth = 0; 1292
1293 dTermDisplay;
1294 dTermGC;
1295
1296 // cut trailing spaces
1297 while (len && text [len - 1] == ' ')
1298 len--;
1259 1299
1260 while (len) 1300 while (len)
1261 { 1301 {
1262 int cwidth = r->TermWin.fwidth; 1302 int cwidth = term->fwidth;
1263 FcChar32 fc = *text++; len--; 1303 FcChar32 fc = *text++; len--;
1264 1304
1265 while (len && *text == NOCHAR) 1305 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1306 text++, len--, cwidth += term->fwidth;
1267 1307
1268 if (fc == ' ' && ep == enc) // skip leading spaces 1308 if (fc != ' ') // skip spaces
1309 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312
1313 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1);
1315 ep->y = y + ascent;
1316
1317 if (extents.xOff == 0)
1318 ep->x = x + cwidth;
1319
1320 ep++;
1321 }
1322
1269 x += cwidth; 1323 x += cwidth;
1270 else
1271 {
1272 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1273 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1274
1275 if (extents.xOff != cwidth)
1276 {
1277 if (ewidth)
1278 {
1279 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1280 x, y + base, enc, ep - enc);
1281 x += ewidth;
1282
1283 ep = enc;
1284 ewidth = 0;
1285 }
1286
1287 if (extents.xOff > cwidth)
1288 extents.xOff = cwidth;
1289
1290 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1291 x + (cwidth - extents.xOff >> 1),
1292 y + base, &gl, 1);
1293 x += cwidth;
1294 }
1295 else
1296 {
1297 *ep++ = gl;
1298 ewidth += cwidth;
1299 }
1300 }
1301 } 1324 }
1302 1325
1303 if (ep != enc) 1326 if (ep != enc)
1304 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1305 x, y + base, enc, ep - enc);
1306} 1328}
1307#endif 1329#endif
1308 1330
1309///////////////////////////////////////////////////////////////////////////// 1331/////////////////////////////////////////////////////////////////////////////
1310 1332
1311rxvt_fontset::rxvt_fontset (rxvt_t r) 1333rxvt_fontset::rxvt_fontset (rxvt_term *term)
1312: r (r), fontdesc (0) 1334: fontdesc (0), term (term)
1313{ 1335{
1314 clear (); 1336 clear ();
1315} 1337}
1316 1338
1317rxvt_fontset::~rxvt_fontset () 1339rxvt_fontset::~rxvt_fontset ()
… …
1320} 1342}
1321 1343
1322void 1344void
1323rxvt_fontset::clear () 1345rxvt_fontset::clear ()
1324{ 1346{
1325 prop.width = prop.height = prop.weight = prop.slant 1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1326 = rxvt_fontprop::unset; 1348 = rxvt_fontprop::unset;
1327 1349
1328 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1329 FONT_UNREF (*i); 1351 FONT_UNREF (*i);
1330 1352
… …
1361 f = new rxvt_font_x11; 1383 f = new rxvt_font_x11;
1362 } 1384 }
1363 else 1385 else
1364 f = new rxvt_font_x11; 1386 f = new rxvt_font_x11;
1365 1387
1366 f->set_term (r); 1388 f->set_term (term);
1367 f->set_name (strdup (name)); 1389 f->set_name (strdup (name));
1368 1390
1369 f->cs = cs; 1391 f->cs = cs;
1370 f->loaded = false; 1392 f->loaded = false;
1371 1393
… …
1503 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1525 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1504 goto next_font; 1526 goto next_font;
1505 1527
1506 if (!realize_font (i)) 1528 if (!realize_font (i))
1507 goto next_font; 1529 goto next_font;
1530
1531 if (prop.ascent != rxvt_fontprop::unset)
1532 max_it (f->ascent, prop.ascent);
1508 } 1533 }
1509 1534
1510 if (f->cs == CS_UNKNOWN) 1535 if (f->cs == CS_UNKNOWN)
1511 goto next_font; 1536 goto next_font;
1512 1537
… …
1551 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1576 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1552 FcPatternAddBool (p, FC_MINSPACE, 1); 1577 FcPatternAddBool (p, FC_MINSPACE, 1);
1553 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1554 1579
1555 XftResult result; 1580 XftResult result;
1556 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1581 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1557 1582
1558 FcPatternDestroy (p); 1583 FcPatternDestroy (p);
1559 1584
1560 if (match) 1585 if (match)
1561 { 1586 {

Diff Legend

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