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.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 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 <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
136#if XFT 138#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
159}; 161};
160 162
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165 165
166///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
167 167
… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
… …
237 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false; 242 Picture dst;
243#ifdef HAVE_BG_PIXMAP 243
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
245 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 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 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 253 }
254 } 254 else
255#endif 255# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
306 return false; 307 return false;
307 308
308 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
309 return true; 310 return true;
310 311
312#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 315 return true;
316#endif
314 317
315 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
316 return true; 319 return true;
317 320
318 switch (unicode) 321 switch (unicode)
… …
342 345
343 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
344 347
345 while (len) 348 while (len)
346 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
347#if ENABLE_COMBINING 356#if ENABLE_COMBINING
348 compose_char *cc; 357 compose_char *cc;
349#endif 358#endif
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
356 int width = text - tp; 359 int width = text - tp;
357 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
358 361
359#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
360 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
439#else 442#else
440 if (0) 443 if (0)
441 ; 444 ;
442#endif 445#endif
443#if ENABLE_COMBINING 446#if ENABLE_COMBINING
444 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
445 { 448 {
446 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
447 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
448 text_t chrs[2]; 473 text_t chrs[2];
449 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
450 475
451 *chrs = cc->c1; 476 *chrs = cc->c1;
452 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
453 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
454 479
455 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
456 { 481 {
457 bool careful; 482 bool careful;
458 483
459 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
460 *chrs = cc->c2; 485 *chrs = cc->c2;
461 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
462 ? f1 487 ? f1
463 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
464 489
465 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
466 } 491 }
492 #endif
467 } 493 }
468#endif 494#endif
469 else 495 else
470 switch (t) 496 switch (t)
471 { 497 {
472 case '\t': 498 case '\t':
473 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
474 case NOCHAR: 500 case NOCHAR:
475 break; 501 break;
476 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
477 default: 512 default:
478 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
479 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
480 } 515 }
481 516
482 x += fwidth; 517 x += fwidth;
483 } 518 }
484} 519}
485 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
486///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
487 577
488struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
489 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
490 581
491 void clear (); 582 void clear ();
492 583
493 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
498 589
499 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
500 const text_t *text, int len, 591 const text_t *text, int len,
501 int fg, int bg); 592 int fg, int bg);
502 593
503 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
504 XFontStruct *f; 595 XFontStruct *f;
505 bool enc2b, encm; 596 bool enc2b, encm;
506 597
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 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); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
608 return false; 699 return false;
609} 700}
610 701
611// fix the size of scalable fonts 702// fix the size of scalable fonts
612static bool 703static bool
613replace_field (char *buf, const char *name, int index, const char old, const char *replace) 704replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
614{ 705{
615 int slashes = 0; 706 int slashes = 0;
616 const char *field, *end; 707 const char *field, *end;
617 708
618 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
628 break; 719 break;
629 } 720 }
630 721
631 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
632 { 723 {
633 // TODO: check for overflow in font-name 724 size_t len = field - name;
634 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 726 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
637 strcat (buf, end); 728 strcat (*ptr, end);
638 729
639 return true; 730 return true;
640 } 731 }
641 else 732 else
642 { 733 {
643 strcpy (buf, name); 734 *ptr = strdup (name);
644 735
645 return false; 736 return false;
646 } 737 }
647} 738}
648 739
… …
656 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
657 748
658 // first morph the font if required 749 // first morph the font if required
659 if (force_prop) 750 if (force_prop)
660 { 751 {
661 char fname[1024]; 752 char *fname;
662 753
663 if (name[0] != '-') 754 if (name[0] != '-')
664 { 755 {
665 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
666 757
667 if (!f) 758 if (!f)
668 return false; 759 return false;
669 760
670 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
671 762
672 if (new_name) 763 if (new_name)
673 set_name (new_name); 764 set_name (new_name);
674 else 765 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 767
677 XFreeFont (disp, f); 768 XFreeFont (disp, f);
678 f = 0; 769 f = 0;
679 } 770 }
680 771
681 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
682 { 773 {
683 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 776 ? "medium" : "bold");
686 set_name (strdup (fname)); 777 set_name (fname);
687 } 778 }
688 779
689 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
690 { 781 {
691 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 785 set_name (fname);
695 } 786 }
696 } 787 }
697 788
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
725 816
726 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
727 { 818 {
728 rxvt_fontprop p; 819 rxvt_fontprop p;
729 char fname[1024]; 820 char *fname;
730 821
731 int diff = 0; 822 int diff = 0;
732 823
733 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
737 832
738 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
739 continue; 839 continue;
740 840 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 841
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 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); 843 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); 844 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); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 846
750 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
751 fonts[i].diff = diff; 848 fonts[i].diff = diff;
752 } 849 }
753 850
754 XFreeFontNames (list); 851 XFreeFontNames (list);
755 852
756 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
757 for (;;) 854 for (;;)
758 { 855 {
759 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
760 857
761 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
763 best = w; 860 best = w;
764 861
765 if (!best->name 862 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 864 break;
… …
787 return false; 884 return false;
788 885
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 888
889 cs = CS_UNKNOWN;
890
792 if (registry && encoding) 891 if (registry && encoding)
793 { 892 {
794 char charset[64]; 893 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
796 895
797 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
798 } 897
799 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
801 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
802 909
803 if (!charset) 910 if (!charset)
804 charset = name; 911 charset = name;
805 912
806 int count = 13; 913 int count = 13;
807 while (*charset) 914 while (*charset)
808 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
809 break; 916 break;
810 917
811 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
812 } 926 {
813 927 clear ();
814 free (registry); 928 return false;
815 free (encoding); 929 }
816 930
817 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 933
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
845 } 959 }
846#endif 960#endif
847 961
848 width = 1; 962 width = 1;
849 963
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
851 { 965 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 967 continue;
854 968
855 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
856 bool careful; 970 bool careful;
857 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
858 continue; 972 continue;
859 973
860 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
861 976
862 XCharStruct g; 977 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 980
… …
867 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 983
869 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
870 } 985 }
871 986
872 if (cs == CS_UNKNOWN) 987#if 0 // do it per-character
988 if (prop && width > prop->width)
873 { 989 {
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875
876 clear (); 990 clear ();
877 return false; 991 return false;
878 } 992 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 993#endif
887 994
888 return true; 995 return true;
889} 996}
890 997
… …
899} 1006}
900 1007
901bool 1008bool
902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
903{ 1010{
1011 careful = false;
1012
904 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
905 1014
906 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
907 return false; 1016 return false;
908 1017
909 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 1019 XCharStruct *xcs;
911 1020
912 if (encm) 1021 if (encm)
913 { 1022 {
914 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
944 return false; 1053 return false;
945 1054
946 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1056 return true;
948 1057
949 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
950 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = max (WCWIDTH (unicode), 1); 1060 int wcw = max (WCWIDTH (unicode), 1);
952 1061
953 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
954 1063
… …
971 dTermDisplay; 1080 dTermDisplay;
972 dTermGC; 1081 dTermGC;
973 1082
974 bool slow = this->slow 1083 bool slow = this->slow
975 || width != term->fwidth 1084 || width != term->fwidth
976 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
977 1087
978 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
979 1089
980 XGCValues v; 1090 XGCValues v;
981 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1049 1159
1050///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1051 1161
1052#if XFT 1162#if XFT
1053 1163
1054struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1055 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1056 1171
1057 void clear (); 1172 void clear ();
1058 1173
1059 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1060 1175
… …
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1244
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1249#endif
1135 1250
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1253
… …
1150 int ftheight = 0; 1265 int ftheight = 0;
1151 bool success = true; 1266 bool success = true;
1152 1267
1153 for (;;) 1268 for (;;)
1154 { 1269 {
1270 p = FcPatternDuplicate (match);
1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1156 1272
1157 if (!f) 1273 if (!f)
1158 { 1274 {
1275 FcPatternDestroy (p);
1159 success = false; 1276 success = false;
1160 break; 1277 break;
1161 } 1278 }
1162 1279
1163 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1171 1288
1172 XftUnlockFace (f); 1289 XftUnlockFace (f);
1173 1290
1174 int glheight = height; 1291 int glheight = height;
1175 1292
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1177 { 1294 {
1178 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1179 1296
1180 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1181 && ch > 0x100 1298 && ch > 0x100
… …
1282rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1283 const text_t *text, int len, 1400 const text_t *text, int len,
1284 int fg, int bg) 1401 int fg, int bg)
1285{ 1402{
1286 XGlyphInfo extents; 1403 XGlyphInfo extents;
1287 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1288 XftGlyphSpec *ep = enc; 1405 XftGlyphSpec *ep = enc;
1289 1406
1290 dTermDisplay; 1407 dTermDisplay;
1291 dTermGC; 1408 dTermGC;
1292 1409
1293 int w = term->fwidth * len; 1410 int w = term->fwidth * len;
1294 int h = term->fheight; 1411 int h = term->fheight;
1295 1412
1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1413 bool buffered = bg >= Color_transparent
1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1414 && term->option (Opt_buffered);
1298 * good idea from the perspective of packaging for wide variety of user configs. 1415
1299 */
1300 bool buffered = true
1301#ifdef FORCE_UNBUFFERED_XFT
1302 && bg >= 0
1303#endif
1304 ;
1305 // cut trailing spaces 1416 // cut trailing spaces
1306 while (len && text [len - 1] == ' ') 1417 while (len && text [len - 1] == ' ')
1307 len--; 1418 len--;
1308 1419
1309 int x_ = buffered ? 0 : x; 1420 int x_ = buffered ? 0 : x;
… …
1335 x_ += cwidth; 1446 x_ += cwidth;
1336 } 1447 }
1337 1448
1338 if (buffered) 1449 if (buffered)
1339 { 1450 {
1340 bool back_rendered = false;
1341 if (ep != enc) 1451 if (ep != enc)
1342 { 1452 {
1343 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344 1454
1345#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_IMG
1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1457
1346 if (term->bgPixmap.pixmap) 1458 if (term->bg_img
1459 && (bg == Color_transparent || bg == Color_bg
1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347 { 1461 {
1348 Picture dst = 0; 1462 int src_x = x, src_y = y;
1349 1463
1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1351 dst = XftDrawPicture (d2);
1352
1353 if (bg < 0 || dst != 0)
1354 { 1465 {
1355 int src_x = x, src_y = y ;
1356
1357 if (term->bgPixmap.is_parentOrigin ())
1358 {
1359 src_x += term->window_vt_x; 1466 src_x += term->window_vt_x;
1360 src_y += term->window_vt_y; 1467 src_y += term->window_vt_y;
1361 } 1468 }
1362 1469
1363 if (term->bgPixmap.pmap_width >= src_x+w 1470 if (term->bg_img->w >= src_x + w
1364 && term->bgPixmap.pmap_height >= src_y+h) 1471 && term->bg_img->h >= src_y + h)
1365 { 1472 {
1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1367 src_x, src_y, w, h, 0, 0); 1474 src_x, src_y, w, h, 0, 0);
1368 } 1475 }
1369 else 1476 else
1370 { 1477 {
1371 XGCValues gcv; 1478 XGCValues gcv;
1372 1479
1373 gcv.fill_style = FillTiled; 1480 gcv.fill_style = FillTiled;
1374 gcv.tile = term->bgPixmap.pixmap; 1481 gcv.tile = term->bg_img->pm;
1375 gcv.ts_x_origin = -src_x; 1482 gcv.ts_x_origin = -src_x;
1376 gcv.ts_y_origin = -src_y; 1483 gcv.ts_y_origin = -src_y;
1377 1484
1378 XChangeGC (disp, gc, 1485 XChangeGC (disp, gc,
1379 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1380 &gcv); 1487 &gcv);
1381 1488
1382 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1489 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383 1490
1384 gcv.fill_style = FillSolid; 1491 gcv.fill_style = FillSolid;
1385 XChangeGC (disp, gc, GCFillStyle, &gcv); 1492 XChangeGC (disp, gc, GCFillStyle, &gcv);
1386 } 1493 }
1387 1494
1388 if (bg >= 0) 1495 if (dst)
1389 { 1496 {
1390 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1497 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1498
1499 // dst can only be set when bg >= 0
1391 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1500 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392 }
1393
1394 back_rendered = true;
1395 } 1501 }
1396 } 1502 }
1503 else
1397#endif 1504#endif
1398
1399 if (bg >= 0 && !back_rendered)
1400 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1505 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1401 1506
1402 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1507 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1508 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404 } 1509 }
1405 else 1510 else
… …
1433 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1434 = rxvt_fontprop::unset; 1539 = rxvt_fontprop::unset;
1435 force_prop = false; 1540 force_prop = false;
1436 1541
1437 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1438 FONT_UNREF (*i); 1543 (*i)->unref ();
1439 1544
1440 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1441 delete *p; 1546 delete *p;
1442 1547
1443 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1445 fonts.clear (); 1550 fonts.clear ();
1446 1551
1447 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1448} 1553}
1449 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1450rxvt_font * 1564rxvt_font *
1451rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1452{ 1566{
1453 rxvt_font *f; 1567 rxvt_font *f;
1454 1568
… …
1470 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1471 } 1585 }
1472 else 1586 else
1473 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1474 1588
1475 f->set_term (term);
1476 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1477 1590 prepare_font (f, cs);
1478 f->cs = cs;
1479 f->loaded = false;
1480 1591
1481 return f; 1592 return f;
1482} 1593}
1483 1594
1484///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1485 1613
1486void 1614void
1487rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1488{ 1616{
1489 if (desc) 1617 if (desc)
… …
1518 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1519 else 1647 else
1520 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1521 1649
1522 desc++; 1650 desc++;
1523 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1524 } 1652 }
1525 1653
1526 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1527 if (!end) 1655 if (!end)
1528 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
1529 1657
1530 if (end - desc < 511) 1658 if (end - desc < 511)
1531 { 1659 {
1532 strncpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1533 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1534 1662
1535 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1536 } 1664 }
1537 else 1665 else
1538 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1539 1667
1540 desc = end + 1; 1668 desc = end + 1;
1541 } 1669 }
1542 while (*end); 1670 while (*end);
1543 } 1671 }
… …
1568{ 1696{
1569 clear (); 1697 clear ();
1570 1698
1571 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1572 1700
1573 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1574 realize_font (0); 1702 realize_font (0);
1575 1703
1576 add_fonts (desc); 1704 add_fonts (desc);
1577 1705
1578 return true; 1706 return true;
… …
1587 1715
1588 return -1; 1716 return -1;
1589} 1717}
1590 1718
1591int 1719int
1592rxvt_fontset::find_font (unicode_t unicode) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1593{ 1721{
1594 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1595 return 0; 1723 return 0;
1596 1724
1597 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
… …
1623 goto next_font; 1751 goto next_font;
1624 1752
1625 bool careful; 1753 bool careful;
1626 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1627 { 1755 {
1628 if (careful) 1756 i = (i << 1) | careful;
1629 i |= 128;
1630 1757
1631 goto found; 1758 goto found;
1632 } 1759 }
1633 1760
1634 next_font: 1761 next_font:
1635 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1636 { 1763 {
1637 if (fallback->name) 1764 if (fallback->name)
1638 { 1765 {
1639 // search through the fallback list 1766 // search through the fallback list
1640 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1641 fallback++; 1768 fallback++;
1642 } 1769 }
1643 else 1770 else
1644 { 1771 {
1645 // try to find a new font. 1772 // try to find a new font.
… …
1647 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1648 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1649 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1650#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1651 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1652 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1653 1781
1654 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1655 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1656 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1676 FcPatternDestroy (match); 1804 FcPatternDestroy (match);
1677 1805
1678 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1679 { 1807 {
1680 char fontname[4096]; 1808 char fontname[4096];
1681 sprintf (fontname, "xft:%-.4090s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1682 1810
1683 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1684 } 1812 }
1685 1813
1686 free (font); 1814 free (font);
1687 } 1815 }
1688#endif 1816#endif
… …
1700 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1701 fmap.push_back (0); 1829 fmap.push_back (0);
1702 1830
1703 if (!fmap[hi]) 1831 if (!fmap[hi])
1704 { 1832 {
1705 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1706 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1707 } 1835 }
1708 1836
1709 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1710 } 1838 }
1711 1839
1712 return i; 1840 return i;
1713} 1841}
1714 1842
1715
1716

Diff Legend

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