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.121 by ayin, Sun Oct 28 11:25:04 2007 UTC vs.
Revision 1.188 by root, Thu Jan 26 13:08:51 2012 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 <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" },
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" },
… …
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{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
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
243#ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 245 if (term->bg_pixmap
245 { 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;
… …
405 407
406 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
407 if (a) 409 if (a)
408 { 410 {
409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
410 412
411 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
413 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
414 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
415 417
… …
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
… …
477 483
478 x += fwidth; 484 x += fwidth;
479 } 485 }
480} 486}
481 487
488struct rxvt_font_overflow : rxvt_font {
489 struct rxvt_fontset *fs;
490
491 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font ()
493 {
494 this->fs = fs;
495 }
496
497 rxvt_fontprop properties ()
498 {
499 rxvt_fontprop p;
500
501 p.width = p.height = 1;
502 p.ascent = rxvt_fontprop::unset;
503 p.weight = rxvt_fontprop::medium;
504 p.slant = rxvt_fontprop::roman;
505
506 return p;
507 }
508
509 bool load (const rxvt_fontprop &prop, bool force_prop)
510 {
511 width = 1; height = 1;
512 ascent = 1; descent = 0;
513
514 set_name (strdup ("built-in rendition overflow font"));
515
516 return true;
517 }
518
519 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
520 {
521 return false;
522 }
523
524 void draw (rxvt_drawable &d, int x, int y,
525 const text_t *text, int len,
526 int fg, int bg)
527 {
528 while (len)
529 {
530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 text += w;
536 len -= w;
537 x += term->fwidth * w;
538 }
539 }
540};
541
482///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
483 543
484struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
485 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
486 546
… …
494 554
495 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 556 const text_t *text, int len,
497 int fg, int bg); 557 int fg, int bg);
498 558
499 bool slow; // wether this is a proportional font or has other funny characteristics 559 bool slow; // whether this is a proportional font or has other funny characteristics
500 XFontStruct *f; 560 XFontStruct *f;
501 bool enc2b, encm; 561 bool enc2b, encm;
502 562
503 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 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); 564 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
604 return false; 664 return false;
605} 665}
606 666
607// fix the size of scalable fonts 667// fix the size of scalable fonts
608static bool 668static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 669replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 670{
611 int slashes = 0; 671 int slashes = 0;
612 const char *field, *end; 672 const char *field, *end;
613 673
614 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
624 break; 684 break;
625 } 685 }
626 686
627 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
628 { 688 {
629 // TODO: check for overflow in font-name 689 size_t len = field - name;
630 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 691 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
633 strcat (buf, end); 693 strcat (*ptr, end);
634 694
635 return true; 695 return true;
636 } 696 }
637 else 697 else
638 { 698 {
639 strcpy (buf, name); 699 *ptr = strdup (name);
640 700
641 return false; 701 return false;
642 } 702 }
643} 703}
644 704
… …
652 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
653 713
654 // first morph the font if required 714 // first morph the font if required
655 if (force_prop) 715 if (force_prop)
656 { 716 {
657 char fname[1024]; 717 char *fname;
658 718
659 if (name[0] != '-') 719 if (name[0] != '-')
660 { 720 {
661 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
662 722
663 if (!f) 723 if (!f)
664 return false; 724 return false;
665 725
666 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
667 727
668 if (new_name) 728 if (new_name)
669 set_name (new_name); 729 set_name (new_name);
670 else 730 else
671 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
672 732
673 XFreeFont (disp, f); 733 XFreeFont (disp, f);
674 f = 0; 734 f = 0;
675 } 735 }
676 736
677 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
678 { 738 {
679 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 741 ? "medium" : "bold");
682 set_name (strdup (fname)); 742 set_name (fname);
683 } 743 }
684 744
685 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
686 { 746 {
687 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
688 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
689 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
690 set_name (strdup (fname)); 750 set_name (fname);
691 } 751 }
692 } 752 }
693 753
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
720 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
721 781
722 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
723 { 783 {
724 rxvt_fontprop p; 784 rxvt_fontprop p;
725 char fname[1024]; 785 char *fname;
726 786
727 int diff = 0; 787 int diff = 0;
728 788
729 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
730 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
731 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
733 797
734 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
735 continue; 804 continue;
736 805 }
737 if (prop.height != rxvt_fontprop::unset
738 && p.height > prop.height) // weed out too large fonts
739 continue;
740 806
741 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 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); 808 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); 809 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); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
745 811
746 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
747 fonts[i].diff = diff; 813 fonts[i].diff = diff;
748 } 814 }
749 815
750 XFreeFontNames (list); 816 XFreeFontNames (list);
751 817
752 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
753 for (;;) 819 for (;;)
754 { 820 {
755 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
756 822
757 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
758 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
759 best = w; 825 best = w;
760 826
761 if (!best->name 827 if (!best->name
762 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
763 break; 829 break;
… …
783 return false; 849 return false;
784 850
785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
787 853
854 cs = CS_UNKNOWN;
855
788 if (registry && encoding) 856 if (registry && encoding)
789 { 857 {
790 char charset[64]; 858 char charset[64];
791 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
792 860
793 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
794 } 862
795 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
796 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
797 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
798 874
799 if (!charset) 875 if (!charset)
800 charset = name; 876 charset = name;
801 877
802 int count = 13; 878 int count = 13;
803 while (*charset) 879 while (*charset)
804 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
805 break; 881 break;
806 882
807 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
884 if (cs == CS_UNKNOWN)
885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
888 }
889
890 if (cs == CS_UNKNOWN)
808 } 891 {
809 892 clear ();
810 free (registry); 893 return false;
811 free (encoding); 894 }
812 895
813 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
814 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 897 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
815 898
816 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
828 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 911 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
829 912
830 if (encm) 913 if (encm)
831 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
832 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
833 916
834 while (N) 917 while (N)
835 { 918 {
836 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
837 width = f->per_char[N].width; 920 width = f->per_char[N].width;
838 921
… …
841 } 924 }
842#endif 925#endif
843 926
844 width = 1; 927 width = 1;
845 928
846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
847 { 930 {
848 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 932 continue;
850 933
851 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 946 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 947
865 if (width < g.width) width = g.width; 948 if (width < g.width) width = g.width;
866 } 949 }
867 950
868 if (cs == CS_UNKNOWN) 951#if 0 // do it per-character
952 if (prop && width > prop->width)
869 { 953 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871
872 clear (); 954 clear ();
873 return false; 955 return false;
874 } 956 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 957#endif
883 958
884 return true; 959 return true;
885} 960}
886 961
… …
895} 970}
896 971
897bool 972bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 974{
975 careful = false;
976
900 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
901 978
902 if (ch == NOCHAR) 979 if (ch == NOCHAR)
903 return false; 980 return false;
904 981
905 /* check wether the character exists in _this_ font. horrible. */ 982 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 983 XCharStruct *xcs;
907 984
908 if (encm) 985 if (encm)
909 { 986 {
910 unsigned char byte1 = ch >> 8; 987 unsigned char byte1 = ch >> 8;
… …
940 return false; 1017 return false;
941 1018
942 if (!prop || prop->width == rxvt_fontprop::unset) 1019 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1020 return true;
944 1021
945 // check wether character overlaps previous/next character 1022 // check whether character overlaps previous/next character
946 int w = xcs->rbearing - xcs->lbearing; 1023 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = max (WCWIDTH (unicode), 1); 1024 int wcw = max (WCWIDTH (unicode), 1);
948 1025
949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1026 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 1027
… …
990 else 1067 else
991 { 1068 {
992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1069 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
993 1070
994 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1071 XChangeGC (disp, gc, GCForeground | GCFont, &v);
995 1072
996 if (slow) 1073 if (slow)
997 { 1074 {
998 do 1075 do
999 { 1076 {
1000 if (xc->byte1 || xc->byte2) 1077 if (xc->byte1 || xc->byte2)
… …
1022 else 1099 else
1023 { 1100 {
1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1101 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1025 1102
1026 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1103 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1027 1104
1028 if (slow) 1105 if (slow)
1029 { 1106 {
1030 do 1107 do
1031 { 1108 {
1032 if (*xc) 1109 if (*xc)
… …
1124 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1201 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1125 1202
1126#if 0 // clipping unfortunately destroys our precious double-width-characters 1203#if 0 // clipping unfortunately destroys our precious double-width-characters
1127 // clip width, we can't do better, or can we? 1204 // clip width, we can't do better, or can we?
1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1205 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1129 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1206 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1130#endif 1207#endif
1131 1208
1132 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1209 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1133 FcPatternAddBool (p, FC_MINSPACE, 1); 1210 FcPatternAddBool (p, FC_MINSPACE, 1);
1134 1211
… …
1146 int ftheight = 0; 1223 int ftheight = 0;
1147 bool success = true; 1224 bool success = true;
1148 1225
1149 for (;;) 1226 for (;;)
1150 { 1227 {
1228 p = FcPatternDuplicate (match);
1151 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1152 1230
1153 if (!f) 1231 if (!f)
1154 { 1232 {
1233 FcPatternDestroy (p);
1155 success = false; 1234 success = false;
1156 break; 1235 break;
1157 } 1236 }
1158 1237
1159 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1167 1246
1168 XftUnlockFace (f); 1247 XftUnlockFace (f);
1169 1248
1170 int glheight = height; 1249 int glheight = height;
1171 1250
1172 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1251 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1173 { 1252 {
1174 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1175 1254
1176 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1177 && ch > 0x100 1256 && ch > 0x100
… …
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1358 const text_t *text, int len,
1280 int fg, int bg) 1359 int fg, int bg)
1281{ 1360{
1282 XGlyphInfo extents; 1361 XGlyphInfo extents;
1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1284 XftGlyphSpec *ep = enc; 1363 XftGlyphSpec *ep = enc;
1285 1364
1286 dTermDisplay; 1365 dTermDisplay;
1287 dTermGC; 1366 dTermGC;
1288 1367
1289 int w = term->fwidth * len; 1368 int w = term->fwidth * len;
1290 int h = term->fheight; 1369 int h = term->fheight;
1291 1370
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1371 bool buffered = bg >= Color_transparent
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1372 && term->option (Opt_buffered);
1294 * good idea from the perspective of packaging for wide variety of user configs. 1373
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces 1374 // cut trailing spaces
1302 while (len && text [len - 1] == ' ') 1375 while (len && text [len - 1] == ' ')
1303 len--; 1376 len--;
1304 1377
1305 int x_ = buffered ? 0 : x; 1378 int x_ = buffered ? 0 : x;
… …
1310 int cwidth = term->fwidth; 1383 int cwidth = term->fwidth;
1311 FcChar32 fc = *text++; len--; 1384 FcChar32 fc = *text++; len--;
1312 1385
1313 while (len && *text == NOCHAR) 1386 while (len && *text == NOCHAR)
1314 text++, len--, cwidth += term->fwidth; 1387 text++, len--, cwidth += term->fwidth;
1315 1388
1316 if (fc != ' ') // skip spaces 1389 if (fc != ' ') // skip spaces
1317 { 1390 {
1318 FT_UInt glyph = XftCharIndex (disp, f, fc); 1391 FT_UInt glyph = XftCharIndex (disp, f, fc);
1319 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1392 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1320 1393
… …
1331 x_ += cwidth; 1404 x_ += cwidth;
1332 } 1405 }
1333 1406
1334 if (buffered) 1407 if (buffered)
1335 { 1408 {
1336 bool back_rendered = false;
1337 if (ep != enc) 1409 if (ep != enc)
1338 { 1410 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340 1412
1341#ifdef HAVE_BG_PIXMAP 1413#ifdef HAVE_BG_PIXMAP
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415
1342 if (term->bgPixmap.pixmap) 1416 if (term->bg_pixmap
1417 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1343 { 1419 {
1344 Picture dst = 0; 1420 int src_x = x, src_y = y;
1345 1421
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 { 1423 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x; 1424 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1425 src_y += term->window_vt_y;
1357 } 1426 }
1358 1427
1359 if (term->bgPixmap.pmap_width >= src_x+w 1428 if (term->bg_pmap_width >= src_x + w
1360 && term->bgPixmap.pmap_height >= src_y+h) 1429 && term->bg_pmap_height >= src_y + h)
1361 { 1430 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1431 XCopyArea (disp, term->bg_pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0); 1432 src_x, src_y, w, h, 0, 0);
1364 } 1433 }
1365 else 1434 else
1366 { 1435 {
1367 XGCValues gcv; 1436 XGCValues gcv;
1368 1437
1369 gcv.fill_style = FillTiled; 1438 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap; 1439 gcv.tile = term->bg_pixmap;
1371 gcv.ts_x_origin = -src_x; 1440 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y; 1441 gcv.ts_y_origin = -src_y;
1373 1442
1374 XChangeGC (disp, gc, 1443 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv); 1445 &gcv);
1377 1446
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1447 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379 1448
1380 gcv.fill_style = FillSolid; 1449 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv); 1450 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 } 1451 }
1383 1452
1384 if (bg >= 0) 1453 if (dst)
1385 { 1454 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1455 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1456
1457 // 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); 1458 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 } 1459 }
1392 } 1460 }
1461 else
1393#endif 1462#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1397 1464
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1465 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1466 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 } 1467 }
1401 else 1468 else
… …
1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1496 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1430 = rxvt_fontprop::unset; 1497 = rxvt_fontprop::unset;
1431 force_prop = false; 1498 force_prop = false;
1432 1499
1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1434 FONT_UNREF (*i); 1501 (*i)->unref ();
1435 1502
1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1437 delete *p; 1504 delete [] *p;
1438 1505
1439 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
1440 1507
1441 fonts.clear (); 1508 fonts.clear ();
1442 1509
1443 fallback = fallback_fonts; 1510 fallback = fallback_fonts;
1511}
1512
1513void
1514rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1515{
1516 font->set_term (term);
1517
1518 font->cs = cs;
1519 font->loaded = false;
1444} 1520}
1445 1521
1446rxvt_font * 1522rxvt_font *
1447rxvt_fontset::new_font (const char *name, codeset cs) 1523rxvt_fontset::new_font (const char *name, codeset cs)
1448{ 1524{
1449 rxvt_font *f; 1525 rxvt_font *f;
1450 1526
1451 if (!name || !*name) 1527 if (!name || !*name)
1452 { 1528 {
1453 name = ""; 1529 name = "";
1454 f = new rxvt_font_default (this); 1530 f = new rxvt_font_default (this);
1455 } 1531 }
… …
1466 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1467 } 1543 }
1468 else 1544 else
1469 f = new rxvt_font_x11; 1545 f = new rxvt_font_x11;
1470 1546
1471 f->set_term (term);
1472 f->set_name (strdup (name)); 1547 f->set_name (strdup (name));
1473 1548 prepare_font (f, cs);
1474 f->cs = cs;
1475 f->loaded = false;
1476 1549
1477 return f; 1550 return f;
1478} 1551}
1479 1552
1480///////////////////////////////////////////////////////////////////////////// 1553/////////////////////////////////////////////////////////////////////////////
1554
1555void
1556rxvt_fontset::push_font (rxvt_font *font)
1557{
1558 // the fontCount index is reserved for the overflow font, it is only
1559 // necessary when we get fontCount or more fonts, as they cannot be
1560 // represented in the rendition.
1561 if (fonts.size () == fontCount)
1562 {
1563 rxvt_font *f = new rxvt_font_overflow (this);
1564
1565 prepare_font (f, CS_UNICODE);
1566 fonts.push_back (f);
1567 }
1568
1569 fonts.push_back (font);
1570}
1481 1571
1482void 1572void
1483rxvt_fontset::add_fonts (const char *desc) 1573rxvt_fontset::add_fonts (const char *desc)
1484{ 1574{
1485 if (desc) 1575 if (desc)
… …
1523 if (!end) 1613 if (!end)
1524 end = desc + strlen (desc); 1614 end = desc + strlen (desc);
1525 1615
1526 if (end - desc < 511) 1616 if (end - desc < 511)
1527 { 1617 {
1528 strncpy (buf, desc, end - desc); 1618 memcpy (buf, desc, end - desc);
1529 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1530 1620
1531 fonts.push_back (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1532 } 1622 }
1533 else 1623 else
1534 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1535 1625
1536 desc = end + 1; 1626 desc = end + 1;
1537 } 1627 }
1538 while (*end); 1628 while (*end);
1539 } 1629 }
… …
1564{ 1654{
1565 clear (); 1655 clear ();
1566 1656
1567 fontdesc = strdup (desc); 1657 fontdesc = strdup (desc);
1568 1658
1569 fonts.push_back (new_font (0, CS_UNICODE)); 1659 push_font (new_font (0, CS_UNICODE));
1570 realize_font (0); 1660 realize_font (0);
1571 1661
1572 add_fonts (desc); 1662 add_fonts (desc);
1573 1663
1574 return true; 1664 return true;
… …
1583 1673
1584 return -1; 1674 return -1;
1585} 1675}
1586 1676
1587int 1677int
1588rxvt_fontset::find_font (unicode_t unicode) 1678rxvt_fontset::find_font_idx (unicode_t unicode)
1589{ 1679{
1590 if (unicode >= 1<<20) 1680 if (unicode >= 1<<20)
1591 return 0; 1681 return 0;
1592 1682
1593 unicode_t hi = unicode >> 8; 1683 unicode_t hi = unicode >> 8;
… …
1619 goto next_font; 1709 goto next_font;
1620 1710
1621 bool careful; 1711 bool careful;
1622 if (f->has_char (unicode, &prop, careful)) 1712 if (f->has_char (unicode, &prop, careful))
1623 { 1713 {
1624 if (careful) 1714 i = (i << 1) | careful;
1625 i |= 128;
1626 1715
1627 goto found; 1716 goto found;
1628 } 1717 }
1629 1718
1630 next_font: 1719 next_font:
1631 if (i == fonts.size () - 1) 1720 if (i == fonts.size () - 1)
1632 { 1721 {
1633 if (fallback->name) 1722 if (fallback->name)
1634 { 1723 {
1635 // search through the fallback list 1724 // search through the fallback list
1636 fonts.push_back (new_font (fallback->name, fallback->cs)); 1725 push_font (new_font (fallback->name, fallback->cs));
1637 fallback++; 1726 fallback++;
1638 } 1727 }
1639 else 1728 else
1640 { 1729 {
1641 // try to find a new font. 1730 // try to find a new font.
… …
1672 FcPatternDestroy (match); 1761 FcPatternDestroy (match);
1673 1762
1674 if (find_font (font) < 0) 1763 if (find_font (font) < 0)
1675 { 1764 {
1676 char fontname[4096]; 1765 char fontname[4096];
1677 sprintf (fontname, "xft:%-.4090s", font); 1766 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1678 1767
1679 fonts.push_back (new_font (fontname, CS_UNICODE)); 1768 push_font (new_font (fontname, CS_UNICODE));
1680 } 1769 }
1681 1770
1682 free (font); 1771 free (font);
1683 } 1772 }
1684#endif 1773#endif
… …
1696 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1697 fmap.push_back (0); 1786 fmap.push_back (0);
1698 1787
1699 if (!fmap[hi]) 1788 if (!fmap[hi])
1700 { 1789 {
1701 fmap[hi] = (pagemap *)new pagemap; 1790 // we use [1] here because C++ has no separate new and new [] forms,
1791 // and pagemap is char[256], so new incorrectly assumes we want to
1792 // allocate an array of chars instead of a single pagemap.
1793 // we can either cast the resulting pointer to (pagemap *) or
1794 // allocate an array of pagemaps, returning a pointer to the first member
1795 // this is no extra overhead, as new even allocates an array for
1796 // "new pagemap"
1797 fmap[hi] = new pagemap[1];
1702 memset (fmap[hi], 0xff, sizeof (pagemap)); 1798 memset (fmap[hi], 0xff, sizeof (pagemap));
1703 } 1799 }
1704 1800
1705 (*fmap[hi])[unicode & 0xff] = i; 1801 (*fmap[hi])[unicode & 0xff] = i;
1706 } 1802 }
1707 1803
1708 return i; 1804 return i;
1709} 1805}
1710 1806
1711
1712

Diff Legend

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