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

Diff Legend

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