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.74 by root, Tue Dec 6 15:41:26 2005 UTC vs.
Revision 1.108 by root, Tue Jun 26 00:40:19 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29
29#include <inttypes.h> 30#include <inttypes.h>
30 31
31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 67
63# if XFT 68# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
65 70
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
73# endif 78# endif
74#endif 79#endif
75 80
76 // japanese 81 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 83# if XFT
79 // prefer xft for complex scripts 84 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 89# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 108# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 125#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 128# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 131# endif
127#endif 132#endif
128 133
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 136#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 141
140 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 144#endif
143 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
144 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
145}; 151};
146 152
147// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
152 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
153}; 159};
154 160
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 162
163#define dTermDisplay Display *disp = term->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{
252 if (color == Color_bg) 234 dTermDisplay;
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 235 dTermGC;
236
237 if (color == Color_bg || color == Color_transparent)
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{
336 Display *disp = d.display->display; 325 dTermDisplay;
326 dTermGC;
337 327
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 328 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 329
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 330 XSetForeground (disp, gc, term->pix_colors[fg]);
341 331
342 while (len) 332 while (len)
343 { 333 {
344#if ENABLE_COMBINING 334#if ENABLE_COMBINING
345 compose_char *cc; 335 compose_char *cc;
… …
349 339
350 while (++text, --len && *text == NOCHAR) 340 while (++text, --len && *text == NOCHAR)
351 ; 341 ;
352 342
353 int width = text - tp; 343 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 344 int fwidth = term->fwidth * width;
355 345
356 if (0x2500 <= t && t <= 0x259f) 346 if (0x2500 <= t && t <= 0x259f)
357 { 347 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 348 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 349 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 350 uint32_t *b = a + (offs & 15);
361 351
362 int W = fwidth; 352 int W = fwidth;
363 int H = r->TermWin.fheight; 353 int H = term->fheight;
364 354
365 int x_[16]; 355 int x_[16];
366 int y_[16]; 356 int y_[16];
367 357
368 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
376 366
377 XGCValues gcv; 367 XGCValues gcv;
378 368
379 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 370 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 372
383 while (a < b) 373 while (a < b)
384 { 374 {
385 uint32_t command = *a++; 375 uint32_t command = *a++;
386 376
… …
393 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
394 384
395 switch (op) 385 switch (op)
396 { 386 {
397 case 0: // line 387 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 389 break;
400 390
401 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
402 if (a) 392 if (a)
403 { 393 {
… …
406 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
410 400
411 XChangeGC (disp, TGC, 401 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 403 &gcv);
414 } 404 }
415 405
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 406 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 407
418 if (a) 408 if (a)
419 { 409 {
420 XFreePixmap (disp, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 411 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 414 }
425 break; 415 break;
426 case 2: // arc 416 case 2: // arc
427 XDrawArc (disp, d, TGC, 417 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 420 break;
431 } 421 }
432 } 422 }
433 } 423 }
434#if ENABLE_COMBINING 424#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
437 text_t chrs[2]; 429 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 430 chrs [1] = NOCHAR;
440 431
441 *chrs = cc->c1; 432 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
… …
450 *chrs = cc->c2; 441 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452 ? f1 443 ? f1
453 : (*fs)[fs->find_font (cc->c2)]; 444 : (*fs)[fs->find_font (cc->c2)];
454 445
455 f2->draw (d, x, y, chrs, width, fg, -1); 446 f2->draw (d, x, y, chrs, width, fg, Color_none);
456 } 447 }
457 } 448 }
458#endif 449#endif
459 else 450 else
460 switch (t) 451 switch (t)
… …
463 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 455 case NOCHAR:
465 break; 456 break;
466 457
467 default: 458 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 460 fwidth - 4, term->fheight - 4);
470 } 461 }
471 462
472 x += fwidth; 463 x += fwidth;
473 } 464 }
474} 465}
… …
480 471
481 void clear (); 472 void clear ();
482 473
483 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
484 475
485 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
486 477
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 479
489 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 481 const text_t *text, int len,
491 int fg, int bg); 482 int fg, int bg);
492 483
493 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 485 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 486 bool enc2b, encm;
497 487
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 488 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 490 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 491 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 492};
503 493
504char * 494char *
505rxvt_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
506{ 496{
507 unsigned long value; 497 unsigned long value;
508 498
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 499 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 500 return XGetAtomName (term->dpy, value);
511 else 501 else
512 return rxvt_strdup (repl); 502 return rxvt_strdup (repl);
513} 503}
514 504
515rxvt_fontprop 505rxvt_fontprop
… …
521} 511}
522 512
523bool 513bool
524rxvt_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)
525{ 515{
526 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;
527 p.height = height; 519 p.height = height;
520 p.ascent = rxvt_fontprop::unset;
528 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;
529 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;
530 523
531 return true; 524 return true;
532} 525}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 528rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 529{
537 unsigned long height; 530 unsigned long height;
538 531
539#if 0 532#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 533 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 534 return false;
542#else 535#else
543 height = f->ascent + f->descent; 536 height = f->ascent + f->descent;
544#endif 537#endif
545 538
546 unsigned long avgwidth; 539 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 540 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 541 avgwidth = 0;
549 542
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 543 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 544 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 545
553 set_properties (p, height, weight, slant, avgwidth); 546 set_properties (p, height, weight, slant, avgwidth);
554 547
555 free (weight); 548 free (weight);
556 free (slant); 549 free (slant);
557 550
551 p.ascent = f->ascent;
552
558 return true; 553 return true;
559} 554}
560 555
561bool 556bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 557rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 558{
559 dTermDisplay;
564 int slashes = 0; 560 int slashes = 0;
565 const char *comp[13]; 561 const char *comp[13];
566 562
567 for (const char *c = name; *c; c++) 563 for (const char *c = name; *c; c++)
568 if (*c == '-') 564 if (*c == '-')
… …
576 if (slashes >= 13 572 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 574 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 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]));
580 576
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 577 XFontStruct *f = XLoadQueryFont (disp, name);
582 578
583 if (f) 579 if (f)
584 { 580 {
585 // 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
586 // (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).
587 // in that case, just return garbage. 583 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 584 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 585 XFreeFont (disp, f);
590 return ret; 586 return ret;
591 } 587 }
592 else 588 else
593 return false; 589 return false;
594} 590}
… …
630 return false; 626 return false;
631 } 627 }
632} 628}
633 629
634bool 630bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 631rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636{ 632{
637 Display *disp = DISPLAY; 633 dTermDisplay;
638 634
639 clear (); 635 clear ();
640 636
641 char field_str[64]; // enough for 128 bits 637 char field_str[64]; // enough for 128 bits
642 638
643 // first morph the font if required 639 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset 640 if (force_prop)
645 || prop.slant != rxvt_fontprop::unset)
646 { 641 {
647 char fname[1024]; 642 char fname[1024];
648 643
649 if (name[0] != '-') 644 if (name[0] != '-')
650 { 645 {
651 f = XLoadQueryFont (disp, name); 646 f = XLoadQueryFont (disp, name);
652 647
653 if (!f) 648 if (!f)
654 return false; 649 return false;
655 650
656 char *new_name = get_property (f, "FONT", name); 651 char *new_name = get_property (f, XA_FONT, name);
657 652
658 if (new_name) 653 if (new_name)
659 set_name (new_name); 654 set_name (new_name);
660 else 655 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 656 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
717 int diff = 0; 712 int diff = 0;
718 713
719 if (replace_field (fname, list[i], 6, '0', field_str)) 714 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 715 diff += 10; // slightly penalize scalable fonts
721 else if (replace_field (fname, list[i], 11, '0', "0")) 716 else if (replace_field (fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
723 718
724 if (!set_properties (p, fname)) 719 if (!set_properties (p, fname))
725 continue; 720 continue;
726 721
727 if (prop.height != rxvt_fontprop::unset 722 if (prop.height != rxvt_fontprop::unset
… …
770 delete [] fonts; 765 delete [] fonts;
771 766
772 if (!f) 767 if (!f)
773 return false; 768 return false;
774 769
775 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
776 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
777 772
778 if (registry && encoding) 773 if (registry && encoding)
779 { 774 {
780 char charset[64]; 775 char charset[64];
781 snprintf (charset, 64, "%s-%s", registry, encoding); 776 snprintf (charset, 64, "%s-%s", registry, encoding);
782 777
783 cs = codeset_from_name (charset); 778 cs = codeset_from_name (charset);
784 } 779 }
785 else 780 else
786 { 781 {
787 const char *charset = get_property (f, "FONT", 0); 782 const char *charset = get_property (f, XA_FONT, 0);
788 783
789 if (!charset) 784 if (!charset)
790 charset = name; 785 charset = name;
791 786
792 int count = 13; 787 int count = 13;
… …
807 enc2b = encm || f->max_char_or_byte2 > 255; 802 enc2b = encm || f->max_char_or_byte2 > 255;
808 803
809 slow = false; 804 slow = false;
810 805
811#if 1 // only used for slow detection, TODO optimize 806#if 1 // only used for slow detection, TODO optimize
812 if (f->min_bounds.width == f->max_bounds.width) 807 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
813 width = f->min_bounds.width;
814 else if (f->per_char == NULL)
815 width = f->max_bounds.width; 808 width = f->max_bounds.width;
816 else 809 else
817 { 810 {
818 slow = true; 811 slow = true;
819 812
… …
835 828
836 width = 1; 829 width = 1;
837 830
838 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; )
839 { 832 {
840 if (cs != CS_UNICODE
841 && *t > 0x100
842 && FROM_UNICODE (cs, *t) == NOCHAR) 833 if (FROM_UNICODE (cs, *t) == NOCHAR)
843 continue; 834 continue;
844 835
845 // ignore characters we wouldn't use anyways 836 // ignore characters we wouldn't use anyways
846 bool careful; 837 bool careful;
847 if (!has_char (*t, &prop, careful)) 838 if (!has_char (*t, &prop, careful))
… …
851 842
852 XCharStruct g; 843 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 844 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 845 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 846
847 int wcw = WCWIDTH (*t);
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 849
858 if (width < g.width) width = g.width; 850 if (width < g.width) width = g.width;
859 } 851 }
860 852
861 if (cs == CS_UNKNOWN) 853 if (cs == CS_UNKNOWN)
862 { 854 {
863 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
880void 872void
881rxvt_font_x11::clear () 873rxvt_font_x11::clear ()
882{ 874{
883 if (f) 875 if (f)
884 { 876 {
885 XFreeFont (DISPLAY, f); 877 XFreeFont (term->dpy, f);
886 f = 0; 878 f = 0;
887 } 879 }
888} 880}
889 881
890bool 882bool
891rxvt_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
892{ 884{
893 uint32_t ch = FROM_UNICODE (cs, unicode); 885 uint32_t ch = FROM_UNICODE (cs, unicode);
894 886
895 if (ch == NOCHAR) 887 if (ch == NOCHAR)
896 return false; 888 return false;
… …
933 return false; 925 return false;
934 926
935 if (!prop || prop->width == rxvt_fontprop::unset) 927 if (!prop || prop->width == rxvt_fontprop::unset)
936 return true; 928 return true;
937 929
938 // check character against base font bounding box 930 // check wether character overlaps previous/next character
939 int w = xcs->width; 931 int w = xcs->rbearing - xcs->lbearing;
940 int wcw = wcwidth (unicode); 932 int wcw = max (WCWIDTH (unicode), 1);
941 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 933
943 careful = w > prop->width; 934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 935
936 if (careful && !OVERLAP_OK (w, wcw, prop))
945 return false; 937 return false;
946 938
947 return true; 939 return true;
948} 940}
949 941
… …
955 // this looks like a mess /. 947 // this looks like a mess /.
956 // and it is a mess /. 948 // and it is a mess /.
957 // yet we are trying to be perfect /. 949 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 950 // but the result still isn't perfect /.
959 951
952 dTermDisplay;
953 dTermGC;
954
960 bool slow = this->slow 955 bool slow = this->slow
961 || width != r->TermWin.fwidth 956 || width != term->fwidth
962 || height != r->TermWin.fheight; 957 || height != term->fheight;
963 958
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 959 int base = ascent; // sorry, incorrect: term->fbase;
965 960
966 XGCValues v; 961 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 962 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 963 v.font = f->fid;
969 964
970 if (enc2b) 965 if (enc2b)
971 { 966 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 967 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 968
974 if (bg == Color_bg && !slow) 969 if (bg == Color_bg && !slow)
975 { 970 {
976 v.background = r->pix_colors[bg]; 971 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 972 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 973 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 974 }
980 else 975 else
981 { 976 {
982 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);
983 978
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 979 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 980
986 if (slow) 981 if (slow)
987 { 982 {
988 do 983 do
989 { 984 {
990 if (xc->byte1 || xc->byte2) 985 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 986 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 987
993 x += r->TermWin.fwidth; 988 x += term->fwidth;
994 xc++; len--; 989 xc++; len--;
995 } 990 }
996 while (len); 991 while (len);
997 } 992 }
998 else 993 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 994 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 995 }
1001 } 996 }
1002 else 997 else
1003 { 998 {
1004 const char *xc = enc_char (text, len, cs, slow); 999 const char *xc = enc_char (text, len, cs, slow);
1005 1000
1006 if (bg == Color_bg && !slow) 1001 if (bg == Color_bg && !slow)
1007 { 1002 {
1008 v.background = r->pix_colors[bg]; 1003 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1005 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1006 }
1012 else 1007 else
1013 { 1008 {
1014 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);
1015 1010
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1011 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1012
1018 if (slow) 1013 if (slow)
1019 { 1014 {
1020 do 1015 do
1021 { 1016 {
1022 if (*xc) 1017 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1018 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1019
1025 x += r->TermWin.fwidth; 1020 x += term->fwidth;
1026 xc++; len--; 1021 xc++; len--;
1027 } 1022 }
1028 while (len); 1023 while (len);
1029 } 1024 }
1030 else 1025 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1026 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1027 }
1033 } 1028 }
1034} 1029}
1035 1030
1036///////////////////////////////////////////////////////////////////////////// 1031/////////////////////////////////////////////////////////////////////////////
… …
1042 1037
1043 void clear (); 1038 void clear ();
1044 1039
1045 rxvt_fontprop properties (); 1040 rxvt_fontprop properties ();
1046 1041
1047 bool load (const rxvt_fontprop &prop); 1042 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1043
1049 void draw (rxvt_drawable &d, int x, int y, 1044 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1045 const text_t *text, int len,
1051 int fg, int bg); 1046 int fg, int bg);
1052 1047
1053 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;
1054 1049
1055protected: 1050protected:
1056 XftFont *f; 1051 XftFont *f;
1057}; 1052};
1058 1053
1059void 1054void
1060rxvt_font_xft::clear () 1055rxvt_font_xft::clear ()
1061{ 1056{
1062 if (f) 1057 if (f)
1063 { 1058 {
1064 XftFontClose (DISPLAY, f); 1059 XftFontClose (term->dpy, f);
1065 f = 0; 1060 f = 0;
1066 } 1061 }
1067} 1062}
1068 1063
1069rxvt_fontprop 1064rxvt_fontprop
… …
1073 1068
1074 FT_Face face = XftLockFace (f); 1069 FT_Face face = XftLockFace (f);
1075 1070
1076 p.width = width; 1071 p.width = width;
1077 p.height = height; 1072 p.height = height;
1073 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1074 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1075 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1076 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1077 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1078
… …
1084 1080
1085 return p; 1081 return p;
1086} 1082}
1087 1083
1088bool 1084bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1085rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1090{ 1086{
1091 Display *disp = DISPLAY; 1087 dTermDisplay;
1092 1088
1093 clear (); 1089 clear ();
1094 1090
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1091 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1092
… …
1103 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1099 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1104 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1100 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1101 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1106 1102
1107 if (prop.weight != rxvt_fontprop::unset 1103 if (prop.weight != rxvt_fontprop::unset
1108 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1104 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1109 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1105 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1110 1106
1111 if (prop.slant != rxvt_fontprop::unset 1107 if (prop.slant != rxvt_fontprop::unset
1112 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1108 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1109 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1114 1110
1115#if 0 // clipping unfortunately destroys our precious double-width-characters 1111#if 0 // clipping unfortunately destroys our precious double-width-characters
1116 // clip width, we can't do better, or can we? 1112 // clip width, we can't do better, or can we?
1117 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1123 1119
1124 // store generated name so iso14755 view gives better results 1120 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1121 set_name ((char *)FcNameUnparse (p));
1126 1122
1127 XftResult result; 1123 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1124 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1125
1130 FcPatternDestroy (p); 1126 FcPatternDestroy (p);
1131 1127
1132 if (!match) 1128 if (!match)
1133 return false; 1129 return false;
… …
1175 XGlyphInfo g; 1171 XGlyphInfo g;
1176 XftTextExtents16 (disp, f, &ch, 1, &g); 1172 XftTextExtents16 (disp, f, &ch, 1, &g);
1177 1173
1178 g.width -= g.x; 1174 g.width -= g.x;
1179 1175
1180 int wcw = wcwidth (ch); 1176 int wcw = WCWIDTH (ch);
1181 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1177 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1182 1178
1183 if (width < g.width ) width = g.width; 1179 if (width < g.width ) width = g.width;
1184 if (height < g.height ) height = g.height; 1180 if (height < g.height ) height = g.height;
1185 if (glheight < g.height - g.y) glheight = g.height - g.y; 1181 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1231 1227
1232 return success; 1228 return success;
1233} 1229}
1234 1230
1235bool 1231bool
1236rxvt_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
1237{ 1233{
1238 careful = false; 1234 careful = false;
1239 1235
1240 if (!XftCharExists (DISPLAY, f, unicode)) 1236 if (!XftCharExists (term->dpy, f, unicode))
1241 return false; 1237 return false;
1242 1238
1243 if (!prop || prop->width == rxvt_fontprop::unset) 1239 if (!prop || prop->width == rxvt_fontprop::unset)
1244 return true; 1240 return true;
1245 1241
1246 // check character against base font bounding box 1242 // check character against base font bounding box
1247 FcChar32 ch = unicode; 1243 FcChar32 ch = unicode;
1248 XGlyphInfo g; 1244 XGlyphInfo g;
1249 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1245 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1250 1246
1251 int w = g.width - g.x; 1247 int w = g.width - g.x;
1252 int wcw = wcwidth (unicode); 1248 int wcw = max (WCWIDTH (unicode), 1);
1253 if (wcw > 0) w = (w + wcw - 1) / wcw;
1254 1249
1255 careful = w > prop->width; 1250 careful = g.x > 0 || w > prop->width * wcw;
1256 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))
1257 return false; 1257 return false;
1258 1258
1259 return true; 1259 return true;
1260} 1260}
1261 1261
1262void 1262void
1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264 const text_t *text, int len, 1264 const text_t *text, int len,
1265 int fg, int bg) 1265 int fg, int bg)
1266{ 1266{
1267 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1268
1269 int base = ascent; // should be fbase, but that is incorrect
1270
1271 XGlyphInfo extents; 1267 XGlyphInfo extents;
1272 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1273 FcChar32 *ep = enc; 1269 XftGlyphSpec *ep = enc;
1274 int ewidth = 0; 1270
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# ifdef ENABLE_TRANSPARENCY
1280 || !term->am_transparent // we aren't transparent
1281# endif
1282#endif
1283 ;
1284
1285 // cut trailing spaces
1286 while (len && text [len - 1] == ' ')
1287 len--;
1288
1289 int x_ = buffered ? 0 : x;
1290 int y_ = buffered ? 0 : y;
1275 1291
1276 while (len) 1292 while (len)
1277 { 1293 {
1278 int cwidth = r->TermWin.fwidth; 1294 int cwidth = term->fwidth;
1279 FcChar32 fc = *text++; len--; 1295 FcChar32 fc = *text++; len--;
1280 1296
1281 while (len && *text == NOCHAR) 1297 while (len && *text == NOCHAR)
1282 text++, len--, cwidth += r->TermWin.fwidth; 1298 text++, len--, cwidth += term->fwidth;
1283 1299
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1300 if (fc != ' ') // skip spaces
1301 {
1302 FT_UInt glyph = XftCharIndex (disp, f, fc);
1303 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304
1305 ep->glyph = glyph;
1306 ep->x = x_ + (cwidth - extents.xOff >> 1);
1307 ep->y = y_ + ascent;
1308
1309 if (extents.xOff == 0)
1310 ep->x = x_ + cwidth;
1311
1312 ep++;
1313 }
1314
1285 x += cwidth; 1315 x_ += cwidth;
1316 }
1317
1318 if (buffered)
1319 {
1320 if (ep != enc)
1321 {
1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323
1324 if (0)
1325 ;
1326#ifdef ENABLE_TRANSPARENCY
1327 else if (bg < 0 && term->am_pixmap_trans)
1328 XCopyArea (disp, term->pixmap, d2, gc,
1329 x + term->window_vt_x, y + term->window_vt_y,
1330 w, h, 0, 0);
1331#endif
1332#ifdef XPM_BACKGROUND
1333 else if (bg < 0 && term->bgPixmap.pixmap)
1334 {
1335 XGCValues gcv;
1336
1337 gcv.fill_style = FillTiled;
1338 gcv.tile = term->pixmap;
1339 gcv.ts_x_origin = -x;
1340 gcv.ts_y_origin = -y;
1341
1342 GC gc2 = XCreateGC (disp, d2,
1343 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1344 &gcv);
1345
1346 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1347
1348 XFreeGC (disp, gc2);
1349 }
1350#endif
1351 else
1352 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1353
1354 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1355 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1356 }
1286 else 1357 else
1287 { 1358 clear_rect (d, x, y, w, h, bg);
1288 FT_UInt gl = XftCharIndex (d.display->display, f, fc); 1359 }
1289 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1360 else
1290
1291 if (extents.xOff != cwidth)
1292 {
1293 if (ewidth)
1294 {
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x, y + base, enc, ep - enc);
1297 x += ewidth;
1298
1299 ep = enc;
1300 ewidth = 0;
1301 }
1302
1303 if (extents.xOff > cwidth)
1304 extents.xOff = cwidth;
1305
1306 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1307 x + (cwidth - extents.xOff >> 1),
1308 y + base, &gl, 1);
1309 x += cwidth;
1310 }
1311 else
1312 {
1313 *ep++ = gl;
1314 ewidth += cwidth;
1315 }
1316 }
1317 } 1361 {
1318 1362 clear_rect (d, x, y, w, h, bg);
1319 if (ep != enc)
1320 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1363 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1321 x, y + base, enc, ep - enc); 1364 }
1322} 1365}
1366
1323#endif 1367#endif
1324 1368
1325///////////////////////////////////////////////////////////////////////////// 1369/////////////////////////////////////////////////////////////////////////////
1326 1370
1327rxvt_fontset::rxvt_fontset (rxvt_t r) 1371rxvt_fontset::rxvt_fontset (rxvt_term *term)
1328: fontdesc (0), r (r) 1372: fontdesc (0), term (term)
1329{ 1373{
1330 clear (); 1374 clear ();
1331} 1375}
1332 1376
1333rxvt_fontset::~rxvt_fontset () 1377rxvt_fontset::~rxvt_fontset ()
… …
1336} 1380}
1337 1381
1338void 1382void
1339rxvt_fontset::clear () 1383rxvt_fontset::clear ()
1340{ 1384{
1341 prop.width = prop.height = prop.weight = prop.slant 1385 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1342 = rxvt_fontprop::unset; 1386 = rxvt_fontprop::unset;
1387 force_prop = false;
1343 1388
1344 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1389 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1345 FONT_UNREF (*i); 1390 FONT_UNREF (*i);
1346 1391
1347 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1392 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1377 f = new rxvt_font_x11; 1422 f = new rxvt_font_x11;
1378 } 1423 }
1379 else 1424 else
1380 f = new rxvt_font_x11; 1425 f = new rxvt_font_x11;
1381 1426
1382 f->set_term (r); 1427 f->set_term (term);
1383 f->set_name (strdup (name)); 1428 f->set_name (strdup (name));
1384 1429
1385 f->cs = cs; 1430 f->cs = cs;
1386 f->loaded = false; 1431 f->loaded = false;
1387 1432
… …
1459 if (fonts[i]->loaded) 1504 if (fonts[i]->loaded)
1460 return true; 1505 return true;
1461 1506
1462 fonts[i]->loaded = true; 1507 fonts[i]->loaded = true;
1463 1508
1464 if (!fonts[i]->load (prop)) 1509 if (!fonts[i]->load (prop, force_prop))
1465 { 1510 {
1466 fonts[i]->cs = CS_UNKNOWN; 1511 fonts[i]->cs = CS_UNKNOWN;
1467 return false; 1512 return false;
1468 } 1513 }
1469 1514
… …
1519 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1564 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1520 goto next_font; 1565 goto next_font;
1521 1566
1522 if (!realize_font (i)) 1567 if (!realize_font (i))
1523 goto next_font; 1568 goto next_font;
1569
1570 if (prop.ascent != rxvt_fontprop::unset)
1571 max_it (f->ascent, prop.ascent);
1524 } 1572 }
1525 1573
1526 if (f->cs == CS_UNKNOWN) 1574 if (f->cs == CS_UNKNOWN)
1527 goto next_font; 1575 goto next_font;
1528 1576
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1615 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1616 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1617 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1618
1571 XftResult result; 1619 XftResult result;
1572 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1620 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573 1621
1574 FcPatternDestroy (p); 1622 FcPatternDestroy (p);
1575 1623
1576 if (match) 1624 if (match)
1577 { 1625 {

Diff Legend

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