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.93 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.184 by root, Tue Jan 17 20:44:16 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 51
49#if ENCODING_EU 52#if ENCODING_EU
50 // cyrillic 53 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 56
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 70
68# if XFT 71# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 72 { CS_KOI8_U, "xft::lang=ru" },
70 73
71 { CS_ISO8859_5, "xft::lang=ru" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 76 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 77 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
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->xdisp 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165
166/////////////////////////////////////////////////////////////////////////////
167
168#if XFT
169rxvt_drawable::~rxvt_drawable ()
170{
171 if (xftdrawable)
172 XftDrawDestroy (xftdrawable);
173}
174
175rxvt_drawable::operator XftDraw *()
176{
177 if (!xftdrawable)
178 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
179
180 return xftdrawable;
181}
182#endif
183 165
184///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
185 167
186static const char * 168static const char *
187enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{ 218{
237} 219}
238 220
239void 221void
240rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
241{ 223{
242 if (this->name == name) 224 if (name == name_)
243 return; 225 return;
244 226
245 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
246 this->name = name; 228 name = name_;
247} 229}
248 230
249void 231void
250rxvt_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
251{ 233{
252 dTermDisplay; 234 dTermDisplay;
253 dTermGC; 235 dTermGC;
254 236
255 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
256 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
257 else if (color >= 0) 239 else if (color >= 0)
258 { 240 {
259#if XFT 241#if XFT
242 Picture dst;
243
244# ifdef HAVE_BG_PIXMAP
245 if (term->bg_pixmap
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
260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
261#else 258#else
262 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
263 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
264#endif 261#endif
265 } 262 }
266} 263}
267 264
268///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
269
270#include "table/linedraw.h"
271 266
272struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
273 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
274 269
275 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
288 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
289 284
290 return p; 285 return p;
291 } 286 }
292 287
293 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
294 { 289 {
295 width = 1; height = 1; 290 width = 1; height = 1;
296 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
297 292
298 set_name (strdup ("built-in support font")); 293 set_name (strdup ("built-in support font"));
… …
311 return false; 306 return false;
312 307
313 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
314 return true; 309 return true;
315 310
311#ifdef BUILTIN_GLYPHS
316 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
318 return true; 314 return true;
315#endif
319 316
320 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
321 return true; 318 return true;
322 319
323 switch (unicode) 320 switch (unicode)
… …
359 ; 356 ;
360 357
361 int width = text - tp; 358 int width = text - tp;
362 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
363 360
361#ifdef BUILTIN_GLYPHS
364 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
365 { 363 {
364# include "table/linedraw.h"
366 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
367 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
368 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
369 368
370 int W = fwidth; 369 int W = fwidth;
… …
408 407
409 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
410 if (a) 409 if (a)
411 { 410 {
412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413 412
414 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
417 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
418 417
… …
437 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
438 break; 437 break;
439 } 438 }
440 } 439 }
441 } 440 }
441#else
442 if (0)
443 ;
444#endif
442#if ENABLE_COMBINING 445#if ENABLE_COMBINING
443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444 { 447 {
445 min_it (width, 2); // we only support wcwidth up to 2 448 min_it (width, 2); // we only support wcwidth up to 2
446 449
447 text_t chrs[2]; 450 text_t chrs[2];
448 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
449 452
450 *chrs = cc->c1; 453 *chrs = cc->c1;
451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
452 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
453 456
454 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
455 { 458 {
456 bool careful; 459 bool careful;
457 460
458 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
459 *chrs = cc->c2; 462 *chrs = cc->c2;
460 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461 ? f1 464 ? f1
462 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
463 466
464 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
465 } 468 }
466 } 469 }
467#endif 470#endif
468 else 471 else
469 switch (t) 472 switch (t)
… …
480 483
481 x += fwidth; 484 x += fwidth;
482 } 485 }
483} 486}
484 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
485///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
486 543
487struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
488 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
489 546
490 void clear (); 547 void clear ();
491 548
492 rxvt_fontprop properties (); 549 rxvt_fontprop properties ();
493 550
494 bool load (const rxvt_fontprop &prop); 551 bool load (const rxvt_fontprop &prop, bool force_prop);
495 552
496 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497 554
498 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
499 const text_t *text, int len, 556 const text_t *text, int len,
500 int fg, int bg); 557 int fg, int bg);
501 558
502 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
503 XFontStruct *f; 560 XFontStruct *f;
504 codeset cs;
505 bool enc2b, encm; 561 bool enc2b, encm;
506 562
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
508 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);
509 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 565 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const 570rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
515{ 571{
516 unsigned long value; 572 unsigned long value;
517 573
518 if (XGetFontProperty (f, property, &value)) 574 if (XGetFontProperty (f, property, &value))
519 return XGetAtomName (term->xdisp, value); 575 return XGetAtomName (term->dpy, value);
520 else 576 else
521 return rxvt_strdup (repl); 577 return repl ? strdup (repl) : 0;
522} 578}
523 579
524rxvt_fontprop 580rxvt_fontprop
525rxvt_font_x11::properties () 581rxvt_font_x11::properties ()
526{ 582{
… …
547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 603rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
548{ 604{
549 unsigned long height; 605 unsigned long height;
550 606
551#if 0 607#if 0
552 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 608 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
553 return false; 609 return false;
554#else 610#else
555 height = f->ascent + f->descent; 611 height = f->ascent + f->descent;
556#endif 612#endif
557 613
… …
608 return false; 664 return false;
609} 665}
610 666
611// fix the size of scalable fonts 667// fix the size of scalable fonts
612static bool 668static bool
613replace_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)
614{ 670{
615 int slashes = 0; 671 int slashes = 0;
616 const char *field, *end; 672 const char *field, *end;
617 673
618 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
628 break; 684 break;
629 } 685 }
630 686
631 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
632 { 688 {
633 // TODO: check for overflow in font-name 689 size_t len = field - name;
634 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 691 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
637 strcat (buf, end); 693 strcat (*ptr, end);
638 694
639 return true; 695 return true;
640 } 696 }
641 else 697 else
642 { 698 {
643 strcpy (buf, name); 699 *ptr = strdup (name);
644 700
645 return false; 701 return false;
646 } 702 }
647} 703}
648 704
649bool 705bool
650rxvt_font_x11::load (const rxvt_fontprop &prop) 706rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651{ 707{
652 dTermDisplay; 708 dTermDisplay;
653 709
654 clear (); 710 clear ();
655 711
656 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
657 713
658 // first morph the font if required 714 // first morph the font if required
659 if (prop.weight != rxvt_fontprop::unset 715 if (force_prop)
660 || prop.slant != rxvt_fontprop::unset)
661 { 716 {
662 char fname[1024]; 717 char *fname;
663 718
664 if (name[0] != '-') 719 if (name[0] != '-')
665 { 720 {
666 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
667 722
668 if (!f) 723 if (!f)
669 return false; 724 return false;
670 725
671 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
672 727
673 if (new_name) 728 if (new_name)
674 set_name (new_name); 729 set_name (new_name);
675 else 730 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 732
678 XFreeFont (disp, f); 733 XFreeFont (disp, f);
679 f = 0; 734 f = 0;
680 } 735 }
681 736
682 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
683 { 738 {
684 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
685 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
686 ? "medium" : "bold"); 741 ? "medium" : "bold");
687 set_name (strdup (fname)); 742 set_name (fname);
688 } 743 }
689 744
690 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
691 { 746 {
692 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
693 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
694 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
695 set_name (strdup (fname)); 750 set_name (fname);
696 } 751 }
697 } 752 }
698 753
699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
725 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
726 781
727 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
728 { 783 {
729 rxvt_fontprop p; 784 rxvt_fontprop p;
730 char fname[1024]; 785 char *fname;
731 786
732 int diff = 0; 787 int diff = 0;
733 788
734 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
735 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
736 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
738 797
739 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);
740 continue; 804 continue;
741 805 }
742 if (prop.height != rxvt_fontprop::unset
743 && p.height > prop.height) // weed out too large fonts
744 continue;
745 806
746 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;
747 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);
748 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);
749 //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);
750 811
751 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
752 fonts[i].diff = diff; 813 fonts[i].diff = diff;
753 } 814 }
754 815
755 XFreeFontNames (list); 816 XFreeFontNames (list);
756 817
757 // 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
758 for (;;) 819 for (;;)
759 { 820 {
760 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
761 822
762 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
763 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
764 best = w; 825 best = w;
765 826
766 if (!best->name 827 if (!best->name
767 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
768 break; 829 break;
… …
788 return false; 849 return false;
789 850
790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792 853
854 cs = CS_UNKNOWN;
855
793 if (registry && encoding) 856 if (registry && encoding)
794 { 857 {
795 char charset[64]; 858 char charset[64];
796 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
797 860
798 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
799 } 862
800 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
801 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
802 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
803 874
804 if (!charset) 875 if (!charset)
805 charset = name; 876 charset = name;
806 877
807 int count = 13; 878 int count = 13;
808 while (*charset) 879 while (*charset)
809 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
810 break; 881 break;
811 882
812 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)
813 } 891 {
814 892 clear ();
815 free (registry); 893 return false;
816 free (encoding); 894 }
817 895
818 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
819 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
820 898
821 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
833 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;
834 912
835 if (encm) 913 if (encm)
836 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
837 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838 916
839 while (N) 917 while (N)
840 { 918 {
841 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
842 width = f->per_char[N].width; 920 width = f->per_char[N].width;
843 921
… …
846 } 924 }
847#endif 925#endif
848 926
849 width = 1; 927 width = 1;
850 928
851 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++)
852 { 930 {
853 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 932 continue;
855 933
856 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 946 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869 947
870 if (width < g.width) width = g.width; 948 if (width < g.width) width = g.width;
871 } 949 }
872 950
873 if (cs == CS_UNKNOWN) 951#if 0 // do it per-character
952 if (prop && width > prop->width)
874 { 953 {
875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877 clear (); 954 clear ();
878 return false; 955 return false;
879 } 956 }
880
881#if 0 // do it per-character
882 if (prop && width > prop->width)
883 {
884 clear ();
885 return false;
886 }
887#endif 957#endif
888 958
889 return true; 959 return true;
890} 960}
891 961
892void 962void
893rxvt_font_x11::clear () 963rxvt_font_x11::clear ()
894{ 964{
895 if (f) 965 if (f)
896 { 966 {
897 XFreeFont (term->xdisp, f); 967 XFreeFont (term->dpy, f);
898 f = 0; 968 f = 0;
899 } 969 }
900} 970}
901 971
902bool 972bool
903rxvt_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
904{ 974{
975 careful = false;
976
905 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
906 978
907 if (ch == NOCHAR) 979 if (ch == NOCHAR)
908 return false; 980 return false;
909 981
910 /* check wether the character exists in _this_ font. horrible. */ 982 /* check whether the character exists in _this_ font. horrible. */
911 XCharStruct *xcs; 983 XCharStruct *xcs;
912 984
913 if (encm) 985 if (encm)
914 { 986 {
915 unsigned char byte1 = ch >> 8; 987 unsigned char byte1 = ch >> 8;
… …
945 return false; 1017 return false;
946 1018
947 if (!prop || prop->width == rxvt_fontprop::unset) 1019 if (!prop || prop->width == rxvt_fontprop::unset)
948 return true; 1020 return true;
949 1021
950 // check wether character overlaps previous/next character 1022 // check whether character overlaps previous/next character
951 int w = xcs->rbearing - xcs->lbearing; 1023 int w = xcs->rbearing - xcs->lbearing;
952 int wcw = max (WCWIDTH (unicode), 1); 1024 int wcw = max (WCWIDTH (unicode), 1);
953 1025
954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1026 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 1027
… …
995 else 1067 else
996 { 1068 {
997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1069 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998 1070
999 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1071 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1000 1072
1001 if (slow) 1073 if (slow)
1002 { 1074 {
1003 do 1075 do
1004 { 1076 {
1005 if (xc->byte1 || xc->byte2) 1077 if (xc->byte1 || xc->byte2)
… …
1027 else 1099 else
1028 { 1100 {
1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1101 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030 1102
1031 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1103 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1032 1104
1033 if (slow) 1105 if (slow)
1034 { 1106 {
1035 do 1107 do
1036 { 1108 {
1037 if (*xc) 1109 if (*xc)
… …
1057 1129
1058 void clear (); 1130 void clear ();
1059 1131
1060 rxvt_fontprop properties (); 1132 rxvt_fontprop properties ();
1061 1133
1062 bool load (const rxvt_fontprop &prop); 1134 bool load (const rxvt_fontprop &prop, bool force_prop);
1063 1135
1064 void draw (rxvt_drawable &d, int x, int y, 1136 void draw (rxvt_drawable &d, int x, int y,
1065 const text_t *text, int len, 1137 const text_t *text, int len,
1066 int fg, int bg); 1138 int fg, int bg);
1067 1139
1068 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1140 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069 1141
1070protected: 1142protected:
1071 XftFont *f; 1143 XftFont *f;
1072}; 1144};
1073 1145
1074void 1146void
1075rxvt_font_xft::clear () 1147rxvt_font_xft::clear ()
1076{ 1148{
1077 if (f) 1149 if (f)
1078 { 1150 {
1079 XftFontClose (term->xdisp, f); 1151 XftFontClose (term->dpy, f);
1080 f = 0; 1152 f = 0;
1081 } 1153 }
1082} 1154}
1083 1155
1084rxvt_fontprop 1156rxvt_fontprop
… …
1100 1172
1101 return p; 1173 return p;
1102} 1174}
1103 1175
1104bool 1176bool
1105rxvt_font_xft::load (const rxvt_fontprop &prop) 1177rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106{ 1178{
1107 dTermDisplay; 1179 dTermDisplay;
1108 1180
1109 clear (); 1181 clear ();
1110 1182
… …
1119 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1191 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1192 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1193 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122 1194
1123 if (prop.weight != rxvt_fontprop::unset 1195 if (prop.weight != rxvt_fontprop::unset
1124 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1196 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1197 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126 1198
1127 if (prop.slant != rxvt_fontprop::unset 1199 if (prop.slant != rxvt_fontprop::unset
1128 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1200 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1201 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130 1202
1131#if 0 // clipping unfortunately destroys our precious double-width-characters 1203#if 0 // clipping unfortunately destroys our precious double-width-characters
1132 // clip width, we can't do better, or can we? 1204 // clip width, we can't do better, or can we?
1133 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1205 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1206 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135#endif 1207#endif
1136 1208
1137 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1209 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138 FcPatternAddBool (p, FC_MINSPACE, 1); 1210 FcPatternAddBool (p, FC_MINSPACE, 1);
1139 1211
… …
1151 int ftheight = 0; 1223 int ftheight = 0;
1152 bool success = true; 1224 bool success = true;
1153 1225
1154 for (;;) 1226 for (;;)
1155 { 1227 {
1228 p = FcPatternDuplicate (match);
1156 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1157 1230
1158 if (!f) 1231 if (!f)
1159 { 1232 {
1233 FcPatternDestroy (p);
1160 success = false; 1234 success = false;
1161 break; 1235 break;
1162 } 1236 }
1163 1237
1164 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1172 1246
1173 XftUnlockFace (f); 1247 XftUnlockFace (f);
1174 1248
1175 int glheight = height; 1249 int glheight = height;
1176 1250
1177 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++)
1178 { 1252 {
1179 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1180 1254
1181 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1182 && ch > 0x100 1256 && ch > 0x100
… …
1251bool 1325bool
1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1326rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1253{ 1327{
1254 careful = false; 1328 careful = false;
1255 1329
1256 if (!XftCharExists (term->xdisp, f, unicode)) 1330 if (!XftCharExists (term->dpy, f, unicode))
1257 return false; 1331 return false;
1258 1332
1259 if (!prop || prop->width == rxvt_fontprop::unset) 1333 if (!prop || prop->width == rxvt_fontprop::unset)
1260 return true; 1334 return true;
1261 1335
1262 // check character against base font bounding box 1336 // check character against base font bounding box
1263 FcChar32 ch = unicode; 1337 FcChar32 ch = unicode;
1264 XGlyphInfo g; 1338 XGlyphInfo g;
1265 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1266 1340
1267 int w = g.width - g.x; 1341 int w = g.width - g.x;
1268 int wcw = max (WCWIDTH (unicode), 1); 1342 int wcw = max (WCWIDTH (unicode), 1);
1269 1343
1270 careful = g.x > 0 || w > prop->width * wcw; 1344 careful = g.x > 0 || w > prop->width * wcw;
… …
1282void 1356void
1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284 const text_t *text, int len, 1358 const text_t *text, int len,
1285 int fg, int bg) 1359 int fg, int bg)
1286{ 1360{
1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289 XGlyphInfo extents; 1361 XGlyphInfo extents;
1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1291 XftGlyphSpec *ep = enc; 1363 XftGlyphSpec *ep = enc;
1292 1364
1293 dTermDisplay; 1365 dTermDisplay;
1294 dTermGC; 1366 dTermGC;
1367
1368 int w = term->fwidth * len;
1369 int h = term->fheight;
1370
1371 bool buffered = bg >= Color_transparent
1372 && term->option (Opt_buffered);
1295 1373
1296 // cut trailing spaces 1374 // cut trailing spaces
1297 while (len && text [len - 1] == ' ') 1375 while (len && text [len - 1] == ' ')
1298 len--; 1376 len--;
1299 1377
1378 int x_ = buffered ? 0 : x;
1379 int y_ = buffered ? 0 : y;
1380
1300 while (len) 1381 while (len)
1301 { 1382 {
1302 int cwidth = term->fwidth; 1383 int cwidth = term->fwidth;
1303 FcChar32 fc = *text++; len--; 1384 FcChar32 fc = *text++; len--;
1304 1385
1305 while (len && *text == NOCHAR) 1386 while (len && *text == NOCHAR)
1306 text++, len--, cwidth += term->fwidth; 1387 text++, len--, cwidth += term->fwidth;
1307 1388
1308 if (fc != ' ') // skip spaces 1389 if (fc != ' ') // skip spaces
1309 { 1390 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc); 1391 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1392 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312 1393
1313 ep->glyph = glyph; 1394 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1); 1395 ep->x = x_ + (cwidth - extents.xOff >> 1);
1315 ep->y = y + ascent; 1396 ep->y = y_ + ascent;
1316 1397
1317 if (extents.xOff == 0) 1398 if (extents.xOff == 0)
1318 ep->x = x + cwidth; 1399 ep->x = x_ + cwidth;
1319 1400
1320 ep++; 1401 ep++;
1321 } 1402 }
1322 1403
1323 x += cwidth; 1404 x_ += cwidth;
1405 }
1406
1407 if (buffered)
1324 } 1408 {
1325
1326 if (ep != enc) 1409 if (ep != enc)
1410 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412
1413#ifdef HAVE_BG_PIXMAP
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415
1416 if (term->bg_pixmap
1417 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 {
1420 int src_x = x, src_y = y;
1421
1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1423 {
1424 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y;
1426 }
1427
1428 if (term->bg_pmap_width >= src_x + w
1429 && term->bg_pmap_height >= src_y + h)
1430 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc,
1432 src_x, src_y, w, h, 0, 0);
1433 }
1434 else
1435 {
1436 XGCValues gcv;
1437
1438 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap;
1440 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y;
1442
1443 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1445 &gcv);
1446
1447 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1448
1449 gcv.fill_style = FillSolid;
1450 XChangeGC (disp, gc, GCFillStyle, &gcv);
1451 }
1452
1453 if (dst)
1454 {
1455 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1456
1457 // dst can only be set when bg >= 0
1458 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1459 }
1460 }
1461 else
1462#endif
1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1464
1465 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1466 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1467 }
1468 else
1469 clear_rect (d, x, y, w, h, bg);
1470 }
1471 else
1472 {
1473 clear_rect (d, x, y, w, h, bg);
1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1474 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1475 }
1328} 1476}
1477
1329#endif 1478#endif
1330 1479
1331///////////////////////////////////////////////////////////////////////////// 1480/////////////////////////////////////////////////////////////////////////////
1332 1481
1333rxvt_fontset::rxvt_fontset (rxvt_term *term) 1482rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1344void 1493void
1345rxvt_fontset::clear () 1494rxvt_fontset::clear ()
1346{ 1495{
1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1496 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348 = rxvt_fontprop::unset; 1497 = rxvt_fontprop::unset;
1498 force_prop = false;
1349 1499
1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351 FONT_UNREF (*i); 1501 (*i)->unref ();
1352 1502
1353 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1354 delete *p; 1504 delete *p;
1355 1505
1356 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
… …
1358 fonts.clear (); 1508 fonts.clear ();
1359 1509
1360 fallback = fallback_fonts; 1510 fallback = fallback_fonts;
1361} 1511}
1362 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;
1520}
1521
1363rxvt_font * 1522rxvt_font *
1364rxvt_fontset::new_font (const char *name, codeset cs) 1523rxvt_fontset::new_font (const char *name, codeset cs)
1365{ 1524{
1366 rxvt_font *f; 1525 rxvt_font *f;
1367 1526
1368 if (!name || !*name) 1527 if (!name || !*name)
1369 { 1528 {
1370 name = ""; 1529 name = "";
1371 f = new rxvt_font_default (this); 1530 f = new rxvt_font_default (this);
1372 } 1531 }
… …
1383 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1384 } 1543 }
1385 else 1544 else
1386 f = new rxvt_font_x11; 1545 f = new rxvt_font_x11;
1387 1546
1388 f->set_term (term);
1389 f->set_name (strdup (name)); 1547 f->set_name (strdup (name));
1390 1548 prepare_font (f, cs);
1391 f->cs = cs;
1392 f->loaded = false;
1393 1549
1394 return f; 1550 return f;
1395} 1551}
1396 1552
1397///////////////////////////////////////////////////////////////////////////// 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}
1398 1571
1399void 1572void
1400rxvt_fontset::add_fonts (const char *desc) 1573rxvt_fontset::add_fonts (const char *desc)
1401{ 1574{
1402 if (desc) 1575 if (desc)
… …
1440 if (!end) 1613 if (!end)
1441 end = desc + strlen (desc); 1614 end = desc + strlen (desc);
1442 1615
1443 if (end - desc < 511) 1616 if (end - desc < 511)
1444 { 1617 {
1445 strncpy (buf, desc, end - desc); 1618 memcpy (buf, desc, end - desc);
1446 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1447 1620
1448 fonts.push_back (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1449 } 1622 }
1450 else 1623 else
1451 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1452 1625
1453 desc = end + 1; 1626 desc = end + 1;
1454 } 1627 }
1455 while (*end); 1628 while (*end);
1456 } 1629 }
… …
1465 if (fonts[i]->loaded) 1638 if (fonts[i]->loaded)
1466 return true; 1639 return true;
1467 1640
1468 fonts[i]->loaded = true; 1641 fonts[i]->loaded = true;
1469 1642
1470 if (!fonts[i]->load (prop)) 1643 if (!fonts[i]->load (prop, force_prop))
1471 { 1644 {
1472 fonts[i]->cs = CS_UNKNOWN; 1645 fonts[i]->cs = CS_UNKNOWN;
1473 return false; 1646 return false;
1474 } 1647 }
1475 1648
… …
1481{ 1654{
1482 clear (); 1655 clear ();
1483 1656
1484 fontdesc = strdup (desc); 1657 fontdesc = strdup (desc);
1485 1658
1486 fonts.push_back (new_font (0, CS_UNICODE)); 1659 push_font (new_font (0, CS_UNICODE));
1487 realize_font (0); 1660 realize_font (0);
1488 1661
1489 add_fonts (desc); 1662 add_fonts (desc);
1490 1663
1491 return true; 1664 return true;
… …
1500 1673
1501 return -1; 1674 return -1;
1502} 1675}
1503 1676
1504int 1677int
1505rxvt_fontset::find_font (unicode_t unicode) 1678rxvt_fontset::find_font_idx (unicode_t unicode)
1506{ 1679{
1507 if (unicode >= 1<<20) 1680 if (unicode >= 1<<20)
1508 return 0; 1681 return 0;
1509 1682
1510 unicode_t hi = unicode >> 8; 1683 unicode_t hi = unicode >> 8;
… …
1536 goto next_font; 1709 goto next_font;
1537 1710
1538 bool careful; 1711 bool careful;
1539 if (f->has_char (unicode, &prop, careful)) 1712 if (f->has_char (unicode, &prop, careful))
1540 { 1713 {
1541 if (careful) 1714 i = (i << 1) | careful;
1542 i |= 128;
1543 1715
1544 goto found; 1716 goto found;
1545 } 1717 }
1546 1718
1547 next_font: 1719 next_font:
1548 if (i == fonts.size () - 1) 1720 if (i == fonts.size () - 1)
1549 { 1721 {
1550 if (fallback->name) 1722 if (fallback->name)
1551 { 1723 {
1552 // search through the fallback list 1724 // search through the fallback list
1553 fonts.push_back (new_font (fallback->name, fallback->cs)); 1725 push_font (new_font (fallback->name, fallback->cs));
1554 fallback++; 1726 fallback++;
1555 } 1727 }
1556 else 1728 else
1557 { 1729 {
1558 // try to find a new font. 1730 // try to find a new font.
… …
1576 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1748 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1577 FcPatternAddBool (p, FC_MINSPACE, 1); 1749 FcPatternAddBool (p, FC_MINSPACE, 1);
1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1750 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1579 1751
1580 XftResult result; 1752 XftResult result;
1581 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1753 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1582 1754
1583 FcPatternDestroy (p); 1755 FcPatternDestroy (p);
1584 1756
1585 if (match) 1757 if (match)
1586 { 1758 {
… …
1589 FcPatternDestroy (match); 1761 FcPatternDestroy (match);
1590 1762
1591 if (find_font (font) < 0) 1763 if (find_font (font) < 0)
1592 { 1764 {
1593 char fontname[4096]; 1765 char fontname[4096];
1594 sprintf (fontname, "xft:%-.4090s", font); 1766 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1595 1767
1596 fonts.push_back (new_font (fontname, CS_UNICODE)); 1768 push_font (new_font (fontname, CS_UNICODE));
1597 } 1769 }
1598 1770
1599 free (font); 1771 free (font);
1600 } 1772 }
1601#endif 1773#endif
… …
1623 } 1795 }
1624 1796
1625 return i; 1797 return i;
1626} 1798}
1627 1799
1628
1629

Diff Legend

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