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.103 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.178 by root, Mon Feb 21 07:41:03 2011 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 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" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
159}; 162};
160 163
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
165 166
166///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
167 168
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 219{
219} 220}
220 221
221void 222void
222rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
223{ 224{
224 if (this->name == name) 225 if (name == name_)
225 return; 226 return;
226 227
227 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
228 this->name = name; 229 name = name_;
229} 230}
230 231
231void 232void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 234{
234 dTermDisplay; 235 dTermDisplay;
235 dTermGC; 236 dTermGC;
236 237
237 if (color < 0 || color == Color_bg) 238 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
239 else 240 else if (color >= 0)
240 { 241 {
241#if XFT 242#if XFT
243 Picture dst;
244
245# ifdef HAVE_BG_PIXMAP
246 if (term->bg_pixmap
247 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d))))
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251
252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
254 }
255 else
256# endif
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
243#else 259#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 262#endif
247 } 263 }
248} 264}
249 265
250///////////////////////////////////////////////////////////////////////////// 266/////////////////////////////////////////////////////////////////////////////
251
252#include "table/linedraw.h"
253 267
254struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
255 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
256 270
257 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
… …
293 return false; 307 return false;
294 308
295 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
296 return true; 310 return true;
297 311
312#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 315 return true;
316#endif
301 317
302 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
303 return true; 319 return true;
304 320
305 switch (unicode) 321 switch (unicode)
… …
341 ; 357 ;
342 358
343 int width = text - tp; 359 int width = text - tp;
344 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
345 361
362#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
347 { 364 {
365# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
351 369
352 int W = fwidth; 370 int W = fwidth;
… …
390 408
391 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
392 if (a) 410 if (a)
393 { 411 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 413
396 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
400 418
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 438 break;
421 } 439 }
422 } 440 }
423 } 441 }
442#else
443 if (0)
444 ;
445#endif
424#if ENABLE_COMBINING 446#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 448 {
427 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
428 450
429 text_t chrs[2]; 451 text_t chrs[2];
430 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
431 453
432 *chrs = cc->c1; 454 *chrs = cc->c1;
433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
434 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
435 457
436 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
437 { 459 {
438 bool careful; 460 bool careful;
439 461
440 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
441 *chrs = cc->c2; 463 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 465 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
445 467
446 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 469 }
448 } 470 }
449#endif 471#endif
450 else 472 else
451 switch (t) 473 switch (t)
… …
462 484
463 x += fwidth; 485 x += fwidth;
464 } 486 }
465} 487}
466 488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
538
467///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
468 540
469struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
470 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
471 543
… …
479 551
480 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 553 const text_t *text, int len,
482 int fg, int bg); 554 int fg, int bg);
483 555
484 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 557 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 558 bool enc2b, encm;
488 559
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 562 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
498 unsigned long value; 569 unsigned long value;
499 570
500 if (XGetFontProperty (f, property, &value)) 571 if (XGetFontProperty (f, property, &value))
501 return XGetAtomName (term->dpy, value); 572 return XGetAtomName (term->dpy, value);
502 else 573 else
503 return rxvt_strdup (repl); 574 return repl ? strdup (repl) : 0;
504} 575}
505 576
506rxvt_fontprop 577rxvt_fontprop
507rxvt_font_x11::properties () 578rxvt_font_x11::properties ()
508{ 579{
… …
590 return false; 661 return false;
591} 662}
592 663
593// fix the size of scalable fonts 664// fix the size of scalable fonts
594static bool 665static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 666replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 667{
597 int slashes = 0; 668 int slashes = 0;
598 const char *field, *end; 669 const char *field, *end;
599 670
600 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
610 break; 681 break;
611 } 682 }
612 683
613 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
614 { 685 {
615 // TODO: check for overflow in font-name 686 size_t len = field - name;
616 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 688 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
619 strcat (buf, end); 690 strcat (*ptr, end);
620 691
621 return true; 692 return true;
622 } 693 }
623 else 694 else
624 { 695 {
625 strcpy (buf, name); 696 *ptr = strdup (name);
626 697
627 return false; 698 return false;
628 } 699 }
629} 700}
630 701
… …
638 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
639 710
640 // first morph the font if required 711 // first morph the font if required
641 if (force_prop) 712 if (force_prop)
642 { 713 {
643 char fname[1024]; 714 char *fname;
644 715
645 if (name[0] != '-') 716 if (name[0] != '-')
646 { 717 {
647 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
648 719
649 if (!f) 720 if (!f)
650 return false; 721 return false;
651 722
652 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
653 724
654 if (new_name) 725 if (new_name)
655 set_name (new_name); 726 set_name (new_name);
656 else 727 else
657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
658 729
659 XFreeFont (disp, f); 730 XFreeFont (disp, f);
660 f = 0; 731 f = 0;
661 } 732 }
662 733
663 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
664 { 735 {
665 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
666 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
667 ? "medium" : "bold"); 738 ? "medium" : "bold");
668 set_name (strdup (fname)); 739 set_name (fname);
669 } 740 }
670 741
671 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
672 { 743 {
673 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
674 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
675 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
676 set_name (strdup (fname)); 747 set_name (fname);
677 } 748 }
678 } 749 }
679 750
680 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
706 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
707 778
708 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
709 { 780 {
710 rxvt_fontprop p; 781 rxvt_fontprop p;
711 char fname[1024]; 782 char *fname;
712 783
713 int diff = 0; 784 int diff = 0;
714 785
715 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
716 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
717 else if (replace_field (fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
718 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
719 794
720 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
721 continue; 801 continue;
722 802 }
723 if (prop.height != rxvt_fontprop::unset
724 && p.height > prop.height) // weed out too large fonts
725 continue;
726 803
727 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;
728 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);
729 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);
730 //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);
731 808
732 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
733 fonts[i].diff = diff; 810 fonts[i].diff = diff;
734 } 811 }
735 812
736 XFreeFontNames (list); 813 XFreeFontNames (list);
737 814
… …
769 return false; 846 return false;
770 847
771 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
772 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
773 850
851 cs = CS_UNKNOWN;
852
774 if (registry && encoding) 853 if (registry && encoding)
775 { 854 {
776 char charset[64]; 855 char charset[64];
777 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
778 857
779 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
780 } 859
781 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
782 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
783 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
784 871
785 if (!charset) 872 if (!charset)
786 charset = name; 873 charset = name;
787 874
788 int count = 13; 875 int count = 13;
789 while (*charset) 876 while (*charset)
790 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
791 break; 878 break;
792 879
793 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
794 } 888 {
795 889 clear ();
796 free (registry); 890 return false;
797 free (encoding); 891 }
798 892
799 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
800 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
801 895
802 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
814 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 908 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
815 909
816 if (encm) 910 if (encm)
817 N += (f->max_byte1 - f->min_byte1) 911 N += (f->max_byte1 - f->min_byte1)
818 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 912 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819 913
820 while (N) 914 while (N)
821 { 915 {
822 if (f->per_char[N].width > width) 916 if (f->per_char[N].width > width)
823 width = f->per_char[N].width; 917 width = f->per_char[N].width;
824 918
… …
827 } 921 }
828#endif 922#endif
829 923
830 width = 1; 924 width = 1;
831 925
832 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
833 { 927 {
834 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
835 continue; 929 continue;
836 930
837 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
849 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
850 944
851 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
852 } 946 }
853 947
854 if (cs == CS_UNKNOWN) 948#if 0 // do it per-character
949 if (prop && width > prop->width)
855 { 950 {
856 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
857
858 clear (); 951 clear ();
859 return false; 952 return false;
860 } 953 }
861
862#if 0 // do it per-character
863 if (prop && width > prop->width)
864 {
865 clear ();
866 return false;
867 }
868#endif 954#endif
869 955
870 return true; 956 return true;
871} 957}
872 958
… …
881} 967}
882 968
883bool 969bool
884rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
885{ 971{
972 careful = false;
973
886 uint32_t ch = FROM_UNICODE (cs, unicode); 974 uint32_t ch = FROM_UNICODE (cs, unicode);
887 975
888 if (ch == NOCHAR) 976 if (ch == NOCHAR)
889 return false; 977 return false;
890 978
891 /* check wether the character exists in _this_ font. horrible. */ 979 /* check whether the character exists in _this_ font. horrible. */
892 XCharStruct *xcs; 980 XCharStruct *xcs;
893 981
894 if (encm) 982 if (encm)
895 { 983 {
896 unsigned char byte1 = ch >> 8; 984 unsigned char byte1 = ch >> 8;
… …
926 return false; 1014 return false;
927 1015
928 if (!prop || prop->width == rxvt_fontprop::unset) 1016 if (!prop || prop->width == rxvt_fontprop::unset)
929 return true; 1017 return true;
930 1018
931 // check wether character overlaps previous/next character 1019 // check whether character overlaps previous/next character
932 int w = xcs->rbearing - xcs->lbearing; 1020 int w = xcs->rbearing - xcs->lbearing;
933 int wcw = max (WCWIDTH (unicode), 1); 1021 int wcw = max (WCWIDTH (unicode), 1);
934 1022
935 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1023 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
936 1024
… …
976 else 1064 else
977 { 1065 {
978 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1066 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
979 1067
980 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1068 XChangeGC (disp, gc, GCForeground | GCFont, &v);
981 1069
982 if (slow) 1070 if (slow)
983 { 1071 {
984 do 1072 do
985 { 1073 {
986 if (xc->byte1 || xc->byte2) 1074 if (xc->byte1 || xc->byte2)
… …
1008 else 1096 else
1009 { 1097 {
1010 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1098 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1011 1099
1012 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1100 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1013 1101
1014 if (slow) 1102 if (slow)
1015 { 1103 {
1016 do 1104 do
1017 { 1105 {
1018 if (*xc) 1106 if (*xc)
… …
1044 1132
1045 void draw (rxvt_drawable &d, int x, int y, 1133 void draw (rxvt_drawable &d, int x, int y,
1046 const text_t *text, int len, 1134 const text_t *text, int len,
1047 int fg, int bg); 1135 int fg, int bg);
1048 1136
1049 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1137 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1050 1138
1051protected: 1139protected:
1052 XftFont *f; 1140 XftFont *f;
1053}; 1141};
1054 1142
… …
1110 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1198 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1111 1199
1112#if 0 // clipping unfortunately destroys our precious double-width-characters 1200#if 0 // clipping unfortunately destroys our precious double-width-characters
1113 // clip width, we can't do better, or can we? 1201 // clip width, we can't do better, or can we?
1114 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1202 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1115 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1203 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1116#endif 1204#endif
1117 1205
1118 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1119 FcPatternAddBool (p, FC_MINSPACE, 1); 1207 FcPatternAddBool (p, FC_MINSPACE, 1);
1120 1208
… …
1132 int ftheight = 0; 1220 int ftheight = 0;
1133 bool success = true; 1221 bool success = true;
1134 1222
1135 for (;;) 1223 for (;;)
1136 { 1224 {
1225 p = FcPatternDuplicate (match);
1137 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1226 f = XftFontOpenPattern (disp, p);
1138 1227
1139 if (!f) 1228 if (!f)
1140 { 1229 {
1230 FcPatternDestroy (p);
1141 success = false; 1231 success = false;
1142 break; 1232 break;
1143 } 1233 }
1144 1234
1145 FT_Face face = XftLockFace (f); 1235 FT_Face face = XftLockFace (f);
… …
1153 1243
1154 XftUnlockFace (f); 1244 XftUnlockFace (f);
1155 1245
1156 int glheight = height; 1246 int glheight = height;
1157 1247
1158 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1248 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1159 { 1249 {
1160 FcChar16 ch = *t; 1250 FcChar16 ch = *t;
1161 1251
1162 if (cs != CS_UNICODE 1252 if (cs != CS_UNICODE
1163 && ch > 0x100 1253 && ch > 0x100
… …
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1354rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1355 const text_t *text, int len,
1266 int fg, int bg) 1356 int fg, int bg)
1267{ 1357{
1268 XGlyphInfo extents; 1358 XGlyphInfo extents;
1269 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1359 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1270 XftGlyphSpec *ep = enc; 1360 XftGlyphSpec *ep = enc;
1271 1361
1272 dTermDisplay; 1362 dTermDisplay;
1273 dTermGC; 1363 dTermGC;
1274 1364
1275 int w = term->fwidth * len; 1365 int w = term->fwidth * len;
1276 int h = term->fheight; 1366 int h = term->fheight;
1277 1367
1278 bool buffered = bg >= 0 // we don't use a transparent bg 1368 bool buffered = bg >= Color_transparent
1279#ifndef FORCE_UNBUFFERED_XFT 1369 && term->option (Opt_buffered);
1280# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1281 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap
1283# endif
1284#endif
1285 ;
1286 1370
1287 // cut trailing spaces 1371 // cut trailing spaces
1288 while (len && text [len - 1] == ' ') 1372 while (len && text [len - 1] == ' ')
1289 len--; 1373 len--;
1290 1374
… …
1296 int cwidth = term->fwidth; 1380 int cwidth = term->fwidth;
1297 FcChar32 fc = *text++; len--; 1381 FcChar32 fc = *text++; len--;
1298 1382
1299 while (len && *text == NOCHAR) 1383 while (len && *text == NOCHAR)
1300 text++, len--, cwidth += term->fwidth; 1384 text++, len--, cwidth += term->fwidth;
1301 1385
1302 if (fc != ' ') // skip spaces 1386 if (fc != ' ') // skip spaces
1303 { 1387 {
1304 FT_UInt glyph = XftCharIndex (disp, f, fc); 1388 FT_UInt glyph = XftCharIndex (disp, f, fc);
1305 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1389 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1306 1390
… …
1321 { 1405 {
1322 if (ep != enc) 1406 if (ep != enc)
1323 { 1407 {
1324 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1325 1409
1326 if (0) 1410#ifdef HAVE_BG_PIXMAP
1327 ; 1411 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1328#ifdef TRANSPARENT 1412
1329 else if (bg < 0 && term->am_pixmap_trans) 1413 if (term->bg_pixmap
1330 XCopyArea (disp, term->pixmap, d2, gc, 1414 && (bg == Color_transparent || bg == Color_bg
1331 x + term->window_vt_x, y + term->window_vt_y, 1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1332 w, h, 0, 0);
1333#endif
1334#ifdef XPM_BACKGROUND
1335 else if (bg < 0 && term->bgPixmap.pixmap)
1336 { 1416 {
1417 int src_x = x, src_y = y;
1418
1419 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1420 {
1421 src_x += term->window_vt_x;
1422 src_y += term->window_vt_y;
1423 }
1424
1425 if (term->bg_pmap_width >= src_x + w
1426 && term->bg_pmap_height >= src_y + h)
1427 {
1428 XCopyArea (disp, term->bg_pixmap, d2, gc,
1429 src_x, src_y, w, h, 0, 0);
1430 }
1431 else
1432 {
1337 XGCValues gcv; 1433 XGCValues gcv;
1338 1434
1339 gcv.fill_style = FillTiled; 1435 gcv.fill_style = FillTiled;
1340 gcv.tile = term->pixmap; 1436 gcv.tile = term->bg_pixmap;
1341 gcv.ts_x_origin = -x; 1437 gcv.ts_x_origin = -src_x;
1342 gcv.ts_y_origin = -y; 1438 gcv.ts_y_origin = -src_y;
1343 1439
1344 GC gc2 = XCreateGC (disp, d2, 1440 XChangeGC (disp, gc,
1345 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1346 &gcv); 1442 &gcv);
1347 1443
1348 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1444 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1349 1445
1350 XFreeGC (disp, gc2); 1446 gcv.fill_style = FillSolid;
1447 XChangeGC (disp, gc, GCFillStyle, &gcv);
1448 }
1449
1450 if (dst)
1451 {
1452 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1453
1454 // dst can only be set when bg >= 0
1455 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1456 }
1351 } 1457 }
1352#endif
1353 else 1458 else
1459#endif
1354 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1460 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1355 1461
1356 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1462 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1463 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358 } 1464 }
1359 else 1465 else
… …
1387 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1493 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1388 = rxvt_fontprop::unset; 1494 = rxvt_fontprop::unset;
1389 force_prop = false; 1495 force_prop = false;
1390 1496
1391 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1497 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1392 FONT_UNREF (*i); 1498 (*i)->unref ();
1393 1499
1394 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1500 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1395 delete *p; 1501 delete *p;
1396 1502
1397 free (fontdesc); fontdesc = 0; 1503 free (fontdesc); fontdesc = 0;
… …
1399 fonts.clear (); 1505 fonts.clear ();
1400 1506
1401 fallback = fallback_fonts; 1507 fallback = fallback_fonts;
1402} 1508}
1403 1509
1510void
1511rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1512{
1513 font->set_term (term);
1514
1515 font->cs = cs;
1516 font->loaded = false;
1517}
1518
1404rxvt_font * 1519rxvt_font *
1405rxvt_fontset::new_font (const char *name, codeset cs) 1520rxvt_fontset::new_font (const char *name, codeset cs)
1406{ 1521{
1407 rxvt_font *f; 1522 rxvt_font *f;
1408 1523
1409 if (!name || !*name) 1524 if (!name || !*name)
1410 { 1525 {
1411 name = ""; 1526 name = "";
1412 f = new rxvt_font_default (this); 1527 f = new rxvt_font_default (this);
1413 } 1528 }
… …
1424 f = new rxvt_font_x11; 1539 f = new rxvt_font_x11;
1425 } 1540 }
1426 else 1541 else
1427 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1428 1543
1429 f->set_term (term);
1430 f->set_name (strdup (name)); 1544 f->set_name (strdup (name));
1431 1545 prepare_font (f, cs);
1432 f->cs = cs;
1433 f->loaded = false;
1434 1546
1435 return f; 1547 return f;
1436} 1548}
1437 1549
1438///////////////////////////////////////////////////////////////////////////// 1550/////////////////////////////////////////////////////////////////////////////
1551
1552void
1553rxvt_fontset::push_font (rxvt_font *font)
1554{
1555 // the fontCount index is reserved for the overflow font, it is only
1556 // necessary when we get fontCount or more fonts, as they cannot be
1557 // represented in the rendition.
1558 if (fonts.size () == fontCount)
1559 {
1560 rxvt_font *f = new rxvt_font_overflow (this);
1561
1562 prepare_font (f, CS_UNICODE);
1563 fonts.push_back (f);
1564 }
1565
1566 fonts.push_back (font);
1567}
1439 1568
1440void 1569void
1441rxvt_fontset::add_fonts (const char *desc) 1570rxvt_fontset::add_fonts (const char *desc)
1442{ 1571{
1443 if (desc) 1572 if (desc)
… …
1481 if (!end) 1610 if (!end)
1482 end = desc + strlen (desc); 1611 end = desc + strlen (desc);
1483 1612
1484 if (end - desc < 511) 1613 if (end - desc < 511)
1485 { 1614 {
1486 strncpy (buf, desc, end - desc); 1615 memcpy (buf, desc, end - desc);
1487 buf[end - desc] = 0; 1616 buf[end - desc] = 0;
1488 1617
1489 fonts.push_back (new_font (buf, cs)); 1618 push_font (new_font (buf, cs));
1490 } 1619 }
1491 else 1620 else
1492 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1621 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1493 1622
1494 desc = end + 1; 1623 desc = end + 1;
1495 } 1624 }
1496 while (*end); 1625 while (*end);
1497 } 1626 }
… …
1522{ 1651{
1523 clear (); 1652 clear ();
1524 1653
1525 fontdesc = strdup (desc); 1654 fontdesc = strdup (desc);
1526 1655
1527 fonts.push_back (new_font (0, CS_UNICODE)); 1656 push_font (new_font (0, CS_UNICODE));
1528 realize_font (0); 1657 realize_font (0);
1529 1658
1530 add_fonts (desc); 1659 add_fonts (desc);
1531 1660
1532 return true; 1661 return true;
… …
1541 1670
1542 return -1; 1671 return -1;
1543} 1672}
1544 1673
1545int 1674int
1546rxvt_fontset::find_font (unicode_t unicode) 1675rxvt_fontset::find_font_idx (unicode_t unicode)
1547{ 1676{
1548 if (unicode >= 1<<20) 1677 if (unicode >= 1<<20)
1549 return 0; 1678 return 0;
1550 1679
1551 unicode_t hi = unicode >> 8; 1680 unicode_t hi = unicode >> 8;
… …
1577 goto next_font; 1706 goto next_font;
1578 1707
1579 bool careful; 1708 bool careful;
1580 if (f->has_char (unicode, &prop, careful)) 1709 if (f->has_char (unicode, &prop, careful))
1581 { 1710 {
1582 if (careful) 1711 i = (i << 1) | careful;
1583 i |= 128;
1584 1712
1585 goto found; 1713 goto found;
1586 } 1714 }
1587 1715
1588 next_font: 1716 next_font:
1589 if (i == fonts.size () - 1) 1717 if (i == fonts.size () - 1)
1590 { 1718 {
1591 if (fallback->name) 1719 if (fallback->name)
1592 { 1720 {
1593 // search through the fallback list 1721 // search through the fallback list
1594 fonts.push_back (new_font (fallback->name, fallback->cs)); 1722 push_font (new_font (fallback->name, fallback->cs));
1595 fallback++; 1723 fallback++;
1596 } 1724 }
1597 else 1725 else
1598 { 1726 {
1599 // try to find a new font. 1727 // try to find a new font.
… …
1630 FcPatternDestroy (match); 1758 FcPatternDestroy (match);
1631 1759
1632 if (find_font (font) < 0) 1760 if (find_font (font) < 0)
1633 { 1761 {
1634 char fontname[4096]; 1762 char fontname[4096];
1635 sprintf (fontname, "xft:%-.4090s", font); 1763 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1636 1764
1637 fonts.push_back (new_font (fontname, CS_UNICODE)); 1765 push_font (new_font (fontname, CS_UNICODE));
1638 } 1766 }
1639 1767
1640 free (font); 1768 free (font);
1641 } 1769 }
1642#endif 1770#endif
… …
1664 } 1792 }
1665 1793
1666 return i; 1794 return i;
1667} 1795}
1668 1796
1669
1670

Diff Legend

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