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

Diff Legend

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