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.52 by root, Sat Dec 4 02:56:06 2004 UTC vs.
Revision 1.85 by root, Wed Jan 25 00:42:21 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29#include <wchar.h>
29#include <inttypes.h> 30#include <inttypes.h>
30
31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33 31
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
35 33
36const struct rxvt_fallback_font { 34const struct rxvt_fallback_font {
37 codeset cs; 35 codeset cs;
… …
90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 88 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
91#endif 89#endif
92 90
93#if ENCODING_ZH || ENCODING_ZH_EXT 91#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 92# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" },
95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
99 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },
100# endif 101# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
101 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
102 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
103 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
106 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
104 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 107 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
105 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 108 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
106 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 109 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
107 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 110 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
108 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 111 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
127 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
128 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
129#if XFT 132#if XFT
130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
134 137
135 // FreeMono is usually uglier than x fonts, so try last only. 138 // FreeMono is usually uglier than x fonts, so try last only.
136 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 139 { CS_UNICODE, "xft:FreeMono:autohint=true" },
137#endif 140#endif
138 141
139 { CS_UNKNOWN, 0 } 142 { CS_UNKNOWN, 0 }
140}; 143};
141 144
142// these characters are used to guess the font height and width 145// these characters are used to guess the font height and width
143// pango uses a similar algorithm and eosn't trust the font either. 146// pango uses a similar algorithm and doesn't trust the font either.
144static uint16_t extent_test_chars[] = { 147static uint16_t extent_test_chars[] = {
145 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 148 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
146 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 149 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
147 0x304c, 0x672c, // が本 150 0x304c, 0x672c, // が本
148}; 151};
149 152
150#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
151 154
155#define dTermDisplay Display *disp = term->display->display
156#define dTermGC GC gc = term->gc
157
152///////////////////////////////////////////////////////////////////////////// 158/////////////////////////////////////////////////////////////////////////////
153 159
154#if XFT 160#if XFT
155rxvt_drawable::~rxvt_drawable () 161rxvt_drawable::~rxvt_drawable ()
156{ 162{
… …
167} 173}
168#endif 174#endif
169 175
170///////////////////////////////////////////////////////////////////////////// 176/////////////////////////////////////////////////////////////////////////////
171 177
172static void *enc_buf;
173static uint32_t enc_len;
174
175static inline void *
176get_enc_buf (uint32_t len)
177{
178 if (len > enc_len)
179 {
180 free (enc_buf);
181 enc_buf = malloc (len);
182 enc_len = len;
183 }
184
185 return enc_buf;
186}
187
188static const char * 178static const char *
189enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 179enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
190{ 180{
191 uint8_t *buf = (uint8_t *)get_enc_buf (len); 181 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
182 uint8_t *res = buf;
192 183
193 while (len--) 184 while (len--)
194 { 185 {
195 uint32_t c = FROM_UNICODE (cs, *text++); 186 uint32_t c = FROM_UNICODE (cs, *text++);
196 187
… …
201 } 192 }
202 193
203 *buf++ = c; 194 *buf++ = c;
204 } 195 }
205 196
206 return (const char *)enc_buf; 197 return (const char *)res;
207} 198}
208 199
209static const XChar2b * 200static const XChar2b *
210enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 201enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
211{ 202{
212 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 203 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
204 XChar2b *res = buf;
213 205
214 while (len--) 206 while (len--)
215 { 207 {
216 uint32_t c = FROM_UNICODE (cs, *text++); 208 uint32_t c = FROM_UNICODE (cs, *text++);
217 209
… …
224 buf->byte1 = c >> 8; 216 buf->byte1 = c >> 8;
225 buf->byte2 = c; 217 buf->byte2 = c;
226 buf++; 218 buf++;
227 } 219 }
228 220
229 return (XChar2b *)enc_buf; 221 return res;
230} 222}
231 223
232///////////////////////////////////////////////////////////////////////////// 224/////////////////////////////////////////////////////////////////////////////
233 225
234void 226void
… …
240 if (this->name) free (this->name); // let the compiler optimize 232 if (this->name) free (this->name); // let the compiler optimize
241 this->name = name; 233 this->name = name;
242} 234}
243 235
244void 236void
245rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 237rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
246{ 238{
239 dTermDisplay;
240 dTermGC;
241
247 if (color == Color_bg) 242 if (color == Color_bg)
248 XClearArea (d.display->display, d, x, y, w, h, FALSE); 243 XClearArea (disp, d, x, y, w, h, FALSE);
249 else if (color >= 0) 244 else if (color >= 0)
250 { 245 {
251#if XFT 246#if XFT
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
253#else 248#else
254 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 249 XSetForeground (disp, gc, term->pix_colors[color]);
255 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 250 XFillRectangle (disp, d, gc, x, y, w, h);
256#endif 251#endif
257 } 252 }
258} 253}
259 254
260#include "table/linedraw.h" 255#include "table/linedraw.h"
… …
271 rxvt_fontprop properties () 266 rxvt_fontprop properties ()
272 { 267 {
273 rxvt_fontprop p; 268 rxvt_fontprop p;
274 269
275 p.width = p.height = 1; 270 p.width = p.height = 1;
271 p.ascent = rxvt_fontprop::unset;
276 p.weight = rxvt_fontprop::medium; 272 p.weight = rxvt_fontprop::medium;
277 p.slant = rxvt_fontprop::roman; 273 p.slant = rxvt_fontprop::roman;
278 274
279 return p; 275 return p;
280 } 276 }
… …
287 set_name (strdup ("built-in support font")); 283 set_name (strdup ("built-in support font"));
288 284
289 return true; 285 return true;
290 } 286 }
291 287
292 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 288 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
293 { 289 {
294 careful = false; 290 careful = false;
295 291
296 if (unicode <= 0x001f) 292 if (unicode <= 0x001f)
297 return true; 293 return true;
… …
300 return false; 296 return false;
301 297
302 if (unicode <= 0x009f) 298 if (unicode <= 0x009f)
303 return true; 299 return true;
304 300
305 if (unicode >= 0x2500 && unicode <= 0x259f) 301 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs))
306 return true; 303 return true;
307 304
308 if (IS_COMPOSE (unicode)) 305 if (IS_COMPOSE (unicode))
309 return true; 306 return true;
310 307
… …
326void 323void
327rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 324rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
328 const text_t *text, int len, 325 const text_t *text, int len,
329 int fg, int bg) 326 int fg, int bg)
330{ 327{
328 dTermDisplay;
329 dTermGC;
330
331 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 331 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
332 332
333 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 333 XSetForeground (disp, gc, term->pix_colors[fg]);
334 334
335 while (len--) 335 while (len)
336 { 336 {
337#if ENABLE_COMBINING 337#if ENABLE_COMBINING
338 compose_char *cc; 338 compose_char *cc;
339#endif 339#endif
340 const text_t *tp = text;
340 text_t t = *text++; 341 text_t t = *tp;
342
343 while (++text, --len && *text == NOCHAR)
344 ;
345
346 int width = text - tp;
347 int fwidth = term->fwidth * width;
341 348
342 if (0x2500 <= t && t <= 0x259f) 349 if (0x2500 <= t && t <= 0x259f)
343 { 350 {
344 uint16_t offs = linedraw_offs[t - 0x2500]; 351 uint16_t offs = linedraw_offs[t - 0x2500];
345 uint32_t *a = linedraw_command + (offs >> 4); 352 uint32_t *a = linedraw_command + (offs >> 4);
346 uint32_t *b = a + (offs & 15); 353 uint32_t *b = a + (offs & 15);
347 354
348 int W = r->TermWin.fwidth; 355 int W = fwidth;
349 int H = r->TermWin.fheight; 356 int H = term->fheight;
350
351 // support double-width (but not more) graphics chars
352 // TODO: do this outside the if/elsif.. statement for all cases
353 if (len && *text == NOCHAR)
354 W += r->TermWin.fwidth;
355 357
356 int x_[16]; 358 int x_[16];
357 int y_[16]; 359 int y_[16];
358 360
359 for (int i = 0; i <= 8; i++) 361 for (int i = 0; i <= 8; i++)
… …
367 369
368 XGCValues gcv; 370 XGCValues gcv;
369 371
370 gcv.cap_style = CapButt; 372 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 373 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 374 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 375
374 while (a < b) 376 while (a < b)
375 { 377 {
376 uint32_t command = *a++; 378 uint32_t command = *a++;
377 379
… …
384 int y2 = y_[(command >> 0) & 15]; 386 int y2 = y_[(command >> 0) & 15];
385 387
386 switch (op) 388 switch (op)
387 { 389 {
388 case 0: // line 390 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 391 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 392 break;
391 393
392 case 1: // rectangle, possibly stippled 394 case 1: // rectangle, possibly stippled
393 if (a) 395 if (a)
394 { 396 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 398
397 gcv.fill_style = FillStippled; 399 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 401 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 402 gcv.ts_y_origin = y;
401 403
402 XChangeGC (d.display->display, TGC, 404 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 405 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 406 &gcv);
405 } 407 }
406 408
407 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 409 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
408 410
409 if (a) 411 if (a)
410 { 412 {
411 XFreePixmap (d.display->display, gcv.stipple); 413 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 414 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 415 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 416 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 417 }
416 break; 418 break;
417 case 2: // arc 419 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 420 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 421 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 422 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 423 break;
422 } 424 }
423 } 425 }
424 } 426 }
425#if ENABLE_COMBINING 427#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 429 {
428 text_t c2[2]; 430 text_t chrs[2];
429 int len2 = 1; 431 width = min (2, width);
430 432 chrs [1] = NOCHAR;
431 // support double-width (but not more) combining characters
432 if (len && *text == NOCHAR)
433 {
434 c2[1] = *text; // not text++ to get correct x-width
435 len2++;
436 }
437 433
438 c2[0] = cc->c1; 434 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 436 f1->draw (d, x, y, chrs, width, fg, bg);
441 437
442 if (cc->c2 != NOCHAR) 438 if (cc->c2 != NOCHAR)
443 { 439 {
444 bool careful; 440 bool careful;
445 441
446 // prefer font of first character, for no good reasons 442 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 443 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 445 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 446 : (*fs)[fs->find_font (cc->c2)];
451 447
452 f2->draw (d, x, y, c2, len2, fg, -1); 448 f2->draw (d, x, y, chrs, width, fg, -1);
453 } 449 }
454 } 450 }
455#endif 451#endif
456 else 452 else
457 switch (t) 453 switch (t)
… …
460 case ZERO_WIDTH_CHAR: 456 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 457 case NOCHAR:
462 break; 458 break;
463 459
464 default: 460 default:
465 int w = 0;
466 while (len > 0 && *text == NOCHAR)
467 {
468 ++text;
469 --len;
470 w += r->TermWin.fwidth;
471 }
472
473 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 461 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 462 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 463 }
477 464
478 x += r->TermWin.fwidth; 465 x += fwidth;
479 } 466 }
480} 467}
481 468
482///////////////////////////////////////////////////////////////////////////// 469/////////////////////////////////////////////////////////////////////////////
483 470
… …
488 475
489 rxvt_fontprop properties (); 476 rxvt_fontprop properties ();
490 477
491 bool load (const rxvt_fontprop &prop); 478 bool load (const rxvt_fontprop &prop);
492 479
493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
494 481
495 void draw (rxvt_drawable &d, int x, int y, 482 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 483 const text_t *text, int len,
497 int fg, int bg); 484 int fg, int bg);
498 485
… …
510char * 497char *
511rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
512{ 499{
513 unsigned long value; 500 unsigned long value;
514 501
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
516 return XGetAtomName (DISPLAY, value); 503 return XGetAtomName (term->display->display, value);
517 else 504 else
518 return rxvt_strdup (repl); 505 return rxvt_strdup (repl);
519} 506}
520 507
521rxvt_fontprop 508rxvt_fontprop
… …
529bool 516bool
530rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
531{ 518{
532 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
533 p.height = height; 520 p.height = height;
521 p.ascent = rxvt_fontprop::unset;
534 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;
535 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;
536 524
537 return true; 525 return true;
538} 526}
539 527
540bool 528bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 530{
543 unsigned long height; 531 unsigned long height;
532
533#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
545 return false; 535 return false;
536#else
537 height = f->ascent + f->descent;
538#endif
546 539
547 unsigned long avgwidth; 540 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
549 avgwidth = 0; 542 avgwidth = 0;
550 543
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 544 char *weight = get_property (f, "WEIGHT_NAME", "medium");
552 char *slant = get_property (f, "SLANT", "r"); 545 char *slant = get_property (f, "SLANT", "r");
553 546
554 set_properties (p, height, weight, slant, avgwidth); 547 set_properties (p, height, weight, slant, avgwidth);
555 548
556 free (weight); 549 free (weight);
557 free (slant); 550 free (slant);
558 551
552 p.ascent = f->ascent;
553
559 return true; 554 return true;
560} 555}
561 556
562bool 557bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 559{
560 dTermDisplay;
565 int slashes = 0; 561 int slashes = 0;
566 const char *comp[13]; 562 const char *comp[13];
567 563
568 for (const char *c = name; *c; c++) 564 for (const char *c = name; *c; c++)
569 if (*c == '-') 565 if (*c == '-')
… …
577 if (slashes >= 13 573 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 574 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 575 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 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]));
581 577
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 578 XFontStruct *f = XLoadQueryFont (disp, name);
583 579
584 if (f) 580 if (f)
585 { 581 {
586 // 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
587 // (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).
588 // in that case, just return garbage. 584 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 585 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 586 XFreeFont (disp, f);
591 return ret; 587 return ret;
592 } 588 }
593 else 589 else
594 return false; 590 return false;
595} 591}
… …
633} 629}
634 630
635bool 631bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop)
637{ 633{
634 dTermDisplay;
635
638 clear (); 636 clear ();
639 637
640 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
641 639
642 // first morph the font if required 640 // first morph the font if required
… …
645 { 643 {
646 char fname[1024]; 644 char fname[1024];
647 645
648 if (name[0] != '-') 646 if (name[0] != '-')
649 { 647 {
650 f = XLoadQueryFont (DISPLAY, name); 648 f = XLoadQueryFont (disp, name);
651 649
652 if (!f) 650 if (!f)
653 return false; 651 return false;
654 652
655 char *new_name = get_property (f, "FONT", name); 653 char *new_name = get_property (f, "FONT", name);
… …
657 if (new_name) 655 if (new_name)
658 set_name (new_name); 656 set_name (new_name);
659 else 657 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
661 659
662 XFreeFont (DISPLAY, f); 660 XFreeFont (disp, f);
663 f = 0; 661 f = 0;
664 } 662 }
665 663
666 if (prop.weight != rxvt_fontprop::unset) 664 if (prop.weight != rxvt_fontprop::unset)
667 { 665 {
… …
678 ? "r" : "i"); // TODO: handle "o"blique, too 676 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 677 set_name (strdup (fname));
680 } 678 }
681 } 679 }
682 680
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height);
683
684 struct font_weight {
685 char *name;
686 int diff;
687
688 void clear ()
689 {
690 name = 0;
691 diff = 0x7fffffff;
692 }
693
694 font_weight () { clear (); }
695 ~font_weight () { free (name); }
696 };
697
683 char **list; 698 char **list;
684 int count; 699 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 700 list = XListFonts (disp, name, 4000, &count);
686 701
687 set_name (0); 702 set_name (0);
688 703
689 if (!list) 704 if (!list)
690 return false; 705 return false;
691 706
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 707 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 708
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 709 for (int i = 0; i < count; i++)
697 { 710 {
698 rxvt_fontprop p; 711 rxvt_fontprop p;
699 char fname[1024]; 712 char fname[1024];
700 713
701 int diff = 0; 714 int diff = 0;
702 715
703 if (replace_field (fname, list[i], 6, '0', field_str)) 716 if (replace_field (fname, list[i], 6, '0', field_str))
704 diff += 10; // slightly penalize scalable fonts 717 diff += 10; // slightly penalize scalable fonts
718 else if (replace_field (fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
705 720
706 if (!set_properties (p, fname)) 721 if (!set_properties (p, fname))
707 continue; 722 continue;
708 723
709 if (prop.height != rxvt_fontprop::unset 724 if (prop.height != rxvt_fontprop::unset
… …
713 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
714 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 729 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
715 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 730 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
716 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 731 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
717 732
718 if (!name // compare against best found so far 733 fonts[i].name = strdup (fname);
719 || diff < bestdiff) 734 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 735 }
725 736
726 XFreeFontNames (list); 737 XFreeFontNames (list);
727 738
728 if (!name) 739 // this loop only iterates when the guessed font-size is too small
729 return false; 740 for (;;)
741 {
742 font_weight *best = fonts + count - 1;
730 743
731 f = XLoadQueryFont (DISPLAY, name); 744 for (font_weight *w = best; w-- > fonts; )
745 if (w->diff <= best->diff)
746 best = w;
747
748 if (!best->name
749 || !(f = XLoadQueryFont (disp, best->name)))
750 break;
751
752 set_name (best->name);
753 best->clear ();
754
755 ascent = f->ascent;
756 descent = f->descent;
757 height = ascent + descent;
758
759 if (prop.height == rxvt_fontprop::unset
760 || height <= prop.height)
761 break; // font is ready for use
762
763 // PIXEL_SIZE small enough, but real height too large
764 clear ();
765 }
766
767 delete [] fonts;
732 768
733 if (!f) 769 if (!f)
734 return false; 770 return false;
735 771
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 772 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
… …
764 if (cs == CS_UNICODE) 800 if (cs == CS_UNICODE)
765 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 801 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
766 802
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 803 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 804 enc2b = encm || f->max_char_or_byte2 > 255;
769
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773 805
774 slow = false; 806 slow = false;
775 807
776#if 1 // only used for slow detection, TODO optimize 808#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 809 if (f->min_bounds.width == f->max_bounds.width)
… …
816 848
817 XCharStruct g; 849 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 850 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 852
821 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
822 854
823 if (width < g.width) width = g.width; 855 if (width < g.width) width = g.width;
824 } 856 }
825 857
826 if (cs == CS_UNKNOWN) 858 if (cs == CS_UNKNOWN)
… …
845void 877void
846rxvt_font_x11::clear () 878rxvt_font_x11::clear ()
847{ 879{
848 if (f) 880 if (f)
849 { 881 {
850 XFreeFont (DISPLAY, f); 882 XFreeFont (term->display->display, f);
851 f = 0; 883 f = 0;
852 } 884 }
853} 885}
854 886
855bool 887bool
856rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 888rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
857{ 889{
858 uint32_t ch = FROM_UNICODE (cs, unicode); 890 uint32_t ch = FROM_UNICODE (cs, unicode);
859 891
860 if (ch == NOCHAR) 892 if (ch == NOCHAR)
861 return false; 893 return false;
… …
901 return true; 933 return true;
902 934
903 // check character against base font bounding box 935 // check character against base font bounding box
904 int w = xcs->width; 936 int w = xcs->width;
905 int wcw = wcwidth (unicode); 937 int wcw = wcwidth (unicode);
906 if (wcw > 0) w /= wcw; 938 if (wcw > 0) w = (w + wcw - 1) / wcw;
907 939
908 careful = w > prop->width; 940 careful = w > prop->width;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 941 if (careful && w > prop->width * MAX_OVERLAP >> 2)
910 return false; 942 return false;
911 943
… …
920 // this looks like a mess /. 952 // this looks like a mess /.
921 // and it is a mess /. 953 // and it is a mess /.
922 // yet we are trying to be perfect /. 954 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 955 // but the result still isn't perfect /.
924 956
957 dTermDisplay;
958 dTermGC;
959
925 bool slow = this->slow 960 bool slow = this->slow
926 || width != r->TermWin.fwidth 961 || width != term->fwidth
927 || height != r->TermWin.fheight; 962 || height != term->fheight;
928 963
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 964 int base = ascent; // sorry, incorrect: term->fbase;
930 965
931 XGCValues v; 966 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 967 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 968 v.font = f->fid;
934 969
935 if (enc2b) 970 if (enc2b)
936 { 971 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 973
939 if (bg == Color_bg && !slow) 974 if (bg == Color_bg && !slow)
940 { 975 {
941 v.background = r->pix_colors[bg]; 976 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 977 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 978 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 979 }
945 else 980 else
946 { 981 {
947 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
948 983
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 984 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 985
951 if (slow) 986 if (slow)
952 { 987 {
953 do 988 do
954 { 989 {
955 if (xc->byte1 || xc->byte2) 990 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 991 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 992
958 x += r->TermWin.fwidth; 993 x += term->fwidth;
959 xc++; len--; 994 xc++; len--;
960 } 995 }
961 while (len); 996 while (len);
962 } 997 }
963 else 998 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 999 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 1000 }
966 } 1001 }
967 else 1002 else
968 { 1003 {
969 const char *xc = enc_char (text, len, cs, slow); 1004 const char *xc = enc_char (text, len, cs, slow);
970 1005
971 if (bg == Color_bg && !slow) 1006 if (bg == Color_bg && !slow)
972 { 1007 {
973 v.background = r->pix_colors[bg]; 1008 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1009 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1010 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1011 }
977 else 1012 else
978 { 1013 {
979 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1015
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1016 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1017
983 if (slow) 1018 if (slow)
984 { 1019 {
985 do 1020 do
986 { 1021 {
987 if (*xc) 1022 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1023 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1024
990 x += r->TermWin.fwidth; 1025 x += term->fwidth;
991 xc++; len--; 1026 xc++; len--;
992 } 1027 }
993 while (len); 1028 while (len);
994 } 1029 }
995 else 1030 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1031 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1032 }
998 } 1033 }
999} 1034}
1000 1035
1001///////////////////////////////////////////////////////////////////////////// 1036/////////////////////////////////////////////////////////////////////////////
… …
1013 1048
1014 void draw (rxvt_drawable &d, int x, int y, 1049 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1050 const text_t *text, int len,
1016 int fg, int bg); 1051 int fg, int bg);
1017 1052
1018 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1019 1054
1020protected: 1055protected:
1021 XftFont *f; 1056 XftFont *f;
1022}; 1057};
1023 1058
1024void 1059void
1025rxvt_font_xft::clear () 1060rxvt_font_xft::clear ()
1026{ 1061{
1027 if (f) 1062 if (f)
1028 { 1063 {
1029 XftFontClose (DISPLAY, f); 1064 XftFontClose (term->display->display, f);
1030 f = 0; 1065 f = 0;
1031 } 1066 }
1032} 1067}
1033 1068
1034rxvt_fontprop 1069rxvt_fontprop
… …
1038 1073
1039 FT_Face face = XftLockFace (f); 1074 FT_Face face = XftLockFace (f);
1040 1075
1041 p.width = width; 1076 p.width = width;
1042 p.height = height; 1077 p.height = height;
1078 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1079 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1080 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1081 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1082 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1083
… …
1051} 1087}
1052 1088
1053bool 1089bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1090rxvt_font_xft::load (const rxvt_fontprop &prop)
1055{ 1091{
1092 dTermDisplay;
1093
1056 clear (); 1094 clear ();
1057 1095
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1096 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1097
1060 if (!p) 1098 if (!p)
1061 return false; 1099 return false;
1062 1100
1063 FcValue v; 1101 FcValue v;
1064 1102
1065 if (prop.height != rxvt_fontprop::unset 1103 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1107
1070 if (prop.weight != rxvt_fontprop::unset 1108 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1086 1124
1087 // store generated name so iso14755 view gives better results 1125 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1126 set_name ((char *)FcNameUnparse (p));
1089 1127
1090 XftResult result; 1128 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1129 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1130
1093 FcPatternDestroy (p); 1131 FcPatternDestroy (p);
1094 1132
1095 if (!match) 1133 if (!match)
1096 return false; 1134 return false;
… …
1098 int ftheight = 0; 1136 int ftheight = 0;
1099 bool success = true; 1137 bool success = true;
1100 1138
1101 for (;;) 1139 for (;;)
1102 { 1140 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1141 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1104 1142
1105 if (!f) 1143 if (!f)
1106 { 1144 {
1107 success = false; 1145 success = false;
1108 break; 1146 break;
… …
1117 1155
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1156 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1157
1120 XftUnlockFace (f); 1158 XftUnlockFace (f);
1121 1159
1160 int glheight = height;
1161
1122 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1162 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1123 { 1163 {
1124 FcChar16 ch = *t; 1164 FcChar16 ch = *t;
1125 1165
1126 if (cs != CS_UNICODE 1166 if (cs != CS_UNICODE
… …
1132 bool careful; 1172 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1173 if (!has_char (*t, &prop, careful))
1134 continue; 1174 continue;
1135 1175
1136 XGlyphInfo g; 1176 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1177 XftTextExtents16 (disp, f, &ch, 1, &g);
1178
1179 g.width -= g.x;
1138 1180
1139 int wcw = wcwidth (ch); 1181 int wcw = wcwidth (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1183
1142 if (width < g.width) width = g.width; 1184 if (width < g.width ) width = g.width;
1143 if (height < g.height) height = g.height; 1185 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y;
1187 }
1188
1189 if (!width)
1190 {
1191 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1192
1193 XftFontClose (disp, f);
1194 f = 0;
1195
1196 success = false;
1197 break;
1144 } 1198 }
1145 1199
1146 if (prop.height == rxvt_fontprop::unset 1200 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1201 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1202 || height <= 2
1149 || !scalable) 1203 || !scalable)
1150 break; 1204 break;
1151 1205
1152 if (ftheight) 1206 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1213 ftheight -= height - prop.height;
1160 } 1214 }
1161 else 1215 else
1162 ftheight = prop.height - 1; 1216 ftheight = prop.height - 1;
1163 1217
1164 XftFontClose (DISPLAY, f); 1218 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1219 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1220 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1221 }
1168 1222
1169 FcPatternDestroy (match); 1223 FcPatternDestroy (match);
1170 1224
1171#if 0 // do it per-character 1225#if 0 // do it per-character
… …
1178 1232
1179 return success; 1233 return success;
1180} 1234}
1181 1235
1182bool 1236bool
1183rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1184{ 1238{
1185 careful = false; 1239 careful = false;
1186 1240
1187 if (!XftCharExists (DISPLAY, f, unicode)) 1241 if (!XftCharExists (term->display->display, f, unicode))
1188 return false; 1242 return false;
1189 1243
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1244 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1245 return true;
1192 1246
1193 // check character against base font bounding box 1247 // check character against base font bounding box
1194 FcChar32 ch = unicode; 1248 FcChar32 ch = unicode;
1195 XGlyphInfo g; 1249 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1197 1251
1198 int w = g.width; 1252 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode); 1253 int wcw = wcwidth (unicode);
1200 if (wcw > 0) w /= wcw; 1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1201 1255
1202 careful = w > prop->width; 1256 careful = w > prop->width;
1203 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1257 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1204 return false; 1258 return false;
1205 1259
… …
1209void 1263void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1265 const text_t *text, int len,
1212 int fg, int bg) 1266 int fg, int bg)
1213{ 1267{
1214 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1215
1216 int base = ascent; // should be fbase, but that is incorrect
1217 1269
1218 XGlyphInfo extents; 1270 XGlyphInfo extents;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1220 FcChar32 *ep = enc; 1272 XftGlyphSpec *ep = enc;
1221 int ewidth = 0; 1273
1222 int xoff = 0; 1274 dTermDisplay;
1275 dTermGC;
1276
1277 // cut trailing spaces
1278 while (len && text [len - 1] == ' ')
1279 len--;
1223 1280
1224 while (len) 1281 while (len)
1225 { 1282 {
1226 int cwidth = r->TermWin.fwidth; 1283 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1284 FcChar32 fc = *text++; len--;
1228 FT_UInt gl;
1229 1285
1230 while (len && *text == NOCHAR) 1286 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1287 text++, len--, cwidth += term->fwidth;
1232 1288
1233 gl = XftCharIndex (d.display->display, f, fc); 1289 if (fc != ' ') // skip spaces
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235
1236 if (extents.xOff != cwidth && ep != enc)
1237 {
1238 if (xoff > ewidth) xoff = ewidth;
1239 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1240 x + (ewidth - xoff >> 1),
1241 y + base, enc, ep - enc);
1242 x += ewidth;
1243
1244 ep = enc;
1245 ewidth = 0;
1246 xoff = 0;
1247 } 1290 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1248 1293
1249 if (fc == ' ' && ep == enc) // skip leading spaces 1294 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent;
1297 ep++;
1250 { 1298 }
1299
1251 x += cwidth; 1300 x += cwidth;
1252 continue;
1253 }
1254
1255 else
1256 {
1257 *ep++ = gl;
1258 ewidth += cwidth;
1259 xoff += extents.xOff;
1260 }
1261 } 1301 }
1262 1302
1263 if (ep != enc) 1303 if (ep != enc)
1264 {
1265 if (xoff > ewidth) xoff = ewidth;
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 }
1270} 1305}
1271#endif 1306#endif
1272 1307
1273///////////////////////////////////////////////////////////////////////////// 1308/////////////////////////////////////////////////////////////////////////////
1274 1309
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1310rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1311: fontdesc (0), term (term)
1277{ 1312{
1278 clear (); 1313 clear ();
1279} 1314}
1280 1315
1281rxvt_fontset::~rxvt_fontset () 1316rxvt_fontset::~rxvt_fontset ()
… …
1284} 1319}
1285 1320
1286void 1321void
1287rxvt_fontset::clear () 1322rxvt_fontset::clear ()
1288{ 1323{
1289 prop.width = prop.height = prop.weight = prop.slant 1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1325 = rxvt_fontprop::unset;
1291 1326
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1328 FONT_UNREF (*i);
1294 1329
… …
1325 f = new rxvt_font_x11; 1360 f = new rxvt_font_x11;
1326 } 1361 }
1327 else 1362 else
1328 f = new rxvt_font_x11; 1363 f = new rxvt_font_x11;
1329 1364
1330 f->set_term (r); 1365 f->set_term (term);
1331 f->set_name (strdup (name)); 1366 f->set_name (strdup (name));
1332 1367
1333 f->cs = cs; 1368 f->cs = cs;
1334 f->loaded = false; 1369 f->loaded = false;
1335 1370
… …
1346 char buf[512]; 1381 char buf[512];
1347 const char *end; 1382 const char *end;
1348 1383
1349 do 1384 do
1350 { 1385 {
1351 while (*desc <= ' ') desc++; 1386 while (*desc && *desc <= ' ')
1387 desc++;
1352 1388
1353 codeset cs = CS_UNICODE; 1389 codeset cs = CS_UNICODE;
1354 1390
1355 if (*desc == '[') 1391 if (*desc == '[')
1356 { 1392 {
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1502 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1503 goto next_font;
1468 1504
1469 if (!realize_font (i)) 1505 if (!realize_font (i))
1470 goto next_font; 1506 goto next_font;
1507
1508 if (prop.ascent != rxvt_fontprop::unset)
1509 max_it (f->ascent, prop.ascent);
1471 } 1510 }
1472 1511
1473 if (f->cs == CS_UNKNOWN) 1512 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1513 goto next_font;
1475 1514
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1553 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1554 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1556
1518 XftResult result; 1557 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1520 1559
1521 FcPatternDestroy (p); 1560 FcPatternDestroy (p);
1522 1561
1523 if (match) 1562 if (match)
1524 { 1563 {

Diff Legend

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