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.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 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
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
… …
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 }
… …
306 return false; 306 return false;
307 307
308 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
309 return true; 309 return true;
310 310
311#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 314 return true;
315#endif
314 316
315 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
316 return true; 318 return true;
317 319
318 switch (unicode) 320 switch (unicode)
… …
447 449
448 text_t chrs[2]; 450 text_t chrs[2];
449 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
450 452
451 *chrs = cc->c1; 453 *chrs = cc->c1;
452 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
453 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
454 456
455 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
456 { 458 {
457 bool careful; 459 bool careful;
458 460
459 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
460 *chrs = cc->c2; 462 *chrs = cc->c2;
461 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
462 ? f1 464 ? f1
463 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
464 466
465 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
466 } 468 }
467 } 469 }
468#endif 470#endif
… …
472 case '\t': 474 case '\t':
473 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
474 case NOCHAR: 476 case NOCHAR:
475 break; 477 break;
476 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
477 default: 488 default:
478 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
479 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
480 } 491 }
481 492
482 x += fwidth; 493 x += fwidth;
483 } 494 }
484} 495}
485 496
497struct rxvt_font_overflow : rxvt_font {
498 struct rxvt_fontset *fs;
499
500 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font ()
502 {
503 this->fs = fs;
504 }
505
506 rxvt_fontprop properties ()
507 {
508 rxvt_fontprop p;
509
510 p.width = p.height = 1;
511 p.ascent = rxvt_fontprop::unset;
512 p.weight = rxvt_fontprop::medium;
513 p.slant = rxvt_fontprop::roman;
514
515 return p;
516 }
517
518 bool load (const rxvt_fontprop &prop, bool force_prop)
519 {
520 width = 1; height = 1;
521 ascent = 1; descent = 0;
522
523 set_name (strdup ("built-in rendition overflow font"));
524
525 return true;
526 }
527
528 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
529 {
530 return false;
531 }
532
533 void draw (rxvt_drawable &d, int x, int y,
534 const text_t *text, int len,
535 int fg, int bg)
536 {
537 while (len)
538 {
539 int fid = fs->find_font_idx (*text);
540 int w = 1;
541 while (w < len && text[w] == NOCHAR)
542 w++;
543 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
544 text += w;
545 len -= w;
546 x += term->fwidth * w;
547 }
548 }
549};
550
486///////////////////////////////////////////////////////////////////////////// 551/////////////////////////////////////////////////////////////////////////////
487 552
488struct rxvt_font_x11 : rxvt_font { 553struct rxvt_font_x11 : rxvt_font {
489 rxvt_font_x11 () { f = 0; } 554 rxvt_font_x11 () { f = 0; }
490 555
… …
498 563
499 void draw (rxvt_drawable &d, int x, int y, 564 void draw (rxvt_drawable &d, int x, int y,
500 const text_t *text, int len, 565 const text_t *text, int len,
501 int fg, int bg); 566 int fg, int bg);
502 567
503 bool slow; // wether this is a proportional font or has other funny characteristics 568 bool slow; // whether this is a proportional font or has other funny characteristics
504 XFontStruct *f; 569 XFontStruct *f;
505 bool enc2b, encm; 570 bool enc2b, encm;
506 571
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 572 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 573 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
608 return false; 673 return false;
609} 674}
610 675
611// fix the size of scalable fonts 676// fix the size of scalable fonts
612static bool 677static bool
613replace_field (char *buf, const char *name, int index, const char old, const char *replace) 678replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
614{ 679{
615 int slashes = 0; 680 int slashes = 0;
616 const char *field, *end; 681 const char *field, *end;
617 682
618 for (const char *c = name; *c; c++) 683 for (const char *c = name; *c; c++)
… …
628 break; 693 break;
629 } 694 }
630 695
631 if (slashes >= 13 && (!old || *field == old)) 696 if (slashes >= 13 && (!old || *field == old))
632 { 697 {
633 // TODO: check for overflow in font-name 698 size_t len = field - name;
634 strncpy (buf, name, field - name); 699 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 700 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 701 strcpy (*ptr + len, replace);
637 strcat (buf, end); 702 strcat (*ptr, end);
638 703
639 return true; 704 return true;
640 } 705 }
641 else 706 else
642 { 707 {
643 strcpy (buf, name); 708 *ptr = strdup (name);
644 709
645 return false; 710 return false;
646 } 711 }
647} 712}
648 713
… …
656 char field_str[64]; // enough for 128 bits 721 char field_str[64]; // enough for 128 bits
657 722
658 // first morph the font if required 723 // first morph the font if required
659 if (force_prop) 724 if (force_prop)
660 { 725 {
661 char fname[1024]; 726 char *fname;
662 727
663 if (name[0] != '-') 728 if (name[0] != '-')
664 { 729 {
665 f = XLoadQueryFont (disp, name); 730 f = XLoadQueryFont (disp, name);
666 731
667 if (!f) 732 if (!f)
668 return false; 733 return false;
669 734
670 char *new_name = get_property (f, XA_FONT, name); 735 char *new_name = get_property (f, XA_FONT, 0);
671 736
672 if (new_name) 737 if (new_name)
673 set_name (new_name); 738 set_name (new_name);
674 else 739 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 740 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 741
677 XFreeFont (disp, f); 742 XFreeFont (disp, f);
678 f = 0; 743 f = 0;
679 } 744 }
680 745
681 if (prop.weight != rxvt_fontprop::unset) 746 if (prop.weight != rxvt_fontprop::unset)
682 { 747 {
683 replace_field (fname, name, 2, 0, 748 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 749 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 750 ? "medium" : "bold");
686 set_name (strdup (fname)); 751 set_name (fname);
687 } 752 }
688 753
689 if (prop.slant != rxvt_fontprop::unset) 754 if (prop.slant != rxvt_fontprop::unset)
690 { 755 {
691 replace_field (fname, name, 3, 0, 756 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 757 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 758 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 759 set_name (fname);
695 } 760 }
696 } 761 }
697 762
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 763 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 764 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 789 font_weight *fonts = new font_weight[count];
725 790
726 for (int i = 0; i < count; i++) 791 for (int i = 0; i < count; i++)
727 { 792 {
728 rxvt_fontprop p; 793 rxvt_fontprop p;
729 char fname[1024]; 794 char *fname;
730 795
731 int diff = 0; 796 int diff = 0;
732 797
733 if (replace_field (fname, list[i], 6, '0', field_str)) 798 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 799 diff += 10; // slightly penalize scalable fonts
800 else
801 {
802 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 803 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 804 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
805 }
737 806
738 if (!set_properties (p, fname)) 807 if (!set_properties (p, fname)
808 // also weed out too large fonts
809 || (prop.height != rxvt_fontprop::unset
810 && p.height > prop.height))
811 {
812 free (fname);
739 continue; 813 continue;
740 814 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 815
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 816 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
746 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 817 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
747 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 818 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 819 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 820
750 fonts[i].name = strdup (fname); 821 fonts[i].name = fname;
751 fonts[i].diff = diff; 822 fonts[i].diff = diff;
752 } 823 }
753 824
754 XFreeFontNames (list); 825 XFreeFontNames (list);
755 826
756 // this loop only iterates when the guessed font-size is too small 827 // this loop only iterates when the guessed font-size is too small
757 for (;;) 828 for (;;)
758 { 829 {
759 font_weight *best = fonts + count - 1; 830 font_weight *best = fonts;
760 831
761 for (font_weight *w = best; w-- > fonts; ) 832 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 833 if (w->diff < best->diff)
763 best = w; 834 best = w;
764 835
765 if (!best->name 836 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 837 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 838 break;
… …
787 return false; 858 return false;
788 859
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 860 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 861 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 862
863 cs = CS_UNKNOWN;
864
792 if (registry && encoding) 865 if (registry && encoding)
793 { 866 {
794 char charset[64]; 867 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 868 snprintf (charset, 64, "%s-%s", registry, encoding);
796 869
797 cs = codeset_from_name (charset); 870 cs = codeset_from_name (charset);
798 } 871
799 else 872 if (cs == CS_UNKNOWN)
873 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 874 }
875
876 free (registry);
877 free (encoding);
878
879 if (cs == CS_UNKNOWN)
880 {
801 const char *charset = get_property (f, XA_FONT, 0); 881 char *value = get_property (f, XA_FONT, 0);
882 const char *charset = value;
802 883
803 if (!charset) 884 if (!charset)
804 charset = name; 885 charset = name;
805 886
806 int count = 13; 887 int count = 13;
807 while (*charset) 888 while (*charset)
808 if (*charset++ == '-' && !--count) 889 if (*charset++ == '-' && !--count)
809 break; 890 break;
810 891
811 cs = codeset_from_name (charset); 892 cs = codeset_from_name (charset);
893 if (cs == CS_UNKNOWN)
894 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
895
896 free (value);
897 }
898
899 if (cs == CS_UNKNOWN)
812 } 900 {
813 901 clear ();
814 free (registry); 902 return false;
815 free (encoding); 903 }
816 904
817 if (cs == CS_UNICODE) 905 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 906 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 907
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 908 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
845 } 933 }
846#endif 934#endif
847 935
848 width = 1; 936 width = 1;
849 937
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 938 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
851 { 939 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 940 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 941 continue;
854 942
855 // ignore characters we wouldn't use anyways 943 // ignore characters we wouldn't use anyways
856 bool careful; 944 bool careful;
857 if (!has_char (*t, &prop, careful)) 945 if (!has_char (*t, &prop, careful))
858 continue; 946 continue;
859 947
860 XChar2b ch = { *t >> 8, *t }; 948 // the casts are needed in C++11 (see 8.5.1)
949 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
861 950
862 XCharStruct g; 951 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 952 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 953 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 954
… …
867 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 956 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 957
869 if (width < g.width) width = g.width; 958 if (width < g.width) width = g.width;
870 } 959 }
871 960
872 if (cs == CS_UNKNOWN) 961#if 0 // do it per-character
962 if (prop && width > prop->width)
873 { 963 {
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875
876 clear (); 964 clear ();
877 return false; 965 return false;
878 } 966 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 967#endif
887 968
888 return true; 969 return true;
889} 970}
890 971
… …
899} 980}
900 981
901bool 982bool
902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 983rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
903{ 984{
985 careful = false;
986
904 uint32_t ch = FROM_UNICODE (cs, unicode); 987 uint32_t ch = FROM_UNICODE (cs, unicode);
905 988
906 if (ch == NOCHAR) 989 if (ch == NOCHAR)
907 return false; 990 return false;
908 991
909 /* check wether the character exists in _this_ font. horrible. */ 992 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 993 XCharStruct *xcs;
911 994
912 if (encm) 995 if (encm)
913 { 996 {
914 unsigned char byte1 = ch >> 8; 997 unsigned char byte1 = ch >> 8;
… …
944 return false; 1027 return false;
945 1028
946 if (!prop || prop->width == rxvt_fontprop::unset) 1029 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1030 return true;
948 1031
949 // check wether character overlaps previous/next character 1032 // check whether character overlaps previous/next character
950 int w = xcs->rbearing - xcs->lbearing; 1033 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = max (WCWIDTH (unicode), 1); 1034 int wcw = max (WCWIDTH (unicode), 1);
952 1035
953 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1036 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
954 1037
… …
971 dTermDisplay; 1054 dTermDisplay;
972 dTermGC; 1055 dTermGC;
973 1056
974 bool slow = this->slow 1057 bool slow = this->slow
975 || width != term->fwidth 1058 || width != term->fwidth
976 || height != term->fheight; 1059 || height != term->fheight
1060 || ascent != f->ascent;
977 1061
978 int base = ascent; // sorry, incorrect: term->fbase; 1062 int base = ascent; // sorry, incorrect: term->fbase;
979 1063
980 XGCValues v; 1064 XGCValues v;
981 v.foreground = term->pix_colors[fg]; 1065 v.foreground = term->pix_colors[fg];
… …
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1212 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1213
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1214#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1215 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1216 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1217 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1218#endif
1135 1219
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1220 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1221 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1222
… …
1150 int ftheight = 0; 1234 int ftheight = 0;
1151 bool success = true; 1235 bool success = true;
1152 1236
1153 for (;;) 1237 for (;;)
1154 { 1238 {
1239 p = FcPatternDuplicate (match);
1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1240 f = XftFontOpenPattern (disp, p);
1156 1241
1157 if (!f) 1242 if (!f)
1158 { 1243 {
1244 FcPatternDestroy (p);
1159 success = false; 1245 success = false;
1160 break; 1246 break;
1161 } 1247 }
1162 1248
1163 FT_Face face = XftLockFace (f); 1249 FT_Face face = XftLockFace (f);
… …
1171 1257
1172 XftUnlockFace (f); 1258 XftUnlockFace (f);
1173 1259
1174 int glheight = height; 1260 int glheight = height;
1175 1261
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1262 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1177 { 1263 {
1178 FcChar16 ch = *t; 1264 FcChar16 ch = *t;
1179 1265
1180 if (cs != CS_UNICODE 1266 if (cs != CS_UNICODE
1181 && ch > 0x100 1267 && ch > 0x100
… …
1282rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1283 const text_t *text, int len, 1369 const text_t *text, int len,
1284 int fg, int bg) 1370 int fg, int bg)
1285{ 1371{
1286 XGlyphInfo extents; 1372 XGlyphInfo extents;
1287 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1288 XftGlyphSpec *ep = enc; 1374 XftGlyphSpec *ep = enc;
1289 1375
1290 dTermDisplay; 1376 dTermDisplay;
1291 dTermGC; 1377 dTermGC;
1292 1378
1293 int w = term->fwidth * len; 1379 int w = term->fwidth * len;
1294 int h = term->fheight; 1380 int h = term->fheight;
1295 1381
1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1382 bool buffered = bg >= Color_transparent
1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1383 && term->option (Opt_buffered);
1298 * good idea from the perspective of packaging for wide variety of user configs. 1384
1299 */
1300 bool buffered = true
1301#ifdef FORCE_UNBUFFERED_XFT
1302 && bg >= 0
1303#endif
1304 ;
1305 // cut trailing spaces 1385 // cut trailing spaces
1306 while (len && text [len - 1] == ' ') 1386 while (len && text [len - 1] == ' ')
1307 len--; 1387 len--;
1308 1388
1309 int x_ = buffered ? 0 : x; 1389 int x_ = buffered ? 0 : x;
… …
1335 x_ += cwidth; 1415 x_ += cwidth;
1336 } 1416 }
1337 1417
1338 if (buffered) 1418 if (buffered)
1339 { 1419 {
1340 bool back_rendered = false;
1341 if (ep != enc) 1420 if (ep != enc)
1342 { 1421 {
1343 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1422 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344 1423
1345#ifdef HAVE_BG_PIXMAP 1424#ifdef HAVE_IMG
1425 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1426
1346 if (term->bgPixmap.pixmap) 1427 if (term->bg_img
1428 && (bg == Color_transparent || bg == Color_bg
1429 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347 { 1430 {
1348 Picture dst = 0; 1431 int src_x = x, src_y = y;
1349 1432
1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1433 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1351 dst = XftDrawPicture (d2);
1352
1353 if (bg < 0 || dst != 0)
1354 { 1434 {
1355 int src_x = x, src_y = y ;
1356
1357 if (term->bgPixmap.is_parentOrigin ())
1358 {
1359 src_x += term->window_vt_x; 1435 src_x += term->window_vt_x;
1360 src_y += term->window_vt_y; 1436 src_y += term->window_vt_y;
1361 } 1437 }
1362 1438
1363 if (term->bgPixmap.pmap_width >= src_x+w 1439 if (term->bg_img->w >= src_x + w
1364 && term->bgPixmap.pmap_height >= src_y+h) 1440 && term->bg_img->h >= src_y + h)
1365 { 1441 {
1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1442 XCopyArea (disp, term->bg_img->pm, d2, gc,
1367 src_x, src_y, w, h, 0, 0); 1443 src_x, src_y, w, h, 0, 0);
1368 } 1444 }
1369 else 1445 else
1370 { 1446 {
1371 XGCValues gcv; 1447 XGCValues gcv;
1372 1448
1373 gcv.fill_style = FillTiled; 1449 gcv.fill_style = FillTiled;
1374 gcv.tile = term->bgPixmap.pixmap; 1450 gcv.tile = term->bg_img->pm;
1375 gcv.ts_x_origin = -src_x; 1451 gcv.ts_x_origin = -src_x;
1376 gcv.ts_y_origin = -src_y; 1452 gcv.ts_y_origin = -src_y;
1377 1453
1378 XChangeGC (disp, gc, 1454 XChangeGC (disp, gc,
1379 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1455 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1380 &gcv); 1456 &gcv);
1381 1457
1382 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1458 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383 1459
1384 gcv.fill_style = FillSolid; 1460 gcv.fill_style = FillSolid;
1385 XChangeGC (disp, gc, GCFillStyle, &gcv); 1461 XChangeGC (disp, gc, GCFillStyle, &gcv);
1386 } 1462 }
1387 1463
1388 if (bg >= 0) 1464 if (dst)
1389 { 1465 {
1390 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1466 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1467
1468 // dst can only be set when bg >= 0
1391 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1469 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392 }
1393
1394 back_rendered = true;
1395 } 1470 }
1396 } 1471 }
1472 else
1397#endif 1473#endif
1398
1399 if (bg >= 0 && !back_rendered)
1400 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1474 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1401 1475
1402 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1476 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1477 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404 } 1478 }
1405 else 1479 else
… …
1433 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1507 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1434 = rxvt_fontprop::unset; 1508 = rxvt_fontprop::unset;
1435 force_prop = false; 1509 force_prop = false;
1436 1510
1437 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1511 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1438 FONT_UNREF (*i); 1512 (*i)->unref ();
1439 1513
1440 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1514 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1441 delete *p; 1515 delete *p;
1442 1516
1443 free (fontdesc); fontdesc = 0; 1517 free (fontdesc); fontdesc = 0;
… …
1445 fonts.clear (); 1519 fonts.clear ();
1446 1520
1447 fallback = fallback_fonts; 1521 fallback = fallback_fonts;
1448} 1522}
1449 1523
1524void
1525rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1526{
1527 font->set_term (term);
1528
1529 font->cs = cs;
1530 font->loaded = false;
1531}
1532
1450rxvt_font * 1533rxvt_font *
1451rxvt_fontset::new_font (const char *name, codeset cs) 1534rxvt_fontset::new_font (const char *name, codeset cs)
1452{ 1535{
1453 rxvt_font *f; 1536 rxvt_font *f;
1454 1537
… …
1470 f = new rxvt_font_x11; 1553 f = new rxvt_font_x11;
1471 } 1554 }
1472 else 1555 else
1473 f = new rxvt_font_x11; 1556 f = new rxvt_font_x11;
1474 1557
1475 f->set_term (term);
1476 f->set_name (strdup (name)); 1558 f->set_name (strdup (name));
1477 1559 prepare_font (f, cs);
1478 f->cs = cs;
1479 f->loaded = false;
1480 1560
1481 return f; 1561 return f;
1482} 1562}
1483 1563
1484///////////////////////////////////////////////////////////////////////////// 1564/////////////////////////////////////////////////////////////////////////////
1565
1566void
1567rxvt_fontset::push_font (rxvt_font *font)
1568{
1569 // the fontCount index is reserved for the overflow font, it is only
1570 // necessary when we get fontCount or more fonts, as they cannot be
1571 // represented in the rendition.
1572 if (fonts.size () == fontCount)
1573 {
1574 rxvt_font *f = new rxvt_font_overflow (this);
1575
1576 prepare_font (f, CS_UNICODE);
1577 fonts.push_back (f);
1578 }
1579
1580 fonts.push_back (font);
1581}
1485 1582
1486void 1583void
1487rxvt_fontset::add_fonts (const char *desc) 1584rxvt_fontset::add_fonts (const char *desc)
1488{ 1585{
1489 if (desc) 1586 if (desc)
… …
1518 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1615 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1519 else 1616 else
1520 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1617 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1521 1618
1522 desc++; 1619 desc++;
1523 while (*desc <= ' ') desc++; 1620 while (*desc <= ' ' && *desc) desc++;
1524 } 1621 }
1525 1622
1526 end = strchr (desc, ','); 1623 end = strchr (desc, ',');
1527 if (!end) 1624 if (!end)
1528 end = desc + strlen (desc); 1625 end = desc + strlen (desc);
1529 1626
1530 if (end - desc < 511) 1627 if (end - desc < 511)
1531 { 1628 {
1532 strncpy (buf, desc, end - desc); 1629 memcpy (buf, desc, end - desc);
1533 buf[end - desc] = 0; 1630 buf[end - desc] = 0;
1534 1631
1535 fonts.push_back (new_font (buf, cs)); 1632 push_font (new_font (buf, cs));
1536 } 1633 }
1537 else 1634 else
1538 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1635 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1539 1636
1540 desc = end + 1; 1637 desc = end + 1;
1541 } 1638 }
1542 while (*end); 1639 while (*end);
1543 } 1640 }
… …
1568{ 1665{
1569 clear (); 1666 clear ();
1570 1667
1571 fontdesc = strdup (desc); 1668 fontdesc = strdup (desc);
1572 1669
1573 fonts.push_back (new_font (0, CS_UNICODE)); 1670 push_font (new_font (0, CS_UNICODE));
1574 realize_font (0); 1671 realize_font (0);
1575 1672
1576 add_fonts (desc); 1673 add_fonts (desc);
1577 1674
1578 return true; 1675 return true;
… …
1587 1684
1588 return -1; 1685 return -1;
1589} 1686}
1590 1687
1591int 1688int
1592rxvt_fontset::find_font (unicode_t unicode) 1689rxvt_fontset::find_font_idx (unicode_t unicode)
1593{ 1690{
1594 if (unicode >= 1<<20) 1691 if (unicode >= 1<<20)
1595 return 0; 1692 return 0;
1596 1693
1597 unicode_t hi = unicode >> 8; 1694 unicode_t hi = unicode >> 8;
… …
1623 goto next_font; 1720 goto next_font;
1624 1721
1625 bool careful; 1722 bool careful;
1626 if (f->has_char (unicode, &prop, careful)) 1723 if (f->has_char (unicode, &prop, careful))
1627 { 1724 {
1628 if (careful) 1725 i = (i << 1) | careful;
1629 i |= 128;
1630 1726
1631 goto found; 1727 goto found;
1632 } 1728 }
1633 1729
1634 next_font: 1730 next_font:
1635 if (i == fonts.size () - 1) 1731 if (i == fonts.size () - 1)
1636 { 1732 {
1637 if (fallback->name) 1733 if (fallback->name)
1638 { 1734 {
1639 // search through the fallback list 1735 // search through the fallback list
1640 fonts.push_back (new_font (fallback->name, fallback->cs)); 1736 push_font (new_font (fallback->name, fallback->cs));
1641 fallback++; 1737 fallback++;
1642 } 1738 }
1643 else 1739 else
1644 { 1740 {
1645 // try to find a new font. 1741 // try to find a new font.
… …
1647 // way to configure this and xft is easier to hack in, 1743 // way to configure this and xft is easier to hack in,
1648 // while x11 has more framework in place already. 1744 // while x11 has more framework in place already.
1649 // TODO: this is a real resource hog, xft takes ages(?) 1745 // TODO: this is a real resource hog, xft takes ages(?)
1650#if XFT && USE_SLOW_LOOKUP 1746#if XFT && USE_SLOW_LOOKUP
1651 // grab the first xft font that seems suitable 1747 // grab the first xft font that seems suitable
1748 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1652 FcPattern *p = FcPatternCreate (); 1749 FcPattern *p = FcPatternCreate ();
1653 1750
1654 FcCharSet *s = FcCharSetCreate (); 1751 FcCharSet *s = FcCharSetCreate ();
1655 FcCharSetAddChar (s, unicode); 1752 FcCharSetAddChar (s, unicode);
1656 FcPatternAddCharSet (p, FC_CHARSET, s); 1753 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1676 FcPatternDestroy (match); 1773 FcPatternDestroy (match);
1677 1774
1678 if (find_font (font) < 0) 1775 if (find_font (font) < 0)
1679 { 1776 {
1680 char fontname[4096]; 1777 char fontname[4096];
1681 sprintf (fontname, "xft:%-.4090s", font); 1778 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1682 1779
1683 fonts.push_back (new_font (fontname, CS_UNICODE)); 1780 push_font (new_font (fontname, CS_UNICODE));
1684 } 1781 }
1685 1782
1686 free (font); 1783 free (font);
1687 } 1784 }
1688#endif 1785#endif
… …
1700 while (hi >= fmap.size ()) 1797 while (hi >= fmap.size ())
1701 fmap.push_back (0); 1798 fmap.push_back (0);
1702 1799
1703 if (!fmap[hi]) 1800 if (!fmap[hi])
1704 { 1801 {
1705 fmap[hi] = (pagemap *)new pagemap; 1802 fmap[hi] = new pagemap;
1706 memset (fmap[hi], 0xff, sizeof (pagemap)); 1803 memset (fmap[hi], 0xff, sizeof (pagemap));
1707 } 1804 }
1708 1805
1709 (*fmap[hi])[unicode & 0xff] = i; 1806 (*fmap[hi])[unicode & 0xff] = i;
1710 } 1807 }
1711 1808
1712 return i; 1809 return i;
1713} 1810}
1714 1811
1715
1716

Diff Legend

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