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.195 by root, Mon Sep 7 14:50:56 2015 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
243#ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 245 if (term->bg_img
245 { 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 }
… …
449 449
450 text_t chrs[2]; 450 text_t chrs[2];
451 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
452 452
453 *chrs = cc->c1; 453 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
456 456
457 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
458 { 458 {
459 bool careful; 459 bool careful;
460 460
461 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 462 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 464 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
466 466
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 468 }
469 } 469 }
470#endif 470#endif
… …
483 483
484 x += fwidth; 484 x += fwidth;
485 } 485 }
486} 486}
487 487
488struct rxvt_font_overflow : rxvt_font {
489 struct rxvt_fontset *fs;
490
491 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font ()
493 {
494 this->fs = fs;
495 }
496
497 rxvt_fontprop properties ()
498 {
499 rxvt_fontprop p;
500
501 p.width = p.height = 1;
502 p.ascent = rxvt_fontprop::unset;
503 p.weight = rxvt_fontprop::medium;
504 p.slant = rxvt_fontprop::roman;
505
506 return p;
507 }
508
509 bool load (const rxvt_fontprop &prop, bool force_prop)
510 {
511 width = 1; height = 1;
512 ascent = 1; descent = 0;
513
514 set_name (strdup ("built-in rendition overflow font"));
515
516 return true;
517 }
518
519 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
520 {
521 return false;
522 }
523
524 void draw (rxvt_drawable &d, int x, int y,
525 const text_t *text, int len,
526 int fg, int bg)
527 {
528 while (len)
529 {
530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 text += w;
536 len -= w;
537 x += term->fwidth * w;
538 }
539 }
540};
541
488///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
489 543
490struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
491 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
492 546
… …
500 554
501 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 556 const text_t *text, int len,
503 int fg, int bg); 557 int fg, int bg);
504 558
505 bool slow; // wether this is a proportional font or has other funny characteristics 559 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 560 XFontStruct *f;
507 bool enc2b, encm; 561 bool enc2b, encm;
508 562
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 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); 564 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
632 686
633 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
634 { 688 {
635 size_t len = field - name; 689 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 strncpy (*ptr, name, len); 691 memcpy (*ptr, name, len);
638 strcpy (*ptr + len, replace); 692 strcpy (*ptr + len, replace);
639 strcat (*ptr, end); 693 strcat (*ptr, end);
640 694
641 return true; 695 return true;
642 } 696 }
… …
667 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
668 722
669 if (!f) 723 if (!f)
670 return false; 724 return false;
671 725
672 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
673 727
674 if (new_name) 728 if (new_name)
675 set_name (new_name); 729 set_name (new_name);
676 else 730 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
678 732
679 XFreeFont (disp, f); 733 XFreeFont (disp, f);
680 f = 0; 734 f = 0;
681 } 735 }
682 736
… …
739 free (fname); 793 free (fname);
740 if (replace_field (&fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 } 796 }
743 797
744 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
745 continue; 804 continue;
746 805 }
747 if (prop.height != rxvt_fontprop::unset
748 && p.height > prop.height) // weed out too large fonts
749 continue;
750 806
751 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 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); 808 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); 809 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); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
760 XFreeFontNames (list); 816 XFreeFontNames (list);
761 817
762 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
763 for (;;) 819 for (;;)
764 { 820 {
765 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
766 822
767 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
768 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
769 best = w; 825 best = w;
770 826
771 if (!best->name 827 if (!best->name
772 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
773 break; 829 break;
… …
793 return false; 849 return false;
794 850
795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
797 853
854 cs = CS_UNKNOWN;
855
798 if (registry && encoding) 856 if (registry && encoding)
799 { 857 {
800 char charset[64]; 858 char charset[64];
801 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
802 860
803 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
804 } 862
805 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
806 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
807 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
808 874
809 if (!charset) 875 if (!charset)
810 charset = name; 876 charset = name;
811 877
812 int count = 13; 878 int count = 13;
813 while (*charset) 879 while (*charset)
814 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
815 break; 881 break;
816 882
817 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
884 if (cs == CS_UNKNOWN)
885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
888 }
889
890 if (cs == CS_UNKNOWN)
818 } 891 {
819 892 clear ();
820 free (registry); 893 return false;
821 free (encoding); 894 }
822 895
823 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
824 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 897 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
825 898
826 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
851 } 924 }
852#endif 925#endif
853 926
854 width = 1; 927 width = 1;
855 928
856 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
857 { 930 {
858 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
859 continue; 932 continue;
860 933
861 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
862 bool careful; 935 bool careful;
863 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
864 continue; 937 continue;
865 938
866 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
867 941
868 XCharStruct g; 942 XCharStruct g;
869 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
870 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
871 945
… …
873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
874 948
875 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
876 } 950 }
877 951
878 if (cs == CS_UNKNOWN) 952#if 0 // do it per-character
953 if (prop && width > prop->width)
879 { 954 {
880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
881
882 clear (); 955 clear ();
883 return false; 956 return false;
884 } 957 }
885
886#if 0 // do it per-character
887 if (prop && width > prop->width)
888 {
889 clear ();
890 return false;
891 }
892#endif 958#endif
893 959
894 return true; 960 return true;
895} 961}
896 962
… …
905} 971}
906 972
907bool 973bool
908rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
909{ 975{
976 careful = false;
977
910 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
911 979
912 if (ch == NOCHAR) 980 if (ch == NOCHAR)
913 return false; 981 return false;
914 982
915 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
916 XCharStruct *xcs; 984 XCharStruct *xcs;
917 985
918 if (encm) 986 if (encm)
919 { 987 {
920 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
950 return false; 1018 return false;
951 1019
952 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
953 return true; 1021 return true;
954 1022
955 // check wether character overlaps previous/next character 1023 // check whether character overlaps previous/next character
956 int w = xcs->rbearing - xcs->lbearing; 1024 int w = xcs->rbearing - xcs->lbearing;
957 int wcw = max (WCWIDTH (unicode), 1); 1025 int wcw = max (WCWIDTH (unicode), 1);
958 1026
959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
960 1028
… …
977 dTermDisplay; 1045 dTermDisplay;
978 dTermGC; 1046 dTermGC;
979 1047
980 bool slow = this->slow 1048 bool slow = this->slow
981 || width != term->fwidth 1049 || width != term->fwidth
982 || height != term->fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
983 1052
984 int base = ascent; // sorry, incorrect: term->fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
985 1054
986 XGCValues v; 1055 XGCValues v;
987 v.foreground = term->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
… …
1134 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1203 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1135 1204
1136#if 0 // clipping unfortunately destroys our precious double-width-characters 1205#if 0 // clipping unfortunately destroys our precious double-width-characters
1137 // clip width, we can't do better, or can we? 1206 // clip width, we can't do better, or can we?
1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1207 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1139 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1208 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1140#endif 1209#endif
1141 1210
1142 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1211 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1143 FcPatternAddBool (p, FC_MINSPACE, 1); 1212 FcPatternAddBool (p, FC_MINSPACE, 1);
1144 1213
… …
1156 int ftheight = 0; 1225 int ftheight = 0;
1157 bool success = true; 1226 bool success = true;
1158 1227
1159 for (;;) 1228 for (;;)
1160 { 1229 {
1230 p = FcPatternDuplicate (match);
1161 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1162 1232
1163 if (!f) 1233 if (!f)
1164 { 1234 {
1235 FcPatternDestroy (p);
1165 success = false; 1236 success = false;
1166 break; 1237 break;
1167 } 1238 }
1168 1239
1169 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1177 1248
1178 XftUnlockFace (f); 1249 XftUnlockFace (f);
1179 1250
1180 int glheight = height; 1251 int glheight = height;
1181 1252
1182 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1183 { 1254 {
1184 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1185 1256
1186 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1187 && ch > 0x100 1258 && ch > 0x100
… …
1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1289 const text_t *text, int len, 1360 const text_t *text, int len,
1290 int fg, int bg) 1361 int fg, int bg)
1291{ 1362{
1292 XGlyphInfo extents; 1363 XGlyphInfo extents;
1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1294 XftGlyphSpec *ep = enc; 1365 XftGlyphSpec *ep = enc;
1295 1366
1296 dTermDisplay; 1367 dTermDisplay;
1297 dTermGC; 1368 dTermGC;
1298 1369
1299 int w = term->fwidth * len; 1370 int w = term->fwidth * len;
1300 int h = term->fheight; 1371 int h = term->fheight;
1301 1372
1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1373 bool buffered = bg >= Color_transparent
1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1374 && term->option (Opt_buffered);
1304 * good idea from the perspective of packaging for wide variety of user configs. 1375
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1311 // cut trailing spaces 1376 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1377 while (len && text [len - 1] == ' ')
1313 len--; 1378 len--;
1314 1379
1315 int x_ = buffered ? 0 : x; 1380 int x_ = buffered ? 0 : x;
… …
1341 x_ += cwidth; 1406 x_ += cwidth;
1342 } 1407 }
1343 1408
1344 if (buffered) 1409 if (buffered)
1345 { 1410 {
1346 bool back_rendered = false;
1347 if (ep != enc) 1411 if (ep != enc)
1348 { 1412 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350 1414
1351#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_BG_PIXMAP
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417
1352 if (term->bgPixmap.pixmap) 1418 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 { 1421 {
1354 Picture dst = 0; 1422 int src_x = x, src_y = y;
1355 1423
1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
1360 { 1425 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x; 1426 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y; 1427 src_y += term->window_vt_y;
1367 } 1428 }
1368 1429
1369 if (term->bgPixmap.pmap_width >= src_x+w 1430 if (term->bg_img->w >= src_x + w
1370 && term->bgPixmap.pmap_height >= src_y+h) 1431 && term->bg_img->h >= src_y + h)
1371 { 1432 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1373 src_x, src_y, w, h, 0, 0); 1434 src_x, src_y, w, h, 0, 0);
1374 } 1435 }
1375 else 1436 else
1376 { 1437 {
1377 XGCValues gcv; 1438 XGCValues gcv;
1378 1439
1379 gcv.fill_style = FillTiled; 1440 gcv.fill_style = FillTiled;
1380 gcv.tile = term->bgPixmap.pixmap; 1441 gcv.tile = term->bg_img->pm;
1381 gcv.ts_x_origin = -src_x; 1442 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y; 1443 gcv.ts_y_origin = -src_y;
1383 1444
1384 XChangeGC (disp, gc, 1445 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv); 1447 &gcv);
1387 1448
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1449 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389 1450
1390 gcv.fill_style = FillSolid; 1451 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv); 1452 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 } 1453 }
1393 1454
1394 if (bg >= 0) 1455 if (dst)
1395 { 1456 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1457 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1458
1459 // 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); 1460 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
1401 } 1461 }
1402 } 1462 }
1463 else
1403#endif 1464#endif
1404
1405 if (bg >= 0 && !back_rendered)
1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1465 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1407 1466
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1467 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1468 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1410 } 1469 }
1411 else 1470 else
… …
1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1498 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1440 = rxvt_fontprop::unset; 1499 = rxvt_fontprop::unset;
1441 force_prop = false; 1500 force_prop = false;
1442 1501
1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1502 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1444 FONT_UNREF (*i); 1503 (*i)->unref ();
1445 1504
1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1505 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1447 delete *p; 1506 delete *p;
1448 1507
1449 free (fontdesc); fontdesc = 0; 1508 free (fontdesc); fontdesc = 0;
… …
1451 fonts.clear (); 1510 fonts.clear ();
1452 1511
1453 fallback = fallback_fonts; 1512 fallback = fallback_fonts;
1454} 1513}
1455 1514
1515void
1516rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1517{
1518 font->set_term (term);
1519
1520 font->cs = cs;
1521 font->loaded = false;
1522}
1523
1456rxvt_font * 1524rxvt_font *
1457rxvt_fontset::new_font (const char *name, codeset cs) 1525rxvt_fontset::new_font (const char *name, codeset cs)
1458{ 1526{
1459 rxvt_font *f; 1527 rxvt_font *f;
1460 1528
… …
1476 f = new rxvt_font_x11; 1544 f = new rxvt_font_x11;
1477 } 1545 }
1478 else 1546 else
1479 f = new rxvt_font_x11; 1547 f = new rxvt_font_x11;
1480 1548
1481 f->set_term (term);
1482 f->set_name (strdup (name)); 1549 f->set_name (strdup (name));
1483 1550 prepare_font (f, cs);
1484 f->cs = cs;
1485 f->loaded = false;
1486 1551
1487 return f; 1552 return f;
1488} 1553}
1489 1554
1490///////////////////////////////////////////////////////////////////////////// 1555/////////////////////////////////////////////////////////////////////////////
1556
1557void
1558rxvt_fontset::push_font (rxvt_font *font)
1559{
1560 // the fontCount index is reserved for the overflow font, it is only
1561 // necessary when we get fontCount or more fonts, as they cannot be
1562 // represented in the rendition.
1563 if (fonts.size () == fontCount)
1564 {
1565 rxvt_font *f = new rxvt_font_overflow (this);
1566
1567 prepare_font (f, CS_UNICODE);
1568 fonts.push_back (f);
1569 }
1570
1571 fonts.push_back (font);
1572}
1491 1573
1492void 1574void
1493rxvt_fontset::add_fonts (const char *desc) 1575rxvt_fontset::add_fonts (const char *desc)
1494{ 1576{
1495 if (desc) 1577 if (desc)
… …
1524 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1525 else 1607 else
1526 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1527 1609
1528 desc++; 1610 desc++;
1529 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1530 } 1612 }
1531 1613
1532 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1533 if (!end) 1615 if (!end)
1534 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
1535 1617
1536 if (end - desc < 511) 1618 if (end - desc < 511)
1537 { 1619 {
1538 strncpy (buf, desc, end - desc); 1620 memcpy (buf, desc, end - desc);
1539 buf[end - desc] = 0; 1621 buf[end - desc] = 0;
1540 1622
1541 fonts.push_back (new_font (buf, cs)); 1623 push_font (new_font (buf, cs));
1542 } 1624 }
1543 else 1625 else
1544 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1626 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1545 1627
1546 desc = end + 1; 1628 desc = end + 1;
1547 } 1629 }
1548 while (*end); 1630 while (*end);
1549 } 1631 }
… …
1574{ 1656{
1575 clear (); 1657 clear ();
1576 1658
1577 fontdesc = strdup (desc); 1659 fontdesc = strdup (desc);
1578 1660
1579 fonts.push_back (new_font (0, CS_UNICODE)); 1661 push_font (new_font (0, CS_UNICODE));
1580 realize_font (0); 1662 realize_font (0);
1581 1663
1582 add_fonts (desc); 1664 add_fonts (desc);
1583 1665
1584 return true; 1666 return true;
… …
1593 1675
1594 return -1; 1676 return -1;
1595} 1677}
1596 1678
1597int 1679int
1598rxvt_fontset::find_font (unicode_t unicode) 1680rxvt_fontset::find_font_idx (unicode_t unicode)
1599{ 1681{
1600 if (unicode >= 1<<20) 1682 if (unicode >= 1<<20)
1601 return 0; 1683 return 0;
1602 1684
1603 unicode_t hi = unicode >> 8; 1685 unicode_t hi = unicode >> 8;
… …
1629 goto next_font; 1711 goto next_font;
1630 1712
1631 bool careful; 1713 bool careful;
1632 if (f->has_char (unicode, &prop, careful)) 1714 if (f->has_char (unicode, &prop, careful))
1633 { 1715 {
1634 if (careful) 1716 i = (i << 1) | careful;
1635 i |= 128;
1636 1717
1637 goto found; 1718 goto found;
1638 } 1719 }
1639 1720
1640 next_font: 1721 next_font:
1641 if (i == fonts.size () - 1) 1722 if (i == fonts.size () - 1)
1642 { 1723 {
1643 if (fallback->name) 1724 if (fallback->name)
1644 { 1725 {
1645 // search through the fallback list 1726 // search through the fallback list
1646 fonts.push_back (new_font (fallback->name, fallback->cs)); 1727 push_font (new_font (fallback->name, fallback->cs));
1647 fallback++; 1728 fallback++;
1648 } 1729 }
1649 else 1730 else
1650 { 1731 {
1651 // try to find a new font. 1732 // try to find a new font.
… …
1682 FcPatternDestroy (match); 1763 FcPatternDestroy (match);
1683 1764
1684 if (find_font (font) < 0) 1765 if (find_font (font) < 0)
1685 { 1766 {
1686 char fontname[4096]; 1767 char fontname[4096];
1687 sprintf (fontname, "xft:%-.4090s", font); 1768 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1688 1769
1689 fonts.push_back (new_font (fontname, CS_UNICODE)); 1770 push_font (new_font (fontname, CS_UNICODE));
1690 } 1771 }
1691 1772
1692 free (font); 1773 free (font);
1693 } 1774 }
1694#endif 1775#endif
… …
1706 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1707 fmap.push_back (0); 1788 fmap.push_back (0);
1708 1789
1709 if (!fmap[hi]) 1790 if (!fmap[hi])
1710 { 1791 {
1711 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1712 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1713 } 1794 }
1714 1795
1715 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1716 } 1797 }
1717 1798
1718 return i; 1799 return i;
1719} 1800}
1720 1801
1721
1722

Diff Legend

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