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.1 by root, Sun Aug 15 00:37:04 2004 UTC vs.
Revision 1.67 by root, Sat Feb 12 18:55:04 2005 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-2004 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
… …
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h"
24#include "rxvtfont.h" 25#include "rxvtfont.h"
25 26
26#include <cstdlib> 27#include <cstdlib>
28#include <wchar.h>
29#include <inttypes.h>
27 30
28#define DISPLAY r->display->display 31#define DISPLAY r->display->display
29#define TGC r->TermWin.gc 32#define TGC r->TermWin.gc
33
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
30 35
31const struct rxvt_fallback_font { 36const struct rxvt_fallback_font {
32 codeset cs; 37 codeset cs;
33 const char *name; 38 const char *name;
34} fallback_fonts[] = { 39} fallback_fonts[] = {
… …
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 57 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 58 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62
63# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },
65
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },
73# endif
57#endif 74#endif
58 75
59 // japanese 76 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 77#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 78# if XFT
62 // prefer xft for complex scripts 79 // prefer xft for complex scripts
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },
64# endif 84# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 89 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
71#endif 91#endif
72 92
73#if ENCODING_CN || ENCODING_CN_EXT 93#if ENCODING_ZH || ENCODING_ZH_EXT
74# if XFT 94# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" },
75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },
79# endif 103# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
80 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
108 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 109 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 110 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 111 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 112 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 113 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 115 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 116 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 117 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
92#endif 118#endif
93 119
120#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
94#if XFT 123# if XFT
95 { CS_UNICODE, "xft:Andale Mono" }, 124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
96 { CS_UNICODE, "xft:Arial Unicode MS" }, 125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },
126# endif
97#endif 127#endif
128
129 // generic font fallback
98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
102#if XFT 134#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },
139
103 // FreeMono is usually uglier than x fonts, so try last only. 140 // FreeMono is usually uglier than x fonts, so try last only.
104 //{ CS_UNICODE, "xft:FreeMono" }, 141 { CS_UNICODE, "xft:FreeMono:autohint=true" },
105#endif 142#endif
106 143
107 { CS_UNKNOWN, 0 } 144 { CS_UNKNOWN, 0 }
108}; 145};
146
147// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either.
149static uint16_t extent_test_chars[] = {
150 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
151 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
152 0x304c, 0x672c, // が本
153};
154
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
109 156
110///////////////////////////////////////////////////////////////////////////// 157/////////////////////////////////////////////////////////////////////////////
111 158
112#if XFT 159#if XFT
113rxvt_drawable::~rxvt_drawable () 160rxvt_drawable::~rxvt_drawable ()
… …
188} 235}
189 236
190///////////////////////////////////////////////////////////////////////////// 237/////////////////////////////////////////////////////////////////////////////
191 238
192void 239void
240rxvt_font::set_name (char *name)
241{
242 if (this->name == name)
243 return;
244
245 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name;
247}
248
249void
193rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
194{ 251{
195 if (color == Color_bg) 252 if (color == Color_bg)
196 XClearArea (d.display->display, d, x, y, w, h, FALSE); 253 XClearArea (d.display->display, d, x, y, w, h, FALSE);
197 else if (color >= 0) 254 else if (color >= 0)
198 { 255 {
199#if XFT 256#if XFT
200 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);
201#else 258#else
202 XSetForeground (d.display->display, TGC, r->PixColors[color]); 259 XSetForeground (d.display->display, TGC, r->pix_colors[color]);
203 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 260 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
204#endif 261#endif
205 } 262 }
206} 263}
207 264
208#include "table/linedraw.h" 265#include "table/linedraw.h"
209 266
210struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs;
269
270 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font ()
272 {
273 this->fs = fs;
274 }
211 275
212 rxvt_fontprop properties () 276 rxvt_fontprop properties ()
213 { 277 {
214 rxvt_fontprop p; 278 rxvt_fontprop p;
215 279
… …
223 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop)
224 { 288 {
225 width = 1; height = 1; 289 width = 1; height = 1;
226 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
227 291
228 set_name (strdup ("built-in pseudofont")); 292 set_name (strdup ("built-in support font"));
229 293
230 return true; 294 return true;
231 } 295 }
232 296
233 bool has_codepoint (unicode_t unicode) 297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
234 { 298 {
299 careful = false;
300
235 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
236 return true; 302 return true;
237 303
238 if (unicode <= 0x007f) 304 if (unicode <= 0x007f)
239 return false; 305 return false;
… …
248 return true; 314 return true;
249 315
250 switch (unicode) 316 switch (unicode)
251 { 317 {
252 case ZERO_WIDTH_CHAR: 318 case ZERO_WIDTH_CHAR:
319 case NOCHAR:
253 return true; 320 return true;
254 } 321 }
255 322
256 return false; 323 return false;
257 } 324 }
… …
264void 331void
265rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 332rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266 const text_t *text, int len, 333 const text_t *text, int len,
267 int fg, int bg) 334 int fg, int bg)
268{ 335{
336 Display *disp = d.display->display;
337
269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
270 339
271 XSetForeground (d.display->display, TGC, r->PixColors[fg]); 340 XSetForeground (disp, TGC, r->pix_colors[fg]);
272 341
273 while (len--) 342 while (len)
274 { 343 {
275#if ENABLE_COMBINING 344#if ENABLE_COMBINING
276 compose_char *cc; 345 compose_char *cc;
277#endif 346#endif
347 const text_t *tp = text;
278 text_t t = *text++; 348 text_t t = *tp;
349
350 while (++text, --len && *text == NOCHAR)
351 ;
352
353 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width;
279 355
280 if (0x2500 <= t && t <= 0x259f) 356 if (0x2500 <= t && t <= 0x259f)
281 { 357 {
282 uint16_t offs = linedraw_offs[t - 0x2500]; 358 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4); 359 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15); 360 uint32_t *b = a + (offs & 15);
285 361
286 int W = r->TermWin.fwidth; 362 int W = fwidth;
287 int H = r->TermWin.fheight; 363 int H = r->TermWin.fheight;
288 364
289 int x_[16]; 365 int x_[16];
290 int y_[16]; 366 int y_[16];
291 367
… …
300 376
301 XGCValues gcv; 377 XGCValues gcv;
302 378
303 gcv.cap_style = CapButt; 379 gcv.cap_style = CapButt;
304 gcv.line_width = 0; 380 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv);
306 382
307 while (a < b) 383 while (a < b)
308 { 384 {
309 uint32_t command = *a++; 385 uint32_t command = *a++;
310 386
… …
317 int y2 = y_[(command >> 0) & 15]; 393 int y2 = y_[(command >> 0) & 15];
318 394
319 switch (op) 395 switch (op)
320 { 396 {
321 case 0: // line 397 case 0: // line
322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 398 XDrawLine (disp, d, TGC, x1, y1, x2, y2);
323 break; 399 break;
324 400
325 case 1: // rectangle, possibly stippled 401 case 1: // rectangle, possibly stippled
326 if (a) 402 if (a)
327 { 403 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329 405
330 gcv.fill_style = FillStippled; 406 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x; 408 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y; 409 gcv.ts_y_origin = y;
334 410
335 XChangeGC (d.display->display, TGC, 411 XChangeGC (disp, TGC,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv); 413 &gcv);
338 } 414 }
339 415
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 417
342 if (a) 418 if (a)
343 { 419 {
344 XFreePixmap (d.display->display, gcv.stipple); 420 XFreePixmap (disp, gcv.stipple);
345 gcv.stipple = 0; 421 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 422 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 423 XChangeGC (disp, TGC, GCFillStyle, &gcv);
348 } 424 }
349 break; 425 break;
350 case 2: // arc 426 case 2: // arc
351 XDrawArc (d.display->display, d, TGC, 427 XDrawArc (disp, d, TGC,
352 x1 - W/2, y1 - H/2, W-1, H-1, 428 x1 - W/2, y1 - H/2, W-1, H-1,
353 (a - 1) * 90*64, (b - 1) * 90*64); 429 (a - 1) * 90*64, (b - 1) * 90*64);
354 break; 430 break;
355 } 431 }
356 } 432 }
357 } 433 }
358#if ENABLE_COMBINING 434#if ENABLE_COMBINING
359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360 { 436 {
437 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR;
440
441 *chrs = cc->c1;
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 443 f1->draw (d, x, y, chrs, width, fg, bg);
444
363 if (cc->c2 != NOCHAR) 445 if (cc->c2 != NOCHAR)
364 { 446 {
447 bool careful;
448
365 // prefer font of first character, for no good reasons 449 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2) 450 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367 ? f1 452 ? f1
368 : (*fs)[fs->find_font (cc->c2)]; 453 : (*fs)[fs->find_font (cc->c2)];
369 454
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 455 f2->draw (d, x, y, chrs, width, fg, -1);
371 } 456 }
372 } 457 }
373#endif 458#endif
374 else 459 else
375 switch (t) 460 switch (t)
376 { 461 {
462 case '\t':
377 case ZERO_WIDTH_CHAR: 463 case ZERO_WIDTH_CHAR:
464 case NOCHAR:
378 break; 465 break;
379 466
380 default: 467 default:
381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 468 XDrawRectangle (disp, d, TGC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 469 fwidth - 4, r->TermWin.fheight - 4);
391 x += w;
392 } 470 }
393 471
394 x += r->TermWin.fwidth; 472 x += fwidth;
395 } 473 }
396} 474}
397 475
398///////////////////////////////////////////////////////////////////////////// 476/////////////////////////////////////////////////////////////////////////////
399 477
… …
404 482
405 rxvt_fontprop properties (); 483 rxvt_fontprop properties ();
406 484
407 bool load (const rxvt_fontprop &prop); 485 bool load (const rxvt_fontprop &prop);
408 486
409 bool has_codepoint (unicode_t unicode); 487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);
410 488
411 void draw (rxvt_drawable &d, int x, int y, 489 void draw (rxvt_drawable &d, int x, int y,
412 const text_t *text, int len, 490 const text_t *text, int len,
413 int fg, int bg); 491 int fg, int bg);
414 492
493 bool slow; // wether this is a proportional font or has other funny characteristics
415 XFontStruct *f; 494 XFontStruct *f;
416 codeset cs; 495 codeset cs;
417 bool enc2b, encm; 496 bool enc2b, encm;
418 497
419 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 498 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
… …
442} 521}
443 522
444bool 523bool
445rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
446{ 525{
447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
448 p.height = height; 527 p.height = height;
449 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
450 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451 530
452 return true; 531 return true;
… …
454 533
455bool 534bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 536{
458 unsigned long height; 537 unsigned long height;
538
539#if 0
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
460 return false; 541 return false;
542#else
543 height = f->ascent + f->descent;
544#endif
461 545
462 unsigned long avgwidth; 546 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
464 avgwidth = 0; 548 avgwidth = 0;
465 549
… …
508 else 592 else
509 return false; 593 return false;
510} 594}
511 595
512// fix the size of scalable fonts 596// fix the size of scalable fonts
513static void 597static bool
514fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) 598replace_field (char *buf, const char *name, int index, const char old, const char *replace)
515{ 599{
516 int slashes = 0; 600 int slashes = 0;
517 const char *size; 601 const char *field, *end;
518 602
519 for (const char *c = name; *c; c++) 603 for (const char *c = name; *c; c++)
520 if (*c == '-') 604 if (*c == '-')
521 { 605 {
522 if (slashes == 6) 606 if (slashes == index)
523 size = c + 1; 607 field = c + 1;
608
609 if (slashes == index + 1)
610 end = c;
524 611
525 if (++slashes >= 13) 612 if (++slashes >= 13)
526 break; 613 break;
527 } 614 }
528 615
529 if (slashes >= 13 && size[0] == '0') 616 if (slashes >= 13 && (!old || *field == old))
530 { 617 {
618 // TODO: check for overflow in font-name
531 strncpy (buf, name, size - name); 619 strncpy (buf, name, field - name);
532 buf += size - name; 620 buf += field - name;
533 buf += sprintf (buf, "%d", prop.height);
534 strcpy (buf, size + 1); 621 strcpy (buf, replace);
622 strcat (buf, end);
623
624 return true;
535 } 625 }
536 else 626 else
627 {
537 strcpy (buf, name); 628 strcpy (buf, name);
629
630 return false;
631 }
538} 632}
539 633
540bool 634bool
541rxvt_font_x11::load (const rxvt_fontprop &prop) 635rxvt_font_x11::load (const rxvt_fontprop &prop)
542{ 636{
637 Display *disp = DISPLAY;
638
543 clear (); 639 clear ();
640
641 char field_str[64]; // enough for 128 bits
642
643 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset
645 || prop.slant != rxvt_fontprop::unset)
646 {
647 char fname[1024];
648
649 if (name[0] != '-')
650 {
651 f = XLoadQueryFont (disp, name);
652
653 if (!f)
654 return false;
655
656 char *new_name = get_property (f, "FONT", name);
657
658 if (new_name)
659 set_name (new_name);
660 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
662
663 XFreeFont (disp, f);
664 f = 0;
665 }
666
667 if (prop.weight != rxvt_fontprop::unset)
668 {
669 replace_field (fname, name, 2, 0,
670 prop.weight < rxvt_fontprop::bold
671 ? "medium" : "bold");
672 set_name (strdup (fname));
673 }
674
675 if (prop.slant != rxvt_fontprop::unset)
676 {
677 replace_field (fname, name, 3, 0,
678 prop.slant < rxvt_fontprop::italic
679 ? "r" : "i"); // TODO: handle "o"blique, too
680 set_name (strdup (fname));
681 }
682 }
683
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
685 ? 0 : prop.height);
686
687 struct font_weight {
688 char *name;
689 int diff;
690
691 void clear ()
692 {
693 name = 0;
694 diff = 0x7fffffff;
695 }
696
697 font_weight () { clear (); }
698 ~font_weight () { free (name); }
699 };
544 700
545 char **list; 701 char **list;
546 int count; 702 int count;
547 list = XListFonts (DISPLAY, name, 1024, &count); 703 list = XListFonts (disp, name, 4000, &count);
704
548 set_name (0); 705 set_name (0);
549 706
550 if (!list) 707 if (!list)
551 return false; 708 return false;
552 709
553 int bestdiff = 0x7fffffff; 710 font_weight *fonts = new font_weight[count];
711
554 for (int i = 0; i < count; i++) 712 for (int i = 0; i < count; i++)
555 { 713 {
556 rxvt_fontprop p; 714 rxvt_fontprop p;
557 char fname[1024]; 715 char fname[1024];
558 fix_scalable (fname, list[i], prop); 716
717 int diff = 0;
718
719 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts
559 721
560 if (!set_properties (p, fname)) 722 if (!set_properties (p, fname))
561 continue; 723 continue;
562 724
725 if (prop.height != rxvt_fontprop::unset
563 if (p.height > prop.height) // weed out too large fonts 726 && p.height > prop.height) // weed out too large fonts
564 continue; 727 continue;
565 728
566 int diff = (prop.height - p.height) * 32 729 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567 + abs (prop.weight - p.weight) 730 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568 + abs (prop.slant - p.slant ); 731 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
732 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569 733
570 if (!name // compare against best found so far 734 fonts[i].name = strdup (fname);
571 || diff < bestdiff) 735 fonts[i].diff = diff;
572 {
573 set_name (strdup (fname));
574 bestdiff = diff;
575 }
576 } 736 }
577 737
578 XFreeFontNames (list); 738 XFreeFontNames (list);
579 739
580 if (!name) 740 // this loop only iterates when the guessed font-size is too small
581 return false; 741 for (;;)
742 {
743 font_weight *best = fonts + count - 1;
582 744
583 f = XLoadQueryFont (DISPLAY, name); 745 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff)
747 best = w;
748
749 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name)))
751 break;
752
753 set_name (best->name);
754 best->clear ();
755
756 ascent = f->ascent;
757 descent = f->descent;
758 height = ascent + descent;
759
760 if (prop.height == rxvt_fontprop::unset
761 || height <= prop.height)
762 break; // font is ready for use
763
764 // PIXEL_SIZE small enough, but real height too large
765 clear ();
766 }
767
768 delete [] fonts;
584 769
585 if (!f) 770 if (!f)
586 return false; 771 return false;
587 772
588 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 773 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
… …
617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 802 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618 803
619 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 804 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620 enc2b = encm || f->max_char_or_byte2 > 255; 805 enc2b = encm || f->max_char_or_byte2 > 255;
621 806
622 ascent = f->ascent;
623 descent = f->descent;
624 height = ascent + descent;
625
626 slow = false; 807 slow = false;
627 808
809#if 1 // only used for slow detection, TODO optimize
628 if (f->min_bounds.width == f->max_bounds.width) 810 if (f->min_bounds.width == f->max_bounds.width)
629 width = f->min_bounds.width; 811 width = f->min_bounds.width;
630 else if (f->per_char == NULL) 812 else if (f->per_char == NULL)
631 width = f->max_bounds.width; 813 width = f->max_bounds.width;
632 else 814 else
… …
645 width = f->per_char[N].width; 827 width = f->per_char[N].width;
646 828
647 --N; 829 --N;
648 } 830 }
649 } 831 }
832#endif
833
834 width = 1;
835
836 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
837 {
838 if (cs != CS_UNICODE
839 && *t > 0x100
840 && FROM_UNICODE (cs, *t) == NOCHAR)
841 continue;
842
843 // ignore characters we wouldn't use anyways
844 bool careful;
845 if (!has_char (*t, &prop, careful))
846 continue;
847
848 XChar2b ch = { *t >> 8, *t };
849
850 XCharStruct g;
851 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853
854 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw;
855
856 if (width < g.width) width = g.width;
857 }
650 858
651 if (cs == CS_UNKNOWN) 859 if (cs == CS_UNKNOWN)
652 { 860 {
653 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 861 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654 862
655 clear (); 863 clear ();
656
657 return false; 864 return false;
658 } 865 }
866
867#if 0 // do it per-character
868 if (prop && width > prop->width)
869 {
870 clear ();
871 return false;
872 }
873#endif
659 874
660 return true; 875 return true;
661} 876}
662 877
663void 878void
… …
669 f = 0; 884 f = 0;
670 } 885 }
671} 886}
672 887
673bool 888bool
674rxvt_font_x11::has_codepoint (unicode_t unicode) 889rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
675{ 890{
676 uint32_t ch = FROM_UNICODE (cs, unicode); 891 uint32_t ch = FROM_UNICODE (cs, unicode);
677 892
678 if (ch == NOCHAR) 893 if (ch == NOCHAR)
679 return false; 894 return false;
… …
688 903
689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 904 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 905 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691 return false; 906 return false;
692 907
693 if (!f->per_char) 908 if (f->per_char)
694 return true; 909 {
695
696 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; 910 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; 911 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698 912
699 xcs = f->per_char + N; 913 xcs = f->per_char + N;
914 }
915 else
916 xcs = &f->max_bounds;
700 } 917 }
701 else 918 else
702 { 919 {
703 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) 920 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704 return false; 921 return false;
705 922
706 if (!f->per_char) 923 if (f->per_char)
707 return true;
708
709 xcs = f->per_char + (ch - f->min_char_or_byte2); 924 xcs = f->per_char + (ch - f->min_char_or_byte2);
925 else
926 xcs = &f->max_bounds;
710 } 927 }
711 928
712 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 929 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713 && xcs->ascent == 0 && xcs->descent == 0) 930 && xcs->ascent == 0 && xcs->descent == 0)
931 return false;
932
933 if (!prop || prop->width == rxvt_fontprop::unset)
934 return true;
935
936 // check character against base font bounding box
937 int w = xcs->width;
938 int wcw = wcwidth (unicode);
939 if (wcw > 0) w /= wcw;
940
941 careful = w > prop->width;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2)
714 return false; 943 return false;
715 944
716 return true; 945 return true;
717} 946}
718 947
… …
728 957
729 bool slow = this->slow 958 bool slow = this->slow
730 || width != r->TermWin.fwidth 959 || width != r->TermWin.fwidth
731 || height != r->TermWin.fheight; 960 || height != r->TermWin.fheight;
732 961
733 int base = r->TermWin.fbase; 962 int base = ascent; // sorry, incorrect: r->TermWin.fbase;
734 963
735 XGCValues v; 964 XGCValues v;
736 v.foreground = r->PixColors[fg]; 965 v.foreground = r->pix_colors[fg];
737 v.font = f->fid; 966 v.font = f->fid;
738 967
739 if (enc2b) 968 if (enc2b)
740 { 969 {
741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 970 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742 971
743 if (bg == Color_bg && !slow) 972 if (bg == Color_bg && !slow)
744 { 973 {
745 v.background = r->PixColors[bg]; 974 v.background = r->pix_colors[bg];
746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
748 } 977 }
749 else 978 else
750 { 979 {
… …
772 { 1001 {
773 const char *xc = enc_char (text, len, cs, slow); 1002 const char *xc = enc_char (text, len, cs, slow);
774 1003
775 if (bg == Color_bg && !slow) 1004 if (bg == Color_bg && !slow)
776 { 1005 {
777 v.background = r->PixColors[bg]; 1006 v.background = r->pix_colors[bg];
778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
780 } 1009 }
781 else 1010 else
782 { 1011 {
… …
803} 1032}
804 1033
805///////////////////////////////////////////////////////////////////////////// 1034/////////////////////////////////////////////////////////////////////////////
806 1035
807#if XFT 1036#if XFT
808#if 0
809#define UNIBITS 21
810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811#define SWATHBITS 8
812#endif
813 1037
814struct rxvt_font_xft : rxvt_font { 1038struct rxvt_font_xft : rxvt_font {
815 rxvt_font_xft () { f = 0; } 1039 rxvt_font_xft () { f = 0; }
816 1040
817 void clear (); 1041 void clear ();
… …
822 1046
823 void draw (rxvt_drawable &d, int x, int y, 1047 void draw (rxvt_drawable &d, int x, int y,
824 const text_t *text, int len, 1048 const text_t *text, int len,
825 int fg, int bg); 1049 int fg, int bg);
826 1050
827 bool has_codepoint (unicode_t unicode); 1051 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);
828 1052
829protected: 1053protected:
830 XftFont *f; 1054 XftFont *f;
831}; 1055};
832 1056
… …
860} 1084}
861 1085
862bool 1086bool
863rxvt_font_xft::load (const rxvt_fontprop &prop) 1087rxvt_font_xft::load (const rxvt_fontprop &prop)
864{ 1088{
865#if 0 1089 Display *disp = DISPLAY;
866 for (int i = 0; i < SWATHCOUNT; i++)
867 cvr[i] = 0;
868#endif
869 1090
870 clear (); 1091 clear ();
871 1092
872 FcPattern *p = FcNameParse ((FcChar8 *) name); 1093 FcPattern *p = FcNameParse ((FcChar8 *) name);
873 1094
874 if (!p) 1095 if (!p)
875 return false; 1096 return false;
876 1097
877 FcValue v; 1098 FcValue v;
878 1099
1100 if (prop.height != rxvt_fontprop::unset
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881 1104
1105 if (prop.weight != rxvt_fontprop::unset
882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884 1108
1109 if (prop.slant != rxvt_fontprop::unset
885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
886 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1111 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890 1112
891#if 0 // clipping unfortunately destroys our precious double-width-characters 1113#if 0 // clipping unfortunately destroys our precious double-width-characters
892 // clip width, we can't do better, or can we? 1114 // clip width, we can't do better, or can we?
893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 1116 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895#endif 1117#endif
896 1118
1119 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120 FcPatternAddBool (p, FC_MINSPACE, 1);
1121
1122 // store generated name so iso14755 view gives better results
1123 set_name ((char *)FcNameUnparse (p));
1124
897 XftResult result; 1125 XftResult result;
898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1126 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);
899 1127
900 FcPatternDestroy (p); 1128 FcPatternDestroy (p);
901 1129
902 if (!match) 1130 if (!match)
903 return false; 1131 return false;
904 1132
905 f = XftFontOpenPattern (DISPLAY, match);
906
907 if (!f)
908 {
909 FcPatternDestroy (match);
910 return false;
911 }
912
913 FT_Face face = XftLockFace (f);
914
915 slow = !FT_IS_FIXED_WIDTH (face);
916
917 int ftheight = 0; 1133 int ftheight = 0;
1134 bool success = true;
918 1135
919 for (;;) 1136 for (;;)
920 { 1137 {
921 XGlyphInfo g1, g2; 1138 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922 FcChar8 c;
923 1139
924 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 1140 if (!f)
925 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 1141 {
1142 success = false;
1143 break;
1144 }
926 1145
927 if (g1.xOff != g2.xOff) // don't simply trust the font 1146 FT_Face face = XftLockFace (f);
928 slow = true;
929 1147
930 width = g2.xOff;
931 ascent = (face->size->metrics.ascender + 63) >> 6; 1148 ascent = (face->size->metrics.ascender + 63) >> 6;
932 descent = (-face->size->metrics.descender + 63) >> 6; 1149 descent = (-face->size->metrics.descender + 63) >> 6;
933 height = ascent + descent; 1150 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1151 width = 0;
934 1152
935 if (height <= prop.height || !prop.height) 1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154
1155 XftUnlockFace (f);
1156
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1158 {
1159 FcChar16 ch = *t;
1160
1161 if (cs != CS_UNICODE
1162 && ch > 0x100
1163 && FROM_UNICODE (cs, ch) == NOCHAR)
1164 continue;
1165
1166 // ignore characters we wouldn't use anyways
1167 bool careful;
1168 if (!has_char (*t, &prop, careful))
1169 continue;
1170
1171 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g);
1173
1174 int wcw = wcwidth (ch);
1175 if (wcw > 0) g.width = g.width / wcw;
1176
1177 if (width < g.width) width = g.width;
1178 if (height < g.height) height = g.height;
1179 }
1180
1181 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height
1183 || height <= 2
1184 || !scalable)
936 break; 1185 break;
937 1186
938 if (ftheight) 1187 if (ftheight)
939 { 1188 {
940 // take smaller steps near the end 1189 // take smaller steps near the end
941 if (height > prop.height + 1) ftheight++; 1190 if (height > prop.height + 1) ftheight++;
942 if (height > prop.height + 2) ftheight++; 1191 if (height > prop.height + 2) ftheight++;
943 if (height > prop.height + 3) ftheight++; 1192 if (height > prop.height + 3) ftheight++;
944 1193
945 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); 1194 ftheight -= height - prop.height;
946 } 1195 }
947 else 1196 else
948 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); 1197 ftheight = prop.height - 1;
1198
1199 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 }
1203
1204 FcPatternDestroy (match);
1205
1206#if 0 // do it per-character
1207 if (prop.width != rxvt_fontprop::unset && width > prop.width)
949 } 1208 {
1209 clear ();
1210 success = false;
1211 }
1212#endif
950 1213
951 XftUnlockFace (f); 1214 return success;
1215}
1216
1217bool
1218rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
1219{
1220 careful = false;
1221
1222 if (!XftCharExists (DISPLAY, f, unicode))
1223 return false;
1224
1225 if (!prop || prop->width == rxvt_fontprop::unset)
1226 return true;
1227
1228 // check character against base font bounding box
1229 FcChar32 ch = unicode;
1230 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
1232
1233 int w = g.width;
1234 int wcw = wcwidth (unicode);
1235 if (wcw > 0) w /= wcw;
1236
1237 careful = w > prop->width;
1238 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1239 return false;
952 1240
953 return true; 1241 return true;
954}
955
956bool
957rxvt_font_xft::has_codepoint (unicode_t unicode)
958{
959 return XftCharExists (DISPLAY, f, unicode);
960} 1242}
961 1243
962void 1244void
963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964 const text_t *text, int len, 1246 const text_t *text, int len,
965 int fg, int bg) 1247 int fg, int bg)
966{ 1248{
967 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1249 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
968 1250
969 if (!slow && width == r->TermWin.fwidth && 0) 1251 int base = ascent; // should be fbase, but that is incorrect
1252
1253 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
1255 FcChar32 *ep = enc;
1256 int ewidth = 0;
1257 int xoff = 0;
1258
1259 while (len)
970 { 1260 {
971 if (sizeof (text_t) == sizeof (FcChar16)) 1261 int cwidth = r->TermWin.fwidth;
972 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1262 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264
1265 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth;
1267
1268 gl = XftCharIndex (d.display->display, f, fc);
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270
1271 if (extents.xOff != cwidth && ep != enc)
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 }
1283
1284 if (fc == ' ' && ep == enc) // skip leading spaces
1285 {
1286 x += cwidth;
1287 continue;
1288 }
1289
973 else 1290 else
974 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
975 }
976 else
977 {
978 while (len)
979 {
980 if (*text != NOCHAR && *text != ' ')
981 {
982 int fwidth = r->TermWin.fwidth;
983 if (len >= 2 && text[1] == NOCHAR)
984 fwidth *= 2;
985
986 XGlyphInfo extents;
987 if (sizeof (text_t) == sizeof (FcChar16))
988 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
990 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
992 }
993 else
994 {
995 XGlyphInfo extents;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
997 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
999 }
1000 }
1001
1002 x += r->TermWin.fwidth;
1003 text++;
1004 len--;
1005 } 1291 {
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 }
1297
1298 if (ep != enc)
1299 {
1300 if (xoff > ewidth) xoff = ewidth;
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1006 } 1304 }
1007} 1305}
1008#endif 1306#endif
1009 1307
1010///////////////////////////////////////////////////////////////////////////// 1308/////////////////////////////////////////////////////////////////////////////
… …
1021} 1319}
1022 1320
1023void 1321void
1024rxvt_fontset::clear () 1322rxvt_fontset::clear ()
1025{ 1323{
1324 prop.width = prop.height = prop.weight = prop.slant
1325 = rxvt_fontprop::unset;
1326
1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027 FONT_UNREF (*i); 1328 FONT_UNREF (*i);
1028 1329
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1331 delete *p;
1332
1029 free (fontdesc); fontdesc = 0; 1333 free (fontdesc); fontdesc = 0;
1030 1334
1031 fonts.clear (); 1335 fonts.clear ();
1032 base_id = 0;
1033 base_prop.height = 0x7fffffff;
1034 base_prop.weight = rxvt_fontprop::medium;
1035 base_prop.slant = rxvt_fontprop::roman;
1036 1336
1037 fallback = fallback_fonts; 1337 fallback = fallback_fonts;
1038} 1338}
1039 1339
1040rxvt_font * 1340rxvt_font *
… …
1043 rxvt_font *f; 1343 rxvt_font *f;
1044 1344
1045 if (!name || !*name) 1345 if (!name || !*name)
1046 { 1346 {
1047 name = ""; 1347 name = "";
1048 f = new rxvt_font_default; 1348 f = new rxvt_font_default (this);
1049 } 1349 }
1050#if XFT 1350#if XFT
1051 else if (!strncmp (name, "xft:", 4)) 1351 else if (!strncmp (name, "xft:", 4))
1052 { 1352 {
1053 name += 4; 1353 name += 4;
1054 f = new rxvt_font_xft; 1354 f = new rxvt_font_xft ();
1055 } 1355 }
1056#endif 1356#endif
1057 else if (!strncmp (name, "x:", 2)) 1357 else if (!strncmp (name, "x:", 2))
1058 { 1358 {
1059 name += 2; 1359 name += 2;
1060 f = new rxvt_font_x11; 1360 f = new rxvt_font_x11;
1061 } 1361 }
1062 else 1362 else
1063 f = new rxvt_font_x11; 1363 f = new rxvt_font_x11;
1064 1364
1065 f->fs = this;
1066 f->set_term (r); 1365 f->set_term (r);
1067 f->set_name (strdup (name)); 1366 f->set_name (strdup (name));
1068 1367
1069 f->cs = cs; 1368 f->cs = cs;
1070 f->loaded = false; 1369 f->loaded = false;
… …
1082 char buf[512]; 1381 char buf[512];
1083 const char *end; 1382 const char *end;
1084 1383
1085 do 1384 do
1086 { 1385 {
1087 while (*desc <= ' ') desc++; 1386 while (*desc && *desc <= ' ')
1387 desc++;
1388
1389 codeset cs = CS_UNICODE;
1088 1390
1089 if (*desc == '[') 1391 if (*desc == '[')
1090 { 1392 {
1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1393 char spec[256];
1092
1093 //const char *extra = desc++; // not yet used 1394 const char *extra = ++desc; // not yet used
1094 1395
1095 desc = strchr (desc, ']'); 1396 desc = strchr (desc, ']');
1096 1397
1097 if (!desc) 1398 if (!desc)
1098 { 1399 {
1099 fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); 1400 rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100 break; 1401 break;
1101 } 1402 }
1403
1404 memcpy (spec, extra, min (desc - extra, 255));
1405 spec[min (desc - extra, 255)] = 0;
1406
1407 if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
1408 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1409 else
1410 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102 1411
1103 desc++; 1412 desc++;
1104 while (*desc <= ' ') desc++; 1413 while (*desc <= ' ') desc++;
1105 } 1414 }
1106 1415
… …
1111 if (end - desc < 511) 1420 if (end - desc < 511)
1112 { 1421 {
1113 strncpy (buf, desc, end - desc); 1422 strncpy (buf, desc, end - desc);
1114 buf[end - desc] = 0; 1423 buf[end - desc] = 0;
1115 1424
1116 fonts.push_back (new_font (buf, CS_UNICODE)); 1425 fonts.push_back (new_font (buf, cs));
1117 } 1426 }
1427 else
1428 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118 1429
1119 desc = end + 1; 1430 desc = end + 1;
1120 } 1431 }
1121 while (*end); 1432 while (*end);
1122 } 1433 }
1123} 1434}
1124 1435
1125bool 1436bool
1126rxvt_fontset::realize_font (int i) 1437rxvt_fontset::realize_font (int i)
1127{ 1438{
1439 if (i < 0 || i >= fonts.size ())
1440 return false;
1441
1128 if (fonts[i]->loaded) 1442 if (fonts[i]->loaded)
1129 return true; 1443 return true;
1130 1444
1131 fonts[i]->loaded = true; 1445 fonts[i]->loaded = true;
1132 1446
1133 if (!fonts[i]->load (base_prop)) 1447 if (!fonts[i]->load (prop))
1134 { 1448 {
1135 fonts[i]->cs = CS_UNKNOWN; 1449 fonts[i]->cs = CS_UNKNOWN;
1136 return false; 1450 return false;
1137 } 1451 }
1138 1452
… …
1148 1462
1149 fonts.push_back (new_font (0, CS_UNICODE)); 1463 fonts.push_back (new_font (0, CS_UNICODE));
1150 realize_font (0); 1464 realize_font (0);
1151 1465
1152 add_fonts (desc); 1466 add_fonts (desc);
1153
1154 if (!base_id)
1155 base_id = 1;
1156
1157 // we currently need a base-font, no matter what
1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1159 {
1160 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161 add_fonts ("fixed");
1162 base_id = fonts.size () - 1;
1163 }
1164
1165 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1166 return false;
1167
1168 base_prop = fonts[base_id]->properties ();
1169 1467
1170 return true; 1468 return true;
1171} 1469}
1172 1470
1173int 1471int
… …
1179 1477
1180 return -1; 1478 return -1;
1181} 1479}
1182 1480
1183int 1481int
1184rxvt_fontset::find_font (unicode_t unicode, bool bold) 1482rxvt_fontset::find_font (unicode_t unicode)
1185{ 1483{
1484 if (unicode >= 1<<20)
1485 return 0;
1186 1486
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1487 unicode_t hi = unicode >> 8;
1188 i < fonts.size (); 1488
1189 i++) 1489 if (hi < fmap.size ()
1490 && fmap[hi]
1491 && (*fmap[hi])[unicode & 0xff] != 0xff)
1492 return (*fmap[hi])[unicode & 0xff];
1493
1494 unsigned int i;
1495
1496 for (i = 0; i < fonts.size (); i++)
1190 { 1497 {
1191 rxvt_font *f = fonts[i]; 1498 rxvt_font *f = fonts[i];
1192 1499
1193 if (!f->loaded) 1500 if (!f->loaded)
1194 { 1501 {
… …
1200 } 1507 }
1201 1508
1202 if (f->cs == CS_UNKNOWN) 1509 if (f->cs == CS_UNKNOWN)
1203 goto next_font; 1510 goto next_font;
1204 1511
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold) 1512 bool careful;
1513 if (f->has_char (unicode, &prop, careful))
1514 {
1515 if (careful)
1516 i |= 128;
1517
1206 goto next_font; 1518 goto found;
1207 1519 }
1208 if (f->has_codepoint (unicode))
1209 return i;
1210 1520
1211 next_font: 1521 next_font:
1212 if (i == fonts.size () - 1) 1522 if (i == fonts.size () - 1)
1213 { 1523 {
1214 if (fallback->name) 1524 if (fallback->name)
… …
1221 { 1531 {
1222 // try to find a new font. 1532 // try to find a new font.
1223 // only xft currently supported, as there is no 1533 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in, 1534 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already. 1535 // while x11 has more framework in place already.
1226#if XFT 1536 // TODO: this is a real resource hog, xft takes ages(?)
1537#if XFT && USE_SLOW_LOOKUP
1227 // grab the first xft font that seems suitable 1538 // grab the first xft font that seems suitable
1228 FcPattern *p = FcPatternCreate (); 1539 FcPattern *p = FcPatternCreate ();
1229 1540
1230 FcCharSet *s = FcCharSetCreate (); 1541 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode); 1542 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s); 1543 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return 1544 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/ 1545 // a non-matching font even if a better font is available :/
1235 1546
1547 x x x x TODO prop might have unset contents
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); 1548 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); 1549 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant); 1550 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1); 1551 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1552 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241 1553
1242 XftResult result; 1554 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1555 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);
1244 1556
1245 FcPatternDestroy (p); 1557 FcPatternDestroy (p);
1246 1558
1247 if (match) 1559 if (match)
1248 { 1560 {
… …
1263#endif 1575#endif
1264 } 1576 }
1265 } 1577 }
1266 } 1578 }
1267 1579
1268 // if no bold font found, use a regular one 1580 /* we must return SOME font */
1269 if (bold) 1581 i = 0;
1270 return find_font (unicode);
1271 1582
1272 return 0; /* we must return SOME font */ 1583found:
1273} 1584 // found a font, cache it
1585 if (i < 255)
1586 {
1587 while (hi >= fmap.size ())
1588 fmap.push_back (0);
1274 1589
1590 if (!fmap[hi])
1591 {
1592 fmap[hi] = (pagemap *)new pagemap;
1593 memset (fmap[hi], 0xff, sizeof (pagemap));
1594 }
1275 1595
1596 (*fmap[hi])[unicode & 0xff] = i;
1597 }
1276 1598
1599 return i;
1600}
1601
1602
1603

Diff Legend

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