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.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.168 by sf-exg, Tue Dec 14 08:01:51 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" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 51
49#if ENCODING_EU 52#if ENCODING_EU
50 // cyrillic 53 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 56
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 70
68# if XFT 71# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 72 { CS_KOI8_U, "xft::lang=ru" },
70 73
71 { CS_ISO8859_5, "xft::lang=ru" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 76 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 77 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
… …
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" },
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 220: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 221{
219} 222}
220 223
221void 224void
222rxvt_font::set_name (char *name) 225rxvt_font::set_name (char *name_)
223{ 226{
224 if (this->name == name) 227 if (name == name_)
225 return; 228 return;
226 229
227 if (this->name) free (this->name); // let the compiler optimize 230 if (name) free (name); // let the compiler optimize
228 this->name = name; 231 name = name_;
229} 232}
230 233
231void 234void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 235rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 236{
234 dTermDisplay; 237 dTermDisplay;
235 dTermGC; 238 dTermGC;
236 239
237 if (color == Color_bg || color == Color_transparent) 240 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 241 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 242 else if (color >= 0)
240 { 243 {
241#if XFT 244#if XFT
245 Picture dst;
246
247# ifdef HAVE_BG_PIXMAP
248 if (term->bgPixmap.pixmap
249 && !term->pix_colors[color].is_opaque ()
250 && ((dst = XftDrawPicture (d))))
251 {
252 XClearArea (disp, d, x, y, w, h, false);
253
254 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
255 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
256 }
257 else
258# endif
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
260
243#else 261#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 264#endif
247 } 265 }
248} 266}
249 267
250///////////////////////////////////////////////////////////////////////////// 268/////////////////////////////////////////////////////////////////////////////
251
252#include "table/linedraw.h"
253 269
254struct rxvt_font_default : rxvt_font { 270struct rxvt_font_default : rxvt_font {
255 struct rxvt_fontset *fs; 271 struct rxvt_fontset *fs;
256 272
257 rxvt_font_default (rxvt_fontset *fs) 273 rxvt_font_default (rxvt_fontset *fs)
… …
293 return false; 309 return false;
294 310
295 if (unicode <= 0x009f) 311 if (unicode <= 0x009f)
296 return true; 312 return true;
297 313
314#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 315 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 316 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 317 return true;
318#endif
301 319
302 if (IS_COMPOSE (unicode)) 320 if (IS_COMPOSE (unicode))
303 return true; 321 return true;
304 322
305 switch (unicode) 323 switch (unicode)
… …
341 ; 359 ;
342 360
343 int width = text - tp; 361 int width = text - tp;
344 int fwidth = term->fwidth * width; 362 int fwidth = term->fwidth * width;
345 363
364#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 365 if (0x2500 <= t && t <= 0x259f)
347 { 366 {
367# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 368 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 369 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 370 uint32_t *b = a + (offs & 15);
351 371
352 int W = fwidth; 372 int W = fwidth;
… …
390 410
391 case 1: // rectangle, possibly stippled 411 case 1: // rectangle, possibly stippled
392 if (a) 412 if (a)
393 { 413 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 414 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 415
396 gcv.fill_style = FillStippled; 416 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 417 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 418 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 419 gcv.ts_y_origin = y;
400 420
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 439 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 440 break;
421 } 441 }
422 } 442 }
423 } 443 }
444#else
445 if (0)
446 ;
447#endif
424#if ENABLE_COMBINING 448#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 449 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 450 {
427 min_it (width, 2); // we only support wcwidth up to 2 451 min_it (width, 2); // we only support wcwidth up to 2
428 452
429 text_t chrs[2]; 453 text_t chrs[2];
430 chrs [1] = NOCHAR; 454 chrs [1] = NOCHAR;
431 455
432 *chrs = cc->c1; 456 *chrs = cc->c1;
433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 457 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
434 f1->draw (d, x, y, chrs, width, fg, bg); 458 f1->draw (d, x, y, chrs, width, fg, bg);
435 459
436 if (cc->c2 != NOCHAR) 460 if (cc->c2 != NOCHAR)
437 { 461 {
438 bool careful; 462 bool careful;
439 463
440 // prefer font of first character, for no good reasons 464 // prefer font of first character, for no good reasons
441 *chrs = cc->c2; 465 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 466 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 467 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 468 : (*fs)[fs->find_font_idx (cc->c2)];
445 469
446 f2->draw (d, x, y, chrs, width, fg, Color_none); 470 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 471 }
448 } 472 }
449#endif 473#endif
… …
462 486
463 x += fwidth; 487 x += fwidth;
464 } 488 }
465} 489}
466 490
491struct rxvt_font_overflow : rxvt_font {
492 struct rxvt_fontset *fs;
493
494 rxvt_font_overflow (rxvt_fontset *fs)
495 : rxvt_font ()
496 {
497 this->fs = fs;
498 }
499
500 rxvt_fontprop properties ()
501 {
502 rxvt_fontprop p;
503
504 p.width = p.height = 1;
505 p.ascent = rxvt_fontprop::unset;
506 p.weight = rxvt_fontprop::medium;
507 p.slant = rxvt_fontprop::roman;
508
509 return p;
510 }
511
512 bool load (const rxvt_fontprop &prop, bool force_prop)
513 {
514 width = 1; height = 1;
515 ascent = 1; descent = 0;
516
517 set_name (strdup ("built-in rendition overflow font"));
518
519 return true;
520 }
521
522 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
523 {
524 return false;
525 }
526
527 void draw (rxvt_drawable &d, int x, int y,
528 const text_t *text, int len,
529 int fg, int bg)
530 {
531 while (len--)
532 {
533 int fid = fs->find_font_idx (*text);
534 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
535 ++text;
536 x += term->fwidth;
537 }
538 }
539};
540
467///////////////////////////////////////////////////////////////////////////// 541/////////////////////////////////////////////////////////////////////////////
468 542
469struct rxvt_font_x11 : rxvt_font { 543struct rxvt_font_x11 : rxvt_font {
470 rxvt_font_x11 () { f = 0; } 544 rxvt_font_x11 () { f = 0; }
471 545
… …
479 553
480 void draw (rxvt_drawable &d, int x, int y, 554 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 555 const text_t *text, int len,
482 int fg, int bg); 556 int fg, int bg);
483 557
484 bool slow; // wether this is a proportional font or has other funny characteristics 558 bool slow; // whether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 559 XFontStruct *f;
486 bool enc2b, encm; 560 bool enc2b, encm;
487 561
488 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 562 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 563 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
497 unsigned long value; 571 unsigned long value;
498 572
499 if (XGetFontProperty (f, property, &value)) 573 if (XGetFontProperty (f, property, &value))
500 return XGetAtomName (term->dpy, value); 574 return XGetAtomName (term->dpy, value);
501 else 575 else
502 return rxvt_strdup (repl); 576 return repl ? strdup (repl) : 0;
503} 577}
504 578
505rxvt_fontprop 579rxvt_fontprop
506rxvt_font_x11::properties () 580rxvt_font_x11::properties ()
507{ 581{
… …
589 return false; 663 return false;
590} 664}
591 665
592// fix the size of scalable fonts 666// fix the size of scalable fonts
593static bool 667static bool
594replace_field (char *buf, const char *name, int index, const char old, const char *replace) 668replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
595{ 669{
596 int slashes = 0; 670 int slashes = 0;
597 const char *field, *end; 671 const char *field, *end;
598 672
599 for (const char *c = name; *c; c++) 673 for (const char *c = name; *c; c++)
… …
609 break; 683 break;
610 } 684 }
611 685
612 if (slashes >= 13 && (!old || *field == old)) 686 if (slashes >= 13 && (!old || *field == old))
613 { 687 {
614 // TODO: check for overflow in font-name 688 size_t len = field - name;
615 strncpy (buf, name, field - name); 689 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 buf += field - name; 690 memcpy (*ptr, name, len);
617 strcpy (buf, replace); 691 strcpy (*ptr + len, replace);
618 strcat (buf, end); 692 strcat (*ptr, end);
619 693
620 return true; 694 return true;
621 } 695 }
622 else 696 else
623 { 697 {
624 strcpy (buf, name); 698 *ptr = strdup (name);
625 699
626 return false; 700 return false;
627 } 701 }
628} 702}
629 703
… …
637 char field_str[64]; // enough for 128 bits 711 char field_str[64]; // enough for 128 bits
638 712
639 // first morph the font if required 713 // first morph the font if required
640 if (force_prop) 714 if (force_prop)
641 { 715 {
642 char fname[1024]; 716 char *fname;
643 717
644 if (name[0] != '-') 718 if (name[0] != '-')
645 { 719 {
646 f = XLoadQueryFont (disp, name); 720 f = XLoadQueryFont (disp, name);
647 721
… …
659 f = 0; 733 f = 0;
660 } 734 }
661 735
662 if (prop.weight != rxvt_fontprop::unset) 736 if (prop.weight != rxvt_fontprop::unset)
663 { 737 {
664 replace_field (fname, name, 2, 0, 738 replace_field (&fname, name, 2, 0,
665 prop.weight < rxvt_fontprop::bold 739 prop.weight < rxvt_fontprop::bold
666 ? "medium" : "bold"); 740 ? "medium" : "bold");
667 set_name (strdup (fname)); 741 set_name (fname);
668 } 742 }
669 743
670 if (prop.slant != rxvt_fontprop::unset) 744 if (prop.slant != rxvt_fontprop::unset)
671 { 745 {
672 replace_field (fname, name, 3, 0, 746 replace_field (&fname, name, 3, 0,
673 prop.slant < rxvt_fontprop::italic 747 prop.slant < rxvt_fontprop::italic
674 ? "r" : "i"); // TODO: handle "o"blique, too 748 ? "r" : "i"); // TODO: handle "o"blique, too
675 set_name (strdup (fname)); 749 set_name (fname);
676 } 750 }
677 } 751 }
678 752
679 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 753 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680 ? 0 : prop.height); 754 ? 0 : prop.height);
… …
705 font_weight *fonts = new font_weight[count]; 779 font_weight *fonts = new font_weight[count];
706 780
707 for (int i = 0; i < count; i++) 781 for (int i = 0; i < count; i++)
708 { 782 {
709 rxvt_fontprop p; 783 rxvt_fontprop p;
710 char fname[1024]; 784 char *fname;
711 785
712 int diff = 0; 786 int diff = 0;
713 787
714 if (replace_field (fname, list[i], 6, '0', field_str)) 788 if (replace_field (&fname, list[i], 6, '0', field_str))
715 diff += 10; // slightly penalize scalable fonts 789 diff += 10; // slightly penalize scalable fonts
790 else
791 {
792 free (fname);
716 else if (replace_field (fname, list[i], 11, '0', "0")) 793 if (replace_field (&fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 794 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
795 }
718 796
719 if (!set_properties (p, fname)) 797 if (!set_properties (p, fname))
720 continue; 798 continue;
721 799
722 if (prop.height != rxvt_fontprop::unset 800 if (prop.height != rxvt_fontprop::unset
… …
726 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;
727 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);
728 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);
729 //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);
730 808
731 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
732 fonts[i].diff = diff; 810 fonts[i].diff = diff;
733 } 811 }
734 812
735 XFreeFontNames (list); 813 XFreeFontNames (list);
736 814
… …
768 return false; 846 return false;
769 847
770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772 850
851 cs = CS_UNKNOWN;
852
773 if (registry && encoding) 853 if (registry && encoding)
774 { 854 {
775 char charset[64]; 855 char charset[64];
776 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
777 857
778 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
859
860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
779 } 862 }
780 else 863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
781 { 868 {
782 const char *charset = get_property (f, XA_FONT, 0); 869 const char *charset = get_property (f, XA_FONT, 0);
783 870
784 if (!charset) 871 if (!charset)
785 charset = name; 872 charset = name;
… …
788 while (*charset) 875 while (*charset)
789 if (*charset++ == '-' && !--count) 876 if (*charset++ == '-' && !--count)
790 break; 877 break;
791 878
792 cs = codeset_from_name (charset); 879 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
882 }
883
884 if (cs == CS_UNKNOWN)
793 } 885 {
794 886 clear ();
795 free (registry); 887 return false;
796 free (encoding); 888 }
797 889
798 if (cs == CS_UNICODE) 890 if (cs == CS_UNICODE)
799 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 891 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
800 892
801 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 893 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
813 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 905 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814 906
815 if (encm) 907 if (encm)
816 N += (f->max_byte1 - f->min_byte1) 908 N += (f->max_byte1 - f->min_byte1)
817 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 909 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818 910
819 while (N) 911 while (N)
820 { 912 {
821 if (f->per_char[N].width > width) 913 if (f->per_char[N].width > width)
822 width = f->per_char[N].width; 914 width = f->per_char[N].width;
823 915
… …
848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 940 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849 941
850 if (width < g.width) width = g.width; 942 if (width < g.width) width = g.width;
851 } 943 }
852 944
853 if (cs == CS_UNKNOWN) 945#if 0 // do it per-character
946 if (prop && width > prop->width)
854 { 947 {
855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857 clear (); 948 clear ();
858 return false; 949 return false;
859 } 950 }
860
861#if 0 // do it per-character
862 if (prop && width > prop->width)
863 {
864 clear ();
865 return false;
866 }
867#endif 951#endif
868 952
869 return true; 953 return true;
870} 954}
871 955
… …
885 uint32_t ch = FROM_UNICODE (cs, unicode); 969 uint32_t ch = FROM_UNICODE (cs, unicode);
886 970
887 if (ch == NOCHAR) 971 if (ch == NOCHAR)
888 return false; 972 return false;
889 973
890 /* check wether the character exists in _this_ font. horrible. */ 974 /* check whether the character exists in _this_ font. horrible. */
891 XCharStruct *xcs; 975 XCharStruct *xcs;
892 976
893 if (encm) 977 if (encm)
894 { 978 {
895 unsigned char byte1 = ch >> 8; 979 unsigned char byte1 = ch >> 8;
… …
925 return false; 1009 return false;
926 1010
927 if (!prop || prop->width == rxvt_fontprop::unset) 1011 if (!prop || prop->width == rxvt_fontprop::unset)
928 return true; 1012 return true;
929 1013
930 // check wether character overlaps previous/next character 1014 // check whether character overlaps previous/next character
931 int w = xcs->rbearing - xcs->lbearing; 1015 int w = xcs->rbearing - xcs->lbearing;
932 int wcw = max (WCWIDTH (unicode), 1); 1016 int wcw = max (WCWIDTH (unicode), 1);
933 1017
934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1018 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
935 1019
… …
975 else 1059 else
976 { 1060 {
977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1061 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978 1062
979 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1063 XChangeGC (disp, gc, GCForeground | GCFont, &v);
980 1064
981 if (slow) 1065 if (slow)
982 { 1066 {
983 do 1067 do
984 { 1068 {
985 if (xc->byte1 || xc->byte2) 1069 if (xc->byte1 || xc->byte2)
… …
1007 else 1091 else
1008 { 1092 {
1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1093 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010 1094
1011 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1095 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1012 1096
1013 if (slow) 1097 if (slow)
1014 { 1098 {
1015 do 1099 do
1016 { 1100 {
1017 if (*xc) 1101 if (*xc)
… …
1043 1127
1044 void draw (rxvt_drawable &d, int x, int y, 1128 void draw (rxvt_drawable &d, int x, int y,
1045 const text_t *text, int len, 1129 const text_t *text, int len,
1046 int fg, int bg); 1130 int fg, int bg);
1047 1131
1048 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1132 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049 1133
1050protected: 1134protected:
1051 XftFont *f; 1135 XftFont *f;
1052}; 1136};
1053 1137
… …
1109 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1193 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110 1194
1111#if 0 // clipping unfortunately destroys our precious double-width-characters 1195#if 0 // clipping unfortunately destroys our precious double-width-characters
1112 // clip width, we can't do better, or can we? 1196 // clip width, we can't do better, or can we?
1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1198 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115#endif 1199#endif
1116 1200
1117 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1201 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118 FcPatternAddBool (p, FC_MINSPACE, 1); 1202 FcPatternAddBool (p, FC_MINSPACE, 1);
1119 1203
… …
1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264 const text_t *text, int len, 1348 const text_t *text, int len,
1265 int fg, int bg) 1349 int fg, int bg)
1266{ 1350{
1267 XGlyphInfo extents; 1351 XGlyphInfo extents;
1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1269 XftGlyphSpec *ep = enc; 1353 XftGlyphSpec *ep = enc;
1270 1354
1271 dTermDisplay; 1355 dTermDisplay;
1272 dTermGC; 1356 dTermGC;
1273 1357
1274 int w = term->fwidth * len; 1358 int w = term->fwidth * len;
1275 int h = term->fheight; 1359 int h = term->fheight;
1276 1360
1277 bool buffered = bg >= 0 // we don't use a transparent bg 1361 bool buffered = bg >= Color_transparent
1278#ifndef FORCE_UNBUFFERED_XFT 1362 && term->option (Opt_buffered);
1279# ifdef ENABLE_TRANSPARENCY
1280 || !term->am_transparent // we aren't transparent
1281# endif
1282#endif
1283 ;
1284 1363
1285 // cut trailing spaces 1364 // cut trailing spaces
1286 while (len && text [len - 1] == ' ') 1365 while (len && text [len - 1] == ' ')
1287 len--; 1366 len--;
1288 1367
… …
1294 int cwidth = term->fwidth; 1373 int cwidth = term->fwidth;
1295 FcChar32 fc = *text++; len--; 1374 FcChar32 fc = *text++; len--;
1296 1375
1297 while (len && *text == NOCHAR) 1376 while (len && *text == NOCHAR)
1298 text++, len--, cwidth += term->fwidth; 1377 text++, len--, cwidth += term->fwidth;
1299 1378
1300 if (fc != ' ') // skip spaces 1379 if (fc != ' ') // skip spaces
1301 { 1380 {
1302 FT_UInt glyph = XftCharIndex (disp, f, fc); 1381 FT_UInt glyph = XftCharIndex (disp, f, fc);
1303 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1382 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304 1383
… …
1319 { 1398 {
1320 if (ep != enc) 1399 if (ep != enc)
1321 { 1400 {
1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323 1402
1324 if (0) 1403#ifdef HAVE_BG_PIXMAP
1325 ; 1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1326#if defined(ENABLE_TRANSPARENCY) || defined(XPM_BACKGROUND) 1405
1327 else if (bg < 0 && term->bgPixmap.pixmap) 1406 if (term->bgPixmap.pixmap
1407 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1328 { 1409 {
1410 int src_x = x, src_y = y;
1411
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1413 {
1414 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y;
1416 }
1417
1329 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w 1418 if (term->bgPixmap.pmap_width >= src_x + w
1330 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) 1419 && term->bgPixmap.pmap_height >= src_y + h)
1331 { 1420 {
1332 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1333 x + term->window_vt_x, y + term->window_vt_y,
1334 w, h, 0, 0); 1422 src_x, src_y, w, h, 0, 0);
1335 } 1423 }
1336 else 1424 else
1337 { 1425 {
1338 XGCValues gcv; 1426 XGCValues gcv;
1339 1427
1340 gcv.fill_style = FillTiled; 1428 gcv.fill_style = FillTiled;
1341 gcv.tile = term->bgPixmap.pixmap; 1429 gcv.tile = term->bgPixmap.pixmap;
1342 gcv.ts_x_origin = -x; 1430 gcv.ts_x_origin = -src_x;
1343 gcv.ts_y_origin = -y; 1431 gcv.ts_y_origin = -src_y;
1344 1432
1345#if 0
1346 GC gc2 = XCreateGC (disp, d2,
1347 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1348 &gcv);
1349#endif
1350 XChangeGC (disp, gc, 1433 XChangeGC (disp, gc,
1351 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1352 &gcv); 1435 &gcv);
1353 1436
1354 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); 1437 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1355 1438
1356 gcv.fill_style = FillSolid; 1439 gcv.fill_style = FillSolid;
1357 XChangeGC (disp, gc, GCFillStyle, &gcv); 1440 XChangeGC (disp, gc, GCFillStyle, &gcv);
1358 /* XFreeGC (disp, gc2); */ 1441 }
1359 1442
1443 if (dst)
1444 {
1445 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1446
1447 // dst can only be set when bg >= 0
1448 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1360 } 1449 }
1361 } 1450 }
1362#endif
1363 else 1451 else
1452#endif
1364 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1365 1454
1366 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1367 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1368 } 1457 }
1369 else 1458 else
… …
1397 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1486 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1398 = rxvt_fontprop::unset; 1487 = rxvt_fontprop::unset;
1399 force_prop = false; 1488 force_prop = false;
1400 1489
1401 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1402 FONT_UNREF (*i); 1491 (*i)->unref ();
1403 1492
1404 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1405 delete *p; 1494 delete *p;
1406 1495
1407 free (fontdesc); fontdesc = 0; 1496 free (fontdesc); fontdesc = 0;
… …
1409 fonts.clear (); 1498 fonts.clear ();
1410 1499
1411 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1412} 1501}
1413 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1414rxvt_font * 1512rxvt_font *
1415rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1416{ 1514{
1417 rxvt_font *f; 1515 rxvt_font *f;
1418 1516
1419 if (!name || !*name) 1517 if (!name || !*name)
1420 { 1518 {
1421 name = ""; 1519 name = "";
1422 f = new rxvt_font_default (this); 1520 f = new rxvt_font_default (this);
1423 } 1521 }
… …
1434 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1435 } 1533 }
1436 else 1534 else
1437 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1438 1536
1439 f->set_term (term);
1440 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1441 1538 prepare_font (f, cs);
1442 f->cs = cs;
1443 f->loaded = false;
1444 1539
1445 return f; 1540 return f;
1446} 1541}
1447 1542
1448///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1449 1561
1450void 1562void
1451rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1452{ 1564{
1453 if (desc) 1565 if (desc)
… …
1491 if (!end) 1603 if (!end)
1492 end = desc + strlen (desc); 1604 end = desc + strlen (desc);
1493 1605
1494 if (end - desc < 511) 1606 if (end - desc < 511)
1495 { 1607 {
1496 strncpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1497 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1498 1610
1499 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1500 } 1612 }
1501 else 1613 else
1502 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1503 1615
1504 desc = end + 1; 1616 desc = end + 1;
… …
1532{ 1644{
1533 clear (); 1645 clear ();
1534 1646
1535 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1536 1648
1537 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1538 realize_font (0); 1650 realize_font (0);
1539 1651
1540 add_fonts (desc); 1652 add_fonts (desc);
1541 1653
1542 return true; 1654 return true;
… …
1551 1663
1552 return -1; 1664 return -1;
1553} 1665}
1554 1666
1555int 1667int
1556rxvt_fontset::find_font (unicode_t unicode) 1668rxvt_fontset::find_font_idx (unicode_t unicode)
1557{ 1669{
1558 if (unicode >= 1<<20) 1670 if (unicode >= 1<<20)
1559 return 0; 1671 return 0;
1560 1672
1561 unicode_t hi = unicode >> 8; 1673 unicode_t hi = unicode >> 8;
… …
1587 goto next_font; 1699 goto next_font;
1588 1700
1589 bool careful; 1701 bool careful;
1590 if (f->has_char (unicode, &prop, careful)) 1702 if (f->has_char (unicode, &prop, careful))
1591 { 1703 {
1592 if (careful) 1704 i = (i << 1) | careful;
1593 i |= 128;
1594 1705
1595 goto found; 1706 goto found;
1596 } 1707 }
1597 1708
1598 next_font: 1709 next_font:
1599 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1600 { 1711 {
1601 if (fallback->name) 1712 if (fallback->name)
1602 { 1713 {
1603 // search through the fallback list 1714 // search through the fallback list
1604 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1605 fallback++; 1716 fallback++;
1606 } 1717 }
1607 else 1718 else
1608 { 1719 {
1609 // try to find a new font. 1720 // try to find a new font.
… …
1640 FcPatternDestroy (match); 1751 FcPatternDestroy (match);
1641 1752
1642 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1643 { 1754 {
1644 char fontname[4096]; 1755 char fontname[4096];
1645 sprintf (fontname, "xft:%-.4090s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1646 1757
1647 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1648 } 1759 }
1649 1760
1650 free (font); 1761 free (font);
1651 } 1762 }
1652#endif 1763#endif
… …
1674 } 1785 }
1675 1786
1676 return i; 1787 return i;
1677} 1788}
1678 1789
1679
1680

Diff Legend

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