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.125 by ayin, Sun Nov 25 11:23:18 2007 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 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" },
… …
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:Bitstream Vera 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" },
… …
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
… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
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{
… …
237 if (color == Color_bg || color == Color_transparent) 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 if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false; 242 Picture dst;
243#ifdef HAVE_BG_PIXMAP 243
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
245 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 253 }
254 } 254 else
255#endif 255# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
344 345
345 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
346 347
347 while (len) 348 while (len)
348 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
349#if ENABLE_COMBINING 356#if ENABLE_COMBINING
350 compose_char *cc; 357 compose_char *cc;
351#endif 358#endif
352 const text_t *tp = text;
353 text_t t = *tp;
354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
361#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
362 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
441#else 442#else
442 if (0) 443 if (0)
443 ; 444 ;
444#endif 445#endif
445#if ENABLE_COMBINING 446#if ENABLE_COMBINING
446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
447 { 448 {
448 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
449 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
450 text_t chrs[2]; 473 text_t chrs[2];
451 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
452 475
453 *chrs = cc->c1; 476 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
456 479
457 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
458 { 481 {
459 bool careful; 482 bool careful;
460 483
461 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 485 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 487 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
466 489
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 491 }
492 #endif
469 } 493 }
470#endif 494#endif
471 else 495 else
472 switch (t) 496 switch (t)
473 { 497 {
474 case '\t': 498 case '\t':
475 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
476 case NOCHAR: 500 case NOCHAR:
477 break; 501 break;
478 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
479 default: 512 default:
480 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
481 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
482 } 515 }
483 516
484 x += fwidth; 517 x += fwidth;
485 } 518 }
486} 519}
487 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
488///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
489 577
490struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
491 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
492 581
493 void clear (); 582 void clear ();
494 583
495 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
500 589
501 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 591 const text_t *text, int len,
503 int fg, int bg); 592 int fg, int bg);
504 593
505 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 595 XFontStruct *f;
507 bool enc2b, encm; 596 bool enc2b, encm;
508 597
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
510 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
632 721
633 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
634 { 723 {
635 size_t len = field - name; 724 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 strncpy (*ptr, name, len); 726 memcpy (*ptr, name, len);
638 strcpy (*ptr + len, replace); 727 strcpy (*ptr + len, replace);
639 strcat (*ptr, end); 728 strcat (*ptr, end);
640 729
641 return true; 730 return true;
642 } 731 }
… …
667 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
668 757
669 if (!f) 758 if (!f)
670 return false; 759 return false;
671 760
672 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
673 762
674 if (new_name) 763 if (new_name)
675 set_name (new_name); 764 set_name (new_name);
676 else 765 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
678 767
679 XFreeFont (disp, f); 768 XFreeFont (disp, f);
680 f = 0; 769 f = 0;
681 } 770 }
682 771
… …
739 free (fname); 828 free (fname);
740 if (replace_field (&fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 } 831 }
743 832
744 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
745 continue; 839 continue;
746 840 }
747 if (prop.height != rxvt_fontprop::unset
748 && p.height > prop.height) // weed out too large fonts
749 continue;
750 841
751 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
752 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 843 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
753 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 844 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
754 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
760 XFreeFontNames (list); 851 XFreeFontNames (list);
761 852
762 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
763 for (;;) 854 for (;;)
764 { 855 {
765 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
766 857
767 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
768 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
769 best = w; 860 best = w;
770 861
771 if (!best->name 862 if (!best->name
772 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
773 break; 864 break;
… …
793 return false; 884 return false;
794 885
795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
797 888
889 cs = CS_UNKNOWN;
890
798 if (registry && encoding) 891 if (registry && encoding)
799 { 892 {
800 char charset[64]; 893 char charset[64];
801 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
802 895
803 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
804 } 897
805 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
806 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
807 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
808 909
809 if (!charset) 910 if (!charset)
810 charset = name; 911 charset = name;
811 912
812 int count = 13; 913 int count = 13;
813 while (*charset) 914 while (*charset)
814 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
815 break; 916 break;
816 917
817 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
818 } 926 {
819 927 clear ();
820 free (registry); 928 return false;
821 free (encoding); 929 }
822 930
823 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
824 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
825 933
826 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
851 } 959 }
852#endif 960#endif
853 961
854 width = 1; 962 width = 1;
855 963
856 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
857 { 965 {
858 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
859 continue; 967 continue;
860 968
861 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
862 bool careful; 970 bool careful;
863 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
864 continue; 972 continue;
865 973
866 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
867 976
868 XCharStruct g; 977 XCharStruct g;
869 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
870 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
871 980
… …
873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
874 983
875 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
876 } 985 }
877 986
878 if (cs == CS_UNKNOWN) 987#if 0 // do it per-character
988 if (prop && width > prop->width)
879 { 989 {
880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
881
882 clear (); 990 clear ();
883 return false; 991 return false;
884 } 992 }
885
886#if 0 // do it per-character
887 if (prop && width > prop->width)
888 {
889 clear ();
890 return false;
891 }
892#endif 993#endif
893 994
894 return true; 995 return true;
895} 996}
896 997
… …
905} 1006}
906 1007
907bool 1008bool
908rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
909{ 1010{
1011 careful = false;
1012
910 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
911 1014
912 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
913 return false; 1016 return false;
914 1017
915 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
916 XCharStruct *xcs; 1019 XCharStruct *xcs;
917 1020
918 if (encm) 1021 if (encm)
919 { 1022 {
920 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
950 return false; 1053 return false;
951 1054
952 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
953 return true; 1056 return true;
954 1057
955 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
956 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
957 int wcw = max (WCWIDTH (unicode), 1); 1060 int wcw = max (WCWIDTH (unicode), 1);
958 1061
959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
960 1063
… …
977 dTermDisplay; 1080 dTermDisplay;
978 dTermGC; 1081 dTermGC;
979 1082
980 bool slow = this->slow 1083 bool slow = this->slow
981 || width != term->fwidth 1084 || width != term->fwidth
982 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
983 1087
984 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
985 1089
986 XGCValues v; 1090 XGCValues v;
987 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1055 1159
1056///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1057 1161
1058#if XFT 1162#if XFT
1059 1163
1060struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1061 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1062 1171
1063 void clear (); 1172 void clear ();
1064 1173
1065 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1066 1175
… …
1134 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1135 1244
1136#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1137 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1139 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1140#endif 1249#endif
1141 1250
1142 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1143 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1144 1253
… …
1156 int ftheight = 0; 1265 int ftheight = 0;
1157 bool success = true; 1266 bool success = true;
1158 1267
1159 for (;;) 1268 for (;;)
1160 { 1269 {
1270 p = FcPatternDuplicate (match);
1161 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1162 1272
1163 if (!f) 1273 if (!f)
1164 { 1274 {
1275 FcPatternDestroy (p);
1165 success = false; 1276 success = false;
1166 break; 1277 break;
1167 } 1278 }
1168 1279
1169 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1177 1288
1178 XftUnlockFace (f); 1289 XftUnlockFace (f);
1179 1290
1180 int glheight = height; 1291 int glheight = height;
1181 1292
1182 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1183 { 1294 {
1184 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1185 1296
1186 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1187 && ch > 0x100 1298 && ch > 0x100
… …
1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1289 const text_t *text, int len, 1400 const text_t *text, int len,
1290 int fg, int bg) 1401 int fg, int bg)
1291{ 1402{
1292 XGlyphInfo extents; 1403 XGlyphInfo extents;
1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1294 XftGlyphSpec *ep = enc; 1405 XftGlyphSpec *ep = enc;
1295 1406
1296 dTermDisplay; 1407 dTermDisplay;
1297 dTermGC; 1408 dTermGC;
1298 1409
1299 int w = term->fwidth * len; 1410 int w = term->fwidth * len;
1300 int h = term->fheight; 1411 int h = term->fheight;
1301 1412
1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1413 bool buffered = bg >= Color_transparent
1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1414 && term->option (Opt_buffered);
1304 * good idea from the perspective of packaging for wide variety of user configs. 1415
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1311 // cut trailing spaces 1416 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1417 while (len && text [len - 1] == ' ')
1313 len--; 1418 len--;
1314 1419
1315 int x_ = buffered ? 0 : x; 1420 int x_ = buffered ? 0 : x;
… …
1341 x_ += cwidth; 1446 x_ += cwidth;
1342 } 1447 }
1343 1448
1344 if (buffered) 1449 if (buffered)
1345 { 1450 {
1346 bool back_rendered = false;
1347 if (ep != enc) 1451 if (ep != enc)
1348 { 1452 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350 1454
1351#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_IMG
1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1457
1352 if (term->bgPixmap.pixmap) 1458 if (term->bg_img
1459 && (bg == Color_transparent || bg == Color_bg
1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 { 1461 {
1354 Picture dst = 0; 1462 int src_x = x, src_y = y;
1355 1463
1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
1360 { 1465 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x; 1466 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y; 1467 src_y += term->window_vt_y;
1367 } 1468 }
1368 1469
1369 if (term->bgPixmap.pmap_width >= src_x+w 1470 if (term->bg_img->w >= src_x + w
1370 && term->bgPixmap.pmap_height >= src_y+h) 1471 && term->bg_img->h >= src_y + h)
1371 { 1472 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1373 src_x, src_y, w, h, 0, 0); 1474 src_x, src_y, w, h, 0, 0);
1374 } 1475 }
1375 else 1476 else
1376 { 1477 {
1377 XGCValues gcv; 1478 XGCValues gcv;
1378 1479
1379 gcv.fill_style = FillTiled; 1480 gcv.fill_style = FillTiled;
1380 gcv.tile = term->bgPixmap.pixmap; 1481 gcv.tile = term->bg_img->pm;
1381 gcv.ts_x_origin = -src_x; 1482 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y; 1483 gcv.ts_y_origin = -src_y;
1383 1484
1384 XChangeGC (disp, gc, 1485 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv); 1487 &gcv);
1387 1488
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1489 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389 1490
1390 gcv.fill_style = FillSolid; 1491 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv); 1492 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 } 1493 }
1393 1494
1394 if (bg >= 0) 1495 if (dst)
1395 { 1496 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1497 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1498
1499 // dst can only be set when bg >= 0
1397 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1500 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
1401 } 1501 }
1402 } 1502 }
1503 else
1403#endif 1504#endif
1404
1405 if (bg >= 0 && !back_rendered)
1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1505 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1407 1506
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1507 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1508 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1410 } 1509 }
1411 else 1510 else
… …
1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1440 = rxvt_fontprop::unset; 1539 = rxvt_fontprop::unset;
1441 force_prop = false; 1540 force_prop = false;
1442 1541
1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1444 FONT_UNREF (*i); 1543 (*i)->unref ();
1445 1544
1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1447 delete *p; 1546 delete *p;
1448 1547
1449 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1451 fonts.clear (); 1550 fonts.clear ();
1452 1551
1453 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1454} 1553}
1455 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1456rxvt_font * 1564rxvt_font *
1457rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1458{ 1566{
1459 rxvt_font *f; 1567 rxvt_font *f;
1460 1568
… …
1476 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1477 } 1585 }
1478 else 1586 else
1479 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1480 1588
1481 f->set_term (term);
1482 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1483 1590 prepare_font (f, cs);
1484 f->cs = cs;
1485 f->loaded = false;
1486 1591
1487 return f; 1592 return f;
1488} 1593}
1489 1594
1490///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1491 1613
1492void 1614void
1493rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1494{ 1616{
1495 if (desc) 1617 if (desc)
… …
1524 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1525 else 1647 else
1526 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1527 1649
1528 desc++; 1650 desc++;
1529 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1530 } 1652 }
1531 1653
1532 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1533 if (!end) 1655 if (!end)
1534 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
1535 1657
1536 if (end - desc < 511) 1658 if (end - desc < 511)
1537 { 1659 {
1538 strncpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1539 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1540 1662
1541 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1542 } 1664 }
1543 else 1665 else
1544 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1545 1667
1546 desc = end + 1; 1668 desc = end + 1;
1547 } 1669 }
1548 while (*end); 1670 while (*end);
1549 } 1671 }
… …
1574{ 1696{
1575 clear (); 1697 clear ();
1576 1698
1577 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1578 1700
1579 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1580 realize_font (0); 1702 realize_font (0);
1581 1703
1582 add_fonts (desc); 1704 add_fonts (desc);
1583 1705
1584 return true; 1706 return true;
… …
1593 1715
1594 return -1; 1716 return -1;
1595} 1717}
1596 1718
1597int 1719int
1598rxvt_fontset::find_font (unicode_t unicode) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1599{ 1721{
1600 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1601 return 0; 1723 return 0;
1602 1724
1603 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
… …
1629 goto next_font; 1751 goto next_font;
1630 1752
1631 bool careful; 1753 bool careful;
1632 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1633 { 1755 {
1634 if (careful) 1756 i = (i << 1) | careful;
1635 i |= 128;
1636 1757
1637 goto found; 1758 goto found;
1638 } 1759 }
1639 1760
1640 next_font: 1761 next_font:
1641 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1642 { 1763 {
1643 if (fallback->name) 1764 if (fallback->name)
1644 { 1765 {
1645 // search through the fallback list 1766 // search through the fallback list
1646 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1647 fallback++; 1768 fallback++;
1648 } 1769 }
1649 else 1770 else
1650 { 1771 {
1651 // try to find a new font. 1772 // try to find a new font.
… …
1653 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1654 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1655 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1656#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1657 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1658 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1659 1781
1660 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1661 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1662 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1682 FcPatternDestroy (match); 1804 FcPatternDestroy (match);
1683 1805
1684 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1685 { 1807 {
1686 char fontname[4096]; 1808 char fontname[4096];
1687 sprintf (fontname, "xft:%-.4090s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1688 1810
1689 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1690 } 1812 }
1691 1813
1692 free (font); 1814 free (font);
1693 } 1815 }
1694#endif 1816#endif
… …
1706 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1707 fmap.push_back (0); 1829 fmap.push_back (0);
1708 1830
1709 if (!fmap[hi]) 1831 if (!fmap[hi])
1710 { 1832 {
1711 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1712 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1713 } 1835 }
1714 1836
1715 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1716 } 1838 }
1717 1839
1718 return i; 1840 return i;
1719} 1841}
1720 1842
1721
1722

Diff Legend

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