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.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.140 by root, Wed Jan 23 14:18:19 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" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 130# endif
132#endif 131#endif
133 132
134 // generic font fallback
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 135#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 140
145 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 143#endif
148 144
145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
149 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
150}; 150};
151 151
152// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
… …
157 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
158}; 158};
159 159
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161 161
162#define dTermDisplay Display *disp = term->xdisp 162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 163#define dTermGC GC gc = term->gc
164
165/////////////////////////////////////////////////////////////////////////////
166
167#if XFT
168rxvt_drawable::~rxvt_drawable ()
169{
170 if (xftdrawable)
171 XftDrawDestroy (xftdrawable);
172}
173
174rxvt_drawable::operator XftDraw *()
175{
176 if (!xftdrawable)
177 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179 return xftdrawable;
180}
181#endif
182 164
183///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
184 166
185static const char * 167static const char *
186enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
248void 230void
249rxvt_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
250{ 232{
251 dTermDisplay; 233 dTermDisplay;
252 dTermGC; 234 dTermGC;
253 235
254 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
255 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
256 else if (color >= 0) 238 else if (color >= 0)
257 { 239 {
258#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
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);
252 }
253 else
254# endif
259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
260#else 257#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
262 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
263#endif 260#endif
264 } 261 }
265} 262}
266 263
267///////////////////////////////////////////////////////////////////////////// 264/////////////////////////////////////////////////////////////////////////////
268
269#include "table/linedraw.h"
270 265
271struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
272 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
273 268
274 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
287 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
288 283
289 return p; 284 return p;
290 } 285 }
291 286
292 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 288 {
294 width = 1; height = 1; 289 width = 1; height = 1;
295 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
296 291
297 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
310 return false; 305 return false;
311 306
312 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
313 return true; 308 return true;
314 309
310#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 313 return true;
314#endif
318 315
319 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
320 return true; 317 return true;
321 318
322 switch (unicode) 319 switch (unicode)
… …
358 ; 355 ;
359 356
360 int width = text - tp; 357 int width = text - tp;
361 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
362 359
360#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
364 { 362 {
363# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
368 367
369 int W = fwidth; 368 int W = fwidth;
… …
407 406
408 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
409 if (a) 408 if (a)
410 { 409 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 411
413 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
417 416
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 436 break;
438 } 437 }
439 } 438 }
440 } 439 }
440#else
441 if (0)
442 ;
443#endif
441#if ENABLE_COMBINING 444#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 446 {
444 min_it (width, 2); // we only support wcwidth up to 2 447 min_it (width, 2); // we only support wcwidth up to 2
445 448
… …
458 *chrs = cc->c2; 461 *chrs = cc->c2;
459 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
460 ? f1 463 ? f1
461 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
462 465
463 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
464 } 467 }
465 } 468 }
466#endif 469#endif
467 else 470 else
468 switch (t) 471 switch (t)
… …
488 491
489 void clear (); 492 void clear ();
490 493
491 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
492 495
493 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
494 497
495 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;
496 499
497 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 501 const text_t *text, int len,
499 int fg, int bg); 502 int fg, int bg);
500 503
501 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
502 XFontStruct *f; 505 XFontStruct *f;
503 codeset cs;
504 bool enc2b, encm; 506 bool enc2b, encm;
505 507
506 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
507 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);
508 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
513rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
514{ 516{
515 unsigned long value; 517 unsigned long value;
516 518
517 if (XGetFontProperty (f, property, &value)) 519 if (XGetFontProperty (f, property, &value))
518 return XGetAtomName (term->xdisp, value); 520 return XGetAtomName (term->dpy, value);
519 else 521 else
520 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
521} 523}
522 524
523rxvt_fontprop 525rxvt_fontprop
524rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
525{ 527{
… …
546rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547{ 549{
548 unsigned long height; 550 unsigned long height;
549 551
550#if 0 552#if 0
551 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552 return false; 554 return false;
553#else 555#else
554 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
555#endif 557#endif
556 558
… …
607 return false; 609 return false;
608} 610}
609 611
610// fix the size of scalable fonts 612// fix the size of scalable fonts
611static bool 613static bool
612replace_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)
613{ 615{
614 int slashes = 0; 616 int slashes = 0;
615 const char *field, *end; 617 const char *field, *end;
616 618
617 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
627 break; 629 break;
628 } 630 }
629 631
630 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
631 { 633 {
632 // TODO: check for overflow in font-name 634 size_t len = field - name;
633 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
634 buf += field - name; 636 memcpy (*ptr, name, len);
635 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
636 strcat (buf, end); 638 strcat (*ptr, end);
637 639
638 return true; 640 return true;
639 } 641 }
640 else 642 else
641 { 643 {
642 strcpy (buf, name); 644 *ptr = strdup (name);
643 645
644 return false; 646 return false;
645 } 647 }
646} 648}
647 649
648bool 650bool
649rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650{ 652{
651 dTermDisplay; 653 dTermDisplay;
652 654
653 clear (); 655 clear ();
654 656
655 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
656 658
657 // first morph the font if required 659 // first morph the font if required
658 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
659 || prop.slant != rxvt_fontprop::unset)
660 { 661 {
661 char fname[1024]; 662 char *fname;
662 663
663 if (name[0] != '-') 664 if (name[0] != '-')
664 { 665 {
665 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
666 667
… …
678 f = 0; 679 f = 0;
679 } 680 }
680 681
681 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
682 { 683 {
683 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 686 ? "medium" : "bold");
686 set_name (strdup (fname)); 687 set_name (fname);
687 } 688 }
688 689
689 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
690 { 691 {
691 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 695 set_name (fname);
695 } 696 }
696 } 697 }
697 698
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
725 726
726 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
727 { 728 {
728 rxvt_fontprop p; 729 rxvt_fontprop p;
729 char fname[1024]; 730 char *fname;
730 731
731 int diff = 0; 732 int diff = 0;
732 733
733 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
737 742
738 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
739 continue; 744 continue;
740 745
741 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
745 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;
746 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);
747 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);
748 //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);
749 754
750 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
751 fonts[i].diff = diff; 756 fonts[i].diff = diff;
752 } 757 }
753 758
754 XFreeFontNames (list); 759 XFreeFontNames (list);
755 760
… …
832 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;
833 838
834 if (encm) 839 if (encm)
835 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837 842
838 while (N) 843 while (N)
839 { 844 {
840 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
841 width = f->per_char[N].width; 846 width = f->per_char[N].width;
842 847
… …
861 866
862 XCharStruct g; 867 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 870
871 int wcw = WCWIDTH (*t);
866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867 873
868 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
869 } 875 }
870 876
871 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
… …
890void 896void
891rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
892{ 898{
893 if (f) 899 if (f)
894 { 900 {
895 XFreeFont (term->xdisp, f); 901 XFreeFont (term->dpy, f);
896 f = 0; 902 f = 0;
897 } 903 }
898} 904}
899 905
900bool 906bool
… …
945 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
946 return true; 952 return true;
947 953
948 // check wether character overlaps previous/next character 954 // check wether character overlaps previous/next character
949 int w = xcs->rbearing - xcs->lbearing; 955 int w = xcs->rbearing - xcs->lbearing;
950 int wcw = WCWIDTH (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
951 957
952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953 959
954 if (careful && !OVERLAP_OK (w, wcw, prop)) 960 if (careful && !OVERLAP_OK (w, wcw, prop))
955 return false; 961 return false;
… …
993 else 999 else
994 { 1000 {
995 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996 1002
997 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
998 1004
999 if (slow) 1005 if (slow)
1000 { 1006 {
1001 do 1007 do
1002 { 1008 {
1003 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
… …
1025 else 1031 else
1026 { 1032 {
1027 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028 1034
1029 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1030 1036
1031 if (slow) 1037 if (slow)
1032 { 1038 {
1033 do 1039 do
1034 { 1040 {
1035 if (*xc) 1041 if (*xc)
… …
1055 1061
1056 void clear (); 1062 void clear ();
1057 1063
1058 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1059 1065
1060 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1061 1067
1062 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1063 const text_t *text, int len, 1069 const text_t *text, int len,
1064 int fg, int bg); 1070 int fg, int bg);
1065 1071
1066 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;
1067 1073
1068protected: 1074protected:
1069 XftFont *f; 1075 XftFont *f;
1070}; 1076};
1071 1077
1072void 1078void
1073rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1074{ 1080{
1075 if (f) 1081 if (f)
1076 { 1082 {
1077 XftFontClose (term->xdisp, f); 1083 XftFontClose (term->dpy, f);
1078 f = 0; 1084 f = 0;
1079 } 1085 }
1080} 1086}
1081 1087
1082rxvt_fontprop 1088rxvt_fontprop
… …
1098 1104
1099 return p; 1105 return p;
1100} 1106}
1101 1107
1102bool 1108bool
1103rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104{ 1110{
1105 dTermDisplay; 1111 dTermDisplay;
1106 1112
1107 clear (); 1113 clear ();
1108 1114
… …
1117 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120 1126
1121 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1122 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124 1130
1125 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1126 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128 1134
1129#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1130 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1131 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1249bool 1255bool
1250rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251{ 1257{
1252 careful = false; 1258 careful = false;
1253 1259
1254 if (!XftCharExists (term->xdisp, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1255 return false; 1261 return false;
1256 1262
1257 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1258 return true; 1264 return true;
1259 1265
1260 // check character against base font bounding box 1266 // check character against base font bounding box
1261 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1262 XGlyphInfo g; 1268 XGlyphInfo g;
1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264 1270
1265 int w = g.width - g.x; 1271 int w = g.width - g.x;
1266 int wcw = WCWIDTH (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1267 1273
1268 careful = g.x > 0 || w > prop->width * wcw; 1274 careful = g.x > 0 || w > prop->width * wcw;
1269 1275
1270 if (careful && !OVERLAP_OK (w, wcw, prop)) 1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false; 1277 return false;
… …
1280void 1286void
1281rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282 const text_t *text, int len, 1288 const text_t *text, int len,
1283 int fg, int bg) 1289 int fg, int bg)
1284{ 1290{
1285 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287 XGlyphInfo extents; 1291 XGlyphInfo extents;
1288 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1289 XftGlyphSpec *ep = enc; 1293 XftGlyphSpec *ep = enc;
1290 1294
1291 dTermDisplay; 1295 dTermDisplay;
1292 dTermGC; 1296 dTermGC;
1293 1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
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
1307 buffered = false;
1308#endif
1309 buffered=false;//D
1310
1294 // cut trailing spaces 1311 // cut trailing spaces
1295 while (len && text [len - 1] == ' ') 1312 while (len && text [len - 1] == ' ')
1296 len--; 1313 len--;
1297 1314
1315 int x_ = buffered ? 0 : x;
1316 int y_ = buffered ? 0 : y;
1317
1298 while (len) 1318 while (len)
1299 { 1319 {
1300 int cwidth = term->fwidth; 1320 int cwidth = term->fwidth;
1301 FcChar32 fc = *text++; len--; 1321 FcChar32 fc = *text++; len--;
1302 1322
1303 while (len && *text == NOCHAR) 1323 while (len && *text == NOCHAR)
1304 text++, len--, cwidth += term->fwidth; 1324 text++, len--, cwidth += term->fwidth;
1305 1325
1306 if (fc != ' ') // skip spaces 1326 if (fc != ' ') // skip spaces
1307 { 1327 {
1308 FT_UInt glyph = XftCharIndex (disp, f, fc); 1328 FT_UInt glyph = XftCharIndex (disp, f, fc);
1309 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1329 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310 1330
1311
1312 ep->glyph = glyph; 1331 ep->glyph = glyph;
1313 ep->x = x + (cwidth - extents.xOff >> 1); 1332 ep->x = x_ + (cwidth - extents.xOff >> 1);
1314 ep->y = y + ascent; 1333 ep->y = y_ + ascent;
1315 1334
1316 if (extents.xOff == 0) 1335 if (extents.xOff == 0)
1317 ep->x = x + cwidth; 1336 ep->x = x_ + cwidth;
1318 1337
1319 ep++; 1338 ep++;
1320 } 1339 }
1321 1340
1322 x += cwidth; 1341 x_ += cwidth;
1342 }
1343
1344 if (buffered)
1323 } 1345 {
1324
1325 if (ep != enc) 1346 if (ep != enc)
1347 {
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349
1350#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0;
1352
1353 if (term->bgPixmap.pixmap
1354 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1356 {
1357 int src_x = x, src_y = y;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y;
1363 }
1364
1365 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y + h)
1367 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0);
1370 }
1371 else
1372 {
1373 XGCValues gcv;
1374
1375 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y;
1379
1380 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv);
1383
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385
1386 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 }
1389
1390 if (dst)
1391 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1396 }
1397 else
1398#endif
1399 clear_rect (d, x, y, w, h, bg);
1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 }
1404 else
1405 clear_rect (d, x, y, w, h, bg);
1406 }
1407 else
1408 {
1409 clear_rect (d, x, y, w, h, bg);
1326 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1411 }
1327} 1412}
1413
1328#endif 1414#endif
1329 1415
1330///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1331 1417
1332rxvt_fontset::rxvt_fontset (rxvt_term *term) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1343void 1429void
1344rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1345{ 1431{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1348 1435
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1351 1438
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1361 1448
1362rxvt_font * 1449rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1451{
1365 rxvt_font *f; 1452 rxvt_font *f;
1366 1453
1367 if (!name || !*name) 1454 if (!name || !*name)
1368 { 1455 {
1369 name = ""; 1456 name = "";
1370 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1371 } 1458 }
… …
1439 if (!end) 1526 if (!end)
1440 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1441 1528
1442 if (end - desc < 511) 1529 if (end - desc < 511)
1443 { 1530 {
1444 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1445 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1446 1533
1447 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1448 } 1535 }
1449 else 1536 else
… …
1464 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1465 return true; 1552 return true;
1466 1553
1467 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1468 1555
1469 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1470 { 1557 {
1471 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1559 return false;
1473 } 1560 }
1474 1561
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1665
1579 XftResult result; 1666 XftResult result;
1580 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1668
1582 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1583 1670
1584 if (match) 1671 if (match)
1585 { 1672 {
… …
1590 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1591 { 1678 {
1592 char fontname[4096]; 1679 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1680 sprintf (fontname, "xft:%-.4090s", font);
1594 1681
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1596 } 1683 }
1597 1684
1598 free (font); 1685 free (font);
1599 } 1686 }
1600#endif 1687#endif

Diff Legend

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