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.95 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.131 by root, Wed Jan 23 06:00:53 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
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
… …
43 const char *name; 42 const char *name;
44} fallback_fonts[] = { 43} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 47
49#if ENCODING_EU 48#if ENCODING_EU
50 // cyrillic 49 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 52
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 66
68# if XFT 67# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 68 { CS_KOI8_U, "xft::lang=ru" },
70 69
71 { CS_ISO8859_5, "xft::lang=ru" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 72 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 73 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
… …
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{
234 dTermDisplay; 233 dTermDisplay;
235 dTermGC; 234 dTermGC;
236 235
237 if (color == Color_bg) 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
241 bool done = false;
242#ifdef HAVE_BG_PIXMAP
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
244 {
245 Picture dst = XftDrawPicture (d);
246 if (dst != 0)
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true;
252 }
253 }
254#endif
255 if (!done)
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
243#else 257#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 260#endif
247 } 261 }
248} 262}
249 263
250///////////////////////////////////////////////////////////////////////////// 264/////////////////////////////////////////////////////////////////////////////
251
252#include "table/linedraw.h"
253 265
254struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
255 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
256 268
257 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
270 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
271 283
272 return p; 284 return p;
273 } 285 }
274 286
275 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 288 {
277 width = 1; height = 1; 289 width = 1; height = 1;
278 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
279 291
280 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
293 return false; 305 return false;
294 306
295 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
296 return true; 308 return true;
297 309
310#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 313 return true;
314#endif
301 315
302 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
303 return true; 317 return true;
304 318
305 switch (unicode) 319 switch (unicode)
… …
341 ; 355 ;
342 356
343 int width = text - tp; 357 int width = text - tp;
344 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
345 359
360#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
347 { 362 {
363# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
351 367
352 int W = fwidth; 368 int W = fwidth;
… …
390 406
391 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
392 if (a) 408 if (a)
393 { 409 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 411
396 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
400 416
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 436 break;
421 } 437 }
422 } 438 }
423 } 439 }
440#else
441 if (0)
442 ;
443#endif
424#if ENABLE_COMBINING 444#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 446 {
427 min_it (width, 2); // we only support wcwidth up to 2 447 min_it (width, 2); // we only support wcwidth up to 2
428 448
… …
441 *chrs = cc->c2; 461 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 463 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
445 465
446 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 467 }
448 } 468 }
449#endif 469#endif
450 else 470 else
451 switch (t) 471 switch (t)
… …
471 491
472 void clear (); 492 void clear ();
473 493
474 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
475 495
476 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
477 497
478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479 499
480 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 501 const text_t *text, int len,
482 int fg, int bg); 502 int fg, int bg);
483 503
484 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // wether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 505 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 506 bool enc2b, encm;
488 507
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
498 unsigned long value; 517 unsigned long value;
499 518
500 if (XGetFontProperty (f, property, &value)) 519 if (XGetFontProperty (f, property, &value))
501 return XGetAtomName (term->dpy, value); 520 return XGetAtomName (term->dpy, value);
502 else 521 else
503 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
504} 523}
505 524
506rxvt_fontprop 525rxvt_fontprop
507rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
508{ 527{
… …
590 return false; 609 return false;
591} 610}
592 611
593// fix the size of scalable fonts 612// fix the size of scalable fonts
594static bool 613static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 615{
597 int slashes = 0; 616 int slashes = 0;
598 const char *field, *end; 617 const char *field, *end;
599 618
600 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
610 break; 629 break;
611 } 630 }
612 631
613 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
614 { 633 {
615 // TODO: check for overflow in font-name 634 size_t len = field - name;
616 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 636 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
619 strcat (buf, end); 638 strcat (*ptr, end);
620 639
621 return true; 640 return true;
622 } 641 }
623 else 642 else
624 { 643 {
625 strcpy (buf, name); 644 *ptr = strdup (name);
626 645
627 return false; 646 return false;
628 } 647 }
629} 648}
630 649
631bool 650bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 652{
634 dTermDisplay; 653 dTermDisplay;
635 654
636 clear (); 655 clear ();
637 656
638 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
639 658
640 // first morph the font if required 659 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 661 {
644 char fname[1024]; 662 char *fname;
645 663
646 if (name[0] != '-') 664 if (name[0] != '-')
647 { 665 {
648 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
649 667
… …
661 f = 0; 679 f = 0;
662 } 680 }
663 681
664 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
665 { 683 {
666 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 686 ? "medium" : "bold");
669 set_name (strdup (fname)); 687 set_name (fname);
670 } 688 }
671 689
672 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
673 { 691 {
674 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 695 set_name (fname);
678 } 696 }
679 } 697 }
680 698
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
708 726
709 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
710 { 728 {
711 rxvt_fontprop p; 729 rxvt_fontprop p;
712 char fname[1024]; 730 char *fname;
713 731
714 int diff = 0; 732 int diff = 0;
715 733
716 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
720 742
721 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
722 continue; 744 continue;
723 745
724 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
729 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
730 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
731 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 754
733 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
734 fonts[i].diff = diff; 756 fonts[i].diff = diff;
735 } 757 }
736 758
737 XFreeFontNames (list); 759 XFreeFontNames (list);
738 760
… …
815 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816 838
817 if (encm) 839 if (encm)
818 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
819 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820 842
821 while (N) 843 while (N)
822 { 844 {
823 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
824 width = f->per_char[N].width; 846 width = f->per_char[N].width;
825 847
… …
977 else 999 else
978 { 1000 {
979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1002
981 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1004
983 if (slow) 1005 if (slow)
984 { 1006 {
985 do 1007 do
986 { 1008 {
987 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
… …
1009 else 1031 else
1010 { 1032 {
1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012 1034
1013 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1014 1036
1015 if (slow) 1037 if (slow)
1016 { 1038 {
1017 do 1039 do
1018 { 1040 {
1019 if (*xc) 1041 if (*xc)
… …
1039 1061
1040 void clear (); 1062 void clear ();
1041 1063
1042 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1043 1065
1044 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1067
1046 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1069 const text_t *text, int len,
1048 int fg, int bg); 1070 int fg, int bg);
1049 1071
1050 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051 1073
1052protected: 1074protected:
1053 XftFont *f; 1075 XftFont *f;
1054}; 1076};
1055 1077
… …
1082 1104
1083 return p; 1105 return p;
1084} 1106}
1085 1107
1086bool 1108bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1110{
1089 dTermDisplay; 1111 dTermDisplay;
1090 1112
1091 clear (); 1113 clear ();
1092 1114
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1126
1105 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1130
1109 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1134
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1274 dTermGC; 1296 dTermGC;
1275 1297
1276 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1277 int h = term->fheight; 1299 int h = term->fheight;
1278 1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1279 bool buffered = false; 1307 buffered = false;
1308#endif
1280 1309
1281 // cut trailing spaces 1310 // cut trailing spaces
1282 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1283 len--; 1312 len--;
1284 1313
… …
1290 int cwidth = term->fwidth; 1319 int cwidth = term->fwidth;
1291 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1292 1321
1293 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1294 text++, len--, cwidth += term->fwidth; 1323 text++, len--, cwidth += term->fwidth;
1295 1324
1296 if (fc != ' ') // skip spaces 1325 if (fc != ' ') // skip spaces
1297 { 1326 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc); 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1329
… …
1313 1342
1314 if (buffered) 1343 if (buffered)
1315 { 1344 {
1316 if (ep != enc) 1345 if (ep != enc)
1317 { 1346 {
1347 bool back_rendered = false;
1318 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1319 1349
1350#ifdef HAVE_BG_PIXMAP
1351 if (term->bgPixmap.pixmap)
1352 {
1353 Picture dst = 0;
1354
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1356 dst = XftDrawPicture (d2);
1357
1358 if (dst)
1359 {
1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y;
1366 }
1367
1368 if (term->bgPixmap.pmap_width >= src_x+w
1369 && term->bgPixmap.pmap_height >= src_y+h)
1370 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0);
1373 }
1374 else
1375 {
1376 XGCValues gcv;
1377
1378 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y;
1382
1383 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv);
1386
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 }
1392
1393 if (bg >= 0)
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 }
1401 }
1402#endif
1403
1404 if (!back_rendered)
1320 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1321 1406
1322 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1323 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1324 } 1409 }
1325 else 1410 else
… …
1350void 1435void
1351rxvt_fontset::clear () 1436rxvt_fontset::clear ()
1352{ 1437{
1353 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1438 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1354 = rxvt_fontprop::unset; 1439 = rxvt_fontprop::unset;
1440 force_prop = false;
1355 1441
1356 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1442 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1357 FONT_UNREF (*i); 1443 FONT_UNREF (*i);
1358 1444
1359 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1445 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1368 1454
1369rxvt_font * 1455rxvt_font *
1370rxvt_fontset::new_font (const char *name, codeset cs) 1456rxvt_fontset::new_font (const char *name, codeset cs)
1371{ 1457{
1372 rxvt_font *f; 1458 rxvt_font *f;
1373 1459
1374 if (!name || !*name) 1460 if (!name || !*name)
1375 { 1461 {
1376 name = ""; 1462 name = "";
1377 f = new rxvt_font_default (this); 1463 f = new rxvt_font_default (this);
1378 } 1464 }
… …
1446 if (!end) 1532 if (!end)
1447 end = desc + strlen (desc); 1533 end = desc + strlen (desc);
1448 1534
1449 if (end - desc < 511) 1535 if (end - desc < 511)
1450 { 1536 {
1451 strncpy (buf, desc, end - desc); 1537 memcpy (buf, desc, end - desc);
1452 buf[end - desc] = 0; 1538 buf[end - desc] = 0;
1453 1539
1454 fonts.push_back (new_font (buf, cs)); 1540 fonts.push_back (new_font (buf, cs));
1455 } 1541 }
1456 else 1542 else
… …
1471 if (fonts[i]->loaded) 1557 if (fonts[i]->loaded)
1472 return true; 1558 return true;
1473 1559
1474 fonts[i]->loaded = true; 1560 fonts[i]->loaded = true;
1475 1561
1476 if (!fonts[i]->load (prop)) 1562 if (!fonts[i]->load (prop, force_prop))
1477 { 1563 {
1478 fonts[i]->cs = CS_UNKNOWN; 1564 fonts[i]->cs = CS_UNKNOWN;
1479 return false; 1565 return false;
1480 } 1566 }
1481 1567
… …
1597 if (find_font (font) < 0) 1683 if (find_font (font) < 0)
1598 { 1684 {
1599 char fontname[4096]; 1685 char fontname[4096];
1600 sprintf (fontname, "xft:%-.4090s", font); 1686 sprintf (fontname, "xft:%-.4090s", font);
1601 1687
1602 fonts.push_back (new_font (fontname, CS_UNICODE)); 1688 fonts.push_back (new_font (fontname, CS_UNICODE));
1603 } 1689 }
1604 1690
1605 free (font); 1691 free (font);
1606 } 1692 }
1607#endif 1693#endif

Diff Legend

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