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.80 by root, Mon Jan 9 07:17:24 2006 UTC vs.
Revision 1.103 by root, Sun Aug 27 10:10:25 2006 UTC

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

Diff Legend

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