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.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 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 }
263} 264}
264 265
265///////////////////////////////////////////////////////////////////////////// 266/////////////////////////////////////////////////////////////////////////////
266
267#include "table/linedraw.h"
268 267
269struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
270 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
271 270
272 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
… …
308 return false; 307 return false;
309 308
310 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
311 return true; 310 return true;
312 311
312#ifdef BUILTIN_GLYPHS
313 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 315 return true;
316#endif
316 317
317 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
318 return true; 319 return true;
319 320
320 switch (unicode) 321 switch (unicode)
… …
356 ; 357 ;
357 358
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
362#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
362 { 364 {
365# include "table/linedraw.h"
363 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
364 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
365 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
366 369
367 int W = fwidth; 370 int W = fwidth;
… …
434 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
435 break; 438 break;
436 } 439 }
437 } 440 }
438 } 441 }
442#else
443 if (0)
444 ;
445#endif
439#if ENABLE_COMBINING 446#if ENABLE_COMBINING
440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
441 { 448 {
442 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
443 450
444 text_t chrs[2]; 451 text_t chrs[2];
445 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
446 453
447 *chrs = cc->c1; 454 *chrs = cc->c1;
448 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
449 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
450 457
451 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
452 { 459 {
453 bool careful; 460 bool careful;
454 461
455 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
456 *chrs = cc->c2; 463 *chrs = cc->c2;
457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
458 ? f1 465 ? f1
459 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
460 467
461 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
462 } 469 }
463 } 470 }
464#endif 471#endif
… …
477 484
478 x += fwidth; 485 x += fwidth;
479 } 486 }
480} 487}
481 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
482///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
483 540
484struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
485 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
486 543
… …
494 551
495 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 553 const text_t *text, int len,
497 int fg, int bg); 554 int fg, int bg);
498 555
499 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
500 XFontStruct *f; 557 XFontStruct *f;
501 bool enc2b, encm; 558 bool enc2b, encm;
502 559
503 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
504 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);
… …
604 return false; 661 return false;
605} 662}
606 663
607// fix the size of scalable fonts 664// fix the size of scalable fonts
608static bool 665static bool
609replace_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)
610{ 667{
611 int slashes = 0; 668 int slashes = 0;
612 const char *field, *end; 669 const char *field, *end;
613 670
614 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
624 break; 681 break;
625 } 682 }
626 683
627 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
628 { 685 {
629 // TODO: check for overflow in font-name 686 size_t len = field - name;
630 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 688 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
633 strcat (buf, end); 690 strcat (*ptr, end);
634 691
635 return true; 692 return true;
636 } 693 }
637 else 694 else
638 { 695 {
639 strcpy (buf, name); 696 *ptr = strdup (name);
640 697
641 return false; 698 return false;
642 } 699 }
643} 700}
644 701
… …
652 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
653 710
654 // first morph the font if required 711 // first morph the font if required
655 if (force_prop) 712 if (force_prop)
656 { 713 {
657 char fname[1024]; 714 char *fname;
658 715
659 if (name[0] != '-') 716 if (name[0] != '-')
660 { 717 {
661 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
662 719
… …
674 f = 0; 731 f = 0;
675 } 732 }
676 733
677 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
678 { 735 {
679 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 738 ? "medium" : "bold");
682 set_name (strdup (fname)); 739 set_name (fname);
683 } 740 }
684 741
685 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
686 { 743 {
687 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
688 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
689 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
690 set_name (strdup (fname)); 747 set_name (fname);
691 } 748 }
692 } 749 }
693 750
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
720 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
721 778
722 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
723 { 780 {
724 rxvt_fontprop p; 781 rxvt_fontprop p;
725 char fname[1024]; 782 char *fname;
726 783
727 int diff = 0; 784 int diff = 0;
728 785
729 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
730 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
731 else if (replace_field (fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
733 794
734 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);
735 continue; 801 continue;
736 802 }
737 if (prop.height != rxvt_fontprop::unset
738 && p.height > prop.height) // weed out too large fonts
739 continue;
740 803
741 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;
742 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);
743 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);
744 //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);
745 808
746 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
747 fonts[i].diff = diff; 810 fonts[i].diff = diff;
748 } 811 }
749 812
750 XFreeFontNames (list); 813 XFreeFontNames (list);
751 814
… …
783 return false; 846 return false;
784 847
785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
787 850
851 cs = CS_UNKNOWN;
852
788 if (registry && encoding) 853 if (registry && encoding)
789 { 854 {
790 char charset[64]; 855 char charset[64];
791 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
792 857
793 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
794 } 859
795 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
796 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
797 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
798 871
799 if (!charset) 872 if (!charset)
800 charset = name; 873 charset = name;
801 874
802 int count = 13; 875 int count = 13;
803 while (*charset) 876 while (*charset)
804 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
805 break; 878 break;
806 879
807 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
808 } 888 {
809 889 clear ();
810 free (registry); 890 return false;
811 free (encoding); 891 }
812 892
813 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
814 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
815 895
816 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
841 } 921 }
842#endif 922#endif
843 923
844 width = 1; 924 width = 1;
845 925
846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
847 { 927 {
848 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 929 continue;
850 930
851 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 944
865 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
866 } 946 }
867 947
868 if (cs == CS_UNKNOWN) 948#if 0 // do it per-character
949 if (prop && width > prop->width)
869 { 950 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871
872 clear (); 951 clear ();
873 return false; 952 return false;
874 } 953 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 954#endif
883 955
884 return true; 956 return true;
885} 957}
886 958
… …
900 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
901 973
902 if (ch == NOCHAR) 974 if (ch == NOCHAR)
903 return false; 975 return false;
904 976
905 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 978 XCharStruct *xcs;
907 979
908 if (encm) 980 if (encm)
909 { 981 {
910 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
940 return false; 1012 return false;
941 1013
942 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1015 return true;
944 1016
945 // check wether character overlaps previous/next character 1017 // check whether character overlaps previous/next character
946 int w = xcs->rbearing - xcs->lbearing; 1018 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = max (WCWIDTH (unicode), 1); 1019 int wcw = max (WCWIDTH (unicode), 1);
948 1020
949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 1022
… …
1124 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1125 1197
1126#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1127 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1129 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1130#endif 1202#endif
1131 1203
1132 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1133 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1134 1206
… …
1167 1239
1168 XftUnlockFace (f); 1240 XftUnlockFace (f);
1169 1241
1170 int glheight = height; 1242 int glheight = height;
1171 1243
1172 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1173 { 1245 {
1174 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1175 1247
1176 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1177 && ch > 0x100 1249 && ch > 0x100
… …
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1351 const text_t *text, int len,
1280 int fg, int bg) 1352 int fg, int bg)
1281{ 1353{
1282 XGlyphInfo extents; 1354 XGlyphInfo extents;
1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1284 XftGlyphSpec *ep = enc; 1356 XftGlyphSpec *ep = enc;
1285 1357
1286 dTermDisplay; 1358 dTermDisplay;
1287 dTermGC; 1359 dTermGC;
1288 1360
1289 int w = term->fwidth * len; 1361 int w = term->fwidth * len;
1290 int h = term->fheight; 1362 int h = term->fheight;
1291 1363
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1364 bool buffered = bg >= Color_transparent
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1365 && term->option (Opt_buffered);
1294 * good idea from the perspective of packaging for wide variety of user configs. 1366
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces 1367 // cut trailing spaces
1302 while (len && text [len - 1] == ' ') 1368 while (len && text [len - 1] == ' ')
1303 len--; 1369 len--;
1304 1370
1305 int x_ = buffered ? 0 : x; 1371 int x_ = buffered ? 0 : x;
… …
1331 x_ += cwidth; 1397 x_ += cwidth;
1332 } 1398 }
1333 1399
1334 if (buffered) 1400 if (buffered)
1335 { 1401 {
1336 bool back_rendered = false;
1337 if (ep != enc) 1402 if (ep != enc)
1338 { 1403 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340 1405
1341#ifdef HAVE_BG_PIXMAP 1406#ifdef HAVE_BG_PIXMAP
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408
1342 if (term->bgPixmap.pixmap) 1409 if (term->bgPixmap.pixmap
1410 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1343 { 1412 {
1344 Picture dst = 0; 1413 int src_x = x, src_y = y;
1345 1414
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 { 1416 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x; 1417 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1418 src_y += term->window_vt_y;
1357 } 1419 }
1358 1420
1359 if (term->bgPixmap.pmap_width >= src_x+w 1421 if (term->bgPixmap.pmap_width >= src_x + w
1360 && term->bgPixmap.pmap_height >= src_y+h) 1422 && term->bgPixmap.pmap_height >= src_y + h)
1361 { 1423 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0); 1425 src_x, src_y, w, h, 0, 0);
1364 } 1426 }
1365 else 1427 else
1366 { 1428 {
1367 XGCValues gcv; 1429 XGCValues gcv;
1368 1430
1369 gcv.fill_style = FillTiled; 1431 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap; 1432 gcv.tile = term->bgPixmap.pixmap;
1371 gcv.ts_x_origin = -src_x; 1433 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y; 1434 gcv.ts_y_origin = -src_y;
1373 1435
1374 XChangeGC (disp, gc, 1436 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv); 1438 &gcv);
1377 1439
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1440 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379 1441
1380 gcv.fill_style = FillSolid; 1442 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv); 1443 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 } 1444 }
1383 1445
1384 if (bg >= 0) 1446 if (dst)
1385 { 1447 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1448 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1449
1450 // dst can only be set when bg >= 0
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1451 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 } 1452 }
1392 } 1453 }
1454 else
1393#endif 1455#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1456 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1397 1457
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 } 1460 }
1401 else 1461 else
… …
1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1430 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1431 force_prop = false; 1491 force_prop = false;
1432 1492
1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1434 FONT_UNREF (*i); 1494 (*i)->unref ();
1435 1495
1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1437 delete *p; 1497 delete *p;
1438 1498
1439 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1441 fonts.clear (); 1501 fonts.clear ();
1442 1502
1443 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1444} 1504}
1445 1505
1506void
1507rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1508{
1509 font->set_term (term);
1510
1511 font->cs = cs;
1512 font->loaded = false;
1513}
1514
1446rxvt_font * 1515rxvt_font *
1447rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1448{ 1517{
1449 rxvt_font *f; 1518 rxvt_font *f;
1450 1519
… …
1466 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1467 } 1536 }
1468 else 1537 else
1469 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1470 1539
1471 f->set_term (term);
1472 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1473 1541 prepare_font (f, cs);
1474 f->cs = cs;
1475 f->loaded = false;
1476 1542
1477 return f; 1543 return f;
1478} 1544}
1479 1545
1480///////////////////////////////////////////////////////////////////////////// 1546/////////////////////////////////////////////////////////////////////////////
1547
1548void
1549rxvt_fontset::push_font (rxvt_font *font)
1550{
1551 // the fontCount index is reserved for the overflow font, it is only
1552 // necessary when we get fontCount or more fonts, as they cannot be
1553 // represented in the rendition.
1554 if (fonts.size () == fontCount)
1555 {
1556 rxvt_font *f = new rxvt_font_overflow (this);
1557
1558 prepare_font (f, CS_UNICODE);
1559 fonts.push_back (f);
1560 }
1561
1562 fonts.push_back (font);
1563}
1481 1564
1482void 1565void
1483rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1484{ 1567{
1485 if (desc) 1568 if (desc)
… …
1523 if (!end) 1606 if (!end)
1524 end = desc + strlen (desc); 1607 end = desc + strlen (desc);
1525 1608
1526 if (end - desc < 511) 1609 if (end - desc < 511)
1527 { 1610 {
1528 strncpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1529 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1530 1613
1531 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1532 } 1615 }
1533 else 1616 else
1534 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1535 1618
1536 desc = end + 1; 1619 desc = end + 1;
… …
1564{ 1647{
1565 clear (); 1648 clear ();
1566 1649
1567 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1568 1651
1569 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1570 realize_font (0); 1653 realize_font (0);
1571 1654
1572 add_fonts (desc); 1655 add_fonts (desc);
1573 1656
1574 return true; 1657 return true;
… …
1583 1666
1584 return -1; 1667 return -1;
1585} 1668}
1586 1669
1587int 1670int
1588rxvt_fontset::find_font (unicode_t unicode) 1671rxvt_fontset::find_font_idx (unicode_t unicode)
1589{ 1672{
1590 if (unicode >= 1<<20) 1673 if (unicode >= 1<<20)
1591 return 0; 1674 return 0;
1592 1675
1593 unicode_t hi = unicode >> 8; 1676 unicode_t hi = unicode >> 8;
… …
1619 goto next_font; 1702 goto next_font;
1620 1703
1621 bool careful; 1704 bool careful;
1622 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1623 { 1706 {
1624 if (careful) 1707 i = (i << 1) | careful;
1625 i |= 128;
1626 1708
1627 goto found; 1709 goto found;
1628 } 1710 }
1629 1711
1630 next_font: 1712 next_font:
1631 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1632 { 1714 {
1633 if (fallback->name) 1715 if (fallback->name)
1634 { 1716 {
1635 // search through the fallback list 1717 // search through the fallback list
1636 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1637 fallback++; 1719 fallback++;
1638 } 1720 }
1639 else 1721 else
1640 { 1722 {
1641 // try to find a new font. 1723 // try to find a new font.
… …
1672 FcPatternDestroy (match); 1754 FcPatternDestroy (match);
1673 1755
1674 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1675 { 1757 {
1676 char fontname[4096]; 1758 char fontname[4096];
1677 sprintf (fontname, "xft:%-.4090s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1678 1760
1679 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1680 } 1762 }
1681 1763
1682 free (font); 1764 free (font);
1683 } 1765 }
1684#endif 1766#endif
… …
1706 } 1788 }
1707 1789
1708 return i; 1790 return i;
1709} 1791}
1710 1792
1711
1712

Diff Legend

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