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.160 by sf-exg, Wed Mar 31 21:52:05 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
… …
80 79
81 // japanese 80 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 82# if XFT
84 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { 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" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 88# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 217{
219} 218}
220 219
221void 220void
222rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
223{ 222{
224 if (this->name == name) 223 if (name == name_)
225 return; 224 return;
226 225
227 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
228 this->name = name; 227 name = name_;
229} 228}
230 229
231void 230void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 232{
… …
237 if (color == Color_bg || color == Color_transparent) 236 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 238 else if (color >= 0)
240 { 239 {
241#if XFT 240#if XFT
242 bool done = false; 241 Picture dst;
242
243#ifdef HAVE_BG_PIXMAP 243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244 if (term->bgPixmap.pixmap
245 { 245 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 246 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 247 {
249 XClearArea (disp, d, x, y, w, h, false); 248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 250 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); 251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 252 }
254 } 253 else
255#endif 254# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
258#else 257#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 260#endif
262 } 261 }
… …
483 482
484 x += fwidth; 483 x += fwidth;
485 } 484 }
486} 485}
487 486
487struct rxvt_font_meta : rxvt_font {
488 struct rxvt_fontset *fs;
489
490 rxvt_font_meta (rxvt_fontset *fs)
491 : rxvt_font ()
492 {
493 this->fs = fs;
494 }
495
496 rxvt_fontprop properties ()
497 {
498 rxvt_fontprop p;
499
500 p.width = p.height = 1;
501 p.ascent = rxvt_fontprop::unset;
502 p.weight = rxvt_fontprop::medium;
503 p.slant = rxvt_fontprop::roman;
504
505 return p;
506 }
507
508 bool load (const rxvt_fontprop &prop, bool force_prop)
509 {
510 width = 1; height = 1;
511 ascent = 1; descent = 0;
512
513 set_name (strdup ("built-in meta font"));
514
515 return true;
516 }
517
518 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
519 {
520 return false;
521 }
522
523 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len,
525 int fg, int bg)
526 {
527 while (len--)
528 {
529 int fid = fs->find_font_idx (*text);
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
531 ++text;
532 x += term->fwidth;
533 }
534 }
535};
536
488///////////////////////////////////////////////////////////////////////////// 537/////////////////////////////////////////////////////////////////////////////
489 538
490struct rxvt_font_x11 : rxvt_font { 539struct rxvt_font_x11 : rxvt_font {
491 rxvt_font_x11 () { f = 0; } 540 rxvt_font_x11 () { f = 0; }
492 541
… …
500 549
501 void draw (rxvt_drawable &d, int x, int y, 550 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 551 const text_t *text, int len,
503 int fg, int bg); 552 int fg, int bg);
504 553
505 bool slow; // wether this is a proportional font or has other funny characteristics 554 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 555 XFontStruct *f;
507 bool enc2b, encm; 556 bool enc2b, encm;
508 557
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 558 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); 559 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
610 return false; 659 return false;
611} 660}
612 661
613// fix the size of scalable fonts 662// fix the size of scalable fonts
614static bool 663static bool
615replace_field (char *buf, const char *name, int index, const char old, const char *replace) 664replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
616{ 665{
617 int slashes = 0; 666 int slashes = 0;
618 const char *field, *end; 667 const char *field, *end;
619 668
620 for (const char *c = name; *c; c++) 669 for (const char *c = name; *c; c++)
… …
630 break; 679 break;
631 } 680 }
632 681
633 if (slashes >= 13 && (!old || *field == old)) 682 if (slashes >= 13 && (!old || *field == old))
634 { 683 {
635 // TODO: check for overflow in font-name 684 size_t len = field - name;
636 strncpy (buf, name, field - name); 685 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 buf += field - name; 686 memcpy (*ptr, name, len);
638 strcpy (buf, replace); 687 strcpy (*ptr + len, replace);
639 strcat (buf, end); 688 strcat (*ptr, end);
640 689
641 return true; 690 return true;
642 } 691 }
643 else 692 else
644 { 693 {
645 strcpy (buf, name); 694 *ptr = strdup (name);
646 695
647 return false; 696 return false;
648 } 697 }
649} 698}
650 699
… …
658 char field_str[64]; // enough for 128 bits 707 char field_str[64]; // enough for 128 bits
659 708
660 // first morph the font if required 709 // first morph the font if required
661 if (force_prop) 710 if (force_prop)
662 { 711 {
663 char fname[1024]; 712 char *fname;
664 713
665 if (name[0] != '-') 714 if (name[0] != '-')
666 { 715 {
667 f = XLoadQueryFont (disp, name); 716 f = XLoadQueryFont (disp, name);
668 717
… …
680 f = 0; 729 f = 0;
681 } 730 }
682 731
683 if (prop.weight != rxvt_fontprop::unset) 732 if (prop.weight != rxvt_fontprop::unset)
684 { 733 {
685 replace_field (fname, name, 2, 0, 734 replace_field (&fname, name, 2, 0,
686 prop.weight < rxvt_fontprop::bold 735 prop.weight < rxvt_fontprop::bold
687 ? "medium" : "bold"); 736 ? "medium" : "bold");
688 set_name (strdup (fname)); 737 set_name (fname);
689 } 738 }
690 739
691 if (prop.slant != rxvt_fontprop::unset) 740 if (prop.slant != rxvt_fontprop::unset)
692 { 741 {
693 replace_field (fname, name, 3, 0, 742 replace_field (&fname, name, 3, 0,
694 prop.slant < rxvt_fontprop::italic 743 prop.slant < rxvt_fontprop::italic
695 ? "r" : "i"); // TODO: handle "o"blique, too 744 ? "r" : "i"); // TODO: handle "o"blique, too
696 set_name (strdup (fname)); 745 set_name (fname);
697 } 746 }
698 } 747 }
699 748
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 749 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height); 750 ? 0 : prop.height);
… …
726 font_weight *fonts = new font_weight[count]; 775 font_weight *fonts = new font_weight[count];
727 776
728 for (int i = 0; i < count; i++) 777 for (int i = 0; i < count; i++)
729 { 778 {
730 rxvt_fontprop p; 779 rxvt_fontprop p;
731 char fname[1024]; 780 char *fname;
732 781
733 int diff = 0; 782 int diff = 0;
734 783
735 if (replace_field (fname, list[i], 6, '0', field_str)) 784 if (replace_field (&fname, list[i], 6, '0', field_str))
736 diff += 10; // slightly penalize scalable fonts 785 diff += 10; // slightly penalize scalable fonts
786 else
787 {
788 free (fname);
737 else if (replace_field (fname, list[i], 11, '0', "0")) 789 if (replace_field (&fname, list[i], 11, '0', "0"))
738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 }
739 792
740 if (!set_properties (p, fname)) 793 if (!set_properties (p, fname))
741 continue; 794 continue;
742 795
743 if (prop.height != rxvt_fontprop::unset 796 if (prop.height != rxvt_fontprop::unset
… …
747 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 800 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); 801 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); 802 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); 803 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
751 804
752 fonts[i].name = strdup (fname); 805 fonts[i].name = fname;
753 fonts[i].diff = diff; 806 fonts[i].diff = diff;
754 } 807 }
755 808
756 XFreeFontNames (list); 809 XFreeFontNames (list);
757 810
… …
789 return false; 842 return false;
790 843
791 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 844 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
792 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 845 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
793 846
847 cs = CS_UNKNOWN;
848
794 if (registry && encoding) 849 if (registry && encoding)
795 { 850 {
796 char charset[64]; 851 char charset[64];
797 snprintf (charset, 64, "%s-%s", registry, encoding); 852 snprintf (charset, 64, "%s-%s", registry, encoding);
798 853
799 cs = codeset_from_name (charset); 854 cs = codeset_from_name (charset);
855
856 if (cs == CS_UNKNOWN)
857 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 } 858 }
801 else 859
860 free (registry);
861 free (encoding);
862
863 if (cs == CS_UNKNOWN)
802 { 864 {
803 const char *charset = get_property (f, XA_FONT, 0); 865 const char *charset = get_property (f, XA_FONT, 0);
804 866
805 if (!charset) 867 if (!charset)
806 charset = name; 868 charset = name;
… …
809 while (*charset) 871 while (*charset)
810 if (*charset++ == '-' && !--count) 872 if (*charset++ == '-' && !--count)
811 break; 873 break;
812 874
813 cs = codeset_from_name (charset); 875 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
878 }
879
880 if (cs == CS_UNKNOWN)
814 } 881 {
815 882 clear ();
816 free (registry); 883 return false;
817 free (encoding); 884 }
818 885
819 if (cs == CS_UNICODE) 886 if (cs == CS_UNICODE)
820 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 887 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
821 888
822 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 889 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
869 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 936 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
870 937
871 if (width < g.width) width = g.width; 938 if (width < g.width) width = g.width;
872 } 939 }
873 940
874 if (cs == CS_UNKNOWN) 941#if 0 // do it per-character
942 if (prop && width > prop->width)
875 { 943 {
876 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
877
878 clear (); 944 clear ();
879 return false; 945 return false;
880 } 946 }
881
882#if 0 // do it per-character
883 if (prop && width > prop->width)
884 {
885 clear ();
886 return false;
887 }
888#endif 947#endif
889 948
890 return true; 949 return true;
891} 950}
892 951
… …
906 uint32_t ch = FROM_UNICODE (cs, unicode); 965 uint32_t ch = FROM_UNICODE (cs, unicode);
907 966
908 if (ch == NOCHAR) 967 if (ch == NOCHAR)
909 return false; 968 return false;
910 969
911 /* check wether the character exists in _this_ font. horrible. */ 970 /* check whether the character exists in _this_ font. horrible. */
912 XCharStruct *xcs; 971 XCharStruct *xcs;
913 972
914 if (encm) 973 if (encm)
915 { 974 {
916 unsigned char byte1 = ch >> 8; 975 unsigned char byte1 = ch >> 8;
… …
946 return false; 1005 return false;
947 1006
948 if (!prop || prop->width == rxvt_fontprop::unset) 1007 if (!prop || prop->width == rxvt_fontprop::unset)
949 return true; 1008 return true;
950 1009
951 // check wether character overlaps previous/next character 1010 // check whether character overlaps previous/next character
952 int w = xcs->rbearing - xcs->lbearing; 1011 int w = xcs->rbearing - xcs->lbearing;
953 int wcw = max (WCWIDTH (unicode), 1); 1012 int wcw = max (WCWIDTH (unicode), 1);
954 1013
955 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1014 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
956 1015
… …
1130 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1189 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1131 1190
1132#if 0 // clipping unfortunately destroys our precious double-width-characters 1191#if 0 // clipping unfortunately destroys our precious double-width-characters
1133 // clip width, we can't do better, or can we? 1192 // clip width, we can't do better, or can we?
1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1193 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1135 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1194 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1136#endif 1195#endif
1137 1196
1138 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1139 FcPatternAddBool (p, FC_MINSPACE, 1); 1198 FcPatternAddBool (p, FC_MINSPACE, 1);
1140 1199
… …
1284rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1343rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1285 const text_t *text, int len, 1344 const text_t *text, int len,
1286 int fg, int bg) 1345 int fg, int bg)
1287{ 1346{
1288 XGlyphInfo extents; 1347 XGlyphInfo extents;
1289 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1348 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1290 XftGlyphSpec *ep = enc; 1349 XftGlyphSpec *ep = enc;
1291 1350
1292 dTermDisplay; 1351 dTermDisplay;
1293 dTermGC; 1352 dTermGC;
1294 1353
1295 int w = term->fwidth * len; 1354 int w = term->fwidth * len;
1296 int h = term->fheight; 1355 int h = term->fheight;
1297 1356
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1357 bool buffered = bg >= Color_transparent
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1358 && term->option (Opt_buffered);
1300 * good idea from the perspective of packaging for wide variety of user configs. 1359
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces 1360 // cut trailing spaces
1308 while (len && text [len - 1] == ' ') 1361 while (len && text [len - 1] == ' ')
1309 len--; 1362 len--;
1310 1363
1311 int x_ = buffered ? 0 : x; 1364 int x_ = buffered ? 0 : x;
… …
1337 x_ += cwidth; 1390 x_ += cwidth;
1338 } 1391 }
1339 1392
1340 if (buffered) 1393 if (buffered)
1341 { 1394 {
1342 bool back_rendered = false;
1343 if (ep != enc) 1395 if (ep != enc)
1344 { 1396 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1398
1347#ifdef HAVE_BG_PIXMAP 1399#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401
1348 if (term->bgPixmap.pixmap) 1402 if (term->bgPixmap.pixmap
1403 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349 { 1405 {
1350 Picture dst = 0; 1406 int src_x = x, src_y = y;
1351 1407
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1408 if (term->bgPixmap.is_parentOrigin ())
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 { 1409 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x; 1410 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1411 src_y += term->window_vt_y;
1363 } 1412 }
1364 1413
1365 if (term->bgPixmap.pmap_width >= src_x+w 1414 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1415 && term->bgPixmap.pmap_height >= src_y + h)
1367 { 1416 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1418 src_x, src_y, w, h, 0, 0);
1370 } 1419 }
1371 else 1420 else
1372 { 1421 {
1373 XGCValues gcv; 1422 XGCValues gcv;
1374 1423
1375 gcv.fill_style = FillTiled; 1424 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1425 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x; 1426 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1427 gcv.ts_y_origin = -src_y;
1379 1428
1380 XChangeGC (disp, gc, 1429 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv); 1431 &gcv);
1383 1432
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1433 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385 1434
1386 gcv.fill_style = FillSolid; 1435 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1436 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1437 }
1389 1438
1390 if (bg >= 0) 1439 if (dst)
1391 { 1440 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1441 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1442
1443 // 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); 1444 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 } 1445 }
1398 } 1446 }
1447 else
1399#endif 1448#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1449 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1403 1450
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1451 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1452 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1453 }
1407 else 1454 else
… …
1529 if (!end) 1576 if (!end)
1530 end = desc + strlen (desc); 1577 end = desc + strlen (desc);
1531 1578
1532 if (end - desc < 511) 1579 if (end - desc < 511)
1533 { 1580 {
1534 strncpy (buf, desc, end - desc); 1581 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1582 buf[end - desc] = 0;
1536 1583
1537 fonts.push_back (new_font (buf, cs)); 1584 fonts.push_back (new_font (buf, cs));
1538 } 1585 }
1539 else 1586 else
… …
1589 1636
1590 return -1; 1637 return -1;
1591} 1638}
1592 1639
1593int 1640int
1594rxvt_fontset::find_font (unicode_t unicode) 1641rxvt_fontset::find_font_idx (unicode_t unicode)
1595{ 1642{
1596 if (unicode >= 1<<20) 1643 if (unicode >= 1<<20)
1597 return 0; 1644 return 0;
1598 1645
1599 unicode_t hi = unicode >> 8; 1646 unicode_t hi = unicode >> 8;
… …
1678 FcPatternDestroy (match); 1725 FcPatternDestroy (match);
1679 1726
1680 if (find_font (font) < 0) 1727 if (find_font (font) < 0)
1681 { 1728 {
1682 char fontname[4096]; 1729 char fontname[4096];
1683 sprintf (fontname, "xft:%-.4090s", font); 1730 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1684 1731
1685 fonts.push_back (new_font (fontname, CS_UNICODE)); 1732 fonts.push_back (new_font (fontname, CS_UNICODE));
1686 } 1733 }
1687 1734
1688 free (font); 1735 free (font);
… …
1712 } 1759 }
1713 1760
1714 return i; 1761 return i;
1715} 1762}
1716 1763
1764int
1765rxvt_fontset::find_font (unicode_t unicode)
1766{
1767 int id = find_font_idx (unicode);
1717 1768
1718 1769 return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
1770}

Diff Legend

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