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.94 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.146 by ayin, Sat Jan 26 14:24:43 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-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
… …
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" },
… …
163#define dTermDisplay Display *disp = term->dpy 162#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 163#define dTermGC GC gc = term->gc
165 164
166///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
167 166
168#if XFT
169rxvt_drawable::~rxvt_drawable ()
170{
171 if (xftdrawable)
172 XftDrawDestroy (xftdrawable);
173}
174
175rxvt_drawable::operator XftDraw *()
176{
177 if (!xftdrawable)
178 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
179
180 return xftdrawable;
181}
182#endif
183
184/////////////////////////////////////////////////////////////////////////////
185
186static const char * 167static const char *
187enc_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)
188{ 169{
189 uint8_t *buf = rxvt_temp_buf<uint8_t> (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
190 uint8_t *res = buf; 171 uint8_t *res = buf;
… …
249void 230void
250rxvt_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
251{ 232{
252 dTermDisplay; 233 dTermDisplay;
253 dTermGC; 234 dTermGC;
254 235
255 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
256 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
257 else if (color >= 0) 238 else if (color >= 0)
258 { 239 {
259#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
260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
261#else 257#else
262 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
263 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
264#endif 260#endif
265 } 261 }
266} 262}
267 263
268///////////////////////////////////////////////////////////////////////////// 264/////////////////////////////////////////////////////////////////////////////
269
270#include "table/linedraw.h"
271 265
272struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
273 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
274 268
275 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
288 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
289 283
290 return p; 284 return p;
291 } 285 }
292 286
293 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
294 { 288 {
295 width = 1; height = 1; 289 width = 1; height = 1;
296 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
297 291
298 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
311 return false; 305 return false;
312 306
313 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
314 return true; 308 return true;
315 309
310#ifdef BUILTIN_GLYPHS
316 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
318 return true; 313 return true;
314#endif
319 315
320 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
321 return true; 317 return true;
322 318
323 switch (unicode) 319 switch (unicode)
… …
359 ; 355 ;
360 356
361 int width = text - tp; 357 int width = text - tp;
362 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
363 359
360#ifdef BUILTIN_GLYPHS
364 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
365 { 362 {
363# include "table/linedraw.h"
366 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
367 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
368 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
369 367
370 int W = fwidth; 368 int W = fwidth;
… …
408 406
409 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
410 if (a) 408 if (a)
411 { 409 {
412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413 411
414 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
417 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
418 416
… …
437 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
438 break; 436 break;
439 } 437 }
440 } 438 }
441 } 439 }
440#else
441 if (0)
442 ;
443#endif
442#if ENABLE_COMBINING 444#if ENABLE_COMBINING
443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444 { 446 {
445 min_it (width, 2); // we only support wcwidth up to 2 447 min_it (width, 2); // we only support wcwidth up to 2
446 448
… …
459 *chrs = cc->c2; 461 *chrs = cc->c2;
460 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461 ? f1 463 ? f1
462 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
463 465
464 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
465 } 467 }
466 } 468 }
467#endif 469#endif
468 else 470 else
469 switch (t) 471 switch (t)
… …
489 491
490 void clear (); 492 void clear ();
491 493
492 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
493 495
494 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
495 497
496 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;
497 499
498 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
499 const text_t *text, int len, 501 const text_t *text, int len,
500 int fg, int bg); 502 int fg, int bg);
501 503
502 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
503 XFontStruct *f; 505 XFontStruct *f;
504 codeset cs;
505 bool enc2b, encm; 506 bool enc2b, encm;
506 507
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
509 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
516 unsigned long value; 517 unsigned long value;
517 518
518 if (XGetFontProperty (f, property, &value)) 519 if (XGetFontProperty (f, property, &value))
519 return XGetAtomName (term->dpy, value); 520 return XGetAtomName (term->dpy, value);
520 else 521 else
521 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
522} 523}
523 524
524rxvt_fontprop 525rxvt_fontprop
525rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
526{ 527{
… …
608 return false; 609 return false;
609} 610}
610 611
611// fix the size of scalable fonts 612// fix the size of scalable fonts
612static bool 613static bool
613replace_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)
614{ 615{
615 int slashes = 0; 616 int slashes = 0;
616 const char *field, *end; 617 const char *field, *end;
617 618
618 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
628 break; 629 break;
629 } 630 }
630 631
631 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
632 { 633 {
633 // TODO: check for overflow in font-name 634 size_t len = field - name;
634 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 636 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
637 strcat (buf, end); 638 strcat (*ptr, end);
638 639
639 return true; 640 return true;
640 } 641 }
641 else 642 else
642 { 643 {
643 strcpy (buf, name); 644 *ptr = strdup (name);
644 645
645 return false; 646 return false;
646 } 647 }
647} 648}
648 649
649bool 650bool
650rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651{ 652{
652 dTermDisplay; 653 dTermDisplay;
653 654
654 clear (); 655 clear ();
655 656
656 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
657 658
658 // first morph the font if required 659 // first morph the font if required
659 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
660 || prop.slant != rxvt_fontprop::unset)
661 { 661 {
662 char fname[1024]; 662 char *fname;
663 663
664 if (name[0] != '-') 664 if (name[0] != '-')
665 { 665 {
666 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
667 667
… …
679 f = 0; 679 f = 0;
680 } 680 }
681 681
682 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
683 { 683 {
684 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
685 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
686 ? "medium" : "bold"); 686 ? "medium" : "bold");
687 set_name (strdup (fname)); 687 set_name (fname);
688 } 688 }
689 689
690 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
691 { 691 {
692 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
693 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
694 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
695 set_name (strdup (fname)); 695 set_name (fname);
696 } 696 }
697 } 697 }
698 698
699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
725 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
726 726
727 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
728 { 728 {
729 rxvt_fontprop p; 729 rxvt_fontprop p;
730 char fname[1024]; 730 char *fname;
731 731
732 int diff = 0; 732 int diff = 0;
733 733
734 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
735 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
736 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
738 742
739 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
740 continue; 744 continue;
741 745
742 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
746 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;
747 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);
748 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);
749 //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);
750 754
751 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
752 fonts[i].diff = diff; 756 fonts[i].diff = diff;
753 } 757 }
754 758
755 XFreeFontNames (list); 759 XFreeFontNames (list);
756 760
… …
833 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;
834 838
835 if (encm) 839 if (encm)
836 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
837 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838 842
839 while (N) 843 while (N)
840 { 844 {
841 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
842 width = f->per_char[N].width; 846 width = f->per_char[N].width;
843 847
… …
995 else 999 else
996 { 1000 {
997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998 1002
999 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1000 1004
1001 if (slow) 1005 if (slow)
1002 { 1006 {
1003 do 1007 do
1004 { 1008 {
1005 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
… …
1027 else 1031 else
1028 { 1032 {
1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030 1034
1031 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1032 1036
1033 if (slow) 1037 if (slow)
1034 { 1038 {
1035 do 1039 do
1036 { 1040 {
1037 if (*xc) 1041 if (*xc)
… …
1057 1061
1058 void clear (); 1062 void clear ();
1059 1063
1060 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1061 1065
1062 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1063 1067
1064 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1065 const text_t *text, int len, 1069 const text_t *text, int len,
1066 int fg, int bg); 1070 int fg, int bg);
1067 1071
1068 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;
1069 1073
1070protected: 1074protected:
1071 XftFont *f; 1075 XftFont *f;
1072}; 1076};
1073 1077
… …
1100 1104
1101 return p; 1105 return p;
1102} 1106}
1103 1107
1104bool 1108bool
1105rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106{ 1110{
1107 dTermDisplay; 1111 dTermDisplay;
1108 1112
1109 clear (); 1113 clear ();
1110 1114
… …
1119 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122 1126
1123 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1124 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126 1130
1127 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1128 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130 1134
1131#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1132 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1133 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1282void 1286void
1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284 const text_t *text, int len, 1288 const text_t *text, int len,
1285 int fg, int bg) 1289 int fg, int bg)
1286{ 1290{
1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289 XGlyphInfo extents; 1291 XGlyphInfo extents;
1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1291 XftGlyphSpec *ep = enc; 1293 XftGlyphSpec *ep = enc;
1292 1294
1293 dTermDisplay; 1295 dTermDisplay;
1294 dTermGC; 1296 dTermGC;
1295 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 && term->option (Opt_buffered);
1307
1296 // cut trailing spaces 1308 // cut trailing spaces
1297 while (len && text [len - 1] == ' ') 1309 while (len && text [len - 1] == ' ')
1298 len--; 1310 len--;
1299 1311
1312 int x_ = buffered ? 0 : x;
1313 int y_ = buffered ? 0 : y;
1314
1300 while (len) 1315 while (len)
1301 { 1316 {
1302 int cwidth = term->fwidth; 1317 int cwidth = term->fwidth;
1303 FcChar32 fc = *text++; len--; 1318 FcChar32 fc = *text++; len--;
1304 1319
1305 while (len && *text == NOCHAR) 1320 while (len && *text == NOCHAR)
1306 text++, len--, cwidth += term->fwidth; 1321 text++, len--, cwidth += term->fwidth;
1307 1322
1308 if (fc != ' ') // skip spaces 1323 if (fc != ' ') // skip spaces
1309 { 1324 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc); 1325 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1326 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312 1327
1313 ep->glyph = glyph; 1328 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1); 1329 ep->x = x_ + (cwidth - extents.xOff >> 1);
1315 ep->y = y + ascent; 1330 ep->y = y_ + ascent;
1316 1331
1317 if (extents.xOff == 0) 1332 if (extents.xOff == 0)
1318 ep->x = x + cwidth; 1333 ep->x = x_ + cwidth;
1319 1334
1320 ep++; 1335 ep++;
1321 } 1336 }
1322 1337
1323 x += cwidth; 1338 x_ += cwidth;
1339 }
1340
1341 if (buffered)
1324 } 1342 {
1325
1326 if (ep != enc) 1343 if (ep != enc)
1344 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346
1347#ifdef HAVE_BG_PIXMAP
1348 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1349
1350 if (term->bgPixmap.pixmap
1351 && (bg == Color_transparent || bg == Color_bg
1352 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 {
1354 int src_x = x, src_y = y;
1355
1356 if (term->bgPixmap.is_parentOrigin ())
1357 {
1358 src_x += term->window_vt_x;
1359 src_y += term->window_vt_y;
1360 }
1361
1362 if (term->bgPixmap.pmap_width >= src_x + w
1363 && term->bgPixmap.pmap_height >= src_y + h)
1364 {
1365 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1366 src_x, src_y, w, h, 0, 0);
1367 }
1368 else
1369 {
1370 XGCValues gcv;
1371
1372 gcv.fill_style = FillTiled;
1373 gcv.tile = term->bgPixmap.pixmap;
1374 gcv.ts_x_origin = -src_x;
1375 gcv.ts_y_origin = -src_y;
1376
1377 XChangeGC (disp, gc,
1378 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1379 &gcv);
1380
1381 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1382
1383 gcv.fill_style = FillSolid;
1384 XChangeGC (disp, gc, GCFillStyle, &gcv);
1385 }
1386
1387 if (dst)
1388 {
1389 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1390
1391 // dst can only be set when bg >= 0
1392 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1393 }
1394 }
1395 else
1396#endif
1397 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1398
1399 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1400 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1401 }
1402 else
1403 clear_rect (d, x, y, w, h, bg);
1404 }
1405 else
1406 {
1407 clear_rect (d, x, y, w, h, bg);
1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1408 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 }
1328} 1410}
1411
1329#endif 1412#endif
1330 1413
1331///////////////////////////////////////////////////////////////////////////// 1414/////////////////////////////////////////////////////////////////////////////
1332 1415
1333rxvt_fontset::rxvt_fontset (rxvt_term *term) 1416rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1344void 1427void
1345rxvt_fontset::clear () 1428rxvt_fontset::clear ()
1346{ 1429{
1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1430 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348 = rxvt_fontprop::unset; 1431 = rxvt_fontprop::unset;
1432 force_prop = false;
1349 1433
1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1434 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351 FONT_UNREF (*i); 1435 FONT_UNREF (*i);
1352 1436
1353 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1437 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1362 1446
1363rxvt_font * 1447rxvt_font *
1364rxvt_fontset::new_font (const char *name, codeset cs) 1448rxvt_fontset::new_font (const char *name, codeset cs)
1365{ 1449{
1366 rxvt_font *f; 1450 rxvt_font *f;
1367 1451
1368 if (!name || !*name) 1452 if (!name || !*name)
1369 { 1453 {
1370 name = ""; 1454 name = "";
1371 f = new rxvt_font_default (this); 1455 f = new rxvt_font_default (this);
1372 } 1456 }
… …
1440 if (!end) 1524 if (!end)
1441 end = desc + strlen (desc); 1525 end = desc + strlen (desc);
1442 1526
1443 if (end - desc < 511) 1527 if (end - desc < 511)
1444 { 1528 {
1445 strncpy (buf, desc, end - desc); 1529 memcpy (buf, desc, end - desc);
1446 buf[end - desc] = 0; 1530 buf[end - desc] = 0;
1447 1531
1448 fonts.push_back (new_font (buf, cs)); 1532 fonts.push_back (new_font (buf, cs));
1449 } 1533 }
1450 else 1534 else
… …
1465 if (fonts[i]->loaded) 1549 if (fonts[i]->loaded)
1466 return true; 1550 return true;
1467 1551
1468 fonts[i]->loaded = true; 1552 fonts[i]->loaded = true;
1469 1553
1470 if (!fonts[i]->load (prop)) 1554 if (!fonts[i]->load (prop, force_prop))
1471 { 1555 {
1472 fonts[i]->cs = CS_UNKNOWN; 1556 fonts[i]->cs = CS_UNKNOWN;
1473 return false; 1557 return false;
1474 } 1558 }
1475 1559
… …
1591 if (find_font (font) < 0) 1675 if (find_font (font) < 0)
1592 { 1676 {
1593 char fontname[4096]; 1677 char fontname[4096];
1594 sprintf (fontname, "xft:%-.4090s", font); 1678 sprintf (fontname, "xft:%-.4090s", font);
1595 1679
1596 fonts.push_back (new_font (fontname, CS_UNICODE)); 1680 fonts.push_back (new_font (fontname, CS_UNICODE));
1597 } 1681 }
1598 1682
1599 free (font); 1683 free (font);
1600 } 1684 }
1601#endif 1685#endif

Diff Legend

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