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.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.186 by root, Wed Jan 25 14:33:42 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 <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 // generic font fallback 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 143
145 // FreeMono is usually uglier than x fonts, so try last only. 144 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 146#endif
148 147
148 // generic font fallback, put this last, as many iso10646 fonts have extents
149 // specified for all glyphs in the range they cover, but most are simply empty
150 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
149 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
150}; 153};
151 154
152// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
158}; 161};
159 162
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->xdisp 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164
165/////////////////////////////////////////////////////////////////////////////
166
167#if XFT
168rxvt_drawable::~rxvt_drawable ()
169{
170 if (xftdrawable)
171 XftDrawDestroy (xftdrawable);
172}
173
174rxvt_drawable::operator XftDraw *()
175{
176 if (!xftdrawable)
177 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179 return xftdrawable;
180}
181#endif
182 165
183///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
184 167
185static const char * 168static const char *
186enc_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)
… …
234: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
235{ 218{
236} 219}
237 220
238void 221void
239rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
240{ 223{
241 if (this->name == name) 224 if (name == name_)
242 return; 225 return;
243 226
244 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
245 this->name = name; 228 name = name_;
246} 229}
247 230
248void 231void
249rxvt_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
250{ 233{
251 dTermDisplay; 234 dTermDisplay;
252 dTermGC; 235 dTermGC;
253 236
254 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
255 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
256 else if (color >= 0) 239 else if (color >= 0)
257 { 240 {
258#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
259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
260#else 258#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
262 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
263#endif 261#endif
264 } 262 }
265} 263}
266 264
267///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
268
269#include "table/linedraw.h"
270 266
271struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
272 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
273 269
274 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
287 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
288 284
289 return p; 285 return p;
290 } 286 }
291 287
292 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 289 {
294 width = 1; height = 1; 290 width = 1; height = 1;
295 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
296 292
297 set_name (strdup ("built-in support font")); 293 set_name (strdup ("built-in support font"));
… …
310 return false; 306 return false;
311 307
312 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
313 return true; 309 return true;
314 310
311#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 314 return true;
315#endif
318 316
319 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
320 return true; 318 return true;
321 319
322 switch (unicode) 320 switch (unicode)
… …
358 ; 356 ;
359 357
360 int width = text - tp; 358 int width = text - tp;
361 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
362 360
361#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
364 { 363 {
364# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
368 368
369 int W = fwidth; 369 int W = fwidth;
… …
407 407
408 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
409 if (a) 409 if (a)
410 { 410 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 412
413 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
417 417
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 437 break;
438 } 438 }
439 } 439 }
440 } 440 }
441#else
442 if (0)
443 ;
444#endif
441#if ENABLE_COMBINING 445#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 447 {
444 min_it (width, 2); // we only support wcwidth up to 2 448 min_it (width, 2); // we only support wcwidth up to 2
445 449
446 text_t chrs[2]; 450 text_t chrs[2];
447 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
448 452
449 *chrs = cc->c1; 453 *chrs = cc->c1;
450 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
451 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
452 456
453 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
454 { 458 {
455 bool careful; 459 bool careful;
456 460
457 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
458 *chrs = cc->c2; 462 *chrs = cc->c2;
459 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
460 ? f1 464 ? f1
461 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
462 466
463 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
464 } 468 }
465 } 469 }
466#endif 470#endif
467 else 471 else
468 switch (t) 472 switch (t)
… …
479 483
480 x += fwidth; 484 x += fwidth;
481 } 485 }
482} 486}
483 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
484///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
485 543
486struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
487 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
488 546
489 void clear (); 547 void clear ();
490 548
491 rxvt_fontprop properties (); 549 rxvt_fontprop properties ();
492 550
493 bool load (const rxvt_fontprop &prop); 551 bool load (const rxvt_fontprop &prop, bool force_prop);
494 552
495 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;
496 554
497 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 556 const text_t *text, int len,
499 int fg, int bg); 557 int fg, int bg);
500 558
501 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
502 XFontStruct *f; 560 XFontStruct *f;
503 codeset cs;
504 bool enc2b, encm; 561 bool enc2b, encm;
505 562
506 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
507 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);
508 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 565 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
513rxvt_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
514{ 571{
515 unsigned long value; 572 unsigned long value;
516 573
517 if (XGetFontProperty (f, property, &value)) 574 if (XGetFontProperty (f, property, &value))
518 return XGetAtomName (term->xdisp, value); 575 return XGetAtomName (term->dpy, value);
519 else 576 else
520 return rxvt_strdup (repl); 577 return repl ? strdup (repl) : 0;
521} 578}
522 579
523rxvt_fontprop 580rxvt_fontprop
524rxvt_font_x11::properties () 581rxvt_font_x11::properties ()
525{ 582{
… …
546rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 603rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547{ 604{
548 unsigned long height; 605 unsigned long height;
549 606
550#if 0 607#if 0
551 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 608 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552 return false; 609 return false;
553#else 610#else
554 height = f->ascent + f->descent; 611 height = f->ascent + f->descent;
555#endif 612#endif
556 613
… …
607 return false; 664 return false;
608} 665}
609 666
610// fix the size of scalable fonts 667// fix the size of scalable fonts
611static bool 668static bool
612replace_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)
613{ 670{
614 int slashes = 0; 671 int slashes = 0;
615 const char *field, *end; 672 const char *field, *end;
616 673
617 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
627 break; 684 break;
628 } 685 }
629 686
630 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
631 { 688 {
632 // TODO: check for overflow in font-name 689 size_t len = field - name;
633 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
634 buf += field - name; 691 memcpy (*ptr, name, len);
635 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
636 strcat (buf, end); 693 strcat (*ptr, end);
637 694
638 return true; 695 return true;
639 } 696 }
640 else 697 else
641 { 698 {
642 strcpy (buf, name); 699 *ptr = strdup (name);
643 700
644 return false; 701 return false;
645 } 702 }
646} 703}
647 704
648bool 705bool
649rxvt_font_x11::load (const rxvt_fontprop &prop) 706rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650{ 707{
651 dTermDisplay; 708 dTermDisplay;
652 709
653 clear (); 710 clear ();
654 711
655 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
656 713
657 // first morph the font if required 714 // first morph the font if required
658 if (prop.weight != rxvt_fontprop::unset 715 if (force_prop)
659 || prop.slant != rxvt_fontprop::unset)
660 { 716 {
661 char fname[1024]; 717 char *fname;
662 718
663 if (name[0] != '-') 719 if (name[0] != '-')
664 { 720 {
665 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
666 722
667 if (!f) 723 if (!f)
668 return false; 724 return false;
669 725
670 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
671 727
672 if (new_name) 728 if (new_name)
673 set_name (new_name); 729 set_name (new_name);
674 else 730 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 732
677 XFreeFont (disp, f); 733 XFreeFont (disp, f);
678 f = 0; 734 f = 0;
679 } 735 }
680 736
681 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
682 { 738 {
683 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 741 ? "medium" : "bold");
686 set_name (strdup (fname)); 742 set_name (fname);
687 } 743 }
688 744
689 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
690 { 746 {
691 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 750 set_name (fname);
695 } 751 }
696 } 752 }
697 753
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
725 781
726 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
727 { 783 {
728 rxvt_fontprop p; 784 rxvt_fontprop p;
729 char fname[1024]; 785 char *fname;
730 786
731 int diff = 0; 787 int diff = 0;
732 788
733 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
737 797
738 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);
739 continue; 804 continue;
740 805 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 806
745 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;
746 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);
747 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);
748 //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);
749 811
750 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
751 fonts[i].diff = diff; 813 fonts[i].diff = diff;
752 } 814 }
753 815
754 XFreeFontNames (list); 816 XFreeFontNames (list);
755 817
756 // 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
757 for (;;) 819 for (;;)
758 { 820 {
759 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
760 822
761 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
763 best = w; 825 best = w;
764 826
765 if (!best->name 827 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 829 break;
… …
787 return false; 849 return false;
788 850
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 853
854 cs = CS_UNKNOWN;
855
792 if (registry && encoding) 856 if (registry && encoding)
793 { 857 {
794 char charset[64]; 858 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
796 860
797 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
798 } 862
799 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
801 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
802 874
803 if (!charset) 875 if (!charset)
804 charset = name; 876 charset = name;
805 877
806 int count = 13; 878 int count = 13;
807 while (*charset) 879 while (*charset)
808 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
809 break; 881 break;
810 882
811 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)
812 } 891 {
813 892 clear ();
814 free (registry); 893 return false;
815 free (encoding); 894 }
816 895
817 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
818 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
819 898
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
832 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;
833 912
834 if (encm) 913 if (encm)
835 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837 916
838 while (N) 917 while (N)
839 { 918 {
840 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
841 width = f->per_char[N].width; 920 width = f->per_char[N].width;
842 921
… …
845 } 924 }
846#endif 925#endif
847 926
848 width = 1; 927 width = 1;
849 928
850 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++)
851 { 930 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 932 continue;
854 933
855 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
861 940
862 XCharStruct g; 941 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 942 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 944
945 int wcw = WCWIDTH (*t);
866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 946 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867 947
868 if (width < g.width) width = g.width; 948 if (width < g.width) width = g.width;
869 } 949 }
870 950
871 if (cs == CS_UNKNOWN) 951#if 0 // do it per-character
952 if (prop && width > prop->width)
872 { 953 {
873 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
874
875 clear (); 954 clear ();
876 return false; 955 return false;
877 } 956 }
878
879#if 0 // do it per-character
880 if (prop && width > prop->width)
881 {
882 clear ();
883 return false;
884 }
885#endif 957#endif
886 958
887 return true; 959 return true;
888} 960}
889 961
890void 962void
891rxvt_font_x11::clear () 963rxvt_font_x11::clear ()
892{ 964{
893 if (f) 965 if (f)
894 { 966 {
895 XFreeFont (term->xdisp, f); 967 XFreeFont (term->dpy, f);
896 f = 0; 968 f = 0;
897 } 969 }
898} 970}
899 971
900bool 972bool
901rxvt_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
902{ 974{
975 careful = false;
976
903 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
904 978
905 if (ch == NOCHAR) 979 if (ch == NOCHAR)
906 return false; 980 return false;
907 981
908 /* check wether the character exists in _this_ font. horrible. */ 982 /* check whether the character exists in _this_ font. horrible. */
909 XCharStruct *xcs; 983 XCharStruct *xcs;
910 984
911 if (encm) 985 if (encm)
912 { 986 {
913 unsigned char byte1 = ch >> 8; 987 unsigned char byte1 = ch >> 8;
… …
943 return false; 1017 return false;
944 1018
945 if (!prop || prop->width == rxvt_fontprop::unset) 1019 if (!prop || prop->width == rxvt_fontprop::unset)
946 return true; 1020 return true;
947 1021
948 // check wether character overlaps previous/next character 1022 // check whether character overlaps previous/next character
949 int w = xcs->rbearing - xcs->lbearing; 1023 int w = xcs->rbearing - xcs->lbearing;
950 int wcw = WCWIDTH (unicode); 1024 int wcw = max (WCWIDTH (unicode), 1);
951 1025
952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1026 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953 1027
954 if (careful && !OVERLAP_OK (w, wcw, prop)) 1028 if (careful && !OVERLAP_OK (w, wcw, prop))
955 return false; 1029 return false;
… …
993 else 1067 else
994 { 1068 {
995 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1069 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996 1070
997 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1071 XChangeGC (disp, gc, GCForeground | GCFont, &v);
998 1072
999 if (slow) 1073 if (slow)
1000 { 1074 {
1001 do 1075 do
1002 { 1076 {
1003 if (xc->byte1 || xc->byte2) 1077 if (xc->byte1 || xc->byte2)
… …
1025 else 1099 else
1026 { 1100 {
1027 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1101 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028 1102
1029 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1103 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1030 1104
1031 if (slow) 1105 if (slow)
1032 { 1106 {
1033 do 1107 do
1034 { 1108 {
1035 if (*xc) 1109 if (*xc)
… …
1055 1129
1056 void clear (); 1130 void clear ();
1057 1131
1058 rxvt_fontprop properties (); 1132 rxvt_fontprop properties ();
1059 1133
1060 bool load (const rxvt_fontprop &prop); 1134 bool load (const rxvt_fontprop &prop, bool force_prop);
1061 1135
1062 void draw (rxvt_drawable &d, int x, int y, 1136 void draw (rxvt_drawable &d, int x, int y,
1063 const text_t *text, int len, 1137 const text_t *text, int len,
1064 int fg, int bg); 1138 int fg, int bg);
1065 1139
1066 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;
1067 1141
1068protected: 1142protected:
1069 XftFont *f; 1143 XftFont *f;
1070}; 1144};
1071 1145
1072void 1146void
1073rxvt_font_xft::clear () 1147rxvt_font_xft::clear ()
1074{ 1148{
1075 if (f) 1149 if (f)
1076 { 1150 {
1077 XftFontClose (term->xdisp, f); 1151 XftFontClose (term->dpy, f);
1078 f = 0; 1152 f = 0;
1079 } 1153 }
1080} 1154}
1081 1155
1082rxvt_fontprop 1156rxvt_fontprop
… …
1098 1172
1099 return p; 1173 return p;
1100} 1174}
1101 1175
1102bool 1176bool
1103rxvt_font_xft::load (const rxvt_fontprop &prop) 1177rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104{ 1178{
1105 dTermDisplay; 1179 dTermDisplay;
1106 1180
1107 clear (); 1181 clear ();
1108 1182
… …
1117 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1191 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1192 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1193 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120 1194
1121 if (prop.weight != rxvt_fontprop::unset 1195 if (prop.weight != rxvt_fontprop::unset
1122 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1196 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1197 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124 1198
1125 if (prop.slant != rxvt_fontprop::unset 1199 if (prop.slant != rxvt_fontprop::unset
1126 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1200 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1201 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128 1202
1129#if 0 // clipping unfortunately destroys our precious double-width-characters 1203#if 0 // clipping unfortunately destroys our precious double-width-characters
1130 // clip width, we can't do better, or can we? 1204 // clip width, we can't do better, or can we?
1131 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1205 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1132 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1206 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1133#endif 1207#endif
1134 1208
1135 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1209 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1136 FcPatternAddBool (p, FC_MINSPACE, 1); 1210 FcPatternAddBool (p, FC_MINSPACE, 1);
1137 1211
… …
1149 int ftheight = 0; 1223 int ftheight = 0;
1150 bool success = true; 1224 bool success = true;
1151 1225
1152 for (;;) 1226 for (;;)
1153 { 1227 {
1228 p = FcPatternDuplicate (match);
1154 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1155 1230
1156 if (!f) 1231 if (!f)
1157 { 1232 {
1233 FcPatternDestroy (p);
1158 success = false; 1234 success = false;
1159 break; 1235 break;
1160 } 1236 }
1161 1237
1162 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1170 1246
1171 XftUnlockFace (f); 1247 XftUnlockFace (f);
1172 1248
1173 int glheight = height; 1249 int glheight = height;
1174 1250
1175 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++)
1176 { 1252 {
1177 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1178 1254
1179 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1180 && ch > 0x100 1256 && ch > 0x100
… …
1249bool 1325bool
1250rxvt_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
1251{ 1327{
1252 careful = false; 1328 careful = false;
1253 1329
1254 if (!XftCharExists (term->xdisp, f, unicode)) 1330 if (!XftCharExists (term->dpy, f, unicode))
1255 return false; 1331 return false;
1256 1332
1257 if (!prop || prop->width == rxvt_fontprop::unset) 1333 if (!prop || prop->width == rxvt_fontprop::unset)
1258 return true; 1334 return true;
1259 1335
1260 // check character against base font bounding box 1336 // check character against base font bounding box
1261 FcChar32 ch = unicode; 1337 FcChar32 ch = unicode;
1262 XGlyphInfo g; 1338 XGlyphInfo g;
1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264 1340
1265 int w = g.width - g.x; 1341 int w = g.width - g.x;
1266 int wcw = WCWIDTH (unicode); 1342 int wcw = max (WCWIDTH (unicode), 1);
1267 1343
1268 careful = g.x > 0 || w > prop->width * wcw; 1344 careful = g.x > 0 || w > prop->width * wcw;
1269 1345
1270 if (careful && !OVERLAP_OK (w, wcw, prop)) 1346 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false; 1347 return false;
… …
1280void 1356void
1281rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282 const text_t *text, int len, 1358 const text_t *text, int len,
1283 int fg, int bg) 1359 int fg, int bg)
1284{ 1360{
1285 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287 XGlyphInfo extents; 1361 XGlyphInfo extents;
1288 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1289 XftGlyphSpec *ep = enc; 1363 XftGlyphSpec *ep = enc;
1290 1364
1291 dTermDisplay; 1365 dTermDisplay;
1292 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);
1293 1373
1294 // cut trailing spaces 1374 // cut trailing spaces
1295 while (len && text [len - 1] == ' ') 1375 while (len && text [len - 1] == ' ')
1296 len--; 1376 len--;
1297 1377
1378 int x_ = buffered ? 0 : x;
1379 int y_ = buffered ? 0 : y;
1380
1298 while (len) 1381 while (len)
1299 { 1382 {
1300 int cwidth = term->fwidth; 1383 int cwidth = term->fwidth;
1301 FcChar32 fc = *text++; len--; 1384 FcChar32 fc = *text++; len--;
1302 1385
1303 while (len && *text == NOCHAR) 1386 while (len && *text == NOCHAR)
1304 text++, len--, cwidth += term->fwidth; 1387 text++, len--, cwidth += term->fwidth;
1305 1388
1306 if (fc != ' ') // skip spaces 1389 if (fc != ' ') // skip spaces
1307 { 1390 {
1308 FT_UInt glyph = XftCharIndex (disp, f, fc); 1391 FT_UInt glyph = XftCharIndex (disp, f, fc);
1309 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1392 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310 1393
1311
1312 ep->glyph = glyph; 1394 ep->glyph = glyph;
1313 ep->x = x + (cwidth - extents.xOff >> 1); 1395 ep->x = x_ + (cwidth - extents.xOff >> 1);
1314 ep->y = y + ascent; 1396 ep->y = y_ + ascent;
1315 1397
1316 if (extents.xOff == 0) 1398 if (extents.xOff == 0)
1317 ep->x = x + cwidth; 1399 ep->x = x_ + cwidth;
1318 1400
1319 ep++; 1401 ep++;
1320 } 1402 }
1321 1403
1322 x += cwidth; 1404 x_ += cwidth;
1405 }
1406
1407 if (buffered)
1323 } 1408 {
1324
1325 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);
1326 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1474 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1475 }
1327} 1476}
1477
1328#endif 1478#endif
1329 1479
1330///////////////////////////////////////////////////////////////////////////// 1480/////////////////////////////////////////////////////////////////////////////
1331 1481
1332rxvt_fontset::rxvt_fontset (rxvt_term *term) 1482rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1343void 1493void
1344rxvt_fontset::clear () 1494rxvt_fontset::clear ()
1345{ 1495{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1496 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1497 = rxvt_fontprop::unset;
1498 force_prop = false;
1348 1499
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1501 (*i)->unref ();
1351 1502
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1353 delete *p; 1504 delete [] *p;
1354 1505
1355 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
1356 1507
1357 fonts.clear (); 1508 fonts.clear ();
1358 1509
1359 fallback = fallback_fonts; 1510 fallback = fallback_fonts;
1511}
1512
1513void
1514rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1515{
1516 font->set_term (term);
1517
1518 font->cs = cs;
1519 font->loaded = false;
1360} 1520}
1361 1521
1362rxvt_font * 1522rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1523rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1524{
1365 rxvt_font *f; 1525 rxvt_font *f;
1366 1526
1367 if (!name || !*name) 1527 if (!name || !*name)
1368 { 1528 {
1369 name = ""; 1529 name = "";
1370 f = new rxvt_font_default (this); 1530 f = new rxvt_font_default (this);
1371 } 1531 }
… …
1382 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1383 } 1543 }
1384 else 1544 else
1385 f = new rxvt_font_x11; 1545 f = new rxvt_font_x11;
1386 1546
1387 f->set_term (term);
1388 f->set_name (strdup (name)); 1547 f->set_name (strdup (name));
1389 1548 prepare_font (f, cs);
1390 f->cs = cs;
1391 f->loaded = false;
1392 1549
1393 return f; 1550 return f;
1394} 1551}
1395 1552
1396///////////////////////////////////////////////////////////////////////////// 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}
1397 1571
1398void 1572void
1399rxvt_fontset::add_fonts (const char *desc) 1573rxvt_fontset::add_fonts (const char *desc)
1400{ 1574{
1401 if (desc) 1575 if (desc)
… …
1439 if (!end) 1613 if (!end)
1440 end = desc + strlen (desc); 1614 end = desc + strlen (desc);
1441 1615
1442 if (end - desc < 511) 1616 if (end - desc < 511)
1443 { 1617 {
1444 strncpy (buf, desc, end - desc); 1618 memcpy (buf, desc, end - desc);
1445 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1446 1620
1447 fonts.push_back (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1448 } 1622 }
1449 else 1623 else
1450 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1451 1625
1452 desc = end + 1; 1626 desc = end + 1;
1453 } 1627 }
1454 while (*end); 1628 while (*end);
1455 } 1629 }
… …
1464 if (fonts[i]->loaded) 1638 if (fonts[i]->loaded)
1465 return true; 1639 return true;
1466 1640
1467 fonts[i]->loaded = true; 1641 fonts[i]->loaded = true;
1468 1642
1469 if (!fonts[i]->load (prop)) 1643 if (!fonts[i]->load (prop, force_prop))
1470 { 1644 {
1471 fonts[i]->cs = CS_UNKNOWN; 1645 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1646 return false;
1473 } 1647 }
1474 1648
… …
1480{ 1654{
1481 clear (); 1655 clear ();
1482 1656
1483 fontdesc = strdup (desc); 1657 fontdesc = strdup (desc);
1484 1658
1485 fonts.push_back (new_font (0, CS_UNICODE)); 1659 push_font (new_font (0, CS_UNICODE));
1486 realize_font (0); 1660 realize_font (0);
1487 1661
1488 add_fonts (desc); 1662 add_fonts (desc);
1489 1663
1490 return true; 1664 return true;
… …
1499 1673
1500 return -1; 1674 return -1;
1501} 1675}
1502 1676
1503int 1677int
1504rxvt_fontset::find_font (unicode_t unicode) 1678rxvt_fontset::find_font_idx (unicode_t unicode)
1505{ 1679{
1506 if (unicode >= 1<<20) 1680 if (unicode >= 1<<20)
1507 return 0; 1681 return 0;
1508 1682
1509 unicode_t hi = unicode >> 8; 1683 unicode_t hi = unicode >> 8;
… …
1535 goto next_font; 1709 goto next_font;
1536 1710
1537 bool careful; 1711 bool careful;
1538 if (f->has_char (unicode, &prop, careful)) 1712 if (f->has_char (unicode, &prop, careful))
1539 { 1713 {
1540 if (careful) 1714 i = (i << 1) | careful;
1541 i |= 128;
1542 1715
1543 goto found; 1716 goto found;
1544 } 1717 }
1545 1718
1546 next_font: 1719 next_font:
1547 if (i == fonts.size () - 1) 1720 if (i == fonts.size () - 1)
1548 { 1721 {
1549 if (fallback->name) 1722 if (fallback->name)
1550 { 1723 {
1551 // search through the fallback list 1724 // search through the fallback list
1552 fonts.push_back (new_font (fallback->name, fallback->cs)); 1725 push_font (new_font (fallback->name, fallback->cs));
1553 fallback++; 1726 fallback++;
1554 } 1727 }
1555 else 1728 else
1556 { 1729 {
1557 // try to find a new font. 1730 // try to find a new font.
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1748 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1749 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1750 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1751
1579 XftResult result; 1752 XftResult result;
1580 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1753 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1754
1582 FcPatternDestroy (p); 1755 FcPatternDestroy (p);
1583 1756
1584 if (match) 1757 if (match)
1585 { 1758 {
… …
1588 FcPatternDestroy (match); 1761 FcPatternDestroy (match);
1589 1762
1590 if (find_font (font) < 0) 1763 if (find_font (font) < 0)
1591 { 1764 {
1592 char fontname[4096]; 1765 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1766 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1594 1767
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1768 push_font (new_font (fontname, CS_UNICODE));
1596 } 1769 }
1597 1770
1598 free (font); 1771 free (font);
1599 } 1772 }
1600#endif 1773#endif
… …
1612 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1613 fmap.push_back (0); 1786 fmap.push_back (0);
1614 1787
1615 if (!fmap[hi]) 1788 if (!fmap[hi])
1616 { 1789 {
1790 // C++ has no separate new and new [] - we need the "new" form,
1791 // just like the syntax implies, but since pagemap is char[],
1792 // C++ chooses the wrong new, so we need the cast and delete [].
1617 fmap[hi] = (pagemap *)new pagemap; 1793 fmap[hi] = (pagemap *)new pagemap;
1618 memset (fmap[hi], 0xff, sizeof (pagemap)); 1794 memset (fmap[hi], 0xff, sizeof (pagemap));
1619 } 1795 }
1620 1796
1621 (*fmap[hi])[unicode & 0xff] = i; 1797 (*fmap[hi])[unicode & 0xff] = i;
1622 } 1798 }
1623 1799
1624 return i; 1800 return i;
1625} 1801}
1626 1802
1627
1628

Diff Legend

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