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.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC

1/*----------------------------------------------------------------------* 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
… …
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, // が本
159}; 161};
160 162
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165 165
166///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
167 167
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
237 if (color < 0 || color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 Picture dst;
243
244# ifdef HAVE_IMG
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
243#else 258#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 261#endif
247 } 262 }
248} 263}
249 264
250///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
251 266
252#include "table/linedraw.h"
253
254struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
255 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
256 270
257 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
258 : rxvt_font () 272 : rxvt_font ()
259 { 273 {
… …
270 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
271 285
272 return p; 286 return p;
273 } 287 }
274 288
275 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 290 {
277 width = 1; height = 1; 291 width = 1; height = 1;
278 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
279 293
280 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
293 return false; 307 return false;
294 308
295 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
296 return true; 310 return true;
297 311
312#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 315 return true;
316#endif
301 317
302 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
303 return true; 319 // rob other fonts from taking over.
304 320
305 switch (unicode) 321 switch (unicode)
306 { 322 {
307 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
308 case NOCHAR: 324 case NOCHAR:
… …
329 345
330 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
331 347
332 while (len) 348 while (len)
333 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
334#if ENABLE_COMBINING 356#if ENABLE_COMBINING
335 compose_char *cc; 357 compose_char *cc;
336#endif 358#endif
337 const text_t *tp = text;
338 text_t t = *tp;
339
340 while (++text, --len && *text == NOCHAR)
341 ;
342
343 int width = text - tp; 359 int width = text - tp;
344 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
345 361
362#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
347 { 364 {
365# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
351 369
352 int W = fwidth; 370 int W = fwidth;
… …
390 408
391 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
392 if (a) 410 if (a)
393 { 411 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 413
396 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
400 418
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 438 break;
421 } 439 }
422 } 440 }
423 } 441 }
442#else
443 if (0)
444 ;
445#endif
424#if ENABLE_COMBINING 446#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 448 {
427 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
428
429 text_t chrs[2]; 450 text_t chrs[2];
430 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
431 452
432 *chrs = cc->c1; 453 *chrs = cc->c1;
433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
434 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
435 456
436 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
437 { 458 {
438 bool careful; 459 bool careful;
439 460
440 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
441 *chrs = cc->c2; 462 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 464 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
445 466
446 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 468 }
448 } 469 }
449#endif 470#endif
450 else 471 else
451 switch (t) 472 switch (t)
… …
453 case '\t': 474 case '\t':
454 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
455 case NOCHAR: 476 case NOCHAR:
456 break; 477 break;
457 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
458 default: 488 default:
459 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
460 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
461 } 491 }
462 492
463 x += fwidth; 493 x += fwidth;
464 } 494 }
465} 495}
466 496
497struct rxvt_font_overflow : rxvt_font
498{
499 struct rxvt_fontset *fs;
500
501 rxvt_font_overflow (rxvt_fontset *fs)
502 : rxvt_font ()
503 {
504 this->fs = fs;
505 }
506
507 rxvt_fontprop properties ()
508 {
509 rxvt_fontprop p;
510
511 p.width = p.height = 1;
512 p.ascent = rxvt_fontprop::unset;
513 p.weight = rxvt_fontprop::medium;
514 p.slant = rxvt_fontprop::roman;
515
516 return p;
517 }
518
519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 {
521 width = 1; height = 1;
522 ascent = 1;
523 descent = (*fs)[2]->descent;
524
525 set_name (strdup ("built-in rendition overflow font"));
526
527 return true;
528 }
529
530 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
531 {
532 return false;
533 }
534
535 void draw (rxvt_drawable &d, int x, int y,
536 const text_t *text, int len,
537 int fg, int bg)
538 {
539 while (len)
540 {
541 int fid = fs->find_font_idx (*text);
542 int w = 1;
543 while (w < len && text[w] == NOCHAR)
544 w++;
545 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
546 text += w;
547 len -= w;
548 x += term->fwidth * w;
549 }
550 }
551};
552
467///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
468 554
469struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
470 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
471 558
472 void clear (); 559 void clear ();
473 560
474 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
475 562
476 bool load (const rxvt_fontprop &prop); 563 bool load (const rxvt_fontprop &prop, bool force_prop);
477 564
478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 565 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479 566
480 void draw (rxvt_drawable &d, int x, int y, 567 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 568 const text_t *text, int len,
482 int fg, int bg); 569 int fg, int bg);
483 570
484 bool slow; // wether this is a proportional font or has other funny characteristics 571 bool slow; // whether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 572 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 573 bool enc2b, encm;
488 574
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 575 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 576 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 577 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
498 unsigned long value; 584 unsigned long value;
499 585
500 if (XGetFontProperty (f, property, &value)) 586 if (XGetFontProperty (f, property, &value))
501 return XGetAtomName (term->dpy, value); 587 return XGetAtomName (term->dpy, value);
502 else 588 else
503 return rxvt_strdup (repl); 589 return repl ? strdup (repl) : 0;
504} 590}
505 591
506rxvt_fontprop 592rxvt_fontprop
507rxvt_font_x11::properties () 593rxvt_font_x11::properties ()
508{ 594{
… …
590 return false; 676 return false;
591} 677}
592 678
593// fix the size of scalable fonts 679// fix the size of scalable fonts
594static bool 680static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 681replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 682{
597 int slashes = 0; 683 int slashes = 0;
598 const char *field, *end; 684 const char *field, *end;
599 685
600 for (const char *c = name; *c; c++) 686 for (const char *c = name; *c; c++)
… …
610 break; 696 break;
611 } 697 }
612 698
613 if (slashes >= 13 && (!old || *field == old)) 699 if (slashes >= 13 && (!old || *field == old))
614 { 700 {
615 // TODO: check for overflow in font-name 701 size_t len = field - name;
616 strncpy (buf, name, field - name); 702 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 703 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 704 strcpy (*ptr + len, replace);
619 strcat (buf, end); 705 strcat (*ptr, end);
620 706
621 return true; 707 return true;
622 } 708 }
623 else 709 else
624 { 710 {
625 strcpy (buf, name); 711 *ptr = strdup (name);
626 712
627 return false; 713 return false;
628 } 714 }
629} 715}
630 716
631bool 717bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 718rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 719{
634 dTermDisplay; 720 dTermDisplay;
635 721
636 clear (); 722 clear ();
637 723
638 char field_str[64]; // enough for 128 bits 724 char field_str[64]; // enough for 128 bits
639 725
640 // first morph the font if required 726 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 727 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 728 {
644 char fname[1024]; 729 char *fname;
645 730
646 if (name[0] != '-') 731 if (name[0] != '-')
647 { 732 {
648 f = XLoadQueryFont (disp, name); 733 f = XLoadQueryFont (disp, name);
649 734
650 if (!f) 735 if (!f)
651 return false; 736 return false;
652 737
653 char *new_name = get_property (f, XA_FONT, name); 738 char *new_name = get_property (f, XA_FONT, 0);
654 739
655 if (new_name) 740 if (new_name)
656 set_name (new_name); 741 set_name (new_name);
657 else 742 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 743 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
659 744
660 XFreeFont (disp, f); 745 XFreeFont (disp, f);
661 f = 0; 746 f = 0;
662 } 747 }
663 748
664 if (prop.weight != rxvt_fontprop::unset) 749 if (prop.weight != rxvt_fontprop::unset)
665 { 750 {
666 replace_field (fname, name, 2, 0, 751 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 752 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 753 ? "medium" : "bold");
669 set_name (strdup (fname)); 754 set_name (fname);
670 } 755 }
671 756
672 if (prop.slant != rxvt_fontprop::unset) 757 if (prop.slant != rxvt_fontprop::unset)
673 { 758 {
674 replace_field (fname, name, 3, 0, 759 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 760 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 761 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 762 set_name (fname);
678 } 763 }
679 } 764 }
680 765
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 766 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 767 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 792 font_weight *fonts = new font_weight[count];
708 793
709 for (int i = 0; i < count; i++) 794 for (int i = 0; i < count; i++)
710 { 795 {
711 rxvt_fontprop p; 796 rxvt_fontprop p;
712 char fname[1024]; 797 char *fname;
713 798
714 int diff = 0; 799 int diff = 0;
715 800
716 if (replace_field (fname, list[i], 6, '0', field_str)) 801 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 802 diff += 10; // slightly penalize scalable fonts
803 else
804 {
805 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 806 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 807 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
808 }
720 809
721 if (!set_properties (p, fname)) 810 if (!set_properties (p, fname)
811 // also weed out too large fonts
812 || (prop.height != rxvt_fontprop::unset
813 && p.height > prop.height))
814 {
815 free (fname);
722 continue; 816 continue;
723 817 }
724 if (prop.height != rxvt_fontprop::unset
725 && p.height > prop.height) // weed out too large fonts
726 continue;
727 818
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 819 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
729 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 820 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
730 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 821 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
731 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 822 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 823
733 fonts[i].name = strdup (fname); 824 fonts[i].name = fname;
734 fonts[i].diff = diff; 825 fonts[i].diff = diff;
735 } 826 }
736 827
737 XFreeFontNames (list); 828 XFreeFontNames (list);
738 829
739 // this loop only iterates when the guessed font-size is too small 830 // this loop only iterates when the guessed font-size is too small
740 for (;;) 831 for (;;)
741 { 832 {
742 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
743 834
744 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
745 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
746 best = w; 837 best = w;
747 838
748 if (!best->name 839 if (!best->name
749 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
750 break; 841 break;
… …
770 return false; 861 return false;
771 862
772 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 863 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 864 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774 865
866 cs = CS_UNKNOWN;
867
775 if (registry && encoding) 868 if (registry && encoding)
776 { 869 {
777 char charset[64]; 870 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 871 snprintf (charset, 64, "%s-%s", registry, encoding);
779 872
780 cs = codeset_from_name (charset); 873 cs = codeset_from_name (charset);
781 } 874
782 else 875 if (cs == CS_UNKNOWN)
876 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783 { 877 }
878
879 free (registry);
880 free (encoding);
881
882 if (cs == CS_UNKNOWN)
883 {
784 const char *charset = get_property (f, XA_FONT, 0); 884 char *value = get_property (f, XA_FONT, 0);
885 const char *charset = value;
785 886
786 if (!charset) 887 if (!charset)
787 charset = name; 888 charset = name;
788 889
789 int count = 13; 890 int count = 13;
790 while (*charset) 891 while (*charset)
791 if (*charset++ == '-' && !--count) 892 if (*charset++ == '-' && !--count)
792 break; 893 break;
793 894
794 cs = codeset_from_name (charset); 895 cs = codeset_from_name (charset);
896 if (cs == CS_UNKNOWN)
897 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
898
899 free (value);
900 }
901
902 if (cs == CS_UNKNOWN)
795 } 903 {
796 904 clear ();
797 free (registry); 905 return false;
798 free (encoding); 906 }
799 907
800 if (cs == CS_UNICODE) 908 if (cs == CS_UNICODE)
801 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 909 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802 910
803 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 911 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
815 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 923 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816 924
817 if (encm) 925 if (encm)
818 N += (f->max_byte1 - f->min_byte1) 926 N += (f->max_byte1 - f->min_byte1)
819 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 927 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820 928
821 while (N) 929 while (N)
822 { 930 {
823 if (f->per_char[N].width > width) 931 if (f->per_char[N].width > width)
824 width = f->per_char[N].width; 932 width = f->per_char[N].width;
825 933
… …
828 } 936 }
829#endif 937#endif
830 938
831 width = 1; 939 width = 1;
832 940
833 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 941 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
834 { 942 {
835 if (FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
836 continue; 944 continue;
837 945
838 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
839 bool careful; 947 bool careful;
840 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
841 continue; 949 continue;
842 950
843 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
844 953
845 XCharStruct g; 954 XCharStruct g;
846 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
847 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
848 957
… …
850 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 959 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 960
852 if (width < g.width) width = g.width; 961 if (width < g.width) width = g.width;
853 } 962 }
854 963
855 if (cs == CS_UNKNOWN) 964#if 0 // do it per-character
965 if (prop && width > prop->width)
856 { 966 {
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859 clear (); 967 clear ();
860 return false; 968 return false;
861 } 969 }
862
863#if 0 // do it per-character
864 if (prop && width > prop->width)
865 {
866 clear ();
867 return false;
868 }
869#endif 970#endif
870 971
871 return true; 972 return true;
872} 973}
873 974
… …
882} 983}
883 984
884bool 985bool
885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 986rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
886{ 987{
988 careful = false;
989
887 uint32_t ch = FROM_UNICODE (cs, unicode); 990 uint32_t ch = FROM_UNICODE (cs, unicode);
888 991
889 if (ch == NOCHAR) 992 if (ch == NOCHAR)
890 return false; 993 return false;
891 994
892 /* check wether the character exists in _this_ font. horrible. */ 995 /* check whether the character exists in _this_ font. horrible. */
893 XCharStruct *xcs; 996 XCharStruct *xcs;
894 997
895 if (encm) 998 if (encm)
896 { 999 {
897 unsigned char byte1 = ch >> 8; 1000 unsigned char byte1 = ch >> 8;
… …
927 return false; 1030 return false;
928 1031
929 if (!prop || prop->width == rxvt_fontprop::unset) 1032 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 1033 return true;
931 1034
932 // check wether character overlaps previous/next character 1035 // check whether character overlaps previous/next character
933 int w = xcs->rbearing - xcs->lbearing; 1036 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = max (WCWIDTH (unicode), 1); 1037 int wcw = max (WCWIDTH (unicode), 1);
935 1038
936 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1039 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
937 1040
… …
954 dTermDisplay; 1057 dTermDisplay;
955 dTermGC; 1058 dTermGC;
956 1059
957 bool slow = this->slow 1060 bool slow = this->slow
958 || width != term->fwidth 1061 || width != term->fwidth
959 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
960 1064
961 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
962 1066
963 XGCValues v; 1067 XGCValues v;
964 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
977 else 1081 else
978 { 1082 {
979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1083 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1084
981 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1085 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1086
983 if (slow) 1087 if (slow)
984 { 1088 {
985 do 1089 do
986 { 1090 {
987 if (xc->byte1 || xc->byte2) 1091 if (xc->byte1 || xc->byte2)
… …
1009 else 1113 else
1010 { 1114 {
1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1115 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012 1116
1013 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1117 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1014 1118
1015 if (slow) 1119 if (slow)
1016 { 1120 {
1017 do 1121 do
1018 { 1122 {
1019 if (*xc) 1123 if (*xc)
… …
1032 1136
1033///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1034 1138
1035#if XFT 1139#if XFT
1036 1140
1037struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1143#if XFT_CHAR_CACHE
1144 // we cache the qascii range xoffsets in the name of speed,
1145 // expecting terminals to deal mostly with these characters
1146 // we also assume the xoff always fits into uint8_t,
1147 // which is questionable, but let's see...
1148 // also, it is uncomfortably big, due to the uints.
1149 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1150 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1151 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1152#endif
1153
1038 rxvt_font_xft () { f = 0; } 1154 rxvt_font_xft ()
1155 {
1156 f = 0;
1157 }
1039 1158
1040 void clear (); 1159 void clear ();
1041 1160
1042 rxvt_fontprop properties (); 1161 rxvt_fontprop properties ();
1043 1162
1044 bool load (const rxvt_fontprop &prop); 1163 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1164
1046 void draw (rxvt_drawable &d, int x, int y, 1165 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1166 const text_t *text, int len,
1048 int fg, int bg); 1167 int fg, int bg);
1049 1168
1050 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1169 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051 1170
1052protected: 1171protected:
1053 XftFont *f; 1172 XftFont *f;
1054}; 1173};
1055 1174
… …
1082 1201
1083 return p; 1202 return p;
1084} 1203}
1085 1204
1086bool 1205bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1206rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1207{
1089 dTermDisplay; 1208 dTermDisplay;
1090 1209
1091 clear (); 1210 clear ();
1092 1211
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1220 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1221 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1222 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1223
1105 if (prop.weight != rxvt_fontprop::unset 1224 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1225 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1226 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1227
1109 if (prop.slant != rxvt_fontprop::unset 1228 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1229 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1230 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1231
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1232#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1233 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1234 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1235 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117#endif 1236#endif
1118 1237
1119 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1238 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120 FcPatternAddBool (p, FC_MINSPACE, 1); 1239 FcPatternAddBool (p, FC_MINSPACE, 1);
1121 1240
… …
1133 int ftheight = 0; 1252 int ftheight = 0;
1134 bool success = true; 1253 bool success = true;
1135 1254
1136 for (;;) 1255 for (;;)
1137 { 1256 {
1257 p = FcPatternDuplicate (match);
1138 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1258 f = XftFontOpenPattern (disp, p);
1139 1259
1140 if (!f) 1260 if (!f)
1141 { 1261 {
1262 FcPatternDestroy (p);
1142 success = false; 1263 success = false;
1143 break; 1264 break;
1144 } 1265 }
1145 1266
1146 FT_Face face = XftLockFace (f); 1267 FT_Face face = XftLockFace (f);
1268
1269 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1270 // we also assume blindly that if the first lock succeeds, then subsequent
1271 // locks will also succeed.
1272 if (!face)
1273 {
1274 XftFontClose (disp, f);
1275 success = false;
1276 break;
1277 }
1147 1278
1148 ascent = (face->size->metrics.ascender + 63) >> 6; 1279 ascent = (face->size->metrics.ascender + 63) >> 6;
1149 descent = (-face->size->metrics.descender + 63) >> 6; 1280 descent = (-face->size->metrics.descender + 63) >> 6;
1150 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1281 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1151 width = 0; 1282 width = 0;
… …
1154 1285
1155 XftUnlockFace (f); 1286 XftUnlockFace (f);
1156 1287
1157 int glheight = height; 1288 int glheight = height;
1158 1289
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1290 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1160 { 1291 {
1161 FcChar16 ch = *t; 1292 FcChar16 ch = *t;
1162 1293
1163 if (cs != CS_UNICODE 1294 if (cs != CS_UNICODE
1164 && ch > 0x100 1295 && ch > 0x100
… …
1183 if (glheight < g.height - g.y) glheight = g.height - g.y; 1314 if (glheight < g.height - g.y) glheight = g.height - g.y;
1184 } 1315 }
1185 1316
1186 if (!width) 1317 if (!width)
1187 { 1318 {
1188 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1319 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1189 1320 width = f->max_advance_width;
1190 XftFontClose (disp, f);
1191 f = 0;
1192
1193 success = false;
1194 break; 1321 break;
1195 } 1322 }
1196 1323
1197 if (prop.height == rxvt_fontprop::unset 1324 if (prop.height == rxvt_fontprop::unset
1198 || (height <= prop.height && glheight <= prop.height) 1325 || (height <= prop.height && glheight <= prop.height)
… …
1225 clear (); 1352 clear ();
1226 success = false; 1353 success = false;
1227 } 1354 }
1228#endif 1355#endif
1229 1356
1357#if XFT_CHAR_CACHE
1358 // populate char cache
1359 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1360 {
1361 FT_UInt glyph = XftCharIndex (disp, f, ch);
1362 glyph_cache [ch - char_cache_min] = glyph;
1363
1364 XGlyphInfo g;
1365 XftGlyphExtents (disp, f, &glyph, 1, &g);
1366 xoff_cache [ch - char_cache_min] = g.xOff;
1367 }
1368#endif
1369
1230 return success; 1370 return success;
1231} 1371}
1232 1372
1233bool 1373bool
1234rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1374rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1235{ 1375{
1236 careful = false; 1376 careful = false;
1237 1377
1378 // handle non-bmp chars when text_t is 16 bit
1379#if ENABLE_COMBINING && !UNICODE_3
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1381 if (compose_char *cc = rxvt_composite [unicode])
1382 if (cc->c2 == NOCHAR)
1383 unicode = cc->c1;
1384 else
1385 return false;
1386 else
1387 return false;
1388#endif
1389
1390 FcChar32 chr = unicode;
1391
1238 if (!XftCharExists (term->dpy, f, unicode)) 1392 if (!XftCharExists (term->dpy, f, chr))
1239 return false; 1393 return false;
1240 1394
1241 if (!prop || prop->width == rxvt_fontprop::unset) 1395 if (!prop || prop->width == rxvt_fontprop::unset)
1242 return true; 1396 return true;
1243 1397
1244 // check character against base font bounding box 1398 int wcw = max (WCWIDTH (chr), 1);
1245 FcChar32 ch = unicode; 1399
1246 XGlyphInfo g; 1400 XGlyphInfo g;
1247 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1401 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1402
1403 int cwidth = prop->width * wcw;
1404
1405 // use same adjustments as in ->draw, see there
1406 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1407 g.x += g.xOff ? 0 : cwidth;
1248 1408
1249 int w = g.width - g.x; 1409 int w = g.width - g.x;
1250 int wcw = max (WCWIDTH (unicode), 1);
1251 1410
1252 careful = g.x > 0 || w > prop->width * wcw; 1411 careful = g.x > 0 || w > cwidth;
1253 1412
1254 if (careful && !OVERLAP_OK (w, wcw, prop)) 1413 if (careful && !OVERLAP_OK (w, wcw, prop))
1255 return false; 1414 return false;
1256 1415
1257 // this weeds out _totally_ broken fonts, or glyphs 1416 // this weeds out _totally_ broken fonts, or glyphs
… …
1264void 1423void
1265rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1424rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266 const text_t *text, int len, 1425 const text_t *text, int len,
1267 int fg, int bg) 1426 int fg, int bg)
1268{ 1427{
1269 XGlyphInfo extents; 1428 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1270 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1271 XftGlyphSpec *ep = enc; 1429 XftGlyphSpec *ep = enc;
1272 1430
1273 dTermDisplay; 1431 dTermDisplay;
1274 dTermGC; 1432 dTermGC;
1275 1433
1276 int w = term->fwidth * len; 1434 int w = term->fwidth * len;
1277 int h = term->fheight; 1435 int h = term->fheight;
1278 1436
1279 bool buffered = 0 1437 bool buffered = bg >= Color_transparent
1280#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1438 && term->option (Opt_buffered);
1281 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap
1283#endif
1284 || bg >= 0; // we don't use a transparent bg
1285 1439
1286 // cut trailing spaces 1440 // cut trailing spaces
1287 while (len && text [len - 1] == ' ') 1441 while (len && text [len - 1] == ' ')
1288 len--; 1442 len--;
1289 1443
… …
1291 int y_ = buffered ? 0 : y; 1445 int y_ = buffered ? 0 : y;
1292 1446
1293 while (len) 1447 while (len)
1294 { 1448 {
1295 int cwidth = term->fwidth; 1449 int cwidth = term->fwidth;
1296 FcChar32 fc = *text++; len--; 1450 FcChar32 chr = *text++; len--;
1297 1451
1298 while (len && *text == NOCHAR) 1452 while (len && *text == NOCHAR)
1299 text++, len--, cwidth += term->fwidth; 1453 text++, len--, cwidth += term->fwidth;
1300 1454
1301 if (fc != ' ') // skip spaces 1455 if (chr != ' ') // skip spaces
1302 {
1303 FT_UInt glyph = XftCharIndex (disp, f, fc);
1304 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305
1306 ep->glyph = glyph;
1307 ep->x = x_ + (cwidth - extents.xOff >> 1);
1308 ep->y = y_ + ascent;
1309
1310 if (extents.xOff == 0)
1311 ep->x = x_ + cwidth;
1312
1313 ep++;
1314 } 1456 {
1457 // handle non-bmp chars when text_t is 16 bit
1458 #if ENABLE_COMBINING && !UNICODE_3
1459 if (ecb_expect_false (IS_COMPOSE (chr)))
1460 if (compose_char *cc = rxvt_composite [chr])
1461 if (cc->c2 == NOCHAR)
1462 chr = cc->c1;
1463 #endif
1315 1464
1316 x_ += cwidth; 1465 #if 0
1317 } 1466 FT_UInt glyphs [decltype (exp)::max_size];
1318 1467
1319 if (buffered) 1468 for (int i = 0; i < nchrs; ++i)
1320 { 1469 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1321 if (ep != enc)
1322 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 1470
1325#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1471 for (int i = 0; i < nchrs; ++i)
1326 if (bg < 0 && term->am_pixmap_trans)
1327 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
1328 else if (bg < 0 && term->bgPixmap.pixmap)
1329 { 1472 {
1330 XGCValues gcv; 1473 XGlyphInfo ep;
1474 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1475 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);
1476 }
1477 #endif
1331 1478
1332 gcv.fill_style = FillTiled; 1479 FT_UInt glyph;
1333 gcv.tile = term->pixmap; 1480 int xOff;
1334 gcv.ts_x_origin = -x;
1335 gcv.ts_y_origin = -y;
1336 1481
1337 GC gc2 = XCreateGC (disp, d2, 1482 #if XFT_CHAR_CACHE
1338 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1483 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1339 &gcv); 1484 {
1340 1485 glyph = glyph_cache [chr - char_cache_min];
1341 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1486 xOff = xoff_cache [chr - char_cache_min];
1342
1343 XFreeGC (disp, gc2);
1344 } 1487 }
1345 else 1488 else
1489 #endif
1490 {
1491 glyph = XftCharIndex (disp, f, chr);
1492 XGlyphInfo extents;
1493 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1494 xOff = extents.xOff;
1495 }
1496
1497 ep->glyph = glyph;
1498 ep->x = x_;
1499 ep->y = y_ + ascent;
1500
1501 // the xft font cell might differ from the terminal font cell,
1502 // in which case we use the average between the two.
1503 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1504
1505 // xft/freetype represent combining characters as characters with zero
1506 // width rendered over the previous character with some fonts, while
1507 // in other fonts, they are considered normal characters, while yet
1508 // in other fonts, they are shifted all over the place.
1509 // we handle the first two cases by keying off on xOff being 0
1510 // for zero-width chars. normally, we would add extents.xOff
1511 // of the base character here, but we don't have that, so we use cwidth.
1512 ep->x += xOff ? 0 : cwidth;
1513
1514 ++ep;
1515 }
1516
1517 x_ += cwidth;
1518 }
1519
1520 if (buffered)
1521 {
1522 if (ep != enc)
1523 {
1524 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1525
1526#ifdef HAVE_IMG
1527 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1528
1529 if (term->bg_img
1530 && (bg == Color_transparent || bg == Color_bg
1531 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1532 {
1533 int src_x = x, src_y = y;
1534
1535 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1536 {
1537 src_x += term->window_vt_x;
1538 src_y += term->window_vt_y;
1539 }
1540
1541 if (term->bg_img->w >= src_x + w
1542 && term->bg_img->h >= src_y + h)
1543 {
1544 XCopyArea (disp, term->bg_img->pm, d2, gc,
1545 src_x, src_y, w, h, 0, 0);
1546 }
1547 else
1548 {
1549 XGCValues gcv;
1550
1551 gcv.fill_style = FillTiled;
1552 gcv.tile = term->bg_img->pm;
1553 gcv.ts_x_origin = -src_x;
1554 gcv.ts_y_origin = -src_y;
1555
1556 XChangeGC (disp, gc,
1557 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1558 &gcv);
1559
1560 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1561
1562 gcv.fill_style = FillSolid;
1563 XChangeGC (disp, gc, GCFillStyle, &gcv);
1564 }
1565
1566 if (dst)
1567 {
1568 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1569
1570 // dst can only be set when bg >= 0
1571 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1572 }
1573 }
1574 else
1346#endif 1575#endif
1347 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1576 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1348 1577
1349 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1578 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1350 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1579 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1351 } 1580 }
1352 else 1581 else
… …
1377void 1606void
1378rxvt_fontset::clear () 1607rxvt_fontset::clear ()
1379{ 1608{
1380 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1609 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1381 = rxvt_fontprop::unset; 1610 = rxvt_fontprop::unset;
1611 force_prop = false;
1382 1612
1383 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1613 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1384 FONT_UNREF (*i); 1614 (*i)->unref ();
1385 1615
1386 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1616 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1387 delete *p; 1617 delete *p;
1388 1618
1389 free (fontdesc); fontdesc = 0; 1619 free (fontdesc); fontdesc = 0;
… …
1391 fonts.clear (); 1621 fonts.clear ();
1392 1622
1393 fallback = fallback_fonts; 1623 fallback = fallback_fonts;
1394} 1624}
1395 1625
1626void
1627rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1628{
1629 font->set_term (term);
1630
1631 font->cs = cs;
1632 font->loaded = false;
1633}
1634
1396rxvt_font * 1635rxvt_font *
1397rxvt_fontset::new_font (const char *name, codeset cs) 1636rxvt_fontset::new_font (const char *name, codeset cs)
1398{ 1637{
1399 rxvt_font *f; 1638 rxvt_font *f;
1400 1639
1401 if (!name || !*name) 1640 if (!name || !*name)
1402 { 1641 {
1403 name = ""; 1642 name = "";
1404 f = new rxvt_font_default (this); 1643 f = new rxvt_font_default (this);
1405 } 1644 }
… …
1416 f = new rxvt_font_x11; 1655 f = new rxvt_font_x11;
1417 } 1656 }
1418 else 1657 else
1419 f = new rxvt_font_x11; 1658 f = new rxvt_font_x11;
1420 1659
1421 f->set_term (term);
1422 f->set_name (strdup (name)); 1660 f->set_name (strdup (name));
1423 1661 prepare_font (f, cs);
1424 f->cs = cs;
1425 f->loaded = false;
1426 1662
1427 return f; 1663 return f;
1428} 1664}
1429 1665
1430///////////////////////////////////////////////////////////////////////////// 1666/////////////////////////////////////////////////////////////////////////////
1667
1668void
1669rxvt_fontset::push_font (rxvt_font *font)
1670{
1671 // the fontCount index is reserved for the overflow font, it is only
1672 // necessary when we get fontCount or more fonts, as they cannot be
1673 // represented in the rendition.
1674 if (fonts.size () == fontCount)
1675 {
1676 rxvt_font *f = new rxvt_font_overflow (this);
1677
1678 prepare_font (f, CS_UNICODE);
1679 fonts.push_back (f);
1680 }
1681
1682 fonts.push_back (font);
1683}
1431 1684
1432void 1685void
1433rxvt_fontset::add_fonts (const char *desc) 1686rxvt_fontset::add_fonts (const char *desc)
1434{ 1687{
1435 if (desc) 1688 if (desc)
… …
1464 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1717 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1465 else 1718 else
1466 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1719 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1467 1720
1468 desc++; 1721 desc++;
1469 while (*desc <= ' ') desc++; 1722 while (*desc <= ' ' && *desc) desc++;
1470 } 1723 }
1471 1724
1472 end = strchr (desc, ','); 1725 end = strchr (desc, ',');
1473 if (!end) 1726 if (!end)
1474 end = desc + strlen (desc); 1727 end = desc + strlen (desc);
1475 1728
1476 if (end - desc < 511) 1729 if (end - desc < 511)
1477 { 1730 {
1478 strncpy (buf, desc, end - desc); 1731 memcpy (buf, desc, end - desc);
1479 buf[end - desc] = 0; 1732 buf[end - desc] = 0;
1480 1733
1481 fonts.push_back (new_font (buf, cs)); 1734 push_font (new_font (buf, cs));
1482 } 1735 }
1483 else 1736 else
1484 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1737 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1485 1738
1486 desc = end + 1; 1739 desc = end + 1;
1487 } 1740 }
1488 while (*end); 1741 while (*end);
1489 } 1742 }
… …
1498 if (fonts[i]->loaded) 1751 if (fonts[i]->loaded)
1499 return true; 1752 return true;
1500 1753
1501 fonts[i]->loaded = true; 1754 fonts[i]->loaded = true;
1502 1755
1503 if (!fonts[i]->load (prop)) 1756 if (!fonts[i]->load (prop, force_prop))
1504 { 1757 {
1505 fonts[i]->cs = CS_UNKNOWN; 1758 fonts[i]->cs = CS_UNKNOWN;
1506 return false; 1759 return false;
1507 } 1760 }
1508 1761
… …
1514{ 1767{
1515 clear (); 1768 clear ();
1516 1769
1517 fontdesc = strdup (desc); 1770 fontdesc = strdup (desc);
1518 1771
1519 fonts.push_back (new_font (0, CS_UNICODE)); 1772 push_font (new_font (0, CS_UNICODE));
1520 realize_font (0); 1773 realize_font (0);
1521 1774
1522 add_fonts (desc); 1775 add_fonts (desc);
1523 1776
1524 return true; 1777 return true;
… …
1533 1786
1534 return -1; 1787 return -1;
1535} 1788}
1536 1789
1537int 1790int
1538rxvt_fontset::find_font (unicode_t unicode) 1791rxvt_fontset::find_font_idx (unicode_t unicode)
1539{ 1792{
1540 if (unicode >= 1<<20) 1793 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1794 if (unicode > 0x1fffff)
1541 return 0; 1795 return 0;
1542 1796
1543 unicode_t hi = unicode >> 8; 1797 unicode_t hi = unicode >> 8;
1544 1798
1545 if (hi < fmap.size () 1799 if (hi < fmap.size ())
1546 && fmap[hi] 1800 if (pagemap *pm = fmap[hi])
1547 && (*fmap[hi])[unicode & 0xff] != 0xff) 1801 if ((*pm)[unicode & 0xff] != 0xff)
1548 return (*fmap[hi])[unicode & 0xff]; 1802 return (*pm)[unicode & 0xff];
1549 1803
1550 unsigned int i; 1804 unsigned int i;
1551 1805
1552 for (i = 0; i < fonts.size (); i++) 1806 for (i = 0; i < fonts.size (); i++)
1553 { 1807 {
… …
1569 goto next_font; 1823 goto next_font;
1570 1824
1571 bool careful; 1825 bool careful;
1572 if (f->has_char (unicode, &prop, careful)) 1826 if (f->has_char (unicode, &prop, careful))
1573 { 1827 {
1574 if (careful) 1828 i = (i << 1) | careful;
1575 i |= 128;
1576 1829
1577 goto found; 1830 goto found;
1578 } 1831 }
1579 1832
1580 next_font: 1833 next_font:
1581 if (i == fonts.size () - 1) 1834 if (i == fonts.size () - 1)
1582 { 1835 {
1836 // compose characters are handled by the default font, unless another font takes over
1837 // we do not go via the fallback list for speed reasons.
1838 if (IS_COMPOSE (unicode))
1839 return 0;
1840
1583 if (fallback->name) 1841 if (fallback->name)
1584 { 1842 {
1585 // search through the fallback list 1843 // search through the fallback list
1586 fonts.push_back (new_font (fallback->name, fallback->cs)); 1844 push_font (new_font (fallback->name, fallback->cs));
1587 fallback++; 1845 fallback++;
1588 } 1846 }
1589 else 1847 else
1590 { 1848 {
1591 // try to find a new font. 1849 // try to find a new font.
… …
1593 // way to configure this and xft is easier to hack in, 1851 // way to configure this and xft is easier to hack in,
1594 // while x11 has more framework in place already. 1852 // while x11 has more framework in place already.
1595 // TODO: this is a real resource hog, xft takes ages(?) 1853 // TODO: this is a real resource hog, xft takes ages(?)
1596#if XFT && USE_SLOW_LOOKUP 1854#if XFT && USE_SLOW_LOOKUP
1597 // grab the first xft font that seems suitable 1855 // grab the first xft font that seems suitable
1856 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1598 FcPattern *p = FcPatternCreate (); 1857 FcPattern *p = FcPatternCreate ();
1599 1858
1600 FcCharSet *s = FcCharSetCreate (); 1859 FcCharSet *s = FcCharSetCreate ();
1601 FcCharSetAddChar (s, unicode); 1860 FcCharSetAddChar (s, unicode);
1602 FcPatternAddCharSet (p, FC_CHARSET, s); 1861 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1622 FcPatternDestroy (match); 1881 FcPatternDestroy (match);
1623 1882
1624 if (find_font (font) < 0) 1883 if (find_font (font) < 0)
1625 { 1884 {
1626 char fontname[4096]; 1885 char fontname[4096];
1627 sprintf (fontname, "xft:%-.4090s", font); 1886 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1628 1887
1629 fonts.push_back (new_font (fontname, CS_UNICODE)); 1888 push_font (new_font (fontname, CS_UNICODE));
1630 } 1889 }
1631 1890
1632 free (font); 1891 free (font);
1633 } 1892 }
1634#endif 1893#endif
… …
1646 while (hi >= fmap.size ()) 1905 while (hi >= fmap.size ())
1647 fmap.push_back (0); 1906 fmap.push_back (0);
1648 1907
1649 if (!fmap[hi]) 1908 if (!fmap[hi])
1650 { 1909 {
1651 fmap[hi] = (pagemap *)new pagemap; 1910 fmap[hi] = new pagemap;
1652 memset (fmap[hi], 0xff, sizeof (pagemap)); 1911 memset (fmap[hi], 0xff, sizeof (pagemap));
1653 } 1912 }
1654 1913
1655 (*fmap[hi])[unicode & 0xff] = i; 1914 (*fmap[hi])[unicode & 0xff] = i;
1656 } 1915 }
1657 1916
1658 return i; 1917 return i;
1659} 1918}
1660 1919
1661
1662

Diff Legend

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