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.199 by root, Thu Jun 17 00:08:35 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
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#ifdef HAVE_BG_PIXMAP 243
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
245 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 253 }
254 } 254 else
255#endif 255# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267#include "table/linedraw.h"
268
269struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
270 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
271 270
272 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
273 : rxvt_font () 272 : rxvt_font ()
274 { 273 {
… …
308 return false; 307 return false;
309 308
310 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
311 return true; 310 return true;
312 311
312#ifdef BUILTIN_GLYPHS
313 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 315 return true;
316#endif
316 317
317 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
318 return true; 319 return true;
319 320
320 switch (unicode) 321 switch (unicode)
… …
356 ; 357 ;
357 358
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
362#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
362 { 364 {
365# include "table/linedraw.h"
363 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
364 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
365 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
366 369
367 int W = fwidth; 370 int W = fwidth;
… …
405 408
406 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
407 if (a) 410 if (a)
408 { 411 {
409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
410 413
411 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
413 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
414 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
415 418
… …
434 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
435 break; 438 break;
436 } 439 }
437 } 440 }
438 } 441 }
442#else
443 if (0)
444 ;
445#endif
439#if ENABLE_COMBINING 446#if ENABLE_COMBINING
440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
441 { 448 {
442 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
443 450
444 text_t chrs[2]; 451 text_t chrs[2];
445 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
446 453
447 *chrs = cc->c1; 454 *chrs = cc->c1;
448 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
449 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
450 457
451 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
452 { 459 {
453 bool careful; 460 bool careful;
454 461
455 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
456 *chrs = cc->c2; 463 *chrs = cc->c2;
457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
458 ? f1 465 ? f1
459 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
460 467
461 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
462 } 469 }
463 } 470 }
464#endif 471#endif
… …
468 case '\t': 475 case '\t':
469 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
470 case NOCHAR: 477 case NOCHAR:
471 break; 478 break;
472 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
473 default: 489 default:
474 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
475 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
476 } 492 }
477 493
478 x += fwidth; 494 x += fwidth;
479 } 495 }
480} 496}
481 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1; descent = 0;
524
525 set_name (strdup ("built-in rendition overflow font"));
526
527 return true;
528 }
529
530 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
531 {
532 return false;
533 }
534
535 void draw (rxvt_drawable &d, int x, int y,
536 const text_t *text, int len,
537 int fg, int bg)
538 {
539 while (len)
540 {
541 int fid = fs->find_font_idx (*text);
542 int w = 1;
543 while (w < len && text[w] == NOCHAR)
544 w++;
545 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
546 text += w;
547 len -= w;
548 x += term->fwidth * w;
549 }
550 }
551};
552
482///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
483 554
484struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
485 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
486 558
487 void clear (); 559 void clear ();
488 560
489 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
… …
494 566
495 void draw (rxvt_drawable &d, int x, int y, 567 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 568 const text_t *text, int len,
497 int fg, int bg); 569 int fg, int bg);
498 570
499 bool slow; // wether this is a proportional font or has other funny characteristics 571 bool slow; // whether this is a proportional font or has other funny characteristics
500 XFontStruct *f; 572 XFontStruct *f;
501 bool enc2b, encm; 573 bool enc2b, encm;
502 574
503 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 575 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); 576 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
604 return false; 676 return false;
605} 677}
606 678
607// fix the size of scalable fonts 679// fix the size of scalable fonts
608static bool 680static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 681replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 682{
611 int slashes = 0; 683 int slashes = 0;
612 const char *field, *end; 684 const char *field, *end;
613 685
614 for (const char *c = name; *c; c++) 686 for (const char *c = name; *c; c++)
… …
624 break; 696 break;
625 } 697 }
626 698
627 if (slashes >= 13 && (!old || *field == old)) 699 if (slashes >= 13 && (!old || *field == old))
628 { 700 {
629 // TODO: check for overflow in font-name 701 size_t len = field - name;
630 strncpy (buf, name, field - name); 702 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 703 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 704 strcpy (*ptr + len, replace);
633 strcat (buf, end); 705 strcat (*ptr, end);
634 706
635 return true; 707 return true;
636 } 708 }
637 else 709 else
638 { 710 {
639 strcpy (buf, name); 711 *ptr = strdup (name);
640 712
641 return false; 713 return false;
642 } 714 }
643} 715}
644 716
… …
652 char field_str[64]; // enough for 128 bits 724 char field_str[64]; // enough for 128 bits
653 725
654 // first morph the font if required 726 // first morph the font if required
655 if (force_prop) 727 if (force_prop)
656 { 728 {
657 char fname[1024]; 729 char *fname;
658 730
659 if (name[0] != '-') 731 if (name[0] != '-')
660 { 732 {
661 f = XLoadQueryFont (disp, name); 733 f = XLoadQueryFont (disp, name);
662 734
663 if (!f) 735 if (!f)
664 return false; 736 return false;
665 737
666 char *new_name = get_property (f, XA_FONT, name); 738 char *new_name = get_property (f, XA_FONT, 0);
667 739
668 if (new_name) 740 if (new_name)
669 set_name (new_name); 741 set_name (new_name);
670 else 742 else
671 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 743 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
672 744
673 XFreeFont (disp, f); 745 XFreeFont (disp, f);
674 f = 0; 746 f = 0;
675 } 747 }
676 748
677 if (prop.weight != rxvt_fontprop::unset) 749 if (prop.weight != rxvt_fontprop::unset)
678 { 750 {
679 replace_field (fname, name, 2, 0, 751 replace_field (&fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 752 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 753 ? "medium" : "bold");
682 set_name (strdup (fname)); 754 set_name (fname);
683 } 755 }
684 756
685 if (prop.slant != rxvt_fontprop::unset) 757 if (prop.slant != rxvt_fontprop::unset)
686 { 758 {
687 replace_field (fname, name, 3, 0, 759 replace_field (&fname, name, 3, 0,
688 prop.slant < rxvt_fontprop::italic 760 prop.slant < rxvt_fontprop::italic
689 ? "r" : "i"); // TODO: handle "o"blique, too 761 ? "r" : "i"); // TODO: handle "o"blique, too
690 set_name (strdup (fname)); 762 set_name (fname);
691 } 763 }
692 } 764 }
693 765
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 766 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height); 767 ? 0 : prop.height);
… …
720 font_weight *fonts = new font_weight[count]; 792 font_weight *fonts = new font_weight[count];
721 793
722 for (int i = 0; i < count; i++) 794 for (int i = 0; i < count; i++)
723 { 795 {
724 rxvt_fontprop p; 796 rxvt_fontprop p;
725 char fname[1024]; 797 char *fname;
726 798
727 int diff = 0; 799 int diff = 0;
728 800
729 if (replace_field (fname, list[i], 6, '0', field_str)) 801 if (replace_field (&fname, list[i], 6, '0', field_str))
730 diff += 10; // slightly penalize scalable fonts 802 diff += 10; // slightly penalize scalable fonts
803 else
804 {
805 free (fname);
731 else if (replace_field (fname, list[i], 11, '0', "0")) 806 if (replace_field (&fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 807 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
808 }
733 809
734 if (!set_properties (p, fname)) 810 if (!set_properties (p, fname)
811 // also weed out too large fonts
812 || (prop.height != rxvt_fontprop::unset
813 && p.height > prop.height))
814 {
815 free (fname);
735 continue; 816 continue;
736 817 }
737 if (prop.height != rxvt_fontprop::unset
738 && p.height > prop.height) // weed out too large fonts
739 continue;
740 818
741 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 819 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); 820 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); 821 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); 822 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
745 823
746 fonts[i].name = strdup (fname); 824 fonts[i].name = fname;
747 fonts[i].diff = diff; 825 fonts[i].diff = diff;
748 } 826 }
749 827
750 XFreeFontNames (list); 828 XFreeFontNames (list);
751 829
752 // this loop only iterates when the guessed font-size is too small 830 // this loop only iterates when the guessed font-size is too small
753 for (;;) 831 for (;;)
754 { 832 {
755 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
756 834
757 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
758 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
759 best = w; 837 best = w;
760 838
761 if (!best->name 839 if (!best->name
762 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
763 break; 841 break;
… …
783 return false; 861 return false;
784 862
785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 863 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 864 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
787 865
866 cs = CS_UNKNOWN;
867
788 if (registry && encoding) 868 if (registry && encoding)
789 { 869 {
790 char charset[64]; 870 char charset[64];
791 snprintf (charset, 64, "%s-%s", registry, encoding); 871 snprintf (charset, 64, "%s-%s", registry, encoding);
792 872
793 cs = codeset_from_name (charset); 873 cs = codeset_from_name (charset);
794 } 874
795 else 875 if (cs == CS_UNKNOWN)
876 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
796 { 877 }
878
879 free (registry);
880 free (encoding);
881
882 if (cs == CS_UNKNOWN)
883 {
797 const char *charset = get_property (f, XA_FONT, 0); 884 char *value = get_property (f, XA_FONT, 0);
885 const char *charset = value;
798 886
799 if (!charset) 887 if (!charset)
800 charset = name; 888 charset = name;
801 889
802 int count = 13; 890 int count = 13;
803 while (*charset) 891 while (*charset)
804 if (*charset++ == '-' && !--count) 892 if (*charset++ == '-' && !--count)
805 break; 893 break;
806 894
807 cs = codeset_from_name (charset); 895 cs = codeset_from_name (charset);
896 if (cs == CS_UNKNOWN)
897 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
898
899 free (value);
900 }
901
902 if (cs == CS_UNKNOWN)
808 } 903 {
809 904 clear ();
810 free (registry); 905 return false;
811 free (encoding); 906 }
812 907
813 if (cs == CS_UNICODE) 908 if (cs == CS_UNICODE)
814 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 909 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
815 910
816 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 911 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
828 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 923 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
829 924
830 if (encm) 925 if (encm)
831 N += (f->max_byte1 - f->min_byte1) 926 N += (f->max_byte1 - f->min_byte1)
832 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 927 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
833 928
834 while (N) 929 while (N)
835 { 930 {
836 if (f->per_char[N].width > width) 931 if (f->per_char[N].width > width)
837 width = f->per_char[N].width; 932 width = f->per_char[N].width;
838 933
… …
841 } 936 }
842#endif 937#endif
843 938
844 width = 1; 939 width = 1;
845 940
846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 941 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
847 { 942 {
848 if (FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 944 continue;
850 945
851 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
852 bool careful; 947 bool careful;
853 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
854 continue; 949 continue;
855 950
856 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
857 953
858 XCharStruct g; 954 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 957
… …
863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 959 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 960
865 if (width < g.width) width = g.width; 961 if (width < g.width) width = g.width;
866 } 962 }
867 963
868 if (cs == CS_UNKNOWN) 964#if 0 // do it per-character
965 if (prop && width > prop->width)
869 { 966 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871
872 clear (); 967 clear ();
873 return false; 968 return false;
874 } 969 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 970#endif
883 971
884 return true; 972 return true;
885} 973}
886 974
… …
895} 983}
896 984
897bool 985bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 986rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 987{
988 careful = false;
989
900 uint32_t ch = FROM_UNICODE (cs, unicode); 990 uint32_t ch = FROM_UNICODE (cs, unicode);
901 991
902 if (ch == NOCHAR) 992 if (ch == NOCHAR)
903 return false; 993 return false;
904 994
905 /* check wether the character exists in _this_ font. horrible. */ 995 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 996 XCharStruct *xcs;
907 997
908 if (encm) 998 if (encm)
909 { 999 {
910 unsigned char byte1 = ch >> 8; 1000 unsigned char byte1 = ch >> 8;
… …
940 return false; 1030 return false;
941 1031
942 if (!prop || prop->width == rxvt_fontprop::unset) 1032 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1033 return true;
944 1034
945 // check wether character overlaps previous/next character 1035 // check whether character overlaps previous/next character
946 int w = xcs->rbearing - xcs->lbearing; 1036 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = max (WCWIDTH (unicode), 1); 1037 int wcw = max (WCWIDTH (unicode), 1);
948 1038
949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1039 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 1040
… …
967 dTermDisplay; 1057 dTermDisplay;
968 dTermGC; 1058 dTermGC;
969 1059
970 bool slow = this->slow 1060 bool slow = this->slow
971 || width != term->fwidth 1061 || width != term->fwidth
972 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
973 1064
974 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
975 1066
976 XGCValues v; 1067 XGCValues v;
977 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
990 else 1081 else
991 { 1082 {
992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1083 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
993 1084
994 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1085 XChangeGC (disp, gc, GCForeground | GCFont, &v);
995 1086
996 if (slow) 1087 if (slow)
997 { 1088 {
998 do 1089 do
999 { 1090 {
1000 if (xc->byte1 || xc->byte2) 1091 if (xc->byte1 || xc->byte2)
… …
1022 else 1113 else
1023 { 1114 {
1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1115 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1025 1116
1026 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1117 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1027 1118
1028 if (slow) 1119 if (slow)
1029 { 1120 {
1030 do 1121 do
1031 { 1122 {
1032 if (*xc) 1123 if (*xc)
… …
1045 1136
1046///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1047 1138
1048#if XFT 1139#if XFT
1049 1140
1050struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1051 rxvt_font_xft () { f = 0; } 1143 rxvt_font_xft ()
1144 {
1145 f = 0;
1146 }
1052 1147
1053 void clear (); 1148 void clear ();
1054 1149
1055 rxvt_fontprop properties (); 1150 rxvt_fontprop properties ();
1056 1151
… …
1124 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1219 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1125 1220
1126#if 0 // clipping unfortunately destroys our precious double-width-characters 1221#if 0 // clipping unfortunately destroys our precious double-width-characters
1127 // clip width, we can't do better, or can we? 1222 // clip width, we can't do better, or can we?
1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1223 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1129 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1224 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1130#endif 1225#endif
1131 1226
1132 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1227 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1133 FcPatternAddBool (p, FC_MINSPACE, 1); 1228 FcPatternAddBool (p, FC_MINSPACE, 1);
1134 1229
… …
1146 int ftheight = 0; 1241 int ftheight = 0;
1147 bool success = true; 1242 bool success = true;
1148 1243
1149 for (;;) 1244 for (;;)
1150 { 1245 {
1246 p = FcPatternDuplicate (match);
1151 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1247 f = XftFontOpenPattern (disp, p);
1152 1248
1153 if (!f) 1249 if (!f)
1154 { 1250 {
1251 FcPatternDestroy (p);
1155 success = false; 1252 success = false;
1156 break; 1253 break;
1157 } 1254 }
1158 1255
1159 FT_Face face = XftLockFace (f); 1256 FT_Face face = XftLockFace (f);
… …
1167 1264
1168 XftUnlockFace (f); 1265 XftUnlockFace (f);
1169 1266
1170 int glheight = height; 1267 int glheight = height;
1171 1268
1172 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1269 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1173 { 1270 {
1174 FcChar16 ch = *t; 1271 FcChar16 ch = *t;
1175 1272
1176 if (cs != CS_UNICODE 1273 if (cs != CS_UNICODE
1177 && ch > 0x100 1274 && ch > 0x100
… …
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1376 const text_t *text, int len,
1280 int fg, int bg) 1377 int fg, int bg)
1281{ 1378{
1282 XGlyphInfo extents; 1379 XGlyphInfo extents;
1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1284 XftGlyphSpec *ep = enc; 1381 XftGlyphSpec *ep = enc;
1285 1382
1286 dTermDisplay; 1383 dTermDisplay;
1287 dTermGC; 1384 dTermGC;
1288 1385
1289 int w = term->fwidth * len; 1386 int w = term->fwidth * len;
1290 int h = term->fheight; 1387 int h = term->fheight;
1291 1388
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1389 bool buffered = bg >= Color_transparent
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1390 && term->option (Opt_buffered);
1294 * good idea from the perspective of packaging for wide variety of user configs. 1391
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces 1392 // cut trailing spaces
1302 while (len && text [len - 1] == ' ') 1393 while (len && text [len - 1] == ' ')
1303 len--; 1394 len--;
1304 1395
1305 int x_ = buffered ? 0 : x; 1396 int x_ = buffered ? 0 : x;
… …
1310 int cwidth = term->fwidth; 1401 int cwidth = term->fwidth;
1311 FcChar32 fc = *text++; len--; 1402 FcChar32 fc = *text++; len--;
1312 1403
1313 while (len && *text == NOCHAR) 1404 while (len && *text == NOCHAR)
1314 text++, len--, cwidth += term->fwidth; 1405 text++, len--, cwidth += term->fwidth;
1315 1406
1316 if (fc != ' ') // skip spaces 1407 if (fc != ' ') // skip spaces
1317 { 1408 {
1318 FT_UInt glyph = XftCharIndex (disp, f, fc); 1409 FT_UInt glyph = XftCharIndex (disp, f, fc);
1319 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1410 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1320 1411
… …
1331 x_ += cwidth; 1422 x_ += cwidth;
1332 } 1423 }
1333 1424
1334 if (buffered) 1425 if (buffered)
1335 { 1426 {
1336 bool back_rendered = false;
1337 if (ep != enc) 1427 if (ep != enc)
1338 { 1428 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1429 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340 1430
1341#ifdef HAVE_BG_PIXMAP 1431#ifdef HAVE_IMG
1432 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1433
1342 if (term->bgPixmap.pixmap) 1434 if (term->bg_img
1435 && (bg == Color_transparent || bg == Color_bg
1436 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1343 { 1437 {
1344 Picture dst = 0; 1438 int src_x = x, src_y = y;
1345 1439
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1440 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 { 1441 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x; 1442 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1443 src_y += term->window_vt_y;
1357 } 1444 }
1358 1445
1359 if (term->bgPixmap.pmap_width >= src_x+w 1446 if (term->bg_img->w >= src_x + w
1360 && term->bgPixmap.pmap_height >= src_y+h) 1447 && term->bg_img->h >= src_y + h)
1361 { 1448 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1449 XCopyArea (disp, term->bg_img->pm, d2, gc,
1363 src_x, src_y, w, h, 0, 0); 1450 src_x, src_y, w, h, 0, 0);
1364 } 1451 }
1365 else 1452 else
1366 { 1453 {
1367 XGCValues gcv; 1454 XGCValues gcv;
1368 1455
1369 gcv.fill_style = FillTiled; 1456 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap; 1457 gcv.tile = term->bg_img->pm;
1371 gcv.ts_x_origin = -src_x; 1458 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y; 1459 gcv.ts_y_origin = -src_y;
1373 1460
1374 XChangeGC (disp, gc, 1461 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1462 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv); 1463 &gcv);
1377 1464
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1465 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379 1466
1380 gcv.fill_style = FillSolid; 1467 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv); 1468 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 } 1469 }
1383 1470
1384 if (bg >= 0) 1471 if (dst)
1385 { 1472 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1473 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1474
1475 // 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); 1476 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 } 1477 }
1392 } 1478 }
1479 else
1393#endif 1480#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1481 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1397 1482
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1483 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1484 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 } 1485 }
1401 else 1486 else
… …
1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1514 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1430 = rxvt_fontprop::unset; 1515 = rxvt_fontprop::unset;
1431 force_prop = false; 1516 force_prop = false;
1432 1517
1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1518 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1434 FONT_UNREF (*i); 1519 (*i)->unref ();
1435 1520
1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1521 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1437 delete *p; 1522 delete *p;
1438 1523
1439 free (fontdesc); fontdesc = 0; 1524 free (fontdesc); fontdesc = 0;
… …
1441 fonts.clear (); 1526 fonts.clear ();
1442 1527
1443 fallback = fallback_fonts; 1528 fallback = fallback_fonts;
1444} 1529}
1445 1530
1531void
1532rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1533{
1534 font->set_term (term);
1535
1536 font->cs = cs;
1537 font->loaded = false;
1538}
1539
1446rxvt_font * 1540rxvt_font *
1447rxvt_fontset::new_font (const char *name, codeset cs) 1541rxvt_fontset::new_font (const char *name, codeset cs)
1448{ 1542{
1449 rxvt_font *f; 1543 rxvt_font *f;
1450 1544
1451 if (!name || !*name) 1545 if (!name || !*name)
1452 { 1546 {
1453 name = ""; 1547 name = "";
1454 f = new rxvt_font_default (this); 1548 f = new rxvt_font_default (this);
1455 } 1549 }
… …
1466 f = new rxvt_font_x11; 1560 f = new rxvt_font_x11;
1467 } 1561 }
1468 else 1562 else
1469 f = new rxvt_font_x11; 1563 f = new rxvt_font_x11;
1470 1564
1471 f->set_term (term);
1472 f->set_name (strdup (name)); 1565 f->set_name (strdup (name));
1473 1566 prepare_font (f, cs);
1474 f->cs = cs;
1475 f->loaded = false;
1476 1567
1477 return f; 1568 return f;
1478} 1569}
1479 1570
1480///////////////////////////////////////////////////////////////////////////// 1571/////////////////////////////////////////////////////////////////////////////
1572
1573void
1574rxvt_fontset::push_font (rxvt_font *font)
1575{
1576 // the fontCount index is reserved for the overflow font, it is only
1577 // necessary when we get fontCount or more fonts, as they cannot be
1578 // represented in the rendition.
1579 if (fonts.size () == fontCount)
1580 {
1581 rxvt_font *f = new rxvt_font_overflow (this);
1582
1583 prepare_font (f, CS_UNICODE);
1584 fonts.push_back (f);
1585 }
1586
1587 fonts.push_back (font);
1588}
1481 1589
1482void 1590void
1483rxvt_fontset::add_fonts (const char *desc) 1591rxvt_fontset::add_fonts (const char *desc)
1484{ 1592{
1485 if (desc) 1593 if (desc)
… …
1514 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1622 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1515 else 1623 else
1516 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1624 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1517 1625
1518 desc++; 1626 desc++;
1519 while (*desc <= ' ') desc++; 1627 while (*desc <= ' ' && *desc) desc++;
1520 } 1628 }
1521 1629
1522 end = strchr (desc, ','); 1630 end = strchr (desc, ',');
1523 if (!end) 1631 if (!end)
1524 end = desc + strlen (desc); 1632 end = desc + strlen (desc);
1525 1633
1526 if (end - desc < 511) 1634 if (end - desc < 511)
1527 { 1635 {
1528 strncpy (buf, desc, end - desc); 1636 memcpy (buf, desc, end - desc);
1529 buf[end - desc] = 0; 1637 buf[end - desc] = 0;
1530 1638
1531 fonts.push_back (new_font (buf, cs)); 1639 push_font (new_font (buf, cs));
1532 } 1640 }
1533 else 1641 else
1534 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1642 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1535 1643
1536 desc = end + 1; 1644 desc = end + 1;
1537 } 1645 }
1538 while (*end); 1646 while (*end);
1539 } 1647 }
… …
1564{ 1672{
1565 clear (); 1673 clear ();
1566 1674
1567 fontdesc = strdup (desc); 1675 fontdesc = strdup (desc);
1568 1676
1569 fonts.push_back (new_font (0, CS_UNICODE)); 1677 push_font (new_font (0, CS_UNICODE));
1570 realize_font (0); 1678 realize_font (0);
1571 1679
1572 add_fonts (desc); 1680 add_fonts (desc);
1573 1681
1574 return true; 1682 return true;
… …
1583 1691
1584 return -1; 1692 return -1;
1585} 1693}
1586 1694
1587int 1695int
1588rxvt_fontset::find_font (unicode_t unicode) 1696rxvt_fontset::find_font_idx (unicode_t unicode)
1589{ 1697{
1590 if (unicode >= 1<<20) 1698 if (unicode >= 1<<20)
1591 return 0; 1699 return 0;
1592 1700
1593 unicode_t hi = unicode >> 8; 1701 unicode_t hi = unicode >> 8;
… …
1619 goto next_font; 1727 goto next_font;
1620 1728
1621 bool careful; 1729 bool careful;
1622 if (f->has_char (unicode, &prop, careful)) 1730 if (f->has_char (unicode, &prop, careful))
1623 { 1731 {
1624 if (careful) 1732 i = (i << 1) | careful;
1625 i |= 128;
1626 1733
1627 goto found; 1734 goto found;
1628 } 1735 }
1629 1736
1630 next_font: 1737 next_font:
1631 if (i == fonts.size () - 1) 1738 if (i == fonts.size () - 1)
1632 { 1739 {
1633 if (fallback->name) 1740 if (fallback->name)
1634 { 1741 {
1635 // search through the fallback list 1742 // search through the fallback list
1636 fonts.push_back (new_font (fallback->name, fallback->cs)); 1743 push_font (new_font (fallback->name, fallback->cs));
1637 fallback++; 1744 fallback++;
1638 } 1745 }
1639 else 1746 else
1640 { 1747 {
1641 // try to find a new font. 1748 // try to find a new font.
… …
1643 // way to configure this and xft is easier to hack in, 1750 // way to configure this and xft is easier to hack in,
1644 // while x11 has more framework in place already. 1751 // while x11 has more framework in place already.
1645 // TODO: this is a real resource hog, xft takes ages(?) 1752 // TODO: this is a real resource hog, xft takes ages(?)
1646#if XFT && USE_SLOW_LOOKUP 1753#if XFT && USE_SLOW_LOOKUP
1647 // grab the first xft font that seems suitable 1754 // grab the first xft font that seems suitable
1755 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1648 FcPattern *p = FcPatternCreate (); 1756 FcPattern *p = FcPatternCreate ();
1649 1757
1650 FcCharSet *s = FcCharSetCreate (); 1758 FcCharSet *s = FcCharSetCreate ();
1651 FcCharSetAddChar (s, unicode); 1759 FcCharSetAddChar (s, unicode);
1652 FcPatternAddCharSet (p, FC_CHARSET, s); 1760 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1672 FcPatternDestroy (match); 1780 FcPatternDestroy (match);
1673 1781
1674 if (find_font (font) < 0) 1782 if (find_font (font) < 0)
1675 { 1783 {
1676 char fontname[4096]; 1784 char fontname[4096];
1677 sprintf (fontname, "xft:%-.4090s", font); 1785 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1678 1786
1679 fonts.push_back (new_font (fontname, CS_UNICODE)); 1787 push_font (new_font (fontname, CS_UNICODE));
1680 } 1788 }
1681 1789
1682 free (font); 1790 free (font);
1683 } 1791 }
1684#endif 1792#endif
… …
1696 while (hi >= fmap.size ()) 1804 while (hi >= fmap.size ())
1697 fmap.push_back (0); 1805 fmap.push_back (0);
1698 1806
1699 if (!fmap[hi]) 1807 if (!fmap[hi])
1700 { 1808 {
1701 fmap[hi] = (pagemap *)new pagemap; 1809 fmap[hi] = new pagemap;
1702 memset (fmap[hi], 0xff, sizeof (pagemap)); 1810 memset (fmap[hi], 0xff, sizeof (pagemap));
1703 } 1811 }
1704 1812
1705 (*fmap[hi])[unicode & 0xff] = i; 1813 (*fmap[hi])[unicode & 0xff] = i;
1706 } 1814 }
1707 1815
1708 return i; 1816 return i;
1709} 1817}
1710 1818
1711
1712

Diff Legend

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