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.118 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.195 by root, Mon Sep 7 14:50:56 2015 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" },
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 Picture dst;
243
244# ifdef HAVE_BG_PIXMAP
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
243#else 258#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 261#endif
247 } 262 }
248} 263}
249 264
250///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
251
252#include "table/linedraw.h"
253 266
254struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
255 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
256 269
257 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
293 return false; 306 return false;
294 307
295 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
296 return true; 309 return true;
297 310
311#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 314 return true;
315#endif
301 316
302 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
303 return true; 318 return true;
304 319
305 switch (unicode) 320 switch (unicode)
… …
341 ; 356 ;
342 357
343 int width = text - tp; 358 int width = text - tp;
344 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
345 360
361#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
347 { 363 {
364# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
351 368
352 int W = fwidth; 369 int W = fwidth;
… …
390 407
391 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
392 if (a) 409 if (a)
393 { 410 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 412
396 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
400 417
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 437 break;
421 } 438 }
422 } 439 }
423 } 440 }
441#else
442 if (0)
443 ;
444#endif
424#if ENABLE_COMBINING 445#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 447 {
427 min_it (width, 2); // we only support wcwidth up to 2 448 min_it (width, 2); // we only support wcwidth up to 2
428 449
429 text_t chrs[2]; 450 text_t chrs[2];
430 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
431 452
432 *chrs = cc->c1; 453 *chrs = cc->c1;
433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
434 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
435 456
436 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
437 { 458 {
438 bool careful; 459 bool careful;
439 460
440 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
441 *chrs = cc->c2; 462 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 464 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
445 466
446 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 468 }
448 } 469 }
449#endif 470#endif
… …
462 483
463 x += fwidth; 484 x += fwidth;
464 } 485 }
465} 486}
466 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
467///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
468 543
469struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
470 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
471 546
… …
479 554
480 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 556 const text_t *text, int len,
482 int fg, int bg); 557 int fg, int bg);
483 558
484 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
485 XFontStruct *f; 560 XFontStruct *f;
486 bool enc2b, encm; 561 bool enc2b, encm;
487 562
488 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 564 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
497 unsigned long value; 572 unsigned long value;
498 573
499 if (XGetFontProperty (f, property, &value)) 574 if (XGetFontProperty (f, property, &value))
500 return XGetAtomName (term->dpy, value); 575 return XGetAtomName (term->dpy, value);
501 else 576 else
502 return rxvt_strdup (repl); 577 return repl ? strdup (repl) : 0;
503} 578}
504 579
505rxvt_fontprop 580rxvt_fontprop
506rxvt_font_x11::properties () 581rxvt_font_x11::properties ()
507{ 582{
… …
589 return false; 664 return false;
590} 665}
591 666
592// fix the size of scalable fonts 667// fix the size of scalable fonts
593static bool 668static bool
594replace_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)
595{ 670{
596 int slashes = 0; 671 int slashes = 0;
597 const char *field, *end; 672 const char *field, *end;
598 673
599 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
609 break; 684 break;
610 } 685 }
611 686
612 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
613 { 688 {
614 // TODO: check for overflow in font-name 689 size_t len = field - name;
615 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 buf += field - name; 691 memcpy (*ptr, name, len);
617 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
618 strcat (buf, end); 693 strcat (*ptr, end);
619 694
620 return true; 695 return true;
621 } 696 }
622 else 697 else
623 { 698 {
624 strcpy (buf, name); 699 *ptr = strdup (name);
625 700
626 return false; 701 return false;
627 } 702 }
628} 703}
629 704
… …
637 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
638 713
639 // first morph the font if required 714 // first morph the font if required
640 if (force_prop) 715 if (force_prop)
641 { 716 {
642 char fname[1024]; 717 char *fname;
643 718
644 if (name[0] != '-') 719 if (name[0] != '-')
645 { 720 {
646 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
647 722
648 if (!f) 723 if (!f)
649 return false; 724 return false;
650 725
651 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
652 727
653 if (new_name) 728 if (new_name)
654 set_name (new_name); 729 set_name (new_name);
655 else 730 else
656 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
657 732
658 XFreeFont (disp, f); 733 XFreeFont (disp, f);
659 f = 0; 734 f = 0;
660 } 735 }
661 736
662 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
663 { 738 {
664 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
665 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
666 ? "medium" : "bold"); 741 ? "medium" : "bold");
667 set_name (strdup (fname)); 742 set_name (fname);
668 } 743 }
669 744
670 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
671 { 746 {
672 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
673 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
674 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
675 set_name (strdup (fname)); 750 set_name (fname);
676 } 751 }
677 } 752 }
678 753
679 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
705 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
706 781
707 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
708 { 783 {
709 rxvt_fontprop p; 784 rxvt_fontprop p;
710 char fname[1024]; 785 char *fname;
711 786
712 int diff = 0; 787 int diff = 0;
713 788
714 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
715 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
716 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
718 797
719 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);
720 continue; 804 continue;
721 805 }
722 if (prop.height != rxvt_fontprop::unset
723 && p.height > prop.height) // weed out too large fonts
724 continue;
725 806
726 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;
727 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);
728 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);
729 //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);
730 811
731 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
732 fonts[i].diff = diff; 813 fonts[i].diff = diff;
733 } 814 }
734 815
735 XFreeFontNames (list); 816 XFreeFontNames (list);
736 817
737 // 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
738 for (;;) 819 for (;;)
739 { 820 {
740 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
741 822
742 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
743 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
744 best = w; 825 best = w;
745 826
746 if (!best->name 827 if (!best->name
747 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
748 break; 829 break;
… …
768 return false; 849 return false;
769 850
770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772 853
854 cs = CS_UNKNOWN;
855
773 if (registry && encoding) 856 if (registry && encoding)
774 { 857 {
775 char charset[64]; 858 char charset[64];
776 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
777 860
778 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
779 } 862
780 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
782 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
783 874
784 if (!charset) 875 if (!charset)
785 charset = name; 876 charset = name;
786 877
787 int count = 13; 878 int count = 13;
788 while (*charset) 879 while (*charset)
789 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
790 break; 881 break;
791 882
792 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)
793 } 891 {
794 892 clear ();
795 free (registry); 893 return false;
796 free (encoding); 894 }
797 895
798 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
799 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
800 898
801 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
813 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;
814 912
815 if (encm) 913 if (encm)
816 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
817 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818 916
819 while (N) 917 while (N)
820 { 918 {
821 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
822 width = f->per_char[N].width; 920 width = f->per_char[N].width;
823 921
… …
826 } 924 }
827#endif 925#endif
828 926
829 width = 1; 927 width = 1;
830 928
831 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++)
832 { 930 {
833 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
834 continue; 932 continue;
835 933
836 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
837 bool careful; 935 bool careful;
838 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
839 continue; 937 continue;
840 938
841 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
842 941
843 XCharStruct g; 942 XCharStruct g;
844 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
845 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
846 945
… …
848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849 948
850 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
851 } 950 }
852 951
853 if (cs == CS_UNKNOWN) 952#if 0 // do it per-character
953 if (prop && width > prop->width)
854 { 954 {
855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857 clear (); 955 clear ();
858 return false; 956 return false;
859 } 957 }
860
861#if 0 // do it per-character
862 if (prop && width > prop->width)
863 {
864 clear ();
865 return false;
866 }
867#endif 958#endif
868 959
869 return true; 960 return true;
870} 961}
871 962
… …
880} 971}
881 972
882bool 973bool
883rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
884{ 975{
976 careful = false;
977
885 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
886 979
887 if (ch == NOCHAR) 980 if (ch == NOCHAR)
888 return false; 981 return false;
889 982
890 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
891 XCharStruct *xcs; 984 XCharStruct *xcs;
892 985
893 if (encm) 986 if (encm)
894 { 987 {
895 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
925 return false; 1018 return false;
926 1019
927 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
928 return true; 1021 return true;
929 1022
930 // check wether character overlaps previous/next character 1023 // check whether character overlaps previous/next character
931 int w = xcs->rbearing - xcs->lbearing; 1024 int w = xcs->rbearing - xcs->lbearing;
932 int wcw = max (WCWIDTH (unicode), 1); 1025 int wcw = max (WCWIDTH (unicode), 1);
933 1026
934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
935 1028
… …
952 dTermDisplay; 1045 dTermDisplay;
953 dTermGC; 1046 dTermGC;
954 1047
955 bool slow = this->slow 1048 bool slow = this->slow
956 || width != term->fwidth 1049 || width != term->fwidth
957 || height != term->fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
958 1052
959 int base = ascent; // sorry, incorrect: term->fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
960 1054
961 XGCValues v; 1055 XGCValues v;
962 v.foreground = term->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
… …
975 else 1069 else
976 { 1070 {
977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1071 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978 1072
979 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1073 XChangeGC (disp, gc, GCForeground | GCFont, &v);
980 1074
981 if (slow) 1075 if (slow)
982 { 1076 {
983 do 1077 do
984 { 1078 {
985 if (xc->byte1 || xc->byte2) 1079 if (xc->byte1 || xc->byte2)
… …
1007 else 1101 else
1008 { 1102 {
1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1103 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010 1104
1011 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1105 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1012 1106
1013 if (slow) 1107 if (slow)
1014 { 1108 {
1015 do 1109 do
1016 { 1110 {
1017 if (*xc) 1111 if (*xc)
… …
1043 1137
1044 void draw (rxvt_drawable &d, int x, int y, 1138 void draw (rxvt_drawable &d, int x, int y,
1045 const text_t *text, int len, 1139 const text_t *text, int len,
1046 int fg, int bg); 1140 int fg, int bg);
1047 1141
1048 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1142 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049 1143
1050protected: 1144protected:
1051 XftFont *f; 1145 XftFont *f;
1052}; 1146};
1053 1147
… …
1109 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1203 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110 1204
1111#if 0 // clipping unfortunately destroys our precious double-width-characters 1205#if 0 // clipping unfortunately destroys our precious double-width-characters
1112 // clip width, we can't do better, or can we? 1206 // clip width, we can't do better, or can we?
1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1207 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1208 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115#endif 1209#endif
1116 1210
1117 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1211 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118 FcPatternAddBool (p, FC_MINSPACE, 1); 1212 FcPatternAddBool (p, FC_MINSPACE, 1);
1119 1213
… …
1131 int ftheight = 0; 1225 int ftheight = 0;
1132 bool success = true; 1226 bool success = true;
1133 1227
1134 for (;;) 1228 for (;;)
1135 { 1229 {
1230 p = FcPatternDuplicate (match);
1136 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1137 1232
1138 if (!f) 1233 if (!f)
1139 { 1234 {
1235 FcPatternDestroy (p);
1140 success = false; 1236 success = false;
1141 break; 1237 break;
1142 } 1238 }
1143 1239
1144 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1152 1248
1153 XftUnlockFace (f); 1249 XftUnlockFace (f);
1154 1250
1155 int glheight = height; 1251 int glheight = height;
1156 1252
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1158 { 1254 {
1159 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1160 1256
1161 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1162 && ch > 0x100 1258 && ch > 0x100
… …
1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264 const text_t *text, int len, 1360 const text_t *text, int len,
1265 int fg, int bg) 1361 int fg, int bg)
1266{ 1362{
1267 XGlyphInfo extents; 1363 XGlyphInfo extents;
1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1269 XftGlyphSpec *ep = enc; 1365 XftGlyphSpec *ep = enc;
1270 1366
1271 dTermDisplay; 1367 dTermDisplay;
1272 dTermGC; 1368 dTermGC;
1273 1369
1274 int w = term->fwidth * len; 1370 int w = term->fwidth * len;
1275 int h = term->fheight; 1371 int h = term->fheight;
1276 1372
1277 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1373 bool buffered = bg >= Color_transparent
1278 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1374 && term->option (Opt_buffered);
1279 * good idea from the perspective of packaging for wide variety of user configs. 1375
1280 */
1281 bool buffered = true
1282#ifdef FORCE_UNBUFFERED_XFT
1283 && bg >= 0
1284#endif
1285 ;
1286 // cut trailing spaces 1376 // cut trailing spaces
1287 while (len && text [len - 1] == ' ') 1377 while (len && text [len - 1] == ' ')
1288 len--; 1378 len--;
1289 1379
1290 int x_ = buffered ? 0 : x; 1380 int x_ = buffered ? 0 : x;
… …
1295 int cwidth = term->fwidth; 1385 int cwidth = term->fwidth;
1296 FcChar32 fc = *text++; len--; 1386 FcChar32 fc = *text++; len--;
1297 1387
1298 while (len && *text == NOCHAR) 1388 while (len && *text == NOCHAR)
1299 text++, len--, cwidth += term->fwidth; 1389 text++, len--, cwidth += term->fwidth;
1300 1390
1301 if (fc != ' ') // skip spaces 1391 if (fc != ' ') // skip spaces
1302 { 1392 {
1303 FT_UInt glyph = XftCharIndex (disp, f, fc); 1393 FT_UInt glyph = XftCharIndex (disp, f, fc);
1304 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1394 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305 1395
… …
1319 if (buffered) 1409 if (buffered)
1320 { 1410 {
1321 if (ep != enc) 1411 if (ep != enc)
1322 { 1412 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 bool back_rendered = false;
1325 1414
1326#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_BG_PIXMAP
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417
1327 if (term->bgPixmap.pixmap) 1418 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1328 { 1421 {
1329 Picture dst = 0; 1422 int src_x = x, src_y = y;
1330 1423
1331 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1332 dst = XftDrawPicture (d2);
1333
1334 if (bg < 0 || dst != 0)
1335 { 1425 {
1336 int src_x = x, src_y = y ;
1337
1338 if (term->bgPixmap.is_parentOrigin ())
1339 {
1340 src_x += term->window_vt_x; 1426 src_x += term->window_vt_x;
1341 src_y += term->window_vt_y; 1427 src_y += term->window_vt_y;
1342 } 1428 }
1343 1429
1344 if (term->bgPixmap.pmap_width >= src_x+w 1430 if (term->bg_img->w >= src_x + w
1345 && term->bgPixmap.pmap_height >= src_y+h) 1431 && term->bg_img->h >= src_y + h)
1346 { 1432 {
1347 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1348 src_x, src_y, w, h, 0, 0); 1434 src_x, src_y, w, h, 0, 0);
1349 } 1435 }
1350 else 1436 else
1351 { 1437 {
1352 XGCValues gcv; 1438 XGCValues gcv;
1353 1439
1354 gcv.fill_style = FillTiled; 1440 gcv.fill_style = FillTiled;
1355 gcv.tile = term->bgPixmap.pixmap; 1441 gcv.tile = term->bg_img->pm;
1356 gcv.ts_x_origin = -src_x; 1442 gcv.ts_x_origin = -src_x;
1357 gcv.ts_y_origin = -src_y; 1443 gcv.ts_y_origin = -src_y;
1358 1444
1359 XChangeGC (disp, gc, 1445 XChangeGC (disp, gc,
1360 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1361 &gcv); 1447 &gcv);
1362 1448
1363 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1449 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1364 1450
1365 gcv.fill_style = FillSolid; 1451 gcv.fill_style = FillSolid;
1366 XChangeGC (disp, gc, GCFillStyle, &gcv); 1452 XChangeGC (disp, gc, GCFillStyle, &gcv);
1367 } 1453 }
1368 1454
1369 if (bg >= 0) 1455 if (dst)
1370 { 1456 {
1371 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1457 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1458
1459 // dst can only be set when bg >= 0
1372 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1460 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1373 }
1374
1375 back_rendered = true;
1376 } 1461 }
1377 } 1462 }
1463 else
1378#endif 1464#endif
1379
1380 if (bg >= 0 && !back_rendered)
1381 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1465 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1382 1466
1383 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1467 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1384 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1468 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1385 } 1469 }
1386 else 1470 else
… …
1414 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1498 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1415 = rxvt_fontprop::unset; 1499 = rxvt_fontprop::unset;
1416 force_prop = false; 1500 force_prop = false;
1417 1501
1418 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1502 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1419 FONT_UNREF (*i); 1503 (*i)->unref ();
1420 1504
1421 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1505 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1422 delete *p; 1506 delete *p;
1423 1507
1424 free (fontdesc); fontdesc = 0; 1508 free (fontdesc); fontdesc = 0;
… …
1426 fonts.clear (); 1510 fonts.clear ();
1427 1511
1428 fallback = fallback_fonts; 1512 fallback = fallback_fonts;
1429} 1513}
1430 1514
1515void
1516rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1517{
1518 font->set_term (term);
1519
1520 font->cs = cs;
1521 font->loaded = false;
1522}
1523
1431rxvt_font * 1524rxvt_font *
1432rxvt_fontset::new_font (const char *name, codeset cs) 1525rxvt_fontset::new_font (const char *name, codeset cs)
1433{ 1526{
1434 rxvt_font *f; 1527 rxvt_font *f;
1435 1528
1436 if (!name || !*name) 1529 if (!name || !*name)
1437 { 1530 {
1438 name = ""; 1531 name = "";
1439 f = new rxvt_font_default (this); 1532 f = new rxvt_font_default (this);
1440 } 1533 }
… …
1451 f = new rxvt_font_x11; 1544 f = new rxvt_font_x11;
1452 } 1545 }
1453 else 1546 else
1454 f = new rxvt_font_x11; 1547 f = new rxvt_font_x11;
1455 1548
1456 f->set_term (term);
1457 f->set_name (strdup (name)); 1549 f->set_name (strdup (name));
1458 1550 prepare_font (f, cs);
1459 f->cs = cs;
1460 f->loaded = false;
1461 1551
1462 return f; 1552 return f;
1463} 1553}
1464 1554
1465///////////////////////////////////////////////////////////////////////////// 1555/////////////////////////////////////////////////////////////////////////////
1556
1557void
1558rxvt_fontset::push_font (rxvt_font *font)
1559{
1560 // the fontCount index is reserved for the overflow font, it is only
1561 // necessary when we get fontCount or more fonts, as they cannot be
1562 // represented in the rendition.
1563 if (fonts.size () == fontCount)
1564 {
1565 rxvt_font *f = new rxvt_font_overflow (this);
1566
1567 prepare_font (f, CS_UNICODE);
1568 fonts.push_back (f);
1569 }
1570
1571 fonts.push_back (font);
1572}
1466 1573
1467void 1574void
1468rxvt_fontset::add_fonts (const char *desc) 1575rxvt_fontset::add_fonts (const char *desc)
1469{ 1576{
1470 if (desc) 1577 if (desc)
… …
1499 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1500 else 1607 else
1501 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1502 1609
1503 desc++; 1610 desc++;
1504 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1505 } 1612 }
1506 1613
1507 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1508 if (!end) 1615 if (!end)
1509 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
1510 1617
1511 if (end - desc < 511) 1618 if (end - desc < 511)
1512 { 1619 {
1513 strncpy (buf, desc, end - desc); 1620 memcpy (buf, desc, end - desc);
1514 buf[end - desc] = 0; 1621 buf[end - desc] = 0;
1515 1622
1516 fonts.push_back (new_font (buf, cs)); 1623 push_font (new_font (buf, cs));
1517 } 1624 }
1518 else 1625 else
1519 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1626 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1520 1627
1521 desc = end + 1; 1628 desc = end + 1;
1522 } 1629 }
1523 while (*end); 1630 while (*end);
1524 } 1631 }
… …
1549{ 1656{
1550 clear (); 1657 clear ();
1551 1658
1552 fontdesc = strdup (desc); 1659 fontdesc = strdup (desc);
1553 1660
1554 fonts.push_back (new_font (0, CS_UNICODE)); 1661 push_font (new_font (0, CS_UNICODE));
1555 realize_font (0); 1662 realize_font (0);
1556 1663
1557 add_fonts (desc); 1664 add_fonts (desc);
1558 1665
1559 return true; 1666 return true;
… …
1568 1675
1569 return -1; 1676 return -1;
1570} 1677}
1571 1678
1572int 1679int
1573rxvt_fontset::find_font (unicode_t unicode) 1680rxvt_fontset::find_font_idx (unicode_t unicode)
1574{ 1681{
1575 if (unicode >= 1<<20) 1682 if (unicode >= 1<<20)
1576 return 0; 1683 return 0;
1577 1684
1578 unicode_t hi = unicode >> 8; 1685 unicode_t hi = unicode >> 8;
… …
1604 goto next_font; 1711 goto next_font;
1605 1712
1606 bool careful; 1713 bool careful;
1607 if (f->has_char (unicode, &prop, careful)) 1714 if (f->has_char (unicode, &prop, careful))
1608 { 1715 {
1609 if (careful) 1716 i = (i << 1) | careful;
1610 i |= 128;
1611 1717
1612 goto found; 1718 goto found;
1613 } 1719 }
1614 1720
1615 next_font: 1721 next_font:
1616 if (i == fonts.size () - 1) 1722 if (i == fonts.size () - 1)
1617 { 1723 {
1618 if (fallback->name) 1724 if (fallback->name)
1619 { 1725 {
1620 // search through the fallback list 1726 // search through the fallback list
1621 fonts.push_back (new_font (fallback->name, fallback->cs)); 1727 push_font (new_font (fallback->name, fallback->cs));
1622 fallback++; 1728 fallback++;
1623 } 1729 }
1624 else 1730 else
1625 { 1731 {
1626 // try to find a new font. 1732 // try to find a new font.
… …
1657 FcPatternDestroy (match); 1763 FcPatternDestroy (match);
1658 1764
1659 if (find_font (font) < 0) 1765 if (find_font (font) < 0)
1660 { 1766 {
1661 char fontname[4096]; 1767 char fontname[4096];
1662 sprintf (fontname, "xft:%-.4090s", font); 1768 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1663 1769
1664 fonts.push_back (new_font (fontname, CS_UNICODE)); 1770 push_font (new_font (fontname, CS_UNICODE));
1665 } 1771 }
1666 1772
1667 free (font); 1773 free (font);
1668 } 1774 }
1669#endif 1775#endif
… …
1681 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1682 fmap.push_back (0); 1788 fmap.push_back (0);
1683 1789
1684 if (!fmap[hi]) 1790 if (!fmap[hi])
1685 { 1791 {
1686 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1687 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1688 } 1794 }
1689 1795
1690 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1691 } 1797 }
1692 1798
1693 return i; 1799 return i;
1694} 1800}
1695 1801
1696
1697

Diff Legend

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