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.124 by ayin, Sat Nov 24 11:41:11 2007 UTC vs.
Revision 1.180 by sf-exg, Mon May 30 18:39:03 2011 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 2 of the License, or
… …
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 <cstdlib>
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" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
159}; 162};
160 163
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
165 166
166///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
167 168
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 219{
219} 220}
220 221
221void 222void
222rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
223{ 224{
224 if (this->name == name) 225 if (name == name_)
225 return; 226 return;
226 227
227 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
228 this->name = name; 229 name = name_;
229} 230}
230 231
231void 232void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 234{
… …
237 if (color == Color_bg || color == Color_transparent) 238 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 240 else if (color >= 0)
240 { 241 {
241#if XFT 242#if XFT
242 bool done = false; 243 Picture dst;
244
243#ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 246 if (term->bg_pixmap
245 { 247 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 248 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 249 {
249 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
251
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 252 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); 253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 254 }
254 } 255 else
255#endif 256# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
258#else 259#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 262#endif
262 } 263 }
… …
449 450
450 text_t chrs[2]; 451 text_t chrs[2];
451 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
452 453
453 *chrs = cc->c1; 454 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
456 457
457 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
458 { 459 {
459 bool careful; 460 bool careful;
460 461
461 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 463 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 465 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
466 467
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 469 }
469 } 470 }
470#endif 471#endif
… …
483 484
484 x += fwidth; 485 x += fwidth;
485 } 486 }
486} 487}
487 488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len)
530 {
531 int fid = fs->find_font_idx (*text);
532 int w = 1;
533 while (w < len && text[w] == NOCHAR)
534 w++;
535 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
536 text += w;
537 len -= w;
538 x += term->fwidth * w;
539 }
540 }
541};
542
488///////////////////////////////////////////////////////////////////////////// 543/////////////////////////////////////////////////////////////////////////////
489 544
490struct rxvt_font_x11 : rxvt_font { 545struct rxvt_font_x11 : rxvt_font {
491 rxvt_font_x11 () { f = 0; } 546 rxvt_font_x11 () { f = 0; }
492 547
… …
500 555
501 void draw (rxvt_drawable &d, int x, int y, 556 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 557 const text_t *text, int len,
503 int fg, int bg); 558 int fg, int bg);
504 559
505 bool slow; // wether this is a proportional font or has other funny characteristics 560 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 561 XFontStruct *f;
507 bool enc2b, encm; 562 bool enc2b, encm;
508 563
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 564 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); 565 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
610 return false; 665 return false;
611} 666}
612 667
613// fix the size of scalable fonts 668// fix the size of scalable fonts
614static bool 669static bool
615replace_field (char *buf, const char *name, int index, const char old, const char *replace) 670replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
616{ 671{
617 int slashes = 0; 672 int slashes = 0;
618 const char *field, *end; 673 const char *field, *end;
619 674
620 for (const char *c = name; *c; c++) 675 for (const char *c = name; *c; c++)
… …
630 break; 685 break;
631 } 686 }
632 687
633 if (slashes >= 13 && (!old || *field == old)) 688 if (slashes >= 13 && (!old || *field == old))
634 { 689 {
635 // TODO: check for overflow in font-name 690 size_t len = field - name;
636 strncpy (buf, name, field - name); 691 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 buf += field - name; 692 memcpy (*ptr, name, len);
638 strcpy (buf, replace); 693 strcpy (*ptr + len, replace);
639 strcat (buf, end); 694 strcat (*ptr, end);
640 695
641 return true; 696 return true;
642 } 697 }
643 else 698 else
644 { 699 {
645 strcpy (buf, name); 700 *ptr = strdup (name);
646 701
647 return false; 702 return false;
648 } 703 }
649} 704}
650 705
… …
658 char field_str[64]; // enough for 128 bits 713 char field_str[64]; // enough for 128 bits
659 714
660 // first morph the font if required 715 // first morph the font if required
661 if (force_prop) 716 if (force_prop)
662 { 717 {
663 char fname[1024]; 718 char *fname;
664 719
665 if (name[0] != '-') 720 if (name[0] != '-')
666 { 721 {
667 f = XLoadQueryFont (disp, name); 722 f = XLoadQueryFont (disp, name);
668 723
669 if (!f) 724 if (!f)
670 return false; 725 return false;
671 726
672 char *new_name = get_property (f, XA_FONT, name); 727 char *new_name = get_property (f, XA_FONT, 0);
673 728
674 if (new_name) 729 if (new_name)
675 set_name (new_name); 730 set_name (new_name);
676 else 731 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 732 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
678 733
679 XFreeFont (disp, f); 734 XFreeFont (disp, f);
680 f = 0; 735 f = 0;
681 } 736 }
682 737
683 if (prop.weight != rxvt_fontprop::unset) 738 if (prop.weight != rxvt_fontprop::unset)
684 { 739 {
685 replace_field (fname, name, 2, 0, 740 replace_field (&fname, name, 2, 0,
686 prop.weight < rxvt_fontprop::bold 741 prop.weight < rxvt_fontprop::bold
687 ? "medium" : "bold"); 742 ? "medium" : "bold");
688 set_name (strdup (fname)); 743 set_name (fname);
689 } 744 }
690 745
691 if (prop.slant != rxvt_fontprop::unset) 746 if (prop.slant != rxvt_fontprop::unset)
692 { 747 {
693 replace_field (fname, name, 3, 0, 748 replace_field (&fname, name, 3, 0,
694 prop.slant < rxvt_fontprop::italic 749 prop.slant < rxvt_fontprop::italic
695 ? "r" : "i"); // TODO: handle "o"blique, too 750 ? "r" : "i"); // TODO: handle "o"blique, too
696 set_name (strdup (fname)); 751 set_name (fname);
697 } 752 }
698 } 753 }
699 754
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 755 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height); 756 ? 0 : prop.height);
… …
726 font_weight *fonts = new font_weight[count]; 781 font_weight *fonts = new font_weight[count];
727 782
728 for (int i = 0; i < count; i++) 783 for (int i = 0; i < count; i++)
729 { 784 {
730 rxvt_fontprop p; 785 rxvt_fontprop p;
731 char fname[1024]; 786 char *fname;
732 787
733 int diff = 0; 788 int diff = 0;
734 789
735 if (replace_field (fname, list[i], 6, '0', field_str)) 790 if (replace_field (&fname, list[i], 6, '0', field_str))
736 diff += 10; // slightly penalize scalable fonts 791 diff += 10; // slightly penalize scalable fonts
792 else
793 {
794 free (fname);
737 else if (replace_field (fname, list[i], 11, '0', "0")) 795 if (replace_field (&fname, list[i], 11, '0', "0"))
738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 796 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
797 }
739 798
740 if (!set_properties (p, fname)) 799 if (!set_properties (p, fname)
800 // also weed out too large fonts
801 || (prop.height != rxvt_fontprop::unset
802 && p.height > prop.height))
803 {
804 free (fname);
741 continue; 805 continue;
742 806 }
743 if (prop.height != rxvt_fontprop::unset
744 && p.height > prop.height) // weed out too large fonts
745 continue;
746 807
747 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 808 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
748 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 809 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
749 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 810 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
750 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 811 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
751 812
752 fonts[i].name = strdup (fname); 813 fonts[i].name = fname;
753 fonts[i].diff = diff; 814 fonts[i].diff = diff;
754 } 815 }
755 816
756 XFreeFontNames (list); 817 XFreeFontNames (list);
757 818
… …
789 return false; 850 return false;
790 851
791 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 852 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
792 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 853 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
793 854
855 cs = CS_UNKNOWN;
856
794 if (registry && encoding) 857 if (registry && encoding)
795 { 858 {
796 char charset[64]; 859 char charset[64];
797 snprintf (charset, 64, "%s-%s", registry, encoding); 860 snprintf (charset, 64, "%s-%s", registry, encoding);
798 861
799 cs = codeset_from_name (charset); 862 cs = codeset_from_name (charset);
800 } 863
801 else 864 if (cs == CS_UNKNOWN)
865 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
802 { 866 }
867
868 free (registry);
869 free (encoding);
870
871 if (cs == CS_UNKNOWN)
872 {
803 const char *charset = get_property (f, XA_FONT, 0); 873 char *value = get_property (f, XA_FONT, 0);
874 const char *charset = value;
804 875
805 if (!charset) 876 if (!charset)
806 charset = name; 877 charset = name;
807 878
808 int count = 13; 879 int count = 13;
809 while (*charset) 880 while (*charset)
810 if (*charset++ == '-' && !--count) 881 if (*charset++ == '-' && !--count)
811 break; 882 break;
812 883
813 cs = codeset_from_name (charset); 884 cs = codeset_from_name (charset);
885 if (cs == CS_UNKNOWN)
886 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
887
888 free (value);
889 }
890
891 if (cs == CS_UNKNOWN)
814 } 892 {
815 893 clear ();
816 free (registry); 894 return false;
817 free (encoding); 895 }
818 896
819 if (cs == CS_UNICODE) 897 if (cs == CS_UNICODE)
820 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 898 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
821 899
822 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 900 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
847 } 925 }
848#endif 926#endif
849 927
850 width = 1; 928 width = 1;
851 929
852 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 930 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
853 { 931 {
854 if (FROM_UNICODE (cs, *t) == NOCHAR) 932 if (FROM_UNICODE (cs, *t) == NOCHAR)
855 continue; 933 continue;
856 934
857 // ignore characters we wouldn't use anyways 935 // ignore characters we wouldn't use anyways
… …
869 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
870 948
871 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
872 } 950 }
873 951
874 if (cs == CS_UNKNOWN) 952#if 0 // do it per-character
953 if (prop && width > prop->width)
875 { 954 {
876 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
877
878 clear (); 955 clear ();
879 return false; 956 return false;
880 } 957 }
881
882#if 0 // do it per-character
883 if (prop && width > prop->width)
884 {
885 clear ();
886 return false;
887 }
888#endif 958#endif
889 959
890 return true; 960 return true;
891} 961}
892 962
… …
901} 971}
902 972
903bool 973bool
904rxvt_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
905{ 975{
976 careful = false;
977
906 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
907 979
908 if (ch == NOCHAR) 980 if (ch == NOCHAR)
909 return false; 981 return false;
910 982
911 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
912 XCharStruct *xcs; 984 XCharStruct *xcs;
913 985
914 if (encm) 986 if (encm)
915 { 987 {
916 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
946 return false; 1018 return false;
947 1019
948 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
949 return true; 1021 return true;
950 1022
951 // check wether character overlaps previous/next character 1023 // check whether character overlaps previous/next character
952 int w = xcs->rbearing - xcs->lbearing; 1024 int w = xcs->rbearing - xcs->lbearing;
953 int wcw = max (WCWIDTH (unicode), 1); 1025 int wcw = max (WCWIDTH (unicode), 1);
954 1026
955 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
956 1028
… …
1130 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1202 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1131 1203
1132#if 0 // clipping unfortunately destroys our precious double-width-characters 1204#if 0 // clipping unfortunately destroys our precious double-width-characters
1133 // clip width, we can't do better, or can we? 1205 // clip width, we can't do better, or can we?
1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1135 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1207 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1136#endif 1208#endif
1137 1209
1138 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1210 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1139 FcPatternAddBool (p, FC_MINSPACE, 1); 1211 FcPatternAddBool (p, FC_MINSPACE, 1);
1140 1212
… …
1152 int ftheight = 0; 1224 int ftheight = 0;
1153 bool success = true; 1225 bool success = true;
1154 1226
1155 for (;;) 1227 for (;;)
1156 { 1228 {
1229 p = FcPatternDuplicate (match);
1157 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1230 f = XftFontOpenPattern (disp, p);
1158 1231
1159 if (!f) 1232 if (!f)
1160 { 1233 {
1234 FcPatternDestroy (p);
1161 success = false; 1235 success = false;
1162 break; 1236 break;
1163 } 1237 }
1164 1238
1165 FT_Face face = XftLockFace (f); 1239 FT_Face face = XftLockFace (f);
… …
1173 1247
1174 XftUnlockFace (f); 1248 XftUnlockFace (f);
1175 1249
1176 int glheight = height; 1250 int glheight = height;
1177 1251
1178 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1252 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
1179 { 1253 {
1180 FcChar16 ch = *t; 1254 FcChar16 ch = *t;
1181 1255
1182 if (cs != CS_UNICODE 1256 if (cs != CS_UNICODE
1183 && ch > 0x100 1257 && ch > 0x100
… …
1284rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1358rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1285 const text_t *text, int len, 1359 const text_t *text, int len,
1286 int fg, int bg) 1360 int fg, int bg)
1287{ 1361{
1288 XGlyphInfo extents; 1362 XGlyphInfo extents;
1289 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1363 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1290 XftGlyphSpec *ep = enc; 1364 XftGlyphSpec *ep = enc;
1291 1365
1292 dTermDisplay; 1366 dTermDisplay;
1293 dTermGC; 1367 dTermGC;
1294 1368
1295 int w = term->fwidth * len; 1369 int w = term->fwidth * len;
1296 int h = term->fheight; 1370 int h = term->fheight;
1297 1371
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1372 bool buffered = bg >= Color_transparent
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1373 && term->option (Opt_buffered);
1300 * good idea from the perspective of packaging for wide variety of user configs. 1374
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces 1375 // cut trailing spaces
1308 while (len && text [len - 1] == ' ') 1376 while (len && text [len - 1] == ' ')
1309 len--; 1377 len--;
1310 1378
1311 int x_ = buffered ? 0 : x; 1379 int x_ = buffered ? 0 : x;
… …
1337 x_ += cwidth; 1405 x_ += cwidth;
1338 } 1406 }
1339 1407
1340 if (buffered) 1408 if (buffered)
1341 { 1409 {
1342 bool back_rendered = false;
1343 if (ep != enc) 1410 if (ep != enc)
1344 { 1411 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1413
1347#ifdef HAVE_BG_PIXMAP 1414#ifdef HAVE_BG_PIXMAP
1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1416
1348 if (term->bgPixmap.pixmap) 1417 if (term->bg_pixmap
1418 && (bg == Color_transparent || bg == Color_bg
1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349 { 1420 {
1350 Picture dst = 0; 1421 int src_x = x, src_y = y;
1351 1422
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1423 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 { 1424 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x; 1425 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1426 src_y += term->window_vt_y;
1363 } 1427 }
1364 1428
1365 if (term->bgPixmap.pmap_width >= src_x+w 1429 if (term->bg_pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1430 && term->bg_pmap_height >= src_y + h)
1367 { 1431 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1432 XCopyArea (disp, term->bg_pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1433 src_x, src_y, w, h, 0, 0);
1370 } 1434 }
1371 else 1435 else
1372 { 1436 {
1373 XGCValues gcv; 1437 XGCValues gcv;
1374 1438
1375 gcv.fill_style = FillTiled; 1439 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1440 gcv.tile = term->bg_pixmap;
1377 gcv.ts_x_origin = -src_x; 1441 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1442 gcv.ts_y_origin = -src_y;
1379 1443
1380 XChangeGC (disp, gc, 1444 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv); 1446 &gcv);
1383 1447
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1448 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385 1449
1386 gcv.fill_style = FillSolid; 1450 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1451 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1452 }
1389 1453
1390 if (bg >= 0) 1454 if (dst)
1391 { 1455 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1456 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1457
1458 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1459 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 } 1460 }
1398 } 1461 }
1462 else
1399#endif 1463#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1464 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1403 1465
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1466 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1467 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1468 }
1407 else 1469 else
… …
1435 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1497 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1436 = rxvt_fontprop::unset; 1498 = rxvt_fontprop::unset;
1437 force_prop = false; 1499 force_prop = false;
1438 1500
1439 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1501 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1440 FONT_UNREF (*i); 1502 (*i)->unref ();
1441 1503
1442 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1504 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1443 delete *p; 1505 delete *p;
1444 1506
1445 free (fontdesc); fontdesc = 0; 1507 free (fontdesc); fontdesc = 0;
… …
1447 fonts.clear (); 1509 fonts.clear ();
1448 1510
1449 fallback = fallback_fonts; 1511 fallback = fallback_fonts;
1450} 1512}
1451 1513
1514void
1515rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1516{
1517 font->set_term (term);
1518
1519 font->cs = cs;
1520 font->loaded = false;
1521}
1522
1452rxvt_font * 1523rxvt_font *
1453rxvt_fontset::new_font (const char *name, codeset cs) 1524rxvt_fontset::new_font (const char *name, codeset cs)
1454{ 1525{
1455 rxvt_font *f; 1526 rxvt_font *f;
1456 1527
… …
1472 f = new rxvt_font_x11; 1543 f = new rxvt_font_x11;
1473 } 1544 }
1474 else 1545 else
1475 f = new rxvt_font_x11; 1546 f = new rxvt_font_x11;
1476 1547
1477 f->set_term (term);
1478 f->set_name (strdup (name)); 1548 f->set_name (strdup (name));
1479 1549 prepare_font (f, cs);
1480 f->cs = cs;
1481 f->loaded = false;
1482 1550
1483 return f; 1551 return f;
1484} 1552}
1485 1553
1486///////////////////////////////////////////////////////////////////////////// 1554/////////////////////////////////////////////////////////////////////////////
1555
1556void
1557rxvt_fontset::push_font (rxvt_font *font)
1558{
1559 // the fontCount index is reserved for the overflow font, it is only
1560 // necessary when we get fontCount or more fonts, as they cannot be
1561 // represented in the rendition.
1562 if (fonts.size () == fontCount)
1563 {
1564 rxvt_font *f = new rxvt_font_overflow (this);
1565
1566 prepare_font (f, CS_UNICODE);
1567 fonts.push_back (f);
1568 }
1569
1570 fonts.push_back (font);
1571}
1487 1572
1488void 1573void
1489rxvt_fontset::add_fonts (const char *desc) 1574rxvt_fontset::add_fonts (const char *desc)
1490{ 1575{
1491 if (desc) 1576 if (desc)
… …
1529 if (!end) 1614 if (!end)
1530 end = desc + strlen (desc); 1615 end = desc + strlen (desc);
1531 1616
1532 if (end - desc < 511) 1617 if (end - desc < 511)
1533 { 1618 {
1534 strncpy (buf, desc, end - desc); 1619 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1620 buf[end - desc] = 0;
1536 1621
1537 fonts.push_back (new_font (buf, cs)); 1622 push_font (new_font (buf, cs));
1538 } 1623 }
1539 else 1624 else
1540 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1625 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1541 1626
1542 desc = end + 1; 1627 desc = end + 1;
1543 } 1628 }
1544 while (*end); 1629 while (*end);
1545 } 1630 }
… …
1570{ 1655{
1571 clear (); 1656 clear ();
1572 1657
1573 fontdesc = strdup (desc); 1658 fontdesc = strdup (desc);
1574 1659
1575 fonts.push_back (new_font (0, CS_UNICODE)); 1660 push_font (new_font (0, CS_UNICODE));
1576 realize_font (0); 1661 realize_font (0);
1577 1662
1578 add_fonts (desc); 1663 add_fonts (desc);
1579 1664
1580 return true; 1665 return true;
… …
1589 1674
1590 return -1; 1675 return -1;
1591} 1676}
1592 1677
1593int 1678int
1594rxvt_fontset::find_font (unicode_t unicode) 1679rxvt_fontset::find_font_idx (unicode_t unicode)
1595{ 1680{
1596 if (unicode >= 1<<20) 1681 if (unicode >= 1<<20)
1597 return 0; 1682 return 0;
1598 1683
1599 unicode_t hi = unicode >> 8; 1684 unicode_t hi = unicode >> 8;
… …
1625 goto next_font; 1710 goto next_font;
1626 1711
1627 bool careful; 1712 bool careful;
1628 if (f->has_char (unicode, &prop, careful)) 1713 if (f->has_char (unicode, &prop, careful))
1629 { 1714 {
1630 if (careful) 1715 i = (i << 1) | careful;
1631 i |= 128;
1632 1716
1633 goto found; 1717 goto found;
1634 } 1718 }
1635 1719
1636 next_font: 1720 next_font:
1637 if (i == fonts.size () - 1) 1721 if (i == fonts.size () - 1)
1638 { 1722 {
1639 if (fallback->name) 1723 if (fallback->name)
1640 { 1724 {
1641 // search through the fallback list 1725 // search through the fallback list
1642 fonts.push_back (new_font (fallback->name, fallback->cs)); 1726 push_font (new_font (fallback->name, fallback->cs));
1643 fallback++; 1727 fallback++;
1644 } 1728 }
1645 else 1729 else
1646 { 1730 {
1647 // try to find a new font. 1731 // try to find a new font.
… …
1678 FcPatternDestroy (match); 1762 FcPatternDestroy (match);
1679 1763
1680 if (find_font (font) < 0) 1764 if (find_font (font) < 0)
1681 { 1765 {
1682 char fontname[4096]; 1766 char fontname[4096];
1683 sprintf (fontname, "xft:%-.4090s", font); 1767 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1684 1768
1685 fonts.push_back (new_font (fontname, CS_UNICODE)); 1769 push_font (new_font (fontname, CS_UNICODE));
1686 } 1770 }
1687 1771
1688 free (font); 1772 free (font);
1689 } 1773 }
1690#endif 1774#endif
… …
1712 } 1796 }
1713 1797
1714 return i; 1798 return i;
1715} 1799}
1716 1800
1717
1718

Diff Legend

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