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.207 by root, Thu Jun 17 19:42:55 2021 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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 51
49#if ENCODING_EU 52#if ENCODING_EU
50 // cyrillic 53 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 56
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 70
68# if XFT 71# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 72 { CS_KOI8_U, "xft::lang=ru" },
70 73
71 { CS_ISO8859_5, "xft::lang=ru" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 76 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 77 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 // 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_IMG
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
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 266
269#include "table/linedraw.h"
270
271struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
272 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
273 270
274 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
275 : rxvt_font () 272 : rxvt_font ()
276 { 273 {
… …
287 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
288 285
289 return p; 286 return p;
290 } 287 }
291 288
292 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 290 {
294 width = 1; height = 1; 291 width = 1; height = 1;
295 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
296 293
297 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
310 return false; 307 return false;
311 308
312 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
313 return true; 310 return true;
314 311
312#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 315 return true;
316#endif
318 317
319 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
320 return true; 319 // rob other fonts from taking over.
321 320
322 switch (unicode) 321 switch (unicode)
323 { 322 {
324 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
325 case NOCHAR: 324 case NOCHAR:
… …
346 345
347 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
348 347
349 while (len) 348 while (len)
350 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
351#if ENABLE_COMBINING 356#if ENABLE_COMBINING
352 compose_char *cc; 357 compose_char *cc;
353#endif 358#endif
354 const text_t *tp = text;
355 text_t t = *tp;
356
357 while (++text, --len && *text == NOCHAR)
358 ;
359
360 int width = text - tp; 359 int width = text - tp;
361 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
362 361
362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
364 { 364 {
365# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
368 369
369 int W = fwidth; 370 int W = fwidth;
… …
407 408
408 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
409 if (a) 410 if (a)
410 { 411 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 413
413 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
417 418
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 438 break;
438 } 439 }
439 } 440 }
440 } 441 }
442#else
443 if (0)
444 ;
445#endif
441#if ENABLE_COMBINING 446#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 448 {
444 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
445
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)
… …
470 case '\t': 474 case '\t':
471 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
472 case NOCHAR: 476 case NOCHAR:
473 break; 477 break;
474 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
475 default: 488 default:
476 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
477 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
478 } 491 }
479 492
480 x += fwidth; 493 x += fwidth;
481 } 494 }
482} 495}
483 496
497struct rxvt_font_overflow : rxvt_font
498{
499 struct rxvt_fontset *fs;
500
501 rxvt_font_overflow (rxvt_fontset *fs)
502 : rxvt_font ()
503 {
504 this->fs = fs;
505 }
506
507 rxvt_fontprop properties ()
508 {
509 rxvt_fontprop p;
510
511 p.width = p.height = 1;
512 p.ascent = rxvt_fontprop::unset;
513 p.weight = rxvt_fontprop::medium;
514 p.slant = rxvt_fontprop::roman;
515
516 return p;
517 }
518
519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 {
521 width = 1; height = 1;
522 ascent = 1; descent = 0;
523
524 set_name (strdup ("built-in rendition overflow font"));
525
526 return true;
527 }
528
529 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
530 {
531 return false;
532 }
533
534 void draw (rxvt_drawable &d, int x, int y,
535 const text_t *text, int len,
536 int fg, int bg)
537 {
538 while (len)
539 {
540 int fid = fs->find_font_idx (*text);
541 int w = 1;
542 while (w < len && text[w] == NOCHAR)
543 w++;
544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
545 text += w;
546 len -= w;
547 x += term->fwidth * w;
548 }
549 }
550};
551
484///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
485 553
486struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
487 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
488 557
489 void clear (); 558 void clear ();
490 559
491 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
492 561
493 bool load (const rxvt_fontprop &prop); 562 bool load (const rxvt_fontprop &prop, bool force_prop);
494 563
495 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 564 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496 565
497 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 567 const text_t *text, int len,
499 int fg, int bg); 568 int fg, int bg);
500 569
501 bool slow; // wether this is a proportional font or has other funny characteristics 570 bool slow; // whether this is a proportional font or has other funny characteristics
502 XFontStruct *f; 571 XFontStruct *f;
503 codeset cs;
504 bool enc2b, encm; 572 bool enc2b, encm;
505 573
506 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 574 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); 575 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); 576 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
513rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const 581rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
514{ 582{
515 unsigned long value; 583 unsigned long value;
516 584
517 if (XGetFontProperty (f, property, &value)) 585 if (XGetFontProperty (f, property, &value))
518 return XGetAtomName (term->xdisp, value); 586 return XGetAtomName (term->dpy, value);
519 else 587 else
520 return rxvt_strdup (repl); 588 return repl ? strdup (repl) : 0;
521} 589}
522 590
523rxvt_fontprop 591rxvt_fontprop
524rxvt_font_x11::properties () 592rxvt_font_x11::properties ()
525{ 593{
… …
546rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 614rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547{ 615{
548 unsigned long height; 616 unsigned long height;
549 617
550#if 0 618#if 0
551 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 619 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552 return false; 620 return false;
553#else 621#else
554 height = f->ascent + f->descent; 622 height = f->ascent + f->descent;
555#endif 623#endif
556 624
… …
607 return false; 675 return false;
608} 676}
609 677
610// fix the size of scalable fonts 678// fix the size of scalable fonts
611static bool 679static bool
612replace_field (char *buf, const char *name, int index, const char old, const char *replace) 680replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
613{ 681{
614 int slashes = 0; 682 int slashes = 0;
615 const char *field, *end; 683 const char *field, *end;
616 684
617 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
627 break; 695 break;
628 } 696 }
629 697
630 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
631 { 699 {
632 // TODO: check for overflow in font-name 700 size_t len = field - name;
633 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
634 buf += field - name; 702 memcpy (*ptr, name, len);
635 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
636 strcat (buf, end); 704 strcat (*ptr, end);
637 705
638 return true; 706 return true;
639 } 707 }
640 else 708 else
641 { 709 {
642 strcpy (buf, name); 710 *ptr = strdup (name);
643 711
644 return false; 712 return false;
645 } 713 }
646} 714}
647 715
648bool 716bool
649rxvt_font_x11::load (const rxvt_fontprop &prop) 717rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650{ 718{
651 dTermDisplay; 719 dTermDisplay;
652 720
653 clear (); 721 clear ();
654 722
655 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
656 724
657 // first morph the font if required 725 // first morph the font if required
658 if (prop.weight != rxvt_fontprop::unset 726 if (force_prop)
659 || prop.slant != rxvt_fontprop::unset)
660 { 727 {
661 char fname[1024]; 728 char *fname;
662 729
663 if (name[0] != '-') 730 if (name[0] != '-')
664 { 731 {
665 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
666 733
667 if (!f) 734 if (!f)
668 return false; 735 return false;
669 736
670 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
671 738
672 if (new_name) 739 if (new_name)
673 set_name (new_name); 740 set_name (new_name);
674 else 741 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 743
677 XFreeFont (disp, f); 744 XFreeFont (disp, f);
678 f = 0; 745 f = 0;
679 } 746 }
680 747
681 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
682 { 749 {
683 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 752 ? "medium" : "bold");
686 set_name (strdup (fname)); 753 set_name (fname);
687 } 754 }
688 755
689 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
690 { 757 {
691 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 761 set_name (fname);
695 } 762 }
696 } 763 }
697 764
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 765 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 766 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 791 font_weight *fonts = new font_weight[count];
725 792
726 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
727 { 794 {
728 rxvt_fontprop p; 795 rxvt_fontprop p;
729 char fname[1024]; 796 char *fname;
730 797
731 int diff = 0; 798 int diff = 0;
732 799
733 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 801 diff += 10; // slightly penalize scalable fonts
802 else
803 {
804 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
807 }
737 808
738 if (!set_properties (p, fname)) 809 if (!set_properties (p, fname)
810 // also weed out too large fonts
811 || (prop.height != rxvt_fontprop::unset
812 && p.height > prop.height))
813 {
814 free (fname);
739 continue; 815 continue;
740 816 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 817
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 818 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); 819 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); 820 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); 821 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 822
750 fonts[i].name = strdup (fname); 823 fonts[i].name = fname;
751 fonts[i].diff = diff; 824 fonts[i].diff = diff;
752 } 825 }
753 826
754 XFreeFontNames (list); 827 XFreeFontNames (list);
755 828
756 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
757 for (;;) 830 for (;;)
758 { 831 {
759 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
760 833
761 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
763 best = w; 836 best = w;
764 837
765 if (!best->name 838 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 840 break;
… …
787 return false; 860 return false;
788 861
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 864
865 cs = CS_UNKNOWN;
866
792 if (registry && encoding) 867 if (registry && encoding)
793 { 868 {
794 char charset[64]; 869 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
796 871
797 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
798 } 873
799 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
801 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
802 885
803 if (!charset) 886 if (!charset)
804 charset = name; 887 charset = name;
805 888
806 int count = 13; 889 int count = 13;
807 while (*charset) 890 while (*charset)
808 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
809 break; 892 break;
810 893
811 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
895 if (cs == CS_UNKNOWN)
896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
899 }
900
901 if (cs == CS_UNKNOWN)
812 } 902 {
813 903 clear ();
814 free (registry); 904 return false;
815 free (encoding); 905 }
816 906
817 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 908 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 909
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
832 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 922 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
833 923
834 if (encm) 924 if (encm)
835 N += (f->max_byte1 - f->min_byte1) 925 N += (f->max_byte1 - f->min_byte1)
836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 926 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837 927
838 while (N) 928 while (N)
839 { 929 {
840 if (f->per_char[N].width > width) 930 if (f->per_char[N].width > width)
841 width = f->per_char[N].width; 931 width = f->per_char[N].width;
842 932
… …
845 } 935 }
846#endif 936#endif
847 937
848 width = 1; 938 width = 1;
849 939
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 940 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
851 { 941 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 943 continue;
854 944
855 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
856 bool careful; 946 bool careful;
857 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
858 continue; 948 continue;
859 949
860 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
861 952
862 XCharStruct g; 953 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 956
957 int wcw = WCWIDTH (*t);
866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867 959
868 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
869 } 961 }
870 962
871 if (cs == CS_UNKNOWN) 963#if 0 // do it per-character
964 if (prop && width > prop->width)
872 { 965 {
873 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
874
875 clear (); 966 clear ();
876 return false; 967 return false;
877 } 968 }
878
879#if 0 // do it per-character
880 if (prop && width > prop->width)
881 {
882 clear ();
883 return false;
884 }
885#endif 969#endif
886 970
887 return true; 971 return true;
888} 972}
889 973
890void 974void
891rxvt_font_x11::clear () 975rxvt_font_x11::clear ()
892{ 976{
893 if (f) 977 if (f)
894 { 978 {
895 XFreeFont (term->xdisp, f); 979 XFreeFont (term->dpy, f);
896 f = 0; 980 f = 0;
897 } 981 }
898} 982}
899 983
900bool 984bool
901rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 985rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
902{ 986{
987 careful = false;
988
903 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
904 990
905 if (ch == NOCHAR) 991 if (ch == NOCHAR)
906 return false; 992 return false;
907 993
908 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
909 XCharStruct *xcs; 995 XCharStruct *xcs;
910 996
911 if (encm) 997 if (encm)
912 { 998 {
913 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
943 return false; 1029 return false;
944 1030
945 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
946 return true; 1032 return true;
947 1033
948 // check wether character overlaps previous/next character 1034 // check whether character overlaps previous/next character
949 int w = xcs->rbearing - xcs->lbearing; 1035 int w = xcs->rbearing - xcs->lbearing;
950 int wcw = WCWIDTH (unicode); 1036 int wcw = max (WCWIDTH (unicode), 1);
951 1037
952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953 1039
954 if (careful && !OVERLAP_OK (w, wcw, prop)) 1040 if (careful && !OVERLAP_OK (w, wcw, prop))
955 return false; 1041 return false;
… …
970 dTermDisplay; 1056 dTermDisplay;
971 dTermGC; 1057 dTermGC;
972 1058
973 bool slow = this->slow 1059 bool slow = this->slow
974 || width != term->fwidth 1060 || width != term->fwidth
975 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
976 1063
977 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
978 1065
979 XGCValues v; 1066 XGCValues v;
980 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
993 else 1080 else
994 { 1081 {
995 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1082 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996 1083
997 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCFont, &v);
998 1085
999 if (slow) 1086 if (slow)
1000 { 1087 {
1001 do 1088 do
1002 { 1089 {
1003 if (xc->byte1 || xc->byte2) 1090 if (xc->byte1 || xc->byte2)
… …
1025 else 1112 else
1026 { 1113 {
1027 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1114 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028 1115
1029 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1116 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1030 1117
1031 if (slow) 1118 if (slow)
1032 { 1119 {
1033 do 1120 do
1034 { 1121 {
1035 if (*xc) 1122 if (*xc)
… …
1048 1135
1049///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1050 1137
1051#if XFT 1138#if XFT
1052 1139
1053struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1054 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1055 1146
1056 void clear (); 1147 void clear ();
1057 1148
1058 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1059 1150
1060 bool load (const rxvt_fontprop &prop); 1151 bool load (const rxvt_fontprop &prop, bool force_prop);
1061 1152
1062 void draw (rxvt_drawable &d, int x, int y, 1153 void draw (rxvt_drawable &d, int x, int y,
1063 const text_t *text, int len, 1154 const text_t *text, int len,
1064 int fg, int bg); 1155 int fg, int bg);
1065 1156
1066 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1157 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1067 1158
1068protected: 1159protected:
1069 XftFont *f; 1160 XftFont *f;
1070}; 1161};
1071 1162
1072void 1163void
1073rxvt_font_xft::clear () 1164rxvt_font_xft::clear ()
1074{ 1165{
1075 if (f) 1166 if (f)
1076 { 1167 {
1077 XftFontClose (term->xdisp, f); 1168 XftFontClose (term->dpy, f);
1078 f = 0; 1169 f = 0;
1079 } 1170 }
1080} 1171}
1081 1172
1082rxvt_fontprop 1173rxvt_fontprop
… …
1098 1189
1099 return p; 1190 return p;
1100} 1191}
1101 1192
1102bool 1193bool
1103rxvt_font_xft::load (const rxvt_fontprop &prop) 1194rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104{ 1195{
1105 dTermDisplay; 1196 dTermDisplay;
1106 1197
1107 clear (); 1198 clear ();
1108 1199
… …
1117 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1208 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1209 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1210 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120 1211
1121 if (prop.weight != rxvt_fontprop::unset 1212 if (prop.weight != rxvt_fontprop::unset
1122 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1213 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1214 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124 1215
1125 if (prop.slant != rxvt_fontprop::unset 1216 if (prop.slant != rxvt_fontprop::unset
1126 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1217 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128 1219
1129#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1130 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1131 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1132 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1133#endif 1224#endif
1134 1225
1135 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1136 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1137 1228
… …
1149 int ftheight = 0; 1240 int ftheight = 0;
1150 bool success = true; 1241 bool success = true;
1151 1242
1152 for (;;) 1243 for (;;)
1153 { 1244 {
1245 p = FcPatternDuplicate (match);
1154 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1155 1247
1156 if (!f) 1248 if (!f)
1157 { 1249 {
1250 FcPatternDestroy (p);
1158 success = false; 1251 success = false;
1159 break; 1252 break;
1160 } 1253 }
1161 1254
1162 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1170 1263
1171 XftUnlockFace (f); 1264 XftUnlockFace (f);
1172 1265
1173 int glheight = height; 1266 int glheight = height;
1174 1267
1175 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1268 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1176 { 1269 {
1177 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1178 1271
1179 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1180 && ch > 0x100 1273 && ch > 0x100
… …
1199 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1200 } 1293 }
1201 1294
1202 if (!width) 1295 if (!width)
1203 { 1296 {
1204 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1205 1298 width = f->max_advance_width;
1206 XftFontClose (disp, f);
1207 f = 0;
1208
1209 success = false;
1210 break; 1299 break;
1211 } 1300 }
1212 1301
1213 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1214 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1249bool 1338bool
1250rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251{ 1340{
1252 careful = false; 1341 careful = false;
1253 1342
1343 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // we handle the sequence if the first char is available
1254 if (!XftCharExists (term->xdisp, f, unicode)) 1348 if (!XftCharExists (term->dpy, f, chrs [0]))
1255 return false; 1349 return false;
1256 1350
1257 if (!prop || prop->width == rxvt_fontprop::unset) 1351 if (!prop || prop->width == rxvt_fontprop::unset)
1258 return true; 1352 return true;
1353
1354 // but we check against the whole sequence bounding box
1259 1355
1260 // check character against base font bounding box 1356 // check character against base font bounding box
1261 FcChar32 ch = unicode; 1357 FcChar32 ch = unicode;
1262 XGlyphInfo g; 1358 XGlyphInfo g;
1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1359 XftTextExtents32 (term->dpy, f, chrs, nchrs, &g);
1264 1360
1265 int w = g.width - g.x; 1361 int w = g.width - g.x;
1266 int wcw = WCWIDTH (unicode); 1362 int wcw = max (WCWIDTH (chrs [0]), 1);
1267 1363
1268 careful = g.x > 0 || w > prop->width * wcw; 1364 careful = g.x > 0 || w > prop->width * wcw;
1269 1365
1270 if (careful && !OVERLAP_OK (w, wcw, prop)) 1366 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false; 1367 return false;
… …
1280void 1376void
1281rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1377rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282 const text_t *text, int len, 1378 const text_t *text, int len,
1283 int fg, int bg) 1379 int fg, int bg)
1284{ 1380{
1285 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287 XGlyphInfo extents; 1381 XGlyphInfo extents;
1288 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1382 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1289 XftGlyphSpec *ep = enc; 1383 //XftGlyphSpec *ep = enc;//D
1384 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1290 1385
1291 dTermDisplay; 1386 dTermDisplay;
1292 dTermGC; 1387 dTermGC;
1388
1389 int w = term->fwidth * len;
1390 int h = term->fheight;
1391
1392 bool buffered = bg >= Color_transparent
1393 && term->option (Opt_buffered);
1293 1394
1294 // cut trailing spaces 1395 // cut trailing spaces
1295 while (len && text [len - 1] == ' ') 1396 while (len && text [len - 1] == ' ')
1296 len--; 1397 len--;
1297 1398
1399 int x_ = buffered ? 0 : x;
1400 int y_ = buffered ? 0 : y;
1401
1298 while (len) 1402 while (len)
1299 { 1403 {
1300 int cwidth = term->fwidth; 1404 int cwidth = term->fwidth;
1405
1406 rxvt_compose_expand_static<FcChar32> exp;
1301 FcChar32 fc = *text++; len--; 1407 FcChar32 *chrs = exp (*text++); len--;
1408 int nchrs = exp.length (chrs);
1302 1409
1303 while (len && *text == NOCHAR) 1410 while (len && *text == NOCHAR)
1304 text++, len--, cwidth += term->fwidth; 1411 text++, len--, cwidth += term->fwidth;
1305 1412
1306 if (fc != ' ') // skip spaces 1413 if (chrs [0] != ' ') // skip spaces
1307 { 1414 {
1415 FT_UInt glyphs [rxvt_compose_expand_static<FcChar32>::max_size];
1416
1417 for (int i = 0; i < nchrs; ++i)
1308 FT_UInt glyph = XftCharIndex (disp, f, fc); 1418 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1419
1309 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1420 XftGlyphExtents (disp, f, glyphs, nchrs, &extents);
1310 1421
1422 XftGlyphSpec ep;
1311 1423
1312 ep->glyph = glyph;
1313 ep->x = x + (cwidth - extents.xOff >> 1); 1424 ep.x = x_ + (cwidth - extents.xOff >> 1);
1314 ep->y = y + ascent; 1425 ep.y = y_ + ascent;
1315 1426
1316 if (extents.xOff == 0) 1427 if (extents.xOff == 0)
1317 ep->x = x + cwidth; 1428 ep.x = x_ + cwidth;
1318 1429
1319 ep++; 1430 for (int i = 0; i < nchrs; ++i)
1431 {
1432 ep.glyph = glyphs [i];
1433 enc.push_back (ep);
1320 } 1434 }
1435 }
1321 1436
1322 x += cwidth; 1437 x_ += cwidth;
1438 }
1439
1440 if (buffered)
1323 } 1441 {
1442 if (!enc.empty ())
1443 {
1444 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 1445
1325 if (ep != enc) 1446#ifdef HAVE_IMG
1447 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1448
1449 if (term->bg_img
1450 && (bg == Color_transparent || bg == Color_bg
1451 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1452 {
1453 int src_x = x, src_y = y;
1454
1455 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1456 {
1457 src_x += term->window_vt_x;
1458 src_y += term->window_vt_y;
1459 }
1460
1461 if (term->bg_img->w >= src_x + w
1462 && term->bg_img->h >= src_y + h)
1463 {
1464 XCopyArea (disp, term->bg_img->pm, d2, gc,
1465 src_x, src_y, w, h, 0, 0);
1466 }
1467 else
1468 {
1469 XGCValues gcv;
1470
1471 gcv.fill_style = FillTiled;
1472 gcv.tile = term->bg_img->pm;
1473 gcv.ts_x_origin = -src_x;
1474 gcv.ts_y_origin = -src_y;
1475
1476 XChangeGC (disp, gc,
1477 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1478 &gcv);
1479
1480 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1481
1482 gcv.fill_style = FillSolid;
1483 XChangeGC (disp, gc, GCFillStyle, &gcv);
1484 }
1485
1486 if (dst)
1487 {
1488 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1489
1490 // dst can only be set when bg >= 0
1491 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1492 }
1493 }
1494 else
1495#endif
1496 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1497
1498 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1499 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1500 }
1501 else
1502 clear_rect (d, x, y, w, h, bg);
1503 }
1504 else
1505 {
1506 clear_rect (d, x, y, w, h, bg);
1326 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1507 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1508 }
1327} 1509}
1510
1328#endif 1511#endif
1329 1512
1330///////////////////////////////////////////////////////////////////////////// 1513/////////////////////////////////////////////////////////////////////////////
1331 1514
1332rxvt_fontset::rxvt_fontset (rxvt_term *term) 1515rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1343void 1526void
1344rxvt_fontset::clear () 1527rxvt_fontset::clear ()
1345{ 1528{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1529 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1530 = rxvt_fontprop::unset;
1531 force_prop = false;
1348 1532
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1533 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1534 (*i)->unref ();
1351 1535
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1536 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1353 delete *p; 1537 delete *p;
1354 1538
1355 free (fontdesc); fontdesc = 0; 1539 free (fontdesc); fontdesc = 0;
… …
1357 fonts.clear (); 1541 fonts.clear ();
1358 1542
1359 fallback = fallback_fonts; 1543 fallback = fallback_fonts;
1360} 1544}
1361 1545
1546void
1547rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1548{
1549 font->set_term (term);
1550
1551 font->cs = cs;
1552 font->loaded = false;
1553}
1554
1362rxvt_font * 1555rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1556rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1557{
1365 rxvt_font *f; 1558 rxvt_font *f;
1366 1559
1367 if (!name || !*name) 1560 if (!name || !*name)
1368 { 1561 {
1369 name = ""; 1562 name = "";
1370 f = new rxvt_font_default (this); 1563 f = new rxvt_font_default (this);
1371 } 1564 }
… …
1382 f = new rxvt_font_x11; 1575 f = new rxvt_font_x11;
1383 } 1576 }
1384 else 1577 else
1385 f = new rxvt_font_x11; 1578 f = new rxvt_font_x11;
1386 1579
1387 f->set_term (term);
1388 f->set_name (strdup (name)); 1580 f->set_name (strdup (name));
1389 1581 prepare_font (f, cs);
1390 f->cs = cs;
1391 f->loaded = false;
1392 1582
1393 return f; 1583 return f;
1394} 1584}
1395 1585
1396///////////////////////////////////////////////////////////////////////////// 1586/////////////////////////////////////////////////////////////////////////////
1587
1588void
1589rxvt_fontset::push_font (rxvt_font *font)
1590{
1591 // the fontCount index is reserved for the overflow font, it is only
1592 // necessary when we get fontCount or more fonts, as they cannot be
1593 // represented in the rendition.
1594 if (fonts.size () == fontCount)
1595 {
1596 rxvt_font *f = new rxvt_font_overflow (this);
1597
1598 prepare_font (f, CS_UNICODE);
1599 fonts.push_back (f);
1600 }
1601
1602 fonts.push_back (font);
1603}
1397 1604
1398void 1605void
1399rxvt_fontset::add_fonts (const char *desc) 1606rxvt_fontset::add_fonts (const char *desc)
1400{ 1607{
1401 if (desc) 1608 if (desc)
… …
1430 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1637 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1431 else 1638 else
1432 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1639 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1433 1640
1434 desc++; 1641 desc++;
1435 while (*desc <= ' ') desc++; 1642 while (*desc <= ' ' && *desc) desc++;
1436 } 1643 }
1437 1644
1438 end = strchr (desc, ','); 1645 end = strchr (desc, ',');
1439 if (!end) 1646 if (!end)
1440 end = desc + strlen (desc); 1647 end = desc + strlen (desc);
1441 1648
1442 if (end - desc < 511) 1649 if (end - desc < 511)
1443 { 1650 {
1444 strncpy (buf, desc, end - desc); 1651 memcpy (buf, desc, end - desc);
1445 buf[end - desc] = 0; 1652 buf[end - desc] = 0;
1446 1653
1447 fonts.push_back (new_font (buf, cs)); 1654 push_font (new_font (buf, cs));
1448 } 1655 }
1449 else 1656 else
1450 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1657 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1451 1658
1452 desc = end + 1; 1659 desc = end + 1;
1453 } 1660 }
1454 while (*end); 1661 while (*end);
1455 } 1662 }
… …
1464 if (fonts[i]->loaded) 1671 if (fonts[i]->loaded)
1465 return true; 1672 return true;
1466 1673
1467 fonts[i]->loaded = true; 1674 fonts[i]->loaded = true;
1468 1675
1469 if (!fonts[i]->load (prop)) 1676 if (!fonts[i]->load (prop, force_prop))
1470 { 1677 {
1471 fonts[i]->cs = CS_UNKNOWN; 1678 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1679 return false;
1473 } 1680 }
1474 1681
… …
1480{ 1687{
1481 clear (); 1688 clear ();
1482 1689
1483 fontdesc = strdup (desc); 1690 fontdesc = strdup (desc);
1484 1691
1485 fonts.push_back (new_font (0, CS_UNICODE)); 1692 push_font (new_font (0, CS_UNICODE));
1486 realize_font (0); 1693 realize_font (0);
1487 1694
1488 add_fonts (desc); 1695 add_fonts (desc);
1489 1696
1490 return true; 1697 return true;
… …
1499 1706
1500 return -1; 1707 return -1;
1501} 1708}
1502 1709
1503int 1710int
1504rxvt_fontset::find_font (unicode_t unicode) 1711rxvt_fontset::find_font_idx (unicode_t unicode)
1505{ 1712{
1506 if (unicode >= 1<<20) 1713 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1714 if (unicode > 0x1fffff)
1507 return 0; 1715 return 0;
1508 1716
1509 unicode_t hi = unicode >> 8; 1717 unicode_t hi = unicode >> 8;
1510 1718
1511 if (hi < fmap.size () 1719 if (hi < fmap.size ())
1512 && fmap[hi] 1720 if (pagemap *pm = fmap[hi])
1513 && (*fmap[hi])[unicode & 0xff] != 0xff) 1721 if ((*pm)[unicode & 0xff] != 0xff)
1514 return (*fmap[hi])[unicode & 0xff]; 1722 return (*pm)[unicode & 0xff];
1515 1723
1516 unsigned int i; 1724 unsigned int i;
1517 1725
1518 for (i = 0; i < fonts.size (); i++) 1726 for (i = 0; i < fonts.size (); i++)
1519 { 1727 {
… …
1535 goto next_font; 1743 goto next_font;
1536 1744
1537 bool careful; 1745 bool careful;
1538 if (f->has_char (unicode, &prop, careful)) 1746 if (f->has_char (unicode, &prop, careful))
1539 { 1747 {
1540 if (careful) 1748 i = (i << 1) | careful;
1541 i |= 128;
1542 1749
1543 goto found; 1750 goto found;
1544 } 1751 }
1545 1752
1546 next_font: 1753 next_font:
1547 if (i == fonts.size () - 1) 1754 if (i == fonts.size () - 1)
1548 { 1755 {
1756 // compose characters are handled by the default font, unless another font takes over
1757 // we do not go via the fallback list for speed reasons.
1758 if (IS_COMPOSE (unicode))
1759 return 0;
1760
1549 if (fallback->name) 1761 if (fallback->name)
1550 { 1762 {
1551 // search through the fallback list 1763 // search through the fallback list
1552 fonts.push_back (new_font (fallback->name, fallback->cs)); 1764 push_font (new_font (fallback->name, fallback->cs));
1553 fallback++; 1765 fallback++;
1554 } 1766 }
1555 else 1767 else
1556 { 1768 {
1557 // try to find a new font. 1769 // try to find a new font.
… …
1559 // way to configure this and xft is easier to hack in, 1771 // way to configure this and xft is easier to hack in,
1560 // while x11 has more framework in place already. 1772 // while x11 has more framework in place already.
1561 // TODO: this is a real resource hog, xft takes ages(?) 1773 // TODO: this is a real resource hog, xft takes ages(?)
1562#if XFT && USE_SLOW_LOOKUP 1774#if XFT && USE_SLOW_LOOKUP
1563 // grab the first xft font that seems suitable 1775 // grab the first xft font that seems suitable
1776 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1564 FcPattern *p = FcPatternCreate (); 1777 FcPattern *p = FcPatternCreate ();
1565 1778
1566 FcCharSet *s = FcCharSetCreate (); 1779 FcCharSet *s = FcCharSetCreate ();
1567 FcCharSetAddChar (s, unicode); 1780 FcCharSetAddChar (s, unicode);
1568 FcPatternAddCharSet (p, FC_CHARSET, s); 1781 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1788 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1789 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1790 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1791
1579 XftResult result; 1792 XftResult result;
1580 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1793 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1794
1582 FcPatternDestroy (p); 1795 FcPatternDestroy (p);
1583 1796
1584 if (match) 1797 if (match)
1585 { 1798 {
… …
1588 FcPatternDestroy (match); 1801 FcPatternDestroy (match);
1589 1802
1590 if (find_font (font) < 0) 1803 if (find_font (font) < 0)
1591 { 1804 {
1592 char fontname[4096]; 1805 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1806 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1594 1807
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1808 push_font (new_font (fontname, CS_UNICODE));
1596 } 1809 }
1597 1810
1598 free (font); 1811 free (font);
1599 } 1812 }
1600#endif 1813#endif
… …
1612 while (hi >= fmap.size ()) 1825 while (hi >= fmap.size ())
1613 fmap.push_back (0); 1826 fmap.push_back (0);
1614 1827
1615 if (!fmap[hi]) 1828 if (!fmap[hi])
1616 { 1829 {
1617 fmap[hi] = (pagemap *)new pagemap; 1830 fmap[hi] = new pagemap;
1618 memset (fmap[hi], 0xff, sizeof (pagemap)); 1831 memset (fmap[hi], 0xff, sizeof (pagemap));
1619 } 1832 }
1620 1833
1621 (*fmap[hi])[unicode & 0xff] = i; 1834 (*fmap[hi])[unicode & 0xff] = i;
1622 } 1835 }
1623 1836
1624 return i; 1837 return i;
1625} 1838}
1626 1839
1627
1628

Diff Legend

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