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.94 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.224 by root, Thu Jan 4 19:52:37 2024 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 51
49#if ENCODING_EU 52#if ENCODING_EU
50 // cyrillic 53 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 56
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 70
68# if XFT 71# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 72 { CS_KOI8_U, "xft::lang=ru" },
70 73
71 { CS_ISO8859_5, "xft::lang=ru" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 76 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 77 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
136#if XFT 138#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
141 143
142 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
143 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
144#endif 146#endif
145 147
… …
150 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
151}; 153};
152 154
153// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
154// pango uses a similar algorithm and doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
155static uint16_t extent_test_chars[] = { 157static uint32_t extent_test_chars[] = {
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
161 0x1f600, // 😀
159}; 162};
160
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162 163
163#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
165
166/////////////////////////////////////////////////////////////////////////////
167
168#if XFT
169rxvt_drawable::~rxvt_drawable ()
170{
171 if (xftdrawable)
172 XftDrawDestroy (xftdrawable);
173}
174
175rxvt_drawable::operator XftDraw *()
176{
177 if (!xftdrawable)
178 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
179
180 return xftdrawable;
181}
182#endif
183 166
184///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
185 168
186static const char * 169static const char *
187enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 170enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{ 219{
237} 220}
238 221
239void 222void
240rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
241{ 224{
242 if (this->name == name) 225 if (name == name_)
243 return; 226 return;
244 227
245 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
246 this->name = name; 229 name = name_;
247} 230}
248 231
249void 232void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 234{
252 dTermDisplay; 235 dTermDisplay;
253 dTermGC; 236 dTermGC;
254 237
255 if (color == Color_bg) 238 if (color == Color_bg || color == Color_transparent)
256 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
257 else if (color >= 0) 240 else if (color >= 0)
258 { 241 {
259#if XFT 242#if XFT
243 Picture dst;
244
245# ifdef HAVE_IMG
246 if (term->bg_img
247 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d))))
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251
252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
254 }
255 else
256# endif
260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
261#else 259#else
262 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
263 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
264#endif 262#endif
265 } 263 }
266} 264}
267 265
268///////////////////////////////////////////////////////////////////////////// 266/////////////////////////////////////////////////////////////////////////////
269 267
270#include "table/linedraw.h"
271
272struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font
269{
273 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
274 271
275 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
276 : rxvt_font () 273 : rxvt_font ()
277 { 274 {
… …
288 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
289 286
290 return p; 287 return p;
291 } 288 }
292 289
293 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
294 { 291 {
295 width = 1; height = 1; 292 width = 1; height = 1;
296 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
297 294
298 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
… …
311 return false; 308 return false;
312 309
313 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
314 return true; 311 return true;
315 312
313#ifdef BUILTIN_GLYPHS
316 if (unicode >= 0x2500 && unicode <= 0x259f && 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs)) 315 !term->option (Opt_skipBuiltinGlyphs))
318 return true; 316 return true;
317#endif
319 318
320 if (IS_COMPOSE (unicode)) 319 // we do not check for IS_COMPOSE here, as this would
321 return true; 320 // rob other fonts from taking over.
322 321
323 switch (unicode) 322 switch (unicode)
324 { 323 {
325 case ZERO_WIDTH_CHAR: 324 case ZERO_WIDTH_CHAR:
326 case NOCHAR: 325 case NOCHAR:
… …
347 346
348 XSetForeground (disp, gc, term->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
349 348
350 while (len) 349 while (len)
351 { 350 {
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
352#if ENABLE_COMBINING 357#if ENABLE_COMBINING
353 compose_char *cc; 358 compose_char *cc;
354#endif 359#endif
355 const text_t *tp = text;
356 text_t t = *tp;
357
358 while (++text, --len && *text == NOCHAR)
359 ;
360
361 int width = text - tp; 360 int width = text - tp;
362 int fwidth = term->fwidth * width; 361 int fwidth = term->fwidth * width;
363 362
363#ifdef BUILTIN_GLYPHS
364 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
365 { 365 {
366# include "table/linedraw.h"
366 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
367 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
368 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
369 370
370 int W = fwidth; 371 int W = fwidth;
… …
408 409
409 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
410 if (a) 411 if (a)
411 { 412 {
412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413 414
414 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
417 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
418 419
… …
437 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
438 break; 439 break;
439 } 440 }
440 } 441 }
441 } 442 }
443#else
444 if (0)
445 ;
446#endif
442#if ENABLE_COMBINING 447#if ENABLE_COMBINING
443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444 { 449 {
445 min_it (width, 2); // we only support wcwidth up to 2 450 min_it (width, 2); // we only support wcwidth up to 2
446
447 text_t chrs[2]; 451 text_t chrs[2];
448 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
449 453
450 *chrs = cc->c1; 454 *chrs = cc->c1;
451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
452 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
453 457
454 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
455 { 459 {
456 bool careful; 460 bool careful;
457 461
458 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
459 *chrs = cc->c2; 463 *chrs = cc->c2;
460 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461 ? f1 465 ? f1
462 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
463 467
464 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
465 } 469 }
466 } 470 }
467#endif 471#endif
468 else 472 else
469 switch (t) 473 switch (t)
… …
471 case '\t': 475 case '\t':
472 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
473 case NOCHAR: 477 case NOCHAR:
474 break; 478 break;
475 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
476 default: 489 default:
477 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
478 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
479 } 492 }
480 493
481 x += fwidth; 494 x += fwidth;
482 } 495 }
483} 496}
484 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1;
524 descent = (*fs)[2]->descent;
525
526 set_name (strdup ("built-in rendition overflow font"));
527
528 return true;
529 }
530
531 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
532 {
533 return false;
534 }
535
536 void draw (rxvt_drawable &d, int x, int y,
537 const text_t *text, int len,
538 int fg, int bg)
539 {
540 while (len)
541 {
542 int fid = fs->find_font_idx (*text);
543 int w = 1;
544 while (w < len && text[w] == NOCHAR)
545 w++;
546 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
547 text += w;
548 len -= w;
549 x += term->fwidth * w;
550 }
551 }
552};
553
485///////////////////////////////////////////////////////////////////////////// 554/////////////////////////////////////////////////////////////////////////////
486 555
487struct rxvt_font_x11 : rxvt_font { 556struct rxvt_font_x11 : rxvt_font
557{
488 rxvt_font_x11 () { f = 0; } 558 rxvt_font_x11 () { f = 0; }
489 559
490 void clear (); 560 void clear ();
491 561
492 rxvt_fontprop properties (); 562 rxvt_fontprop properties ();
493 563
494 bool load (const rxvt_fontprop &prop); 564 bool load (const rxvt_fontprop &prop, bool force_prop);
495 565
496 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 566 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497 567
498 void draw (rxvt_drawable &d, int x, int y, 568 void draw (rxvt_drawable &d, int x, int y,
499 const text_t *text, int len, 569 const text_t *text, int len,
500 int fg, int bg); 570 int fg, int bg);
501 571
502 bool slow; // wether this is a proportional font or has other funny characteristics 572 bool slow; // whether this is a proportional font or has other funny characteristics
503 XFontStruct *f; 573 XFontStruct *f;
504 codeset cs;
505 bool enc2b, encm; 574 bool enc2b, encm;
506 575
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 576 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 577 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
509 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 578 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
516 unsigned long value; 585 unsigned long value;
517 586
518 if (XGetFontProperty (f, property, &value)) 587 if (XGetFontProperty (f, property, &value))
519 return XGetAtomName (term->dpy, value); 588 return XGetAtomName (term->dpy, value);
520 else 589 else
521 return rxvt_strdup (repl); 590 return repl ? strdup (repl) : 0;
522} 591}
523 592
524rxvt_fontprop 593rxvt_fontprop
525rxvt_font_x11::properties () 594rxvt_font_x11::properties ()
526{ 595{
… …
608 return false; 677 return false;
609} 678}
610 679
611// fix the size of scalable fonts 680// fix the size of scalable fonts
612static bool 681static bool
613replace_field (char *buf, const char *name, int index, const char old, const char *replace) 682replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
614{ 683{
615 int slashes = 0; 684 int slashes = 0;
616 const char *field, *end; 685 const char *field, *end;
617 686
618 for (const char *c = name; *c; c++) 687 for (const char *c = name; *c; c++)
… …
628 break; 697 break;
629 } 698 }
630 699
631 if (slashes >= 13 && (!old || *field == old)) 700 if (slashes >= 13 && (!old || *field == old))
632 { 701 {
633 // TODO: check for overflow in font-name 702 size_t len = field - name;
634 strncpy (buf, name, field - name); 703 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 704 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 705 strcpy (*ptr + len, replace);
637 strcat (buf, end); 706 strcat (*ptr, end);
638 707
639 return true; 708 return true;
640 } 709 }
641 else 710 else
642 { 711 {
643 strcpy (buf, name); 712 *ptr = strdup (name);
644 713
645 return false; 714 return false;
646 } 715 }
647} 716}
648 717
649bool 718bool
650rxvt_font_x11::load (const rxvt_fontprop &prop) 719rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651{ 720{
652 dTermDisplay; 721 dTermDisplay;
653 722
654 clear (); 723 clear ();
655 724
656 char field_str[64]; // enough for 128 bits 725 char field_str[64]; // enough for 128 bits
657 726
658 // first morph the font if required 727 // first morph the font if required
659 if (prop.weight != rxvt_fontprop::unset 728 if (force_prop)
660 || prop.slant != rxvt_fontprop::unset)
661 { 729 {
662 char fname[1024]; 730 char *fname;
663 731
664 if (name[0] != '-') 732 if (name[0] != '-')
665 { 733 {
666 f = XLoadQueryFont (disp, name); 734 f = XLoadQueryFont (disp, name);
667 735
668 if (!f) 736 if (!f)
669 return false; 737 return false;
670 738
671 char *new_name = get_property (f, XA_FONT, name); 739 char *new_name = get_property (f, XA_FONT, 0);
672 740
673 if (new_name) 741 if (new_name)
674 set_name (new_name); 742 set_name (new_name);
675 else 743 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 744 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 745
678 XFreeFont (disp, f); 746 XFreeFont (disp, f);
679 f = 0; 747 f = 0;
680 } 748 }
681 749
682 if (prop.weight != rxvt_fontprop::unset) 750 if (prop.weight != rxvt_fontprop::unset)
683 { 751 {
684 replace_field (fname, name, 2, 0, 752 replace_field (&fname, name, 2, 0,
685 prop.weight < rxvt_fontprop::bold 753 prop.weight < rxvt_fontprop::bold
686 ? "medium" : "bold"); 754 ? "medium" : "bold");
687 set_name (strdup (fname)); 755 set_name (fname);
688 } 756 }
689 757
690 if (prop.slant != rxvt_fontprop::unset) 758 if (prop.slant != rxvt_fontprop::unset)
691 { 759 {
692 replace_field (fname, name, 3, 0, 760 replace_field (&fname, name, 3, 0,
693 prop.slant < rxvt_fontprop::italic 761 prop.slant < rxvt_fontprop::italic
694 ? "r" : "i"); // TODO: handle "o"blique, too 762 ? "r" : "i"); // TODO: handle "o"blique, too
695 set_name (strdup (fname)); 763 set_name (fname);
696 } 764 }
697 } 765 }
698 766
699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 767 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700 ? 0 : prop.height); 768 ? 0 : prop.height);
… …
725 font_weight *fonts = new font_weight[count]; 793 font_weight *fonts = new font_weight[count];
726 794
727 for (int i = 0; i < count; i++) 795 for (int i = 0; i < count; i++)
728 { 796 {
729 rxvt_fontprop p; 797 rxvt_fontprop p;
730 char fname[1024]; 798 char *fname;
731 799
732 int diff = 0; 800 int diff = 0;
733 801
734 if (replace_field (fname, list[i], 6, '0', field_str)) 802 if (replace_field (&fname, list[i], 6, '0', field_str))
735 diff += 10; // slightly penalize scalable fonts 803 diff += 10; // slightly penalize scalable fonts
804 else
805 {
806 free (fname);
736 else if (replace_field (fname, list[i], 11, '0', "0")) 807 if (replace_field (&fname, list[i], 11, '0', "0"))
737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 808 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
809 }
738 810
739 if (!set_properties (p, fname)) 811 if (!set_properties (p, fname)
812 // also weed out too large fonts
813 || (prop.height != rxvt_fontprop::unset
814 && p.height > prop.height))
815 {
816 free (fname);
740 continue; 817 continue;
741 818 }
742 if (prop.height != rxvt_fontprop::unset
743 && p.height > prop.height) // weed out too large fonts
744 continue;
745 819
746 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 820 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
747 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 821 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
748 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 822 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
749 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 823 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
750 824
751 fonts[i].name = strdup (fname); 825 fonts[i].name = fname;
752 fonts[i].diff = diff; 826 fonts[i].diff = diff;
753 } 827 }
754 828
755 XFreeFontNames (list); 829 XFreeFontNames (list);
756 830
757 // this loop only iterates when the guessed font-size is too small 831 // this loop only iterates when the guessed font-size is too small
758 for (;;) 832 for (;;)
759 { 833 {
760 font_weight *best = fonts + count - 1; 834 font_weight *best = fonts;
761 835
762 for (font_weight *w = best; w-- > fonts; ) 836 for (font_weight *w = fonts + 1; w < fonts + count; w++)
763 if (w->diff <= best->diff) 837 if (w->diff < best->diff)
764 best = w; 838 best = w;
765 839
766 if (!best->name 840 if (!best->name
767 || !(f = XLoadQueryFont (disp, best->name))) 841 || !(f = XLoadQueryFont (disp, best->name)))
768 break; 842 break;
… …
788 return false; 862 return false;
789 863
790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 864 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 865 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792 866
867 cs = CS_UNKNOWN;
868
793 if (registry && encoding) 869 if (registry && encoding)
794 { 870 {
795 char charset[64]; 871 char charset[64];
796 snprintf (charset, 64, "%s-%s", registry, encoding); 872 snprintf (charset, 64, "%s-%s", registry, encoding);
797 873
798 cs = codeset_from_name (charset); 874 cs = codeset_from_name (charset);
799 } 875
800 else 876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
801 { 878 }
879
880 free (registry);
881 free (encoding);
882
883 if (cs == CS_UNKNOWN)
884 {
802 const char *charset = get_property (f, XA_FONT, 0); 885 char *value = get_property (f, XA_FONT, 0);
886 const char *charset = value;
803 887
804 if (!charset) 888 if (!charset)
805 charset = name; 889 charset = name;
806 890
807 int count = 13; 891 int count = 13;
808 while (*charset) 892 while (*charset)
809 if (*charset++ == '-' && !--count) 893 if (*charset++ == '-' && !--count)
810 break; 894 break;
811 895
812 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
897 if (cs == CS_UNKNOWN)
898 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
899
900 free (value);
901 }
902
903 if (cs == CS_UNKNOWN)
813 } 904 {
814 905 clear ();
815 free (registry); 906 return false;
816 free (encoding); 907 }
817 908
818 if (cs == CS_UNICODE) 909 if (cs == CS_UNICODE)
819 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 910 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
820 911
821 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 912 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
833 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 924 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
834 925
835 if (encm) 926 if (encm)
836 N += (f->max_byte1 - f->min_byte1) 927 N += (f->max_byte1 - f->min_byte1)
837 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 928 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838 929
839 while (N) 930 while (N)
840 { 931 {
841 if (f->per_char[N].width > width) 932 if (f->per_char[N].width > width)
842 width = f->per_char[N].width; 933 width = f->per_char[N].width;
843 934
… …
846 } 937 }
847#endif 938#endif
848 939
849 width = 1; 940 width = 1;
850 941
851 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 942 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
852 { 943 {
853 if (FROM_UNICODE (cs, *t) == NOCHAR) 944 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 945 continue;
855 946
856 // ignore characters we wouldn't use anyways 947 // ignore characters we wouldn't use anyways
857 bool careful; 948 bool careful;
858 if (!has_char (*t, &prop, careful)) 949 if (!has_char (*t, &prop, careful))
859 continue; 950 continue;
860 951
861 XChar2b ch = { *t >> 8, *t }; 952 // the casts are needed in C++11 (see 8.5.1)
953 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
862 954
863 XCharStruct g; 955 XCharStruct g;
864 int dir_ret, asc_ret, des_ret; 956 int dir_ret, asc_ret, des_ret;
865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 957 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866 958
… …
868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 960 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869 961
870 if (width < g.width) width = g.width; 962 if (width < g.width) width = g.width;
871 } 963 }
872 964
873 if (cs == CS_UNKNOWN) 965#if 0 // do it per-character
966 if (prop && width > prop->width)
874 { 967 {
875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877 clear (); 968 clear ();
878 return false; 969 return false;
879 } 970 }
880
881#if 0 // do it per-character
882 if (prop && width > prop->width)
883 {
884 clear ();
885 return false;
886 }
887#endif 971#endif
888 972
889 return true; 973 return true;
890} 974}
891 975
… …
900} 984}
901 985
902bool 986bool
903rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 987rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
904{ 988{
989 careful = false;
990
905 uint32_t ch = FROM_UNICODE (cs, unicode); 991 uint32_t ch = FROM_UNICODE (cs, unicode);
906 992
907 if (ch == NOCHAR) 993 if (ch == NOCHAR)
908 return false; 994 return false;
909 995
910 /* check wether the character exists in _this_ font. horrible. */ 996 /* check whether the character exists in _this_ font. horrible. */
911 XCharStruct *xcs; 997 XCharStruct *xcs;
912 998
913 if (encm) 999 if (encm)
914 { 1000 {
915 unsigned char byte1 = ch >> 8; 1001 unsigned char byte1 = ch >> 8;
… …
945 return false; 1031 return false;
946 1032
947 if (!prop || prop->width == rxvt_fontprop::unset) 1033 if (!prop || prop->width == rxvt_fontprop::unset)
948 return true; 1034 return true;
949 1035
950 // check wether character overlaps previous/next character 1036 // check whether character overlaps previous/next character
951 int w = xcs->rbearing - xcs->lbearing; 1037 int w = xcs->rbearing - xcs->lbearing;
952 int wcw = max (WCWIDTH (unicode), 1); 1038 int wcw = max (WCWIDTH (unicode), 1);
953 1039
954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1040 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 1041
… …
972 dTermDisplay; 1058 dTermDisplay;
973 dTermGC; 1059 dTermGC;
974 1060
975 bool slow = this->slow 1061 bool slow = this->slow
976 || width != term->fwidth 1062 || width != term->fwidth
977 || height != term->fheight; 1063 || height != term->fheight
1064 || ascent != f->ascent;
978 1065
979 int base = ascent; // sorry, incorrect: term->fbase; 1066 int base = ascent; // sorry, incorrect: term->fbase;
980 1067
981 XGCValues v; 1068 XGCValues v;
982 v.foreground = term->pix_colors[fg]; 1069 v.foreground = term->pix_colors[fg];
… …
995 else 1082 else
996 { 1083 {
997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1084 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998 1085
999 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1086 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1000 1087
1001 if (slow) 1088 if (slow)
1002 { 1089 {
1003 do 1090 do
1004 { 1091 {
1005 if (xc->byte1 || xc->byte2) 1092 if (xc->byte1 || xc->byte2)
… …
1027 else 1114 else
1028 { 1115 {
1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1116 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030 1117
1031 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1118 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1032 1119
1033 if (slow) 1120 if (slow)
1034 { 1121 {
1035 do 1122 do
1036 { 1123 {
1037 if (*xc) 1124 if (*xc)
… …
1050 1137
1051///////////////////////////////////////////////////////////////////////////// 1138/////////////////////////////////////////////////////////////////////////////
1052 1139
1053#if XFT 1140#if XFT
1054 1141
1055struct rxvt_font_xft : rxvt_font { 1142struct rxvt_font_xft : rxvt_font
1143{
1144#if XFT_CHAR_CACHE
1145 // we cache the qascii range xoffsets in the name of speed,
1146 // expecting terminals to deal mostly with these characters
1147 // we also assume the xoff always fits into uint8_t,
1148 // which is questionable, but let's see...
1149 // also, it is uncomfortably big, due to the uints.
1150 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1151 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1152 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1153#endif
1154
1056 rxvt_font_xft () { f = 0; } 1155 rxvt_font_xft ()
1156 {
1157 f = 0;
1158 }
1057 1159
1058 void clear (); 1160 void clear ();
1059 1161
1060 rxvt_fontprop properties (); 1162 rxvt_fontprop properties ();
1061 1163
1062 bool load (const rxvt_fontprop &prop); 1164 bool load (const rxvt_fontprop &prop, bool force_prop);
1063 1165
1064 void draw (rxvt_drawable &d, int x, int y, 1166 void draw (rxvt_drawable &d, int x, int y,
1065 const text_t *text, int len, 1167 const text_t *text, int len,
1066 int fg, int bg); 1168 int fg, int bg);
1067 1169
1068 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1170 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069 1171
1070protected: 1172protected:
1071 XftFont *f; 1173 XftFont *f;
1072}; 1174};
1073 1175
… …
1100 1202
1101 return p; 1203 return p;
1102} 1204}
1103 1205
1104bool 1206bool
1105rxvt_font_xft::load (const rxvt_fontprop &prop) 1207rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106{ 1208{
1107 dTermDisplay; 1209 dTermDisplay;
1108 1210
1109 clear (); 1211 clear ();
1110 1212
… …
1119 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1221 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1222 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1223 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122 1224
1123 if (prop.weight != rxvt_fontprop::unset 1225 if (prop.weight != rxvt_fontprop::unset
1124 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1226 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1227 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126 1228
1127 if (prop.slant != rxvt_fontprop::unset 1229 if (prop.slant != rxvt_fontprop::unset
1128 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1230 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1231 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130 1232
1131#if 0 // clipping unfortunately destroys our precious double-width-characters 1233#if 0 // clipping unfortunately destroys our precious double-width-characters
1132 // clip width, we can't do better, or can we? 1234 // clip width, we can't do better, or can we?
1133 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1235 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1236 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135#endif 1237#endif
1136 1238
1137 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1239 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138 FcPatternAddBool (p, FC_MINSPACE, 1); 1240 FcPatternAddBool (p, FC_MINSPACE, 1);
1139 1241
… …
1151 int ftheight = 0; 1253 int ftheight = 0;
1152 bool success = true; 1254 bool success = true;
1153 1255
1154 for (;;) 1256 for (;;)
1155 { 1257 {
1258 p = FcPatternDuplicate (match);
1156 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1259 f = XftFontOpenPattern (disp, p);
1157 1260
1158 if (!f) 1261 if (!f)
1159 { 1262 {
1263 FcPatternDestroy (p);
1160 success = false; 1264 success = false;
1161 break; 1265 break;
1162 } 1266 }
1163 1267
1164 FT_Face face = XftLockFace (f); 1268 FT_Face face = XftLockFace (f);
1269
1270 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1271 // we also assume blindly that if the first lock succeeds, then subsequent
1272 // locks will also succeed.
1273 if (!face)
1274 {
1275 XftFontClose (disp, f);
1276 success = false;
1277 break;
1278 }
1165 1279
1166 ascent = (face->size->metrics.ascender + 63) >> 6; 1280 ascent = (face->size->metrics.ascender + 63) >> 6;
1167 descent = (-face->size->metrics.descender + 63) >> 6; 1281 descent = (-face->size->metrics.descender + 63) >> 6;
1168 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1282 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1169 width = 0; 1283 width = 0;
… …
1172 1286
1173 XftUnlockFace (f); 1287 XftUnlockFace (f);
1174 1288
1175 int glheight = height; 1289 int glheight = height;
1176 1290
1177 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1291 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1178 { 1292 {
1179 FcChar16 ch = *t; 1293 FcChar32 ch = *t;
1180 1294
1181 if (cs != CS_UNICODE 1295 if (cs != CS_UNICODE
1182 && ch > 0x100 1296 && ch > 0x100
1183 && FROM_UNICODE (cs, ch) == NOCHAR) 1297 && FROM_UNICODE (cs, ch) == NOCHAR)
1184 continue; 1298 continue;
… …
1187 bool careful; 1301 bool careful;
1188 if (!has_char (*t, &prop, careful)) 1302 if (!has_char (*t, &prop, careful))
1189 continue; 1303 continue;
1190 1304
1191 XGlyphInfo g; 1305 XGlyphInfo g;
1192 XftTextExtents16 (disp, f, &ch, 1, &g); 1306 XftTextExtents32 (disp, f, &ch, 1, &g);
1193 1307
1194 g.width -= g.x; 1308 g.width -= g.x;
1195 1309
1196 int wcw = WCWIDTH (ch); 1310 int wcw = WCWIDTH (ch);
1197 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1311 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
… …
1201 if (glheight < g.height - g.y) glheight = g.height - g.y; 1315 if (glheight < g.height - g.y) glheight = g.height - g.y;
1202 } 1316 }
1203 1317
1204 if (!width) 1318 if (!width)
1205 { 1319 {
1206 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1320 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1207 1321 width = f->max_advance_width;
1208 XftFontClose (disp, f);
1209 f = 0;
1210
1211 success = false;
1212 break; 1322 break;
1213 } 1323 }
1214 1324
1215 if (prop.height == rxvt_fontprop::unset 1325 if (prop.height == rxvt_fontprop::unset
1216 || (height <= prop.height && glheight <= prop.height) 1326 || (height <= prop.height && glheight <= prop.height)
… …
1243 clear (); 1353 clear ();
1244 success = false; 1354 success = false;
1245 } 1355 }
1246#endif 1356#endif
1247 1357
1358#if XFT_CHAR_CACHE
1359 // populate char cache
1360 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1361 {
1362 FT_UInt glyph = XftCharIndex (disp, f, ch);
1363 glyph_cache [ch - char_cache_min] = glyph;
1364
1365 XGlyphInfo g;
1366 XftGlyphExtents (disp, f, &glyph, 1, &g);
1367 xoff_cache [ch - char_cache_min] = g.xOff;
1368 }
1369#endif
1370
1248 return success; 1371 return success;
1249} 1372}
1250 1373
1251bool 1374bool
1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1375rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1253{ 1376{
1254 careful = false; 1377 careful = false;
1255 1378
1379 // handle non-bmp chars when text_t is 16 bit
1380#if ENABLE_COMBINING && !UNICODE_3
1381 if (ecb_expect_false (IS_COMPOSE (unicode)))
1382 if (compose_char *cc = rxvt_composite [unicode])
1383 if (cc->c2 == NOCHAR)
1384 unicode = cc->c1;
1385 else
1386 return false;
1387 else
1388 return false;
1389#endif
1390
1391 FcChar32 chr = unicode;
1392
1256 if (!XftCharExists (term->dpy, f, unicode)) 1393 if (!XftCharExists (term->dpy, f, chr))
1257 return false; 1394 return false;
1258 1395
1259 if (!prop || prop->width == rxvt_fontprop::unset) 1396 if (!prop || prop->width == rxvt_fontprop::unset)
1260 return true; 1397 return true;
1261 1398
1262 // check character against base font bounding box 1399 int wcw = max (WCWIDTH (chr), 1);
1263 FcChar32 ch = unicode; 1400
1264 XGlyphInfo g; 1401 XGlyphInfo g;
1265 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1402 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1403
1404 int cwidth = prop->width * wcw;
1405
1406 // use same adjustments as in ->draw, see there
1407 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1408 g.x += g.xOff ? 0 : cwidth;
1266 1409
1267 int w = g.width - g.x; 1410 int w = g.width - g.x;
1268 int wcw = max (WCWIDTH (unicode), 1);
1269 1411
1270 careful = g.x > 0 || w > prop->width * wcw; 1412 careful = g.x > 0 || w > cwidth;
1271 1413
1272 if (careful && !OVERLAP_OK (w, wcw, prop)) 1414 if (careful && !OVERLAP_OK (w, wcw, prop))
1273 return false; 1415 return false;
1274 1416
1275 // this weeds out _totally_ broken fonts, or glyphs 1417 // this weeds out _totally_ broken fonts, or glyphs
… …
1282void 1424void
1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1425rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284 const text_t *text, int len, 1426 const text_t *text, int len,
1285 int fg, int bg) 1427 int fg, int bg)
1286{ 1428{
1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1429 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1288
1289 XGlyphInfo extents;
1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1291 XftGlyphSpec *ep = enc; 1430 XftGlyphSpec *ep = enc;
1292 1431
1293 dTermDisplay; 1432 dTermDisplay;
1294 dTermGC; 1433 dTermGC;
1434
1435 int w = term->fwidth * len;
1436 int h = term->fheight;
1437
1438 bool buffered = bg >= Color_transparent
1439 && term->option (Opt_buffered);
1295 1440
1296 // cut trailing spaces 1441 // cut trailing spaces
1297 while (len && text [len - 1] == ' ') 1442 while (len && text [len - 1] == ' ')
1298 len--; 1443 len--;
1299 1444
1445 int x_ = buffered ? 0 : x;
1446 int y_ = buffered ? 0 : y;
1447
1300 while (len) 1448 while (len)
1301 { 1449 {
1302 int cwidth = term->fwidth; 1450 int cwidth = term->fwidth;
1303 FcChar32 fc = *text++; len--; 1451 FcChar32 chr = *text++; len--;
1304 1452
1305 while (len && *text == NOCHAR) 1453 while (len && *text == NOCHAR)
1306 text++, len--, cwidth += term->fwidth; 1454 text++, len--, cwidth += term->fwidth;
1307 1455
1308 if (fc != ' ') // skip spaces 1456 if (chr != ' ') // skip spaces
1457 {
1458 // handle non-bmp chars when text_t is 16 bit
1459 #if ENABLE_COMBINING && !UNICODE_3
1460 if (ecb_expect_false (IS_COMPOSE (chr)))
1461 if (compose_char *cc = rxvt_composite [chr])
1462 if (cc->c2 == NOCHAR)
1463 chr = cc->c1;
1464 #endif
1465
1466 #if 0
1467 FT_UInt glyphs [decltype (exp)::max_size];
1468
1469 for (int i = 0; i < nchrs; ++i)
1470 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1471
1472 for (int i = 0; i < nchrs; ++i)
1309 { 1473 {
1474 XGlyphInfo ep;
1475 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1476 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1477 }
1478 #endif
1479
1480 FT_UInt glyph;
1481 int xOff;
1482
1483 #if XFT_CHAR_CACHE
1484 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1485 {
1486 glyph = glyph_cache [chr - char_cache_min];
1487 xOff = xoff_cache [chr - char_cache_min];
1488 }
1489 else
1490 #endif
1491 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc); 1492 glyph = XftCharIndex (disp, f, chr);
1493 XGlyphInfo extents;
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1494 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1495 xOff = extents.xOff;
1496 }
1312 1497
1313 ep->glyph = glyph; 1498 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1); 1499 ep->x = x_;
1315 ep->y = y + ascent; 1500 ep->y = y_ + ascent;
1316 1501
1317 if (extents.xOff == 0) 1502 // the xft font cell might differ from the terminal font cell,
1503 // in which case we use the average between the two.
1504 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1505
1506 // xft/freetype represent combining characters as characters with zero
1507 // width rendered over the previous character with some fonts, while
1508 // in other fonts, they are considered normal characters, while yet
1509 // in other fonts, they are shifted all over the place.
1510 // we handle the first two cases by keying off on xOff being 0
1511 // for zero-width chars. normally, we would add extents.xOff
1512 // of the base character here, but we don't have that, so we use cwidth.
1318 ep->x = x + cwidth; 1513 ep->x += xOff ? 0 : cwidth;
1319 1514
1320 ep++; 1515 ++ep;
1321 } 1516 }
1322 1517
1323 x += cwidth; 1518 x_ += cwidth;
1519 }
1520
1521 if (buffered)
1324 } 1522 {
1325
1326 if (ep != enc) 1523 if (ep != enc)
1524 {
1525 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1526
1527#ifdef HAVE_IMG
1528 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1529
1530 if (term->bg_img
1531 && (bg == Color_transparent || bg == Color_bg
1532 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1533 {
1534 int src_x = x, src_y = y;
1535
1536 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1537 {
1538 src_x += term->window_vt_x;
1539 src_y += term->window_vt_y;
1540 }
1541
1542 if (term->bg_img->w >= src_x + w
1543 && term->bg_img->h >= src_y + h)
1544 {
1545 XCopyArea (disp, term->bg_img->pm, d2, gc,
1546 src_x, src_y, w, h, 0, 0);
1547 }
1548 else
1549 {
1550 XGCValues gcv;
1551
1552 gcv.fill_style = FillTiled;
1553 gcv.tile = term->bg_img->pm;
1554 gcv.ts_x_origin = -src_x;
1555 gcv.ts_y_origin = -src_y;
1556
1557 XChangeGC (disp, gc,
1558 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1559 &gcv);
1560
1561 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1562
1563 gcv.fill_style = FillSolid;
1564 XChangeGC (disp, gc, GCFillStyle, &gcv);
1565 }
1566
1567 if (dst)
1568 {
1569 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1570
1571 // dst can only be set when bg >= 0
1572 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1573 }
1574 }
1575 else
1576#endif
1577 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1578
1579 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1580 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1581 }
1582 else
1583 clear_rect (d, x, y, w, h, bg);
1584 }
1585 else
1586 {
1587 clear_rect (d, x, y, w, h, bg);
1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1588 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1589 }
1328} 1590}
1591
1329#endif 1592#endif
1330 1593
1331///////////////////////////////////////////////////////////////////////////// 1594/////////////////////////////////////////////////////////////////////////////
1332 1595
1333rxvt_fontset::rxvt_fontset (rxvt_term *term) 1596rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1344void 1607void
1345rxvt_fontset::clear () 1608rxvt_fontset::clear ()
1346{ 1609{
1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1610 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348 = rxvt_fontprop::unset; 1611 = rxvt_fontprop::unset;
1612 force_prop = false;
1349 1613
1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1614 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351 FONT_UNREF (*i); 1615 (*i)->unref ();
1352 1616
1353 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1617 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1354 delete *p; 1618 delete *p;
1355 1619
1356 free (fontdesc); fontdesc = 0; 1620 free (fontdesc); fontdesc = 0;
… …
1358 fonts.clear (); 1622 fonts.clear ();
1359 1623
1360 fallback = fallback_fonts; 1624 fallback = fallback_fonts;
1361} 1625}
1362 1626
1627void
1628rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1629{
1630 font->set_term (term);
1631
1632 font->cs = cs;
1633 font->loaded = false;
1634}
1635
1363rxvt_font * 1636rxvt_font *
1364rxvt_fontset::new_font (const char *name, codeset cs) 1637rxvt_fontset::new_font (const char *name, codeset cs)
1365{ 1638{
1366 rxvt_font *f; 1639 rxvt_font *f;
1367 1640
1368 if (!name || !*name) 1641 if (!name || !*name)
1369 { 1642 {
1370 name = ""; 1643 name = "";
1371 f = new rxvt_font_default (this); 1644 f = new rxvt_font_default (this);
1372 } 1645 }
… …
1383 f = new rxvt_font_x11; 1656 f = new rxvt_font_x11;
1384 } 1657 }
1385 else 1658 else
1386 f = new rxvt_font_x11; 1659 f = new rxvt_font_x11;
1387 1660
1388 f->set_term (term);
1389 f->set_name (strdup (name)); 1661 f->set_name (strdup (name));
1390 1662 prepare_font (f, cs);
1391 f->cs = cs;
1392 f->loaded = false;
1393 1663
1394 return f; 1664 return f;
1395} 1665}
1396 1666
1397///////////////////////////////////////////////////////////////////////////// 1667/////////////////////////////////////////////////////////////////////////////
1668
1669void
1670rxvt_fontset::push_font (rxvt_font *font)
1671{
1672 // the fontCount index is reserved for the overflow font, it is only
1673 // necessary when we get fontCount or more fonts, as they cannot be
1674 // represented in the rendition.
1675 if (fonts.size () == fontCount)
1676 {
1677 rxvt_font *f = new rxvt_font_overflow (this);
1678
1679 prepare_font (f, CS_UNICODE);
1680 fonts.push_back (f);
1681 }
1682
1683 fonts.push_back (font);
1684}
1398 1685
1399void 1686void
1400rxvt_fontset::add_fonts (const char *desc) 1687rxvt_fontset::add_fonts (const char *desc)
1401{ 1688{
1402 if (desc) 1689 if (desc)
… …
1431 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1718 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1432 else 1719 else
1433 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1720 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1434 1721
1435 desc++; 1722 desc++;
1436 while (*desc <= ' ') desc++; 1723 while (*desc <= ' ' && *desc) desc++;
1437 } 1724 }
1438 1725
1439 end = strchr (desc, ','); 1726 end = strchr (desc, ',');
1440 if (!end) 1727 if (!end)
1441 end = desc + strlen (desc); 1728 end = desc + strlen (desc);
1442 1729
1443 if (end - desc < 511) 1730 if (end - desc < 511)
1444 { 1731 {
1445 strncpy (buf, desc, end - desc); 1732 memcpy (buf, desc, end - desc);
1446 buf[end - desc] = 0; 1733 buf[end - desc] = 0;
1447 1734
1448 fonts.push_back (new_font (buf, cs)); 1735 push_font (new_font (buf, cs));
1449 } 1736 }
1450 else 1737 else
1451 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1738 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1452 1739
1453 desc = end + 1; 1740 desc = end + 1;
1454 } 1741 }
1455 while (*end); 1742 while (*end);
1456 } 1743 }
… …
1465 if (fonts[i]->loaded) 1752 if (fonts[i]->loaded)
1466 return true; 1753 return true;
1467 1754
1468 fonts[i]->loaded = true; 1755 fonts[i]->loaded = true;
1469 1756
1470 if (!fonts[i]->load (prop)) 1757 if (!fonts[i]->load (prop, force_prop))
1471 { 1758 {
1472 fonts[i]->cs = CS_UNKNOWN; 1759 fonts[i]->cs = CS_UNKNOWN;
1473 return false; 1760 return false;
1474 } 1761 }
1475 1762
… …
1481{ 1768{
1482 clear (); 1769 clear ();
1483 1770
1484 fontdesc = strdup (desc); 1771 fontdesc = strdup (desc);
1485 1772
1486 fonts.push_back (new_font (0, CS_UNICODE)); 1773 push_font (new_font (0, CS_UNICODE));
1487 realize_font (0); 1774 realize_font (0);
1488 1775
1489 add_fonts (desc); 1776 add_fonts (desc);
1490 1777
1491 return true; 1778 return true;
… …
1500 1787
1501 return -1; 1788 return -1;
1502} 1789}
1503 1790
1504int 1791int
1505rxvt_fontset::find_font (unicode_t unicode) 1792rxvt_fontset::find_font_idx (unicode_t unicode)
1506{ 1793{
1507 if (unicode >= 1<<20) 1794 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1795 if (unicode > 0x1fffff)
1508 return 0; 1796 return 0;
1509 1797
1510 unicode_t hi = unicode >> 8; 1798 unicode_t hi = unicode >> 8;
1511 1799
1512 if (hi < fmap.size () 1800 if (hi < fmap.size ())
1513 && fmap[hi] 1801 if (pagemap *pm = fmap[hi])
1514 && (*fmap[hi])[unicode & 0xff] != 0xff) 1802 if ((*pm)[unicode & 0xff] != 0xff)
1515 return (*fmap[hi])[unicode & 0xff]; 1803 return (*pm)[unicode & 0xff];
1516 1804
1517 unsigned int i; 1805 unsigned int i;
1518 1806
1519 for (i = 0; i < fonts.size (); i++) 1807 for (i = 0; i < fonts.size (); i++)
1520 { 1808 {
… …
1536 goto next_font; 1824 goto next_font;
1537 1825
1538 bool careful; 1826 bool careful;
1539 if (f->has_char (unicode, &prop, careful)) 1827 if (f->has_char (unicode, &prop, careful))
1540 { 1828 {
1541 if (careful) 1829 i = (i << 1) | careful;
1542 i |= 128;
1543 1830
1544 goto found; 1831 goto found;
1545 } 1832 }
1546 1833
1547 next_font: 1834 next_font:
1548 if (i == fonts.size () - 1) 1835 if (i == fonts.size () - 1)
1549 { 1836 {
1837 // compose characters are handled by the default font, unless another font takes over
1838 // we do not go via the fallback list for speed reasons.
1839 if (IS_COMPOSE (unicode))
1840 return 0;
1841
1550 if (fallback->name) 1842 if (fallback->name)
1551 { 1843 {
1552 // search through the fallback list 1844 // search through the fallback list
1553 fonts.push_back (new_font (fallback->name, fallback->cs)); 1845 push_font (new_font (fallback->name, fallback->cs));
1554 fallback++; 1846 fallback++;
1555 } 1847 }
1556 else 1848 else
1557 { 1849 {
1558 // try to find a new font. 1850 // try to find a new font.
… …
1560 // way to configure this and xft is easier to hack in, 1852 // way to configure this and xft is easier to hack in,
1561 // while x11 has more framework in place already. 1853 // while x11 has more framework in place already.
1562 // TODO: this is a real resource hog, xft takes ages(?) 1854 // TODO: this is a real resource hog, xft takes ages(?)
1563#if XFT && USE_SLOW_LOOKUP 1855#if XFT && USE_SLOW_LOOKUP
1564 // grab the first xft font that seems suitable 1856 // grab the first xft font that seems suitable
1857 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1565 FcPattern *p = FcPatternCreate (); 1858 FcPattern *p = FcPatternCreate ();
1566 1859
1567 FcCharSet *s = FcCharSetCreate (); 1860 FcCharSet *s = FcCharSetCreate ();
1568 FcCharSetAddChar (s, unicode); 1861 FcCharSetAddChar (s, unicode);
1569 FcPatternAddCharSet (p, FC_CHARSET, s); 1862 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1589 FcPatternDestroy (match); 1882 FcPatternDestroy (match);
1590 1883
1591 if (find_font (font) < 0) 1884 if (find_font (font) < 0)
1592 { 1885 {
1593 char fontname[4096]; 1886 char fontname[4096];
1594 sprintf (fontname, "xft:%-.4090s", font); 1887 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1595 1888
1596 fonts.push_back (new_font (fontname, CS_UNICODE)); 1889 push_font (new_font (fontname, CS_UNICODE));
1597 } 1890 }
1598 1891
1599 free (font); 1892 free (font);
1600 } 1893 }
1601#endif 1894#endif
… …
1613 while (hi >= fmap.size ()) 1906 while (hi >= fmap.size ())
1614 fmap.push_back (0); 1907 fmap.push_back (0);
1615 1908
1616 if (!fmap[hi]) 1909 if (!fmap[hi])
1617 { 1910 {
1618 fmap[hi] = (pagemap *)new pagemap; 1911 fmap[hi] = new pagemap;
1619 memset (fmap[hi], 0xff, sizeof (pagemap)); 1912 memset (fmap[hi], 0xff, sizeof (pagemap));
1620 } 1913 }
1621 1914
1622 (*fmap[hi])[unicode & 0xff] = i; 1915 (*fmap[hi])[unicode & 0xff] = i;
1623 } 1916 }
1624 1917
1625 return i; 1918 return i;
1626} 1919}
1627 1920
1628
1629

Diff Legend

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