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.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.105 by root, Tue Oct 3 12:50:31 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29
29#include <inttypes.h> 30#include <inttypes.h>
30 31
31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 67
63# if XFT 68# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
65 70
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
73# endif 78# endif
74#endif 79#endif
75 80
76 // japanese 81 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 83# if XFT
79 // prefer xft for complex scripts 84 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 89# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 108# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 125#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 128# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 131# endif
127#endif 132#endif
128 133
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 136#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 141
140 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 144#endif
143 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
144 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
145}; 151};
146 152
147// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
152 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
153}; 159};
154 160
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
157///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
158
159#if XFT
160rxvt_drawable::~rxvt_drawable ()
161{
162 if (xftdrawable)
163 XftDrawDestroy (xftdrawable);
164}
165
166rxvt_drawable::operator XftDraw *()
167{
168 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
170
171 return xftdrawable;
172}
173#endif
174
175/////////////////////////////////////////////////////////////////////////////
176
177static void *enc_buf;
178static uint32_t enc_len;
179
180static inline void *
181get_enc_buf (uint32_t len)
182{
183 if (len > enc_len)
184 {
185 free (enc_buf);
186 enc_buf = malloc (len);
187 enc_len = len;
188 }
189
190 return enc_buf;
191}
192 167
193static const char * 168static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 170{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
197 173
198 while (len--) 174 while (len--)
199 { 175 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
201 177
… …
206 } 182 }
207 183
208 *buf++ = c; 184 *buf++ = c;
209 } 185 }
210 186
211 return (const char *)enc_buf; 187 return (const char *)res;
212} 188}
213 189
214static const XChar2b * 190static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 191enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 192{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
218 195
219 while (len--) 196 while (len--)
220 { 197 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
222 199
… …
229 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
230 buf->byte2 = c; 207 buf->byte2 = c;
231 buf++; 208 buf++;
232 } 209 }
233 210
234 return (XChar2b *)enc_buf; 211 return res;
235} 212}
236 213
237///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
238 220
239void 221void
240rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
241{ 223{
242 if (this->name == name) 224 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 228 this->name = name;
247} 229}
248 230
249void 231void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 233{
234 dTermDisplay;
235 dTermGC;
236
252 if (color == Color_bg) 237 if (color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 239 else if (color >= 0)
255 { 240 {
256#if XFT 241#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 243#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 245 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 246#endif
262 } 247 }
263} 248}
249
250/////////////////////////////////////////////////////////////////////////////
264 251
265#include "table/linedraw.h" 252#include "table/linedraw.h"
266 253
267struct rxvt_font_default : rxvt_font { 254struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 255 struct rxvt_fontset *fs;
… …
276 rxvt_fontprop properties () 263 rxvt_fontprop properties ()
277 { 264 {
278 rxvt_fontprop p; 265 rxvt_fontprop p;
279 266
280 p.width = p.height = 1; 267 p.width = p.height = 1;
268 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 269 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 270 p.slant = rxvt_fontprop::roman;
283 271
284 return p; 272 return p;
285 } 273 }
286 274
287 bool load (const rxvt_fontprop &prop) 275 bool load (const rxvt_fontprop &prop, bool force_prop)
288 { 276 {
289 width = 1; height = 1; 277 width = 1; height = 1;
290 ascent = 1; descent = 0; 278 ascent = 1; descent = 0;
291 279
292 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
293 281
294 return true; 282 return true;
295 } 283 }
296 284
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 285 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 286 {
299 careful = false; 287 careful = false;
300 288
301 if (unicode <= 0x001f) 289 if (unicode <= 0x001f)
302 return true; 290 return true;
… …
305 return false; 293 return false;
306 294
307 if (unicode <= 0x009f) 295 if (unicode <= 0x009f)
308 return true; 296 return true;
309 297
310 if (unicode >= 0x2500 && unicode <= 0x259f) 298 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 300 return true;
312 301
313 if (IS_COMPOSE (unicode)) 302 if (IS_COMPOSE (unicode))
314 return true; 303 return true;
315 304
… …
331void 320void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 321rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 322 const text_t *text, int len,
334 int fg, int bg) 323 int fg, int bg)
335{ 324{
325 dTermDisplay;
326 dTermGC;
327
336 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 328 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337 329
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 330 XSetForeground (disp, gc, term->pix_colors[fg]);
339 331
340 while (len) 332 while (len)
341 { 333 {
342#if ENABLE_COMBINING 334#if ENABLE_COMBINING
343 compose_char *cc; 335 compose_char *cc;
… …
347 339
348 while (++text, --len && *text == NOCHAR) 340 while (++text, --len && *text == NOCHAR)
349 ; 341 ;
350 342
351 int width = text - tp; 343 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 344 int fwidth = term->fwidth * width;
353 345
354 if (0x2500 <= t && t <= 0x259f) 346 if (0x2500 <= t && t <= 0x259f)
355 { 347 {
356 uint16_t offs = linedraw_offs[t - 0x2500]; 348 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 349 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 350 uint32_t *b = a + (offs & 15);
359 351
360 int W = fwidth; 352 int W = fwidth;
361 int H = r->TermWin.fheight; 353 int H = term->fheight;
362 354
363 int x_[16]; 355 int x_[16];
364 int y_[16]; 356 int y_[16];
365 357
366 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
374 366
375 XGCValues gcv; 367 XGCValues gcv;
376 368
377 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 370 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 372
381 while (a < b) 373 while (a < b)
382 { 374 {
383 uint32_t command = *a++; 375 uint32_t command = *a++;
384 376
… …
391 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
392 384
393 switch (op) 385 switch (op)
394 { 386 {
395 case 0: // line 387 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 389 break;
398 390
399 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
400 if (a) 392 if (a)
401 { 393 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 395
404 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
408 400
409 XChangeGC (d.display->display, TGC, 401 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 403 &gcv);
412 } 404 }
413 405
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 406 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 407
416 if (a) 408 if (a)
417 { 409 {
418 XFreePixmap (d.display->display, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 411 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 414 }
423 break; 415 break;
424 case 2: // arc 416 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 417 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 420 break;
429 } 421 }
430 } 422 }
431 } 423 }
432#if ENABLE_COMBINING 424#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
435 text_t chrs[2]; 429 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 430 chrs [1] = NOCHAR;
438 431
439 *chrs = cc->c1; 432 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
… …
461 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 455 case NOCHAR:
463 break; 456 break;
464 457
465 default: 458 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 460 fwidth - 4, term->fheight - 4);
468 } 461 }
469 462
470 x += fwidth; 463 x += fwidth;
471 } 464 }
472} 465}
… …
478 471
479 void clear (); 472 void clear ();
480 473
481 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
482 475
483 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
484 477
485 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
486 479
487 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 481 const text_t *text, int len,
489 int fg, int bg); 482 int fg, int bg);
490 483
491 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
492 XFontStruct *f; 485 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 486 bool enc2b, encm;
495 487
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 488 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 490 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 491 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 492};
501 493
502char * 494char *
503rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 495rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
504{ 496{
505 unsigned long value; 497 unsigned long value;
506 498
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 499 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 500 return XGetAtomName (term->dpy, value);
509 else 501 else
510 return rxvt_strdup (repl); 502 return rxvt_strdup (repl);
511} 503}
512 504
513rxvt_fontprop 505rxvt_fontprop
… …
519} 511}
520 512
521bool 513bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 514rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
523{ 515{
524 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 516 p.width = width != rxvt_fontprop::unset ? width
517 : avgwidth ? (avgwidth + 1) / 10
518 : (height + 1) / 2;
525 p.height = height; 519 p.height = height;
520 p.ascent = rxvt_fontprop::unset;
526 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 521 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
527 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 522 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
528 523
529 return true; 524 return true;
530} 525}
… …
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 528rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 529{
535 unsigned long height; 530 unsigned long height;
536 531
537#if 0 532#if 0
538 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 533 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
539 return false; 534 return false;
540#else 535#else
541 height = f->ascent + f->descent; 536 height = f->ascent + f->descent;
542#endif 537#endif
543 538
544 unsigned long avgwidth; 539 unsigned long avgwidth;
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 540 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
546 avgwidth = 0; 541 avgwidth = 0;
547 542
548 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 543 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
549 char *slant = get_property (f, "SLANT", "r"); 544 char *slant = get_property (f, term->xa [XA_SLANT], "r");
550 545
551 set_properties (p, height, weight, slant, avgwidth); 546 set_properties (p, height, weight, slant, avgwidth);
552 547
553 free (weight); 548 free (weight);
554 free (slant); 549 free (slant);
555 550
551 p.ascent = f->ascent;
552
556 return true; 553 return true;
557} 554}
558 555
559bool 556bool
560rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 557rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
561{ 558{
559 dTermDisplay;
562 int slashes = 0; 560 int slashes = 0;
563 const char *comp[13]; 561 const char *comp[13];
564 562
565 for (const char *c = name; *c; c++) 563 for (const char *c = name; *c; c++)
566 if (*c == '-') 564 if (*c == '-')
… …
574 if (slashes >= 13 572 if (slashes >= 13
575 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
576 && (*comp[11] >= '0' && *comp[11] <= '9')) 574 && (*comp[11] >= '0' && *comp[11] <= '9'))
577 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 575 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
578 576
579 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 577 XFontStruct *f = XLoadQueryFont (disp, name);
580 578
581 if (f) 579 if (f)
582 { 580 {
583 // the font should really exist now. if not, we have a problem 581 // the font should really exist now. if not, we have a problem
584 // (e.g. if the user did xset fp rehash just when we were searching fonts). 582 // (e.g. if the user did xset fp rehash just when we were searching fonts).
585 // in that case, just return garbage. 583 // in that case, just return garbage.
586 bool ret = set_properties (p, f); 584 bool ret = set_properties (p, f);
587 XFreeFont (DISPLAY, f); 585 XFreeFont (disp, f);
588 return ret; 586 return ret;
589 } 587 }
590 else 588 else
591 return false; 589 return false;
592} 590}
… …
628 return false; 626 return false;
629 } 627 }
630} 628}
631 629
632bool 630bool
633rxvt_font_x11::load (const rxvt_fontprop &prop) 631rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
634{ 632{
633 dTermDisplay;
634
635 clear (); 635 clear ();
636 636
637 char field_str[64]; // enough for 128 bits 637 char field_str[64]; // enough for 128 bits
638 638
639 // first morph the font if required 639 // first morph the font if required
640 if (prop.weight != rxvt_fontprop::unset 640 if (force_prop)
641 || prop.slant != rxvt_fontprop::unset)
642 { 641 {
643 char fname[1024]; 642 char fname[1024];
644 643
645 if (name[0] != '-') 644 if (name[0] != '-')
646 { 645 {
647 f = XLoadQueryFont (DISPLAY, name); 646 f = XLoadQueryFont (disp, name);
648 647
649 if (!f) 648 if (!f)
650 return false; 649 return false;
651 650
652 char *new_name = get_property (f, "FONT", name); 651 char *new_name = get_property (f, XA_FONT, name);
653 652
654 if (new_name) 653 if (new_name)
655 set_name (new_name); 654 set_name (new_name);
656 else 655 else
657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 656 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
658 657
659 XFreeFont (DISPLAY, f); 658 XFreeFont (disp, f);
660 f = 0; 659 f = 0;
661 } 660 }
662 661
663 if (prop.weight != rxvt_fontprop::unset) 662 if (prop.weight != rxvt_fontprop::unset)
664 { 663 {
… …
694 ~font_weight () { free (name); } 693 ~font_weight () { free (name); }
695 }; 694 };
696 695
697 char **list; 696 char **list;
698 int count; 697 int count;
699 list = XListFonts (DISPLAY, name, 4000, &count); 698 list = XListFonts (disp, name, 4000, &count);
700 699
701 set_name (0); 700 set_name (0);
702 701
703 if (!list) 702 if (!list)
704 return false; 703 return false;
… …
712 711
713 int diff = 0; 712 int diff = 0;
714 713
715 if (replace_field (fname, list[i], 6, '0', field_str)) 714 if (replace_field (fname, list[i], 6, '0', field_str))
716 diff += 10; // slightly penalize scalable fonts 715 diff += 10; // slightly penalize scalable fonts
716 else if (replace_field (fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
717 718
718 if (!set_properties (p, fname)) 719 if (!set_properties (p, fname))
719 continue; 720 continue;
720 721
721 if (prop.height != rxvt_fontprop::unset 722 if (prop.height != rxvt_fontprop::unset
… …
737 for (;;) 738 for (;;)
738 { 739 {
739 font_weight *best = fonts + count - 1; 740 font_weight *best = fonts + count - 1;
740 741
741 for (font_weight *w = best; w-- > fonts; ) 742 for (font_weight *w = best; w-- > fonts; )
742 if (w->diff < best->diff) 743 if (w->diff <= best->diff)
743 best = w; 744 best = w;
744 745
745 if (!best->name 746 if (!best->name
746 || !(f = XLoadQueryFont (DISPLAY, best->name))) 747 || !(f = XLoadQueryFont (disp, best->name)))
747 break; 748 break;
748 749
749 set_name (best->name); 750 set_name (best->name);
750 best->clear (); 751 best->clear ();
751 752
… …
764 delete [] fonts; 765 delete [] fonts;
765 766
766 if (!f) 767 if (!f)
767 return false; 768 return false;
768 769
769 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
770 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
771 772
772 if (registry && encoding) 773 if (registry && encoding)
773 { 774 {
774 char charset[64]; 775 char charset[64];
775 snprintf (charset, 64, "%s-%s", registry, encoding); 776 snprintf (charset, 64, "%s-%s", registry, encoding);
776 777
777 cs = codeset_from_name (charset); 778 cs = codeset_from_name (charset);
778 } 779 }
779 else 780 else
780 { 781 {
781 const char *charset = get_property (f, "FONT", 0); 782 const char *charset = get_property (f, XA_FONT, 0);
782 783
783 if (!charset) 784 if (!charset)
784 charset = name; 785 charset = name;
785 786
786 int count = 13; 787 int count = 13;
… …
801 enc2b = encm || f->max_char_or_byte2 > 255; 802 enc2b = encm || f->max_char_or_byte2 > 255;
802 803
803 slow = false; 804 slow = false;
804 805
805#if 1 // only used for slow detection, TODO optimize 806#if 1 // only used for slow detection, TODO optimize
806 if (f->min_bounds.width == f->max_bounds.width) 807 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
807 width = f->min_bounds.width;
808 else if (f->per_char == NULL)
809 width = f->max_bounds.width; 808 width = f->max_bounds.width;
810 else 809 else
811 { 810 {
812 slow = true; 811 slow = true;
813 812
… …
829 828
830 width = 1; 829 width = 1;
831 830
832 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 831 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
833 { 832 {
834 if (cs != CS_UNICODE
835 && *t > 0x100
836 && FROM_UNICODE (cs, *t) == NOCHAR) 833 if (FROM_UNICODE (cs, *t) == NOCHAR)
837 continue; 834 continue;
838 835
839 // ignore characters we wouldn't use anyways 836 // ignore characters we wouldn't use anyways
840 bool careful; 837 bool careful;
841 if (!has_char (*t, &prop, careful)) 838 if (!has_char (*t, &prop, careful))
… …
845 842
846 XCharStruct g; 843 XCharStruct g;
847 int dir_ret, asc_ret, des_ret; 844 int dir_ret, asc_ret, des_ret;
848 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 845 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
849 846
850 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 847 int wcw = WCWIDTH (*t);
848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 849
852 if (width < g.width) width = g.width; 850 if (width < g.width) width = g.width;
853 } 851 }
854 852
855 if (cs == CS_UNKNOWN) 853 if (cs == CS_UNKNOWN)
856 { 854 {
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
874void 872void
875rxvt_font_x11::clear () 873rxvt_font_x11::clear ()
876{ 874{
877 if (f) 875 if (f)
878 { 876 {
879 XFreeFont (DISPLAY, f); 877 XFreeFont (term->dpy, f);
880 f = 0; 878 f = 0;
881 } 879 }
882} 880}
883 881
884bool 882bool
885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 883rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
886{ 884{
887 uint32_t ch = FROM_UNICODE (cs, unicode); 885 uint32_t ch = FROM_UNICODE (cs, unicode);
888 886
889 if (ch == NOCHAR) 887 if (ch == NOCHAR)
890 return false; 888 return false;
… …
927 return false; 925 return false;
928 926
929 if (!prop || prop->width == rxvt_fontprop::unset) 927 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 928 return true;
931 929
932 // check character against base font bounding box 930 // check wether character overlaps previous/next character
933 int w = xcs->width; 931 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = wcwidth (unicode); 932 int wcw = max (WCWIDTH (unicode), 1);
935 if (wcw > 0) w /= wcw;
936 933
937 careful = w > prop->width; 934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
938 if (careful && w > prop->width * MAX_OVERLAP >> 2) 935
936 if (careful && !OVERLAP_OK (w, wcw, prop))
939 return false; 937 return false;
940 938
941 return true; 939 return true;
942} 940}
943 941
… …
949 // this looks like a mess /. 947 // this looks like a mess /.
950 // and it is a mess /. 948 // and it is a mess /.
951 // yet we are trying to be perfect /. 949 // yet we are trying to be perfect /.
952 // but the result still isn't perfect /. 950 // but the result still isn't perfect /.
953 951
952 dTermDisplay;
953 dTermGC;
954
954 bool slow = this->slow 955 bool slow = this->slow
955 || width != r->TermWin.fwidth 956 || width != term->fwidth
956 || height != r->TermWin.fheight; 957 || height != term->fheight;
957 958
958 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 959 int base = ascent; // sorry, incorrect: term->fbase;
959 960
960 XGCValues v; 961 XGCValues v;
961 v.foreground = r->pix_colors[fg]; 962 v.foreground = term->pix_colors[fg];
962 v.font = f->fid; 963 v.font = f->fid;
963 964
964 if (enc2b) 965 if (enc2b)
965 { 966 {
966 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 967 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
967 968
968 if (bg == Color_bg && !slow) 969 if (bg == Color_bg && !slow)
969 { 970 {
970 v.background = r->pix_colors[bg]; 971 v.background = term->pix_colors[bg];
971 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 972 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
972 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 973 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
973 } 974 }
974 else 975 else
975 { 976 {
976 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
977 978
978 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 979 XChangeGC (disp, gc, GCForeground | GCFont, &v);
979 980
980 if (slow) 981 if (slow)
981 { 982 {
982 do 983 do
983 { 984 {
984 if (xc->byte1 || xc->byte2) 985 if (xc->byte1 || xc->byte2)
985 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 986 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
986 987
987 x += r->TermWin.fwidth; 988 x += term->fwidth;
988 xc++; len--; 989 xc++; len--;
989 } 990 }
990 while (len); 991 while (len);
991 } 992 }
992 else 993 else
993 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 994 XDrawString16 (disp, d, gc, x, y + base, xc, len);
994 } 995 }
995 } 996 }
996 else 997 else
997 { 998 {
998 const char *xc = enc_char (text, len, cs, slow); 999 const char *xc = enc_char (text, len, cs, slow);
999 1000
1000 if (bg == Color_bg && !slow) 1001 if (bg == Color_bg && !slow)
1001 { 1002 {
1002 v.background = r->pix_colors[bg]; 1003 v.background = term->pix_colors[bg];
1003 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1004 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1005 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1005 } 1006 }
1006 else 1007 else
1007 { 1008 {
1008 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1009 1010
1010 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1011 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1011 1012
1012 if (slow) 1013 if (slow)
1013 { 1014 {
1014 do 1015 do
1015 { 1016 {
1016 if (*xc) 1017 if (*xc)
1017 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1018 XDrawString (disp, d, gc, x, y + base, xc, 1);
1018 1019
1019 x += r->TermWin.fwidth; 1020 x += term->fwidth;
1020 xc++; len--; 1021 xc++; len--;
1021 } 1022 }
1022 while (len); 1023 while (len);
1023 } 1024 }
1024 else 1025 else
1025 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1026 XDrawString (disp, d, gc, x, y + base, xc, len);
1026 } 1027 }
1027 } 1028 }
1028} 1029}
1029 1030
1030///////////////////////////////////////////////////////////////////////////// 1031/////////////////////////////////////////////////////////////////////////////
… …
1036 1037
1037 void clear (); 1038 void clear ();
1038 1039
1039 rxvt_fontprop properties (); 1040 rxvt_fontprop properties ();
1040 1041
1041 bool load (const rxvt_fontprop &prop); 1042 bool load (const rxvt_fontprop &prop, bool force_prop);
1042 1043
1043 void draw (rxvt_drawable &d, int x, int y, 1044 void draw (rxvt_drawable &d, int x, int y,
1044 const text_t *text, int len, 1045 const text_t *text, int len,
1045 int fg, int bg); 1046 int fg, int bg);
1046 1047
1047 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1048 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1048 1049
1049protected: 1050protected:
1050 XftFont *f; 1051 XftFont *f;
1051}; 1052};
1052 1053
1053void 1054void
1054rxvt_font_xft::clear () 1055rxvt_font_xft::clear ()
1055{ 1056{
1056 if (f) 1057 if (f)
1057 { 1058 {
1058 XftFontClose (DISPLAY, f); 1059 XftFontClose (term->dpy, f);
1059 f = 0; 1060 f = 0;
1060 } 1061 }
1061} 1062}
1062 1063
1063rxvt_fontprop 1064rxvt_fontprop
… …
1067 1068
1068 FT_Face face = XftLockFace (f); 1069 FT_Face face = XftLockFace (f);
1069 1070
1070 p.width = width; 1071 p.width = width;
1071 p.height = height; 1072 p.height = height;
1073 p.ascent = ascent;
1072 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1074 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1073 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1075 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1074 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1076 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1075 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1077 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1076 1078
… …
1078 1080
1079 return p; 1081 return p;
1080} 1082}
1081 1083
1082bool 1084bool
1083rxvt_font_xft::load (const rxvt_fontprop &prop) 1085rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1084{ 1086{
1087 dTermDisplay;
1088
1085 clear (); 1089 clear ();
1086 1090
1087 FcPattern *p = FcNameParse ((FcChar8 *) name); 1091 FcPattern *p = FcNameParse ((FcChar8 *) name);
1088 1092
1089 if (!p) 1093 if (!p)
1090 return false; 1094 return false;
1091 1095
1092 FcValue v; 1096 FcValue v;
1093 1097
1094 if (prop.height != rxvt_fontprop::unset 1098 if (prop.height != rxvt_fontprop::unset
1095 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1099 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1096 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1100 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1097 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1101 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1098 1102
1099 if (prop.weight != rxvt_fontprop::unset 1103 if (prop.weight != rxvt_fontprop::unset
1100 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1104 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1101 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1105 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1102 1106
1103 if (prop.slant != rxvt_fontprop::unset 1107 if (prop.slant != rxvt_fontprop::unset
1104 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1108 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1109 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1106 1110
1107#if 0 // clipping unfortunately destroys our precious double-width-characters 1111#if 0 // clipping unfortunately destroys our precious double-width-characters
1108 // clip width, we can't do better, or can we? 1112 // clip width, we can't do better, or can we?
1109 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1115 1119
1116 // store generated name so iso14755 view gives better results 1120 // store generated name so iso14755 view gives better results
1117 set_name ((char *)FcNameUnparse (p)); 1121 set_name ((char *)FcNameUnparse (p));
1118 1122
1119 XftResult result; 1123 XftResult result;
1120 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1124 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1121 1125
1122 FcPatternDestroy (p); 1126 FcPatternDestroy (p);
1123 1127
1124 if (!match) 1128 if (!match)
1125 return false; 1129 return false;
… …
1127 int ftheight = 0; 1131 int ftheight = 0;
1128 bool success = true; 1132 bool success = true;
1129 1133
1130 for (;;) 1134 for (;;)
1131 { 1135 {
1132 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1136 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1133 1137
1134 if (!f) 1138 if (!f)
1135 { 1139 {
1136 success = false; 1140 success = false;
1137 break; 1141 break;
… …
1146 1150
1147 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1151 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1148 1152
1149 XftUnlockFace (f); 1153 XftUnlockFace (f);
1150 1154
1155 int glheight = height;
1156
1151 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1152 { 1158 {
1153 FcChar16 ch = *t; 1159 FcChar16 ch = *t;
1154 1160
1155 if (cs != CS_UNICODE 1161 if (cs != CS_UNICODE
… …
1161 bool careful; 1167 bool careful;
1162 if (!has_char (*t, &prop, careful)) 1168 if (!has_char (*t, &prop, careful))
1163 continue; 1169 continue;
1164 1170
1165 XGlyphInfo g; 1171 XGlyphInfo g;
1166 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1172 XftTextExtents16 (disp, f, &ch, 1, &g);
1167 1173
1174 g.width -= g.x;
1175
1168 int wcw = wcwidth (ch); 1176 int wcw = WCWIDTH (ch);
1169 if (wcw > 0) g.width = g.width / wcw; 1177 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1170 1178
1171 if (width < g.width) width = g.width; 1179 if (width < g.width ) width = g.width;
1172 if (height < g.height) height = g.height; 1180 if (height < g.height ) height = g.height;
1181 if (glheight < g.height - g.y) glheight = g.height - g.y;
1182 }
1183
1184 if (!width)
1185 {
1186 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1187
1188 XftFontClose (disp, f);
1189 f = 0;
1190
1191 success = false;
1192 break;
1173 } 1193 }
1174 1194
1175 if (prop.height == rxvt_fontprop::unset 1195 if (prop.height == rxvt_fontprop::unset
1176 || height <= prop.height 1196 || (height <= prop.height && glheight <= prop.height)
1177 || height <= 2 1197 || height <= 2
1178 || !scalable) 1198 || !scalable)
1179 break; 1199 break;
1180 1200
1181 if (ftheight) 1201 if (ftheight)
… …
1188 ftheight -= height - prop.height; 1208 ftheight -= height - prop.height;
1189 } 1209 }
1190 else 1210 else
1191 ftheight = prop.height - 1; 1211 ftheight = prop.height - 1;
1192 1212
1193 XftFontClose (DISPLAY, f); 1213 XftFontClose (disp, f);
1194 FcPatternDel (match, FC_PIXEL_SIZE); 1214 FcPatternDel (match, FC_PIXEL_SIZE);
1195 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1215 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1196 } 1216 }
1197 1217
1198 FcPatternDestroy (match); 1218 FcPatternDestroy (match);
1199 1219
1200#if 0 // do it per-character 1220#if 0 // do it per-character
… …
1207 1227
1208 return success; 1228 return success;
1209} 1229}
1210 1230
1211bool 1231bool
1212rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1232rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1213{ 1233{
1214 careful = false; 1234 careful = false;
1215 1235
1216 if (!XftCharExists (DISPLAY, f, unicode)) 1236 if (!XftCharExists (term->dpy, f, unicode))
1217 return false; 1237 return false;
1218 1238
1219 if (!prop || prop->width == rxvt_fontprop::unset) 1239 if (!prop || prop->width == rxvt_fontprop::unset)
1220 return true; 1240 return true;
1221 1241
1222 // check character against base font bounding box 1242 // check character against base font bounding box
1223 FcChar32 ch = unicode; 1243 FcChar32 ch = unicode;
1224 XGlyphInfo g; 1244 XGlyphInfo g;
1225 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1245 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1226 1246
1227 int w = g.width; 1247 int w = g.width - g.x;
1228 int wcw = wcwidth (unicode); 1248 int wcw = max (WCWIDTH (unicode), 1);
1229 if (wcw > 0) w /= wcw;
1230 1249
1231 careful = w > prop->width; 1250 careful = g.x > 0 || w > prop->width * wcw;
1232 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1251
1252 if (careful && !OVERLAP_OK (w, wcw, prop))
1253 return false;
1254
1255 // this weeds out _totally_ broken fonts, or glyphs
1256 if (!OVERLAP_OK (g.xOff, wcw, prop))
1233 return false; 1257 return false;
1234 1258
1235 return true; 1259 return true;
1236} 1260}
1237 1261
1238void 1262void
1239rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1240 const text_t *text, int len, 1264 const text_t *text, int len,
1241 int fg, int bg) 1265 int fg, int bg)
1242{ 1266{
1243 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1244
1245 int base = ascent; // should be fbase, but that is incorrect
1246
1247 XGlyphInfo extents; 1267 XGlyphInfo extents;
1248 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1249 FcChar32 *ep = enc; 1269 XftGlyphSpec *ep = enc;
1250 int ewidth = 0; 1270
1251 int xoff = 0; 1271 dTermDisplay;
1272 dTermGC;
1273
1274 int w = term->fwidth * len;
1275 int h = term->fheight;
1276
1277 bool buffered = bg >= 0 // we don't use a transparent bg
1278#ifndef FORCE_UNBUFFERED_XFT
1279# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1280 || !term->am_transparent // we aren't transparent
1281 || term->am_pixmap_trans // we have a pixmap
1282# endif
1283#endif
1284 ;
1285
1286 // cut trailing spaces
1287 while (len && text [len - 1] == ' ')
1288 len--;
1289
1290 int x_ = buffered ? 0 : x;
1291 int y_ = buffered ? 0 : y;
1252 1292
1253 while (len) 1293 while (len)
1254 { 1294 {
1255 int cwidth = r->TermWin.fwidth; 1295 int cwidth = term->fwidth;
1256 FcChar32 fc = *text++; len--; 1296 FcChar32 fc = *text++; len--;
1257 FT_UInt gl;
1258 1297
1259 while (len && *text == NOCHAR) 1298 while (len && *text == NOCHAR)
1260 text++, len--, cwidth += r->TermWin.fwidth; 1299 text++, len--, cwidth += term->fwidth;
1261 1300
1262 gl = XftCharIndex (d.display->display, f, fc); 1301 if (fc != ' ') // skip spaces
1263 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1264
1265 if (extents.xOff != cwidth && ep != enc)
1266 {
1267 if (xoff > ewidth) xoff = ewidth;
1268 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1269 x + (ewidth - xoff >> 1),
1270 y + base, enc, ep - enc);
1271 x += ewidth;
1272
1273 ep = enc;
1274 ewidth = 0;
1275 xoff = 0;
1276 } 1302 {
1303 FT_UInt glyph = XftCharIndex (disp, f, fc);
1304 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1277 1305
1278 if (fc == ' ' && ep == enc) // skip leading spaces 1306 ep->glyph = glyph;
1307 ep->x = x_ + (cwidth - extents.xOff >> 1);
1308 ep->y = y_ + ascent;
1309
1310 if (extents.xOff == 0)
1311 ep->x = x_ + cwidth;
1312
1313 ep++;
1279 { 1314 }
1315
1280 x += cwidth; 1316 x_ += cwidth;
1281 continue; 1317 }
1318
1319 if (buffered)
1320 {
1321 if (ep != enc)
1282 } 1322 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1283 1324
1325 if (0)
1326 ;
1327#ifdef TRANSPARENT
1328 else if (bg < 0 && term->am_pixmap_trans)
1329 XCopyArea (disp, term->pixmap, d2, gc,
1330 x + term->window_vt_x, y + term->window_vt_y,
1331 w, h, 0, 0);
1332#endif
1333#ifdef XPM_BACKGROUND
1334 else if (bg < 0 && term->bgPixmap.pixmap)
1335 {
1336 XGCValues gcv;
1337
1338 gcv.fill_style = FillTiled;
1339 gcv.tile = term->pixmap;
1340 gcv.ts_x_origin = -x;
1341 gcv.ts_y_origin = -y;
1342
1343 GC gc2 = XCreateGC (disp, d2,
1344 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1345 &gcv);
1346
1347 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1348
1349 XFreeGC (disp, gc2);
1350 }
1351#endif
1352 else
1353 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1354
1355 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1356 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1357 }
1284 else 1358 else
1285 { 1359 clear_rect (d, x, y, w, h, bg);
1286 *ep++ = gl;
1287 ewidth += cwidth;
1288 xoff += extents.xOff;
1289 }
1290 }
1291
1292 if (ep != enc)
1293 { 1360 }
1294 if (xoff > ewidth) xoff = ewidth; 1361 else
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x + (ewidth - xoff >> 1),
1297 y + base, enc, ep - enc);
1298 } 1362 {
1363 clear_rect (d, x, y, w, h, bg);
1364 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1365 }
1299} 1366}
1367
1300#endif 1368#endif
1301 1369
1302///////////////////////////////////////////////////////////////////////////// 1370/////////////////////////////////////////////////////////////////////////////
1303 1371
1304rxvt_fontset::rxvt_fontset (rxvt_t r) 1372rxvt_fontset::rxvt_fontset (rxvt_term *term)
1305: r (r), fontdesc (0) 1373: fontdesc (0), term (term)
1306{ 1374{
1307 clear (); 1375 clear ();
1308} 1376}
1309 1377
1310rxvt_fontset::~rxvt_fontset () 1378rxvt_fontset::~rxvt_fontset ()
… …
1313} 1381}
1314 1382
1315void 1383void
1316rxvt_fontset::clear () 1384rxvt_fontset::clear ()
1317{ 1385{
1318 prop.width = prop.height = prop.weight = prop.slant 1386 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1319 = rxvt_fontprop::unset; 1387 = rxvt_fontprop::unset;
1388 force_prop = false;
1320 1389
1321 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1390 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1322 FONT_UNREF (*i); 1391 FONT_UNREF (*i);
1323 1392
1324 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1393 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1354 f = new rxvt_font_x11; 1423 f = new rxvt_font_x11;
1355 } 1424 }
1356 else 1425 else
1357 f = new rxvt_font_x11; 1426 f = new rxvt_font_x11;
1358 1427
1359 f->set_term (r); 1428 f->set_term (term);
1360 f->set_name (strdup (name)); 1429 f->set_name (strdup (name));
1361 1430
1362 f->cs = cs; 1431 f->cs = cs;
1363 f->loaded = false; 1432 f->loaded = false;
1364 1433
… …
1375 char buf[512]; 1444 char buf[512];
1376 const char *end; 1445 const char *end;
1377 1446
1378 do 1447 do
1379 { 1448 {
1380 while (*desc <= ' ') desc++; 1449 while (*desc && *desc <= ' ')
1450 desc++;
1381 1451
1382 codeset cs = CS_UNICODE; 1452 codeset cs = CS_UNICODE;
1383 1453
1384 if (*desc == '[') 1454 if (*desc == '[')
1385 { 1455 {
… …
1435 if (fonts[i]->loaded) 1505 if (fonts[i]->loaded)
1436 return true; 1506 return true;
1437 1507
1438 fonts[i]->loaded = true; 1508 fonts[i]->loaded = true;
1439 1509
1440 if (!fonts[i]->load (prop)) 1510 if (!fonts[i]->load (prop, force_prop))
1441 { 1511 {
1442 fonts[i]->cs = CS_UNKNOWN; 1512 fonts[i]->cs = CS_UNKNOWN;
1443 return false; 1513 return false;
1444 } 1514 }
1445 1515
… …
1495 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1565 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1496 goto next_font; 1566 goto next_font;
1497 1567
1498 if (!realize_font (i)) 1568 if (!realize_font (i))
1499 goto next_font; 1569 goto next_font;
1570
1571 if (prop.ascent != rxvt_fontprop::unset)
1572 max_it (f->ascent, prop.ascent);
1500 } 1573 }
1501 1574
1502 if (f->cs == CS_UNKNOWN) 1575 if (f->cs == CS_UNKNOWN)
1503 goto next_font; 1576 goto next_font;
1504 1577
… …
1543 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1616 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1544 FcPatternAddBool (p, FC_MINSPACE, 1); 1617 FcPatternAddBool (p, FC_MINSPACE, 1);
1545 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1618 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1546 1619
1547 XftResult result; 1620 XftResult result;
1548 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1621 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1549 1622
1550 FcPatternDestroy (p); 1623 FcPatternDestroy (p);
1551 1624
1552 if (match) 1625 if (match)
1553 { 1626 {

Diff Legend

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