ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 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
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
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
267#include "table/linedraw.h"
268 266
269struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
270 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
271 269
272 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
308 return false; 306 return false;
309 307
310 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
311 return true; 309 return true;
312 310
311#ifdef BUILTIN_GLYPHS
313 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 314 return true;
315#endif
316 316
317 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
318 return true; 318 return true;
319 319
320 switch (unicode) 320 switch (unicode)
… …
356 ; 356 ;
357 357
358 int width = text - tp; 358 int width = text - tp;
359 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
360 360
361#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
362 { 363 {
364# include "table/linedraw.h"
363 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
364 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
365 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
366 368
367 int W = fwidth; 369 int W = fwidth;
… …
434 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
435 break; 437 break;
436 } 438 }
437 } 439 }
438 } 440 }
441#else
442 if (0)
443 ;
444#endif
439#if ENABLE_COMBINING 445#if ENABLE_COMBINING
440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
441 { 447 {
442 min_it (width, 2); // we only support wcwidth up to 2 448 min_it (width, 2); // we only support wcwidth up to 2
443 449
444 text_t chrs[2]; 450 text_t chrs[2];
445 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
446 452
447 *chrs = cc->c1; 453 *chrs = cc->c1;
448 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
449 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
450 456
451 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
452 { 458 {
453 bool careful; 459 bool careful;
454 460
455 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
456 *chrs = cc->c2; 462 *chrs = cc->c2;
457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
458 ? f1 464 ? f1
459 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
460 466
461 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
462 } 468 }
463 } 469 }
464#endif 470#endif
… …
468 case '\t': 474 case '\t':
469 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
470 case NOCHAR: 476 case NOCHAR:
471 break; 477 break;
472 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
473 default: 488 default:
474 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
475 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
476 } 491 }
477 492
478 x += fwidth; 493 x += fwidth;
479 } 494 }
480} 495}
481 496
497struct rxvt_font_overflow : rxvt_font {
498 struct rxvt_fontset *fs;
499
500 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font ()
502 {
503 this->fs = fs;
504 }
505
506 rxvt_fontprop properties ()
507 {
508 rxvt_fontprop p;
509
510 p.width = p.height = 1;
511 p.ascent = rxvt_fontprop::unset;
512 p.weight = rxvt_fontprop::medium;
513 p.slant = rxvt_fontprop::roman;
514
515 return p;
516 }
517
518 bool load (const rxvt_fontprop &prop, bool force_prop)
519 {
520 width = 1; height = 1;
521 ascent = 1; descent = 0;
522
523 set_name (strdup ("built-in rendition overflow font"));
524
525 return true;
526 }
527
528 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
529 {
530 return false;
531 }
532
533 void draw (rxvt_drawable &d, int x, int y,
534 const text_t *text, int len,
535 int fg, int bg)
536 {
537 while (len)
538 {
539 int fid = fs->find_font_idx (*text);
540 int w = 1;
541 while (w < len && text[w] == NOCHAR)
542 w++;
543 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
544 text += w;
545 len -= w;
546 x += term->fwidth * w;
547 }
548 }
549};
550
482///////////////////////////////////////////////////////////////////////////// 551/////////////////////////////////////////////////////////////////////////////
483 552
484struct rxvt_font_x11 : rxvt_font { 553struct rxvt_font_x11 : rxvt_font {
485 rxvt_font_x11 () { f = 0; } 554 rxvt_font_x11 () { f = 0; }
486 555
… …
494 563
495 void draw (rxvt_drawable &d, int x, int y, 564 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 565 const text_t *text, int len,
497 int fg, int bg); 566 int fg, int bg);
498 567
499 bool slow; // wether this is a proportional font or has other funny characteristics 568 bool slow; // whether this is a proportional font or has other funny characteristics
500 XFontStruct *f; 569 XFontStruct *f;
501 bool enc2b, encm; 570 bool enc2b, encm;
502 571
503 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 572 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
504 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 573 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
604 return false; 673 return false;
605} 674}
606 675
607// fix the size of scalable fonts 676// fix the size of scalable fonts
608static bool 677static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 678replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 679{
611 int slashes = 0; 680 int slashes = 0;
612 const char *field, *end; 681 const char *field, *end;
613 682
614 for (const char *c = name; *c; c++) 683 for (const char *c = name; *c; c++)
… …
624 break; 693 break;
625 } 694 }
626 695
627 if (slashes >= 13 && (!old || *field == old)) 696 if (slashes >= 13 && (!old || *field == old))
628 { 697 {
629 // TODO: check for overflow in font-name 698 size_t len = field - name;
630 strncpy (buf, name, field - name); 699 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 700 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 701 strcpy (*ptr + len, replace);
633 strcat (buf, end); 702 strcat (*ptr, end);
634 703
635 return true; 704 return true;
636 } 705 }
637 else 706 else
638 { 707 {
639 strcpy (buf, name); 708 *ptr = strdup (name);
640 709
641 return false; 710 return false;
642 } 711 }
643} 712}
644 713
… …
652 char field_str[64]; // enough for 128 bits 721 char field_str[64]; // enough for 128 bits
653 722
654 // first morph the font if required 723 // first morph the font if required
655 if (force_prop) 724 if (force_prop)
656 { 725 {
657 char fname[1024]; 726 char *fname;
658 727
659 if (name[0] != '-') 728 if (name[0] != '-')
660 { 729 {
661 f = XLoadQueryFont (disp, name); 730 f = XLoadQueryFont (disp, name);
662 731
663 if (!f) 732 if (!f)
664 return false; 733 return false;
665 734
666 char *new_name = get_property (f, XA_FONT, name); 735 char *new_name = get_property (f, XA_FONT, 0);
667 736
668 if (new_name) 737 if (new_name)
669 set_name (new_name); 738 set_name (new_name);
670 else 739 else
671 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 740 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
672 741
673 XFreeFont (disp, f); 742 XFreeFont (disp, f);
674 f = 0; 743 f = 0;
675 } 744 }
676 745
677 if (prop.weight != rxvt_fontprop::unset) 746 if (prop.weight != rxvt_fontprop::unset)
678 { 747 {
679 replace_field (fname, name, 2, 0, 748 replace_field (&fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 749 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 750 ? "medium" : "bold");
682 set_name (strdup (fname)); 751 set_name (fname);
683 } 752 }
684 753
685 if (prop.slant != rxvt_fontprop::unset) 754 if (prop.slant != rxvt_fontprop::unset)
686 { 755 {
687 replace_field (fname, name, 3, 0, 756 replace_field (&fname, name, 3, 0,
688 prop.slant < rxvt_fontprop::italic 757 prop.slant < rxvt_fontprop::italic
689 ? "r" : "i"); // TODO: handle "o"blique, too 758 ? "r" : "i"); // TODO: handle "o"blique, too
690 set_name (strdup (fname)); 759 set_name (fname);
691 } 760 }
692 } 761 }
693 762
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 763 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height); 764 ? 0 : prop.height);
… …
720 font_weight *fonts = new font_weight[count]; 789 font_weight *fonts = new font_weight[count];
721 790
722 for (int i = 0; i < count; i++) 791 for (int i = 0; i < count; i++)
723 { 792 {
724 rxvt_fontprop p; 793 rxvt_fontprop p;
725 char fname[1024]; 794 char *fname;
726 795
727 int diff = 0; 796 int diff = 0;
728 797
729 if (replace_field (fname, list[i], 6, '0', field_str)) 798 if (replace_field (&fname, list[i], 6, '0', field_str))
730 diff += 10; // slightly penalize scalable fonts 799 diff += 10; // slightly penalize scalable fonts
800 else
801 {
802 free (fname);
731 else if (replace_field (fname, list[i], 11, '0', "0")) 803 if (replace_field (&fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 804 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
805 }
733 806
734 if (!set_properties (p, fname)) 807 if (!set_properties (p, fname)
808 // also weed out too large fonts
809 || (prop.height != rxvt_fontprop::unset
810 && p.height > prop.height))
811 {
812 free (fname);
735 continue; 813 continue;
736 814 }
737 if (prop.height != rxvt_fontprop::unset
738 && p.height > prop.height) // weed out too large fonts
739 continue;
740 815
741 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 816 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
742 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 817 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
743 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 818 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
744 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 819 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
745 820
746 fonts[i].name = strdup (fname); 821 fonts[i].name = fname;
747 fonts[i].diff = diff; 822 fonts[i].diff = diff;
748 } 823 }
749 824
750 XFreeFontNames (list); 825 XFreeFontNames (list);
751 826
752 // this loop only iterates when the guessed font-size is too small 827 // this loop only iterates when the guessed font-size is too small
753 for (;;) 828 for (;;)
754 { 829 {
755 font_weight *best = fonts + count - 1; 830 font_weight *best = fonts;
756 831
757 for (font_weight *w = best; w-- > fonts; ) 832 for (font_weight *w = fonts + 1; w < fonts + count; w++)
758 if (w->diff <= best->diff) 833 if (w->diff < best->diff)
759 best = w; 834 best = w;
760 835
761 if (!best->name 836 if (!best->name
762 || !(f = XLoadQueryFont (disp, best->name))) 837 || !(f = XLoadQueryFont (disp, best->name)))
763 break; 838 break;
… …
783 return false; 858 return false;
784 859
785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 860 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 861 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
787 862
863 cs = CS_UNKNOWN;
864
788 if (registry && encoding) 865 if (registry && encoding)
789 { 866 {
790 char charset[64]; 867 char charset[64];
791 snprintf (charset, 64, "%s-%s", registry, encoding); 868 snprintf (charset, 64, "%s-%s", registry, encoding);
792 869
793 cs = codeset_from_name (charset); 870 cs = codeset_from_name (charset);
794 } 871
795 else 872 if (cs == CS_UNKNOWN)
873 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
796 { 874 }
875
876 free (registry);
877 free (encoding);
878
879 if (cs == CS_UNKNOWN)
880 {
797 const char *charset = get_property (f, XA_FONT, 0); 881 char *value = get_property (f, XA_FONT, 0);
882 const char *charset = value;
798 883
799 if (!charset) 884 if (!charset)
800 charset = name; 885 charset = name;
801 886
802 int count = 13; 887 int count = 13;
803 while (*charset) 888 while (*charset)
804 if (*charset++ == '-' && !--count) 889 if (*charset++ == '-' && !--count)
805 break; 890 break;
806 891
807 cs = codeset_from_name (charset); 892 cs = codeset_from_name (charset);
893 if (cs == CS_UNKNOWN)
894 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
895
896 free (value);
897 }
898
899 if (cs == CS_UNKNOWN)
808 } 900 {
809 901 clear ();
810 free (registry); 902 return false;
811 free (encoding); 903 }
812 904
813 if (cs == CS_UNICODE) 905 if (cs == CS_UNICODE)
814 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 906 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
815 907
816 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 908 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
841 } 933 }
842#endif 934#endif
843 935
844 width = 1; 936 width = 1;
845 937
846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 938 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
847 { 939 {
848 if (FROM_UNICODE (cs, *t) == NOCHAR) 940 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 941 continue;
850 942
851 // ignore characters we wouldn't use anyways 943 // ignore characters we wouldn't use anyways
852 bool careful; 944 bool careful;
853 if (!has_char (*t, &prop, careful)) 945 if (!has_char (*t, &prop, careful))
854 continue; 946 continue;
855 947
856 XChar2b ch = { *t >> 8, *t }; 948 // the casts are needed in C++11 (see 8.5.1)
949 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
857 950
858 XCharStruct g; 951 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 952 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 953 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 954
… …
863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 956 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 957
865 if (width < g.width) width = g.width; 958 if (width < g.width) width = g.width;
866 } 959 }
867 960
868 if (cs == CS_UNKNOWN) 961#if 0 // do it per-character
962 if (prop && width > prop->width)
869 { 963 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871
872 clear (); 964 clear ();
873 return false; 965 return false;
874 } 966 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 967#endif
883 968
884 return true; 969 return true;
885} 970}
886 971
… …
895} 980}
896 981
897bool 982bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 983rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 984{
985 careful = false;
986
900 uint32_t ch = FROM_UNICODE (cs, unicode); 987 uint32_t ch = FROM_UNICODE (cs, unicode);
901 988
902 if (ch == NOCHAR) 989 if (ch == NOCHAR)
903 return false; 990 return false;
904 991
905 /* check wether the character exists in _this_ font. horrible. */ 992 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 993 XCharStruct *xcs;
907 994
908 if (encm) 995 if (encm)
909 { 996 {
910 unsigned char byte1 = ch >> 8; 997 unsigned char byte1 = ch >> 8;
… …
940 return false; 1027 return false;
941 1028
942 if (!prop || prop->width == rxvt_fontprop::unset) 1029 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1030 return true;
944 1031
945 // check wether character overlaps previous/next character 1032 // check whether character overlaps previous/next character
946 int w = xcs->rbearing - xcs->lbearing; 1033 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = max (WCWIDTH (unicode), 1); 1034 int wcw = max (WCWIDTH (unicode), 1);
948 1035
949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1036 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 1037
… …
967 dTermDisplay; 1054 dTermDisplay;
968 dTermGC; 1055 dTermGC;
969 1056
970 bool slow = this->slow 1057 bool slow = this->slow
971 || width != term->fwidth 1058 || width != term->fwidth
972 || height != term->fheight; 1059 || height != term->fheight
1060 || ascent != f->ascent;
973 1061
974 int base = ascent; // sorry, incorrect: term->fbase; 1062 int base = ascent; // sorry, incorrect: term->fbase;
975 1063
976 XGCValues v; 1064 XGCValues v;
977 v.foreground = term->pix_colors[fg]; 1065 v.foreground = term->pix_colors[fg];
… …
1124 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1212 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1125 1213
1126#if 0 // clipping unfortunately destroys our precious double-width-characters 1214#if 0 // clipping unfortunately destroys our precious double-width-characters
1127 // clip width, we can't do better, or can we? 1215 // clip width, we can't do better, or can we?
1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1216 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1129 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1217 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1130#endif 1218#endif
1131 1219
1132 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1220 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1133 FcPatternAddBool (p, FC_MINSPACE, 1); 1221 FcPatternAddBool (p, FC_MINSPACE, 1);
1134 1222
… …
1146 int ftheight = 0; 1234 int ftheight = 0;
1147 bool success = true; 1235 bool success = true;
1148 1236
1149 for (;;) 1237 for (;;)
1150 { 1238 {
1239 p = FcPatternDuplicate (match);
1151 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1240 f = XftFontOpenPattern (disp, p);
1152 1241
1153 if (!f) 1242 if (!f)
1154 { 1243 {
1244 FcPatternDestroy (p);
1155 success = false; 1245 success = false;
1156 break; 1246 break;
1157 } 1247 }
1158 1248
1159 FT_Face face = XftLockFace (f); 1249 FT_Face face = XftLockFace (f);
… …
1167 1257
1168 XftUnlockFace (f); 1258 XftUnlockFace (f);
1169 1259
1170 int glheight = height; 1260 int glheight = height;
1171 1261
1172 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1262 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1173 { 1263 {
1174 FcChar16 ch = *t; 1264 FcChar16 ch = *t;
1175 1265
1176 if (cs != CS_UNICODE 1266 if (cs != CS_UNICODE
1177 && ch > 0x100 1267 && ch > 0x100
… …
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1369 const text_t *text, int len,
1280 int fg, int bg) 1370 int fg, int bg)
1281{ 1371{
1282 XGlyphInfo extents; 1372 XGlyphInfo extents;
1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1284 XftGlyphSpec *ep = enc; 1374 XftGlyphSpec *ep = enc;
1285 1375
1286 dTermDisplay; 1376 dTermDisplay;
1287 dTermGC; 1377 dTermGC;
1288 1378
1289 int w = term->fwidth * len; 1379 int w = term->fwidth * len;
1290 int h = term->fheight; 1380 int h = term->fheight;
1291 1381
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1382 bool buffered = bg >= Color_transparent
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1383 && term->option (Opt_buffered);
1294 * good idea from the perspective of packaging for wide variety of user configs. 1384
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces 1385 // cut trailing spaces
1302 while (len && text [len - 1] == ' ') 1386 while (len && text [len - 1] == ' ')
1303 len--; 1387 len--;
1304 1388
1305 int x_ = buffered ? 0 : x; 1389 int x_ = buffered ? 0 : x;
… …
1331 x_ += cwidth; 1415 x_ += cwidth;
1332 } 1416 }
1333 1417
1334 if (buffered) 1418 if (buffered)
1335 { 1419 {
1336 bool back_rendered = false;
1337 if (ep != enc) 1420 if (ep != enc)
1338 { 1421 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1422 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340 1423
1341#ifdef HAVE_BG_PIXMAP 1424#ifdef HAVE_IMG
1425 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1426
1342 if (term->bgPixmap.pixmap) 1427 if (term->bg_img
1428 && (bg == Color_transparent || bg == Color_bg
1429 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1343 { 1430 {
1344 Picture dst = 0; 1431 int src_x = x, src_y = y;
1345 1432
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1433 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 { 1434 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x; 1435 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1436 src_y += term->window_vt_y;
1357 } 1437 }
1358 1438
1359 if (term->bgPixmap.pmap_width >= src_x+w 1439 if (term->bg_img->w >= src_x + w
1360 && term->bgPixmap.pmap_height >= src_y+h) 1440 && term->bg_img->h >= src_y + h)
1361 { 1441 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1442 XCopyArea (disp, term->bg_img->pm, d2, gc,
1363 src_x, src_y, w, h, 0, 0); 1443 src_x, src_y, w, h, 0, 0);
1364 } 1444 }
1365 else 1445 else
1366 { 1446 {
1367 XGCValues gcv; 1447 XGCValues gcv;
1368 1448
1369 gcv.fill_style = FillTiled; 1449 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap; 1450 gcv.tile = term->bg_img->pm;
1371 gcv.ts_x_origin = -src_x; 1451 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y; 1452 gcv.ts_y_origin = -src_y;
1373 1453
1374 XChangeGC (disp, gc, 1454 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1455 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv); 1456 &gcv);
1377 1457
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1458 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379 1459
1380 gcv.fill_style = FillSolid; 1460 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv); 1461 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 } 1462 }
1383 1463
1384 if (bg >= 0) 1464 if (dst)
1385 { 1465 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1466 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1467
1468 // dst can only be set when bg >= 0
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1469 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 } 1470 }
1392 } 1471 }
1472 else
1393#endif 1473#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1474 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1397 1475
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1476 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1477 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 } 1478 }
1401 else 1479 else
… …
1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1507 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1430 = rxvt_fontprop::unset; 1508 = rxvt_fontprop::unset;
1431 force_prop = false; 1509 force_prop = false;
1432 1510
1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1511 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1434 FONT_UNREF (*i); 1512 (*i)->unref ();
1435 1513
1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1514 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1437 delete *p; 1515 delete *p;
1438 1516
1439 free (fontdesc); fontdesc = 0; 1517 free (fontdesc); fontdesc = 0;
… …
1441 fonts.clear (); 1519 fonts.clear ();
1442 1520
1443 fallback = fallback_fonts; 1521 fallback = fallback_fonts;
1444} 1522}
1445 1523
1524void
1525rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1526{
1527 font->set_term (term);
1528
1529 font->cs = cs;
1530 font->loaded = false;
1531}
1532
1446rxvt_font * 1533rxvt_font *
1447rxvt_fontset::new_font (const char *name, codeset cs) 1534rxvt_fontset::new_font (const char *name, codeset cs)
1448{ 1535{
1449 rxvt_font *f; 1536 rxvt_font *f;
1450 1537
… …
1466 f = new rxvt_font_x11; 1553 f = new rxvt_font_x11;
1467 } 1554 }
1468 else 1555 else
1469 f = new rxvt_font_x11; 1556 f = new rxvt_font_x11;
1470 1557
1471 f->set_term (term);
1472 f->set_name (strdup (name)); 1558 f->set_name (strdup (name));
1473 1559 prepare_font (f, cs);
1474 f->cs = cs;
1475 f->loaded = false;
1476 1560
1477 return f; 1561 return f;
1478} 1562}
1479 1563
1480///////////////////////////////////////////////////////////////////////////// 1564/////////////////////////////////////////////////////////////////////////////
1565
1566void
1567rxvt_fontset::push_font (rxvt_font *font)
1568{
1569 // the fontCount index is reserved for the overflow font, it is only
1570 // necessary when we get fontCount or more fonts, as they cannot be
1571 // represented in the rendition.
1572 if (fonts.size () == fontCount)
1573 {
1574 rxvt_font *f = new rxvt_font_overflow (this);
1575
1576 prepare_font (f, CS_UNICODE);
1577 fonts.push_back (f);
1578 }
1579
1580 fonts.push_back (font);
1581}
1481 1582
1482void 1583void
1483rxvt_fontset::add_fonts (const char *desc) 1584rxvt_fontset::add_fonts (const char *desc)
1484{ 1585{
1485 if (desc) 1586 if (desc)
… …
1514 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1615 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1515 else 1616 else
1516 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1617 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1517 1618
1518 desc++; 1619 desc++;
1519 while (*desc <= ' ') desc++; 1620 while (*desc <= ' ' && *desc) desc++;
1520 } 1621 }
1521 1622
1522 end = strchr (desc, ','); 1623 end = strchr (desc, ',');
1523 if (!end) 1624 if (!end)
1524 end = desc + strlen (desc); 1625 end = desc + strlen (desc);
1525 1626
1526 if (end - desc < 511) 1627 if (end - desc < 511)
1527 { 1628 {
1528 strncpy (buf, desc, end - desc); 1629 memcpy (buf, desc, end - desc);
1529 buf[end - desc] = 0; 1630 buf[end - desc] = 0;
1530 1631
1531 fonts.push_back (new_font (buf, cs)); 1632 push_font (new_font (buf, cs));
1532 } 1633 }
1533 else 1634 else
1534 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1635 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1535 1636
1536 desc = end + 1; 1637 desc = end + 1;
1537 } 1638 }
1538 while (*end); 1639 while (*end);
1539 } 1640 }
… …
1564{ 1665{
1565 clear (); 1666 clear ();
1566 1667
1567 fontdesc = strdup (desc); 1668 fontdesc = strdup (desc);
1568 1669
1569 fonts.push_back (new_font (0, CS_UNICODE)); 1670 push_font (new_font (0, CS_UNICODE));
1570 realize_font (0); 1671 realize_font (0);
1571 1672
1572 add_fonts (desc); 1673 add_fonts (desc);
1573 1674
1574 return true; 1675 return true;
… …
1583 1684
1584 return -1; 1685 return -1;
1585} 1686}
1586 1687
1587int 1688int
1588rxvt_fontset::find_font (unicode_t unicode) 1689rxvt_fontset::find_font_idx (unicode_t unicode)
1589{ 1690{
1590 if (unicode >= 1<<20) 1691 if (unicode >= 1<<20)
1591 return 0; 1692 return 0;
1592 1693
1593 unicode_t hi = unicode >> 8; 1694 unicode_t hi = unicode >> 8;
… …
1619 goto next_font; 1720 goto next_font;
1620 1721
1621 bool careful; 1722 bool careful;
1622 if (f->has_char (unicode, &prop, careful)) 1723 if (f->has_char (unicode, &prop, careful))
1623 { 1724 {
1624 if (careful) 1725 i = (i << 1) | careful;
1625 i |= 128;
1626 1726
1627 goto found; 1727 goto found;
1628 } 1728 }
1629 1729
1630 next_font: 1730 next_font:
1631 if (i == fonts.size () - 1) 1731 if (i == fonts.size () - 1)
1632 { 1732 {
1633 if (fallback->name) 1733 if (fallback->name)
1634 { 1734 {
1635 // search through the fallback list 1735 // search through the fallback list
1636 fonts.push_back (new_font (fallback->name, fallback->cs)); 1736 push_font (new_font (fallback->name, fallback->cs));
1637 fallback++; 1737 fallback++;
1638 } 1738 }
1639 else 1739 else
1640 { 1740 {
1641 // try to find a new font. 1741 // try to find a new font.
… …
1643 // way to configure this and xft is easier to hack in, 1743 // way to configure this and xft is easier to hack in,
1644 // while x11 has more framework in place already. 1744 // while x11 has more framework in place already.
1645 // TODO: this is a real resource hog, xft takes ages(?) 1745 // TODO: this is a real resource hog, xft takes ages(?)
1646#if XFT && USE_SLOW_LOOKUP 1746#if XFT && USE_SLOW_LOOKUP
1647 // grab the first xft font that seems suitable 1747 // grab the first xft font that seems suitable
1748 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1648 FcPattern *p = FcPatternCreate (); 1749 FcPattern *p = FcPatternCreate ();
1649 1750
1650 FcCharSet *s = FcCharSetCreate (); 1751 FcCharSet *s = FcCharSetCreate ();
1651 FcCharSetAddChar (s, unicode); 1752 FcCharSetAddChar (s, unicode);
1652 FcPatternAddCharSet (p, FC_CHARSET, s); 1753 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1672 FcPatternDestroy (match); 1773 FcPatternDestroy (match);
1673 1774
1674 if (find_font (font) < 0) 1775 if (find_font (font) < 0)
1675 { 1776 {
1676 char fontname[4096]; 1777 char fontname[4096];
1677 sprintf (fontname, "xft:%-.4090s", font); 1778 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1678 1779
1679 fonts.push_back (new_font (fontname, CS_UNICODE)); 1780 push_font (new_font (fontname, CS_UNICODE));
1680 } 1781 }
1681 1782
1682 free (font); 1783 free (font);
1683 } 1784 }
1684#endif 1785#endif
… …
1696 while (hi >= fmap.size ()) 1797 while (hi >= fmap.size ())
1697 fmap.push_back (0); 1798 fmap.push_back (0);
1698 1799
1699 if (!fmap[hi]) 1800 if (!fmap[hi])
1700 { 1801 {
1701 fmap[hi] = (pagemap *)new pagemap; 1802 fmap[hi] = new pagemap;
1702 memset (fmap[hi], 0xff, sizeof (pagemap)); 1803 memset (fmap[hi], 0xff, sizeof (pagemap));
1703 } 1804 }
1704 1805
1705 (*fmap[hi])[unicode & 0xff] = i; 1806 (*fmap[hi])[unicode & 0xff] = i;
1706 } 1807 }
1707 1808
1708 return i; 1809 return i;
1709} 1810}
1710 1811
1711
1712

Diff Legend

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