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.170 by sf-exg, Thu Dec 30 01:13:24 2010 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 <pcg@goof.com>
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->bgPixmap.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 }
… …
306 return false; 307 return false;
307 308
308 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
309 return true; 310 return true;
310 311
312#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 315 return true;
316#endif
314 317
315 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
316 return true; 319 return true;
317 320
318 switch (unicode) 321 switch (unicode)
… …
447 450
448 text_t chrs[2]; 451 text_t chrs[2];
449 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
450 453
451 *chrs = cc->c1; 454 *chrs = cc->c1;
452 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
453 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
454 457
455 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
456 { 459 {
457 bool careful; 460 bool careful;
458 461
459 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
460 *chrs = cc->c2; 463 *chrs = cc->c2;
461 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
462 ? f1 465 ? f1
463 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
464 467
465 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
466 } 469 }
467 } 470 }
468#endif 471#endif
… …
481 484
482 x += fwidth; 485 x += fwidth;
483 } 486 }
484} 487}
485 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 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
538
486///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
487 540
488struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
489 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
490 543
… …
498 551
499 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
500 const text_t *text, int len, 553 const text_t *text, int len,
501 int fg, int bg); 554 int fg, int bg);
502 555
503 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
504 XFontStruct *f; 557 XFontStruct *f;
505 bool enc2b, encm; 558 bool enc2b, encm;
506 559
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 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); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
608 return false; 661 return false;
609} 662}
610 663
611// fix the size of scalable fonts 664// fix the size of scalable fonts
612static bool 665static bool
613replace_field (char *buf, const char *name, int index, const char old, const char *replace) 666replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
614{ 667{
615 int slashes = 0; 668 int slashes = 0;
616 const char *field, *end; 669 const char *field, *end;
617 670
618 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
628 break; 681 break;
629 } 682 }
630 683
631 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
632 { 685 {
633 // TODO: check for overflow in font-name 686 size_t len = field - name;
634 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 688 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
637 strcat (buf, end); 690 strcat (*ptr, end);
638 691
639 return true; 692 return true;
640 } 693 }
641 else 694 else
642 { 695 {
643 strcpy (buf, name); 696 *ptr = strdup (name);
644 697
645 return false; 698 return false;
646 } 699 }
647} 700}
648 701
… …
656 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
657 710
658 // first morph the font if required 711 // first morph the font if required
659 if (force_prop) 712 if (force_prop)
660 { 713 {
661 char fname[1024]; 714 char *fname;
662 715
663 if (name[0] != '-') 716 if (name[0] != '-')
664 { 717 {
665 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
666 719
… …
678 f = 0; 731 f = 0;
679 } 732 }
680 733
681 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
682 { 735 {
683 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 738 ? "medium" : "bold");
686 set_name (strdup (fname)); 739 set_name (fname);
687 } 740 }
688 741
689 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
690 { 743 {
691 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 747 set_name (fname);
695 } 748 }
696 } 749 }
697 750
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
725 778
726 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
727 { 780 {
728 rxvt_fontprop p; 781 rxvt_fontprop p;
729 char fname[1024]; 782 char *fname;
730 783
731 int diff = 0; 784 int diff = 0;
732 785
733 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
737 794
738 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
739 continue; 801 continue;
740 802 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 803
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 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); 805 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); 806 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); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 808
750 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
751 fonts[i].diff = diff; 810 fonts[i].diff = diff;
752 } 811 }
753 812
754 XFreeFontNames (list); 813 XFreeFontNames (list);
755 814
… …
787 return false; 846 return false;
788 847
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 850
851 cs = CS_UNKNOWN;
852
792 if (registry && encoding) 853 if (registry && encoding)
793 { 854 {
794 char charset[64]; 855 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
796 857
797 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
859
860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
798 } 862 }
799 else 863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
800 { 868 {
801 const char *charset = get_property (f, XA_FONT, 0); 869 const char *charset = get_property (f, XA_FONT, 0);
802 870
803 if (!charset) 871 if (!charset)
804 charset = name; 872 charset = name;
… …
807 while (*charset) 875 while (*charset)
808 if (*charset++ == '-' && !--count) 876 if (*charset++ == '-' && !--count)
809 break; 877 break;
810 878
811 cs = codeset_from_name (charset); 879 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
882 }
883
884 if (cs == CS_UNKNOWN)
812 } 885 {
813 886 clear ();
814 free (registry); 887 return false;
815 free (encoding); 888 }
816 889
817 if (cs == CS_UNICODE) 890 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 891 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 892
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 893 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
845 } 918 }
846#endif 919#endif
847 920
848 width = 1; 921 width = 1;
849 922
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
851 { 924 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 925 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 926 continue;
854 927
855 // ignore characters we wouldn't use anyways 928 // ignore characters we wouldn't use anyways
… …
867 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 940 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 941
869 if (width < g.width) width = g.width; 942 if (width < g.width) width = g.width;
870 } 943 }
871 944
872 if (cs == CS_UNKNOWN) 945#if 0 // do it per-character
946 if (prop && width > prop->width)
873 { 947 {
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875
876 clear (); 948 clear ();
877 return false; 949 return false;
878 } 950 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 951#endif
887 952
888 return true; 953 return true;
889} 954}
890 955
… …
904 uint32_t ch = FROM_UNICODE (cs, unicode); 969 uint32_t ch = FROM_UNICODE (cs, unicode);
905 970
906 if (ch == NOCHAR) 971 if (ch == NOCHAR)
907 return false; 972 return false;
908 973
909 /* check wether the character exists in _this_ font. horrible. */ 974 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 975 XCharStruct *xcs;
911 976
912 if (encm) 977 if (encm)
913 { 978 {
914 unsigned char byte1 = ch >> 8; 979 unsigned char byte1 = ch >> 8;
… …
944 return false; 1009 return false;
945 1010
946 if (!prop || prop->width == rxvt_fontprop::unset) 1011 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1012 return true;
948 1013
949 // check wether character overlaps previous/next character 1014 // check whether character overlaps previous/next character
950 int w = xcs->rbearing - xcs->lbearing; 1015 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = max (WCWIDTH (unicode), 1); 1016 int wcw = max (WCWIDTH (unicode), 1);
952 1017
953 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1018 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
954 1019
… …
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1193 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1194
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1195#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1196 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1198 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1199#endif
1135 1200
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1201 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1202 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1203
… …
1171 1236
1172 XftUnlockFace (f); 1237 XftUnlockFace (f);
1173 1238
1174 int glheight = height; 1239 int glheight = height;
1175 1240
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1177 { 1242 {
1178 FcChar16 ch = *t; 1243 FcChar16 ch = *t;
1179 1244
1180 if (cs != CS_UNICODE 1245 if (cs != CS_UNICODE
1181 && ch > 0x100 1246 && ch > 0x100
… …
1282rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1283 const text_t *text, int len, 1348 const text_t *text, int len,
1284 int fg, int bg) 1349 int fg, int bg)
1285{ 1350{
1286 XGlyphInfo extents; 1351 XGlyphInfo extents;
1287 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1288 XftGlyphSpec *ep = enc; 1353 XftGlyphSpec *ep = enc;
1289 1354
1290 dTermDisplay; 1355 dTermDisplay;
1291 dTermGC; 1356 dTermGC;
1292 1357
1293 int w = term->fwidth * len; 1358 int w = term->fwidth * len;
1294 int h = term->fheight; 1359 int h = term->fheight;
1295 1360
1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1361 bool buffered = bg >= Color_transparent
1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1362 && term->option (Opt_buffered);
1298 * good idea from the perspective of packaging for wide variety of user configs. 1363
1299 */
1300 bool buffered = true
1301#ifdef FORCE_UNBUFFERED_XFT
1302 && bg >= 0
1303#endif
1304 ;
1305 // cut trailing spaces 1364 // cut trailing spaces
1306 while (len && text [len - 1] == ' ') 1365 while (len && text [len - 1] == ' ')
1307 len--; 1366 len--;
1308 1367
1309 int x_ = buffered ? 0 : x; 1368 int x_ = buffered ? 0 : x;
… …
1335 x_ += cwidth; 1394 x_ += cwidth;
1336 } 1395 }
1337 1396
1338 if (buffered) 1397 if (buffered)
1339 { 1398 {
1340 bool back_rendered = false;
1341 if (ep != enc) 1399 if (ep != enc)
1342 { 1400 {
1343 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344 1402
1345#ifdef HAVE_BG_PIXMAP 1403#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405
1346 if (term->bgPixmap.pixmap) 1406 if (term->bgPixmap.pixmap
1407 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347 { 1409 {
1348 Picture dst = 0; 1410 int src_x = x, src_y = y;
1349 1411
1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1351 dst = XftDrawPicture (d2);
1352
1353 if (bg < 0 || dst != 0)
1354 { 1413 {
1355 int src_x = x, src_y = y ;
1356
1357 if (term->bgPixmap.is_parentOrigin ())
1358 {
1359 src_x += term->window_vt_x; 1414 src_x += term->window_vt_x;
1360 src_y += term->window_vt_y; 1415 src_y += term->window_vt_y;
1361 } 1416 }
1362 1417
1363 if (term->bgPixmap.pmap_width >= src_x+w 1418 if (term->bgPixmap.pmap_width >= src_x + w
1364 && term->bgPixmap.pmap_height >= src_y+h) 1419 && term->bgPixmap.pmap_height >= src_y + h)
1365 { 1420 {
1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1367 src_x, src_y, w, h, 0, 0); 1422 src_x, src_y, w, h, 0, 0);
1368 } 1423 }
1369 else 1424 else
1370 { 1425 {
1371 XGCValues gcv; 1426 XGCValues gcv;
1372 1427
1373 gcv.fill_style = FillTiled; 1428 gcv.fill_style = FillTiled;
1374 gcv.tile = term->bgPixmap.pixmap; 1429 gcv.tile = term->bgPixmap.pixmap;
1375 gcv.ts_x_origin = -src_x; 1430 gcv.ts_x_origin = -src_x;
1376 gcv.ts_y_origin = -src_y; 1431 gcv.ts_y_origin = -src_y;
1377 1432
1378 XChangeGC (disp, gc, 1433 XChangeGC (disp, gc,
1379 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1380 &gcv); 1435 &gcv);
1381 1436
1382 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1437 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383 1438
1384 gcv.fill_style = FillSolid; 1439 gcv.fill_style = FillSolid;
1385 XChangeGC (disp, gc, GCFillStyle, &gcv); 1440 XChangeGC (disp, gc, GCFillStyle, &gcv);
1386 } 1441 }
1387 1442
1388 if (bg >= 0) 1443 if (dst)
1389 { 1444 {
1390 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1445 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1446
1447 // 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); 1448 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392 }
1393
1394 back_rendered = true;
1395 } 1449 }
1396 } 1450 }
1451 else
1397#endif 1452#endif
1398
1399 if (bg >= 0 && !back_rendered)
1400 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1401 1454
1402 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404 } 1457 }
1405 else 1458 else
… …
1433 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1486 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1434 = rxvt_fontprop::unset; 1487 = rxvt_fontprop::unset;
1435 force_prop = false; 1488 force_prop = false;
1436 1489
1437 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1438 FONT_UNREF (*i); 1491 (*i)->unref ();
1439 1492
1440 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1441 delete *p; 1494 delete *p;
1442 1495
1443 free (fontdesc); fontdesc = 0; 1496 free (fontdesc); fontdesc = 0;
… …
1445 fonts.clear (); 1498 fonts.clear ();
1446 1499
1447 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1448} 1501}
1449 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1450rxvt_font * 1512rxvt_font *
1451rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1452{ 1514{
1453 rxvt_font *f; 1515 rxvt_font *f;
1454 1516
… …
1470 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1471 } 1533 }
1472 else 1534 else
1473 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1474 1536
1475 f->set_term (term);
1476 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1477 1538 prepare_font (f, cs);
1478 f->cs = cs;
1479 f->loaded = false;
1480 1539
1481 return f; 1540 return f;
1482} 1541}
1483 1542
1484///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1485 1561
1486void 1562void
1487rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1488{ 1564{
1489 if (desc) 1565 if (desc)
… …
1527 if (!end) 1603 if (!end)
1528 end = desc + strlen (desc); 1604 end = desc + strlen (desc);
1529 1605
1530 if (end - desc < 511) 1606 if (end - desc < 511)
1531 { 1607 {
1532 strncpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1533 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1534 1610
1535 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1536 } 1612 }
1537 else 1613 else
1538 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1539 1615
1540 desc = end + 1; 1616 desc = end + 1;
… …
1568{ 1644{
1569 clear (); 1645 clear ();
1570 1646
1571 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1572 1648
1573 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1574 realize_font (0); 1650 realize_font (0);
1575 1651
1576 add_fonts (desc); 1652 add_fonts (desc);
1577 1653
1578 return true; 1654 return true;
… …
1587 1663
1588 return -1; 1664 return -1;
1589} 1665}
1590 1666
1591int 1667int
1592rxvt_fontset::find_font (unicode_t unicode) 1668rxvt_fontset::find_font_idx (unicode_t unicode)
1593{ 1669{
1594 if (unicode >= 1<<20) 1670 if (unicode >= 1<<20)
1595 return 0; 1671 return 0;
1596 1672
1597 unicode_t hi = unicode >> 8; 1673 unicode_t hi = unicode >> 8;
… …
1623 goto next_font; 1699 goto next_font;
1624 1700
1625 bool careful; 1701 bool careful;
1626 if (f->has_char (unicode, &prop, careful)) 1702 if (f->has_char (unicode, &prop, careful))
1627 { 1703 {
1628 if (careful) 1704 i = (i << 1) | careful;
1629 i |= 128;
1630 1705
1631 goto found; 1706 goto found;
1632 } 1707 }
1633 1708
1634 next_font: 1709 next_font:
1635 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1636 { 1711 {
1637 if (fallback->name) 1712 if (fallback->name)
1638 { 1713 {
1639 // search through the fallback list 1714 // search through the fallback list
1640 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1641 fallback++; 1716 fallback++;
1642 } 1717 }
1643 else 1718 else
1644 { 1719 {
1645 // try to find a new font. 1720 // try to find a new font.
… …
1676 FcPatternDestroy (match); 1751 FcPatternDestroy (match);
1677 1752
1678 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1679 { 1754 {
1680 char fontname[4096]; 1755 char fontname[4096];
1681 sprintf (fontname, "xft:%-.4090s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1682 1757
1683 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1684 } 1759 }
1685 1760
1686 free (font); 1761 free (font);
1687 } 1762 }
1688#endif 1763#endif
… …
1710 } 1785 }
1711 1786
1712 return i; 1787 return i;
1713} 1788}
1714 1789
1715
1716

Diff Legend

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