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.200 by root, Thu Jun 17 00:49:20 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)
… …
229} 212}
230 213
231///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
232 215
233rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
234: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
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 if (IS_COMPOSE (unicode))
320 return true; 319 return true;
321 320
322 switch (unicode) 321 switch (unicode)
… …
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) && 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 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
446 text_t chrs[2]; 473 text_t chrs[2];
447 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
448 475
449 *chrs = cc->c1; 476 *chrs = cc->c1;
450 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
451 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
452 479
453 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
454 { 481 {
455 bool careful; 482 bool careful;
456 483
457 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
458 *chrs = cc->c2; 485 *chrs = cc->c2;
459 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
460 ? f1 487 ? f1
461 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
462 489
463 f2->draw (d, x, y, chrs, width, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
464 } 491 }
492 #endif
465 } 493 }
466#endif 494#endif
467 else 495 else
468 switch (t) 496 switch (t)
469 { 497 {
470 case '\t': 498 case '\t':
471 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
472 case NOCHAR: 500 case NOCHAR:
473 break; 501 break;
474 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
475 default: 512 default:
476 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
477 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
478 } 515 }
479 516
480 x += fwidth; 517 x += fwidth;
481 } 518 }
482} 519}
483 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
484///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
485 577
486struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
487 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
488 581
489 void clear (); 582 void clear ();
490 583
491 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
492 585
493 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
494 587
495 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 588 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496 589
497 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 591 const text_t *text, int len,
499 int fg, int bg); 592 int fg, int bg);
500 593
501 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
502 XFontStruct *f; 595 XFontStruct *f;
503 codeset cs;
504 bool enc2b, encm; 596 bool enc2b, encm;
505 597
506 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 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); 599 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); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
513rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const 605rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
514{ 606{
515 unsigned long value; 607 unsigned long value;
516 608
517 if (XGetFontProperty (f, property, &value)) 609 if (XGetFontProperty (f, property, &value))
518 return XGetAtomName (term->xdisp, value); 610 return XGetAtomName (term->dpy, value);
519 else 611 else
520 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
521} 613}
522 614
523rxvt_fontprop 615rxvt_fontprop
524rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
525{ 617{
… …
546rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 638rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547{ 639{
548 unsigned long height; 640 unsigned long height;
549 641
550#if 0 642#if 0
551 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 643 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552 return false; 644 return false;
553#else 645#else
554 height = f->ascent + f->descent; 646 height = f->ascent + f->descent;
555#endif 647#endif
556 648
… …
607 return false; 699 return false;
608} 700}
609 701
610// fix the size of scalable fonts 702// fix the size of scalable fonts
611static bool 703static bool
612replace_field (char *buf, const char *name, int index, const char old, const char *replace) 704replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
613{ 705{
614 int slashes = 0; 706 int slashes = 0;
615 const char *field, *end; 707 const char *field, *end;
616 708
617 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
627 break; 719 break;
628 } 720 }
629 721
630 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
631 { 723 {
632 // TODO: check for overflow in font-name 724 size_t len = field - name;
633 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
634 buf += field - name; 726 memcpy (*ptr, name, len);
635 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
636 strcat (buf, end); 728 strcat (*ptr, end);
637 729
638 return true; 730 return true;
639 } 731 }
640 else 732 else
641 { 733 {
642 strcpy (buf, name); 734 *ptr = strdup (name);
643 735
644 return false; 736 return false;
645 } 737 }
646} 738}
647 739
648bool 740bool
649rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650{ 742{
651 dTermDisplay; 743 dTermDisplay;
652 744
653 clear (); 745 clear ();
654 746
655 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
656 748
657 // first morph the font if required 749 // first morph the font if required
658 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
659 || prop.slant != rxvt_fontprop::unset)
660 { 751 {
661 char fname[1024]; 752 char *fname;
662 753
663 if (name[0] != '-') 754 if (name[0] != '-')
664 { 755 {
665 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
666 757
667 if (!f) 758 if (!f)
668 return false; 759 return false;
669 760
670 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
671 762
672 if (new_name) 763 if (new_name)
673 set_name (new_name); 764 set_name (new_name);
674 else 765 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 767
677 XFreeFont (disp, f); 768 XFreeFont (disp, f);
678 f = 0; 769 f = 0;
679 } 770 }
680 771
681 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
682 { 773 {
683 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 776 ? "medium" : "bold");
686 set_name (strdup (fname)); 777 set_name (fname);
687 } 778 }
688 779
689 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
690 { 781 {
691 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 785 set_name (fname);
695 } 786 }
696 } 787 }
697 788
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
725 816
726 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
727 { 818 {
728 rxvt_fontprop p; 819 rxvt_fontprop p;
729 char fname[1024]; 820 char *fname;
730 821
731 int diff = 0; 822 int diff = 0;
732 823
733 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
737 832
738 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
739 continue; 839 continue;
740 840 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 841
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 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); 843 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); 844 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); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 846
750 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
751 fonts[i].diff = diff; 848 fonts[i].diff = diff;
752 } 849 }
753 850
754 XFreeFontNames (list); 851 XFreeFontNames (list);
755 852
756 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
757 for (;;) 854 for (;;)
758 { 855 {
759 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
760 857
761 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
763 best = w; 860 best = w;
764 861
765 if (!best->name 862 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 864 break;
… …
787 return false; 884 return false;
788 885
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 888
889 cs = CS_UNKNOWN;
890
792 if (registry && encoding) 891 if (registry && encoding)
793 { 892 {
794 char charset[64]; 893 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
796 895
797 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
798 } 897
799 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
801 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
802 909
803 if (!charset) 910 if (!charset)
804 charset = name; 911 charset = name;
805 912
806 int count = 13; 913 int count = 13;
807 while (*charset) 914 while (*charset)
808 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
809 break; 916 break;
810 917
811 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
812 } 926 {
813 927 clear ();
814 free (registry); 928 return false;
815 free (encoding); 929 }
816 930
817 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 933
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
832 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 946 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
833 947
834 if (encm) 948 if (encm)
835 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837 951
838 while (N) 952 while (N)
839 { 953 {
840 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
841 width = f->per_char[N].width; 955 width = f->per_char[N].width;
842 956
… …
845 } 959 }
846#endif 960#endif
847 961
848 width = 1; 962 width = 1;
849 963
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
851 { 965 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 967 continue;
854 968
855 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
856 bool careful; 970 bool careful;
857 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
858 continue; 972 continue;
859 973
860 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
861 976
862 XCharStruct g; 977 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 980
981 int wcw = WCWIDTH (*t);
866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867 983
868 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
869 } 985 }
870 986
871 if (cs == CS_UNKNOWN) 987#if 0 // do it per-character
988 if (prop && width > prop->width)
872 { 989 {
873 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
874
875 clear (); 990 clear ();
876 return false; 991 return false;
877 } 992 }
878
879#if 0 // do it per-character
880 if (prop && width > prop->width)
881 {
882 clear ();
883 return false;
884 }
885#endif 993#endif
886 994
887 return true; 995 return true;
888} 996}
889 997
890void 998void
891rxvt_font_x11::clear () 999rxvt_font_x11::clear ()
892{ 1000{
893 if (f) 1001 if (f)
894 { 1002 {
895 XFreeFont (term->xdisp, f); 1003 XFreeFont (term->dpy, f);
896 f = 0; 1004 f = 0;
897 } 1005 }
898} 1006}
899 1007
900bool 1008bool
901rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
902{ 1010{
1011 careful = false;
1012
903 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
904 1014
905 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
906 return false; 1016 return false;
907 1017
908 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
909 XCharStruct *xcs; 1019 XCharStruct *xcs;
910 1020
911 if (encm) 1021 if (encm)
912 { 1022 {
913 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
943 return false; 1053 return false;
944 1054
945 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
946 return true; 1056 return true;
947 1057
948 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
949 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
950 int wcw = WCWIDTH (unicode); 1060 int wcw = max (WCWIDTH (unicode), 1);
951 1061
952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953 1063
954 if (careful && !OVERLAP_OK (w, wcw, prop)) 1064 if (careful && !OVERLAP_OK (w, wcw, prop))
955 return false; 1065 return false;
… …
970 dTermDisplay; 1080 dTermDisplay;
971 dTermGC; 1081 dTermGC;
972 1082
973 bool slow = this->slow 1083 bool slow = this->slow
974 || width != term->fwidth 1084 || width != term->fwidth
975 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
976 1087
977 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
978 1089
979 XGCValues v; 1090 XGCValues v;
980 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
993 else 1104 else
994 { 1105 {
995 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1106 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996 1107
997 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
998 1109
999 if (slow) 1110 if (slow)
1000 { 1111 {
1001 do 1112 do
1002 { 1113 {
1003 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
… …
1025 else 1136 else
1026 { 1137 {
1027 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1138 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028 1139
1029 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1030 1141
1031 if (slow) 1142 if (slow)
1032 { 1143 {
1033 do 1144 do
1034 { 1145 {
1035 if (*xc) 1146 if (*xc)
… …
1048 1159
1049///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1050 1161
1051#if XFT 1162#if XFT
1052 1163
1053struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1054 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1055 1171
1056 void clear (); 1172 void clear ();
1057 1173
1058 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1059 1175
1060 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
1061 1177
1062 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
1063 const text_t *text, int len, 1179 const text_t *text, int len,
1064 int fg, int bg); 1180 int fg, int bg);
1065 1181
1066 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1182 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1067 1183
1068protected: 1184protected:
1069 XftFont *f; 1185 XftFont *f;
1070}; 1186};
1071 1187
1072void 1188void
1073rxvt_font_xft::clear () 1189rxvt_font_xft::clear ()
1074{ 1190{
1075 if (f) 1191 if (f)
1076 { 1192 {
1077 XftFontClose (term->xdisp, f); 1193 XftFontClose (term->dpy, f);
1078 f = 0; 1194 f = 0;
1079 } 1195 }
1080} 1196}
1081 1197
1082rxvt_fontprop 1198rxvt_fontprop
… …
1098 1214
1099 return p; 1215 return p;
1100} 1216}
1101 1217
1102bool 1218bool
1103rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104{ 1220{
1105 dTermDisplay; 1221 dTermDisplay;
1106 1222
1107 clear (); 1223 clear ();
1108 1224
… …
1117 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120 1236
1121 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1122 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124 1240
1125 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1126 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128 1244
1129#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1130 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1131 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1132 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1133#endif 1249#endif
1134 1250
1135 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1136 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1137 1253
… …
1149 int ftheight = 0; 1265 int ftheight = 0;
1150 bool success = true; 1266 bool success = true;
1151 1267
1152 for (;;) 1268 for (;;)
1153 { 1269 {
1270 p = FcPatternDuplicate (match);
1154 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1155 1272
1156 if (!f) 1273 if (!f)
1157 { 1274 {
1275 FcPatternDestroy (p);
1158 success = false; 1276 success = false;
1159 break; 1277 break;
1160 } 1278 }
1161 1279
1162 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1170 1288
1171 XftUnlockFace (f); 1289 XftUnlockFace (f);
1172 1290
1173 int glheight = height; 1291 int glheight = height;
1174 1292
1175 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1176 { 1294 {
1177 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1178 1296
1179 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1180 && ch > 0x100 1298 && ch > 0x100
… …
1249bool 1367bool
1250rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1368rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251{ 1369{
1252 careful = false; 1370 careful = false;
1253 1371
1254 if (!XftCharExists (term->xdisp, f, unicode)) 1372 if (!XftCharExists (term->dpy, f, unicode))
1255 return false; 1373 return false;
1256 1374
1257 if (!prop || prop->width == rxvt_fontprop::unset) 1375 if (!prop || prop->width == rxvt_fontprop::unset)
1258 return true; 1376 return true;
1259 1377
1260 // check character against base font bounding box 1378 // check character against base font bounding box
1261 FcChar32 ch = unicode; 1379 FcChar32 ch = unicode;
1262 XGlyphInfo g; 1380 XGlyphInfo g;
1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1381 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264 1382
1265 int w = g.width - g.x; 1383 int w = g.width - g.x;
1266 int wcw = WCWIDTH (unicode); 1384 int wcw = max (WCWIDTH (unicode), 1);
1267 1385
1268 careful = g.x > 0 || w > prop->width * wcw; 1386 careful = g.x > 0 || w > prop->width * wcw;
1269 1387
1270 if (careful && !OVERLAP_OK (w, wcw, prop)) 1388 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false; 1389 return false;
… …
1280void 1398void
1281rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282 const text_t *text, int len, 1400 const text_t *text, int len,
1283 int fg, int bg) 1401 int fg, int bg)
1284{ 1402{
1285 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287 XGlyphInfo extents; 1403 XGlyphInfo extents;
1288 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1289 XftGlyphSpec *ep = enc; 1405 XftGlyphSpec *ep = enc;
1290 1406
1291 dTermDisplay; 1407 dTermDisplay;
1292 dTermGC; 1408 dTermGC;
1409
1410 int w = term->fwidth * len;
1411 int h = term->fheight;
1412
1413 bool buffered = bg >= Color_transparent
1414 && term->option (Opt_buffered);
1293 1415
1294 // cut trailing spaces 1416 // cut trailing spaces
1295 while (len && text [len - 1] == ' ') 1417 while (len && text [len - 1] == ' ')
1296 len--; 1418 len--;
1297 1419
1420 int x_ = buffered ? 0 : x;
1421 int y_ = buffered ? 0 : y;
1422
1298 while (len) 1423 while (len)
1299 { 1424 {
1300 int cwidth = term->fwidth; 1425 int cwidth = term->fwidth;
1301 FcChar32 fc = *text++; len--; 1426 FcChar32 fc = *text++; len--;
1302 1427
1303 while (len && *text == NOCHAR) 1428 while (len && *text == NOCHAR)
1304 text++, len--, cwidth += term->fwidth; 1429 text++, len--, cwidth += term->fwidth;
1305 1430
1306 if (fc != ' ') // skip spaces 1431 if (fc != ' ') // skip spaces
1307 { 1432 {
1308 FT_UInt glyph = XftCharIndex (disp, f, fc); 1433 FT_UInt glyph = XftCharIndex (disp, f, fc);
1309 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1434 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310 1435
1311
1312 ep->glyph = glyph; 1436 ep->glyph = glyph;
1313 ep->x = x + (cwidth - extents.xOff >> 1); 1437 ep->x = x_ + (cwidth - extents.xOff >> 1);
1314 ep->y = y + ascent; 1438 ep->y = y_ + ascent;
1315 1439
1316 if (extents.xOff == 0) 1440 if (extents.xOff == 0)
1317 ep->x = x + cwidth; 1441 ep->x = x_ + cwidth;
1318 1442
1319 ep++; 1443 ep++;
1320 } 1444 }
1321 1445
1322 x += cwidth; 1446 x_ += cwidth;
1447 }
1448
1449 if (buffered)
1323 } 1450 {
1324
1325 if (ep != enc) 1451 if (ep != enc)
1452 {
1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1454
1455#ifdef HAVE_IMG
1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1457
1458 if (term->bg_img
1459 && (bg == Color_transparent || bg == Color_bg
1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1461 {
1462 int src_x = x, src_y = y;
1463
1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1465 {
1466 src_x += term->window_vt_x;
1467 src_y += term->window_vt_y;
1468 }
1469
1470 if (term->bg_img->w >= src_x + w
1471 && term->bg_img->h >= src_y + h)
1472 {
1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1474 src_x, src_y, w, h, 0, 0);
1475 }
1476 else
1477 {
1478 XGCValues gcv;
1479
1480 gcv.fill_style = FillTiled;
1481 gcv.tile = term->bg_img->pm;
1482 gcv.ts_x_origin = -src_x;
1483 gcv.ts_y_origin = -src_y;
1484
1485 XChangeGC (disp, gc,
1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1487 &gcv);
1488
1489 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1490
1491 gcv.fill_style = FillSolid;
1492 XChangeGC (disp, gc, GCFillStyle, &gcv);
1493 }
1494
1495 if (dst)
1496 {
1497 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1498
1499 // dst can only be set when bg >= 0
1500 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1501 }
1502 }
1503 else
1504#endif
1505 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1506
1507 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1508 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1509 }
1510 else
1511 clear_rect (d, x, y, w, h, bg);
1512 }
1513 else
1514 {
1515 clear_rect (d, x, y, w, h, bg);
1326 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1516 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1517 }
1327} 1518}
1519
1328#endif 1520#endif
1329 1521
1330///////////////////////////////////////////////////////////////////////////// 1522/////////////////////////////////////////////////////////////////////////////
1331 1523
1332rxvt_fontset::rxvt_fontset (rxvt_term *term) 1524rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1343void 1535void
1344rxvt_fontset::clear () 1536rxvt_fontset::clear ()
1345{ 1537{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1539 = rxvt_fontprop::unset;
1540 force_prop = false;
1348 1541
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1543 (*i)->unref ();
1351 1544
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1353 delete *p; 1546 delete *p;
1354 1547
1355 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1357 fonts.clear (); 1550 fonts.clear ();
1358 1551
1359 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1360} 1553}
1361 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1362rxvt_font * 1564rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1566{
1365 rxvt_font *f; 1567 rxvt_font *f;
1366 1568
1367 if (!name || !*name) 1569 if (!name || !*name)
1368 { 1570 {
1369 name = ""; 1571 name = "";
1370 f = new rxvt_font_default (this); 1572 f = new rxvt_font_default (this);
1371 } 1573 }
… …
1382 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1383 } 1585 }
1384 else 1586 else
1385 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1386 1588
1387 f->set_term (term);
1388 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1389 1590 prepare_font (f, cs);
1390 f->cs = cs;
1391 f->loaded = false;
1392 1591
1393 return f; 1592 return f;
1394} 1593}
1395 1594
1396///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1397 1613
1398void 1614void
1399rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1400{ 1616{
1401 if (desc) 1617 if (desc)
… …
1430 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1431 else 1647 else
1432 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1433 1649
1434 desc++; 1650 desc++;
1435 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1436 } 1652 }
1437 1653
1438 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1439 if (!end) 1655 if (!end)
1440 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
1441 1657
1442 if (end - desc < 511) 1658 if (end - desc < 511)
1443 { 1659 {
1444 strncpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1445 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1446 1662
1447 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1448 } 1664 }
1449 else 1665 else
1450 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1451 1667
1452 desc = end + 1; 1668 desc = end + 1;
1453 } 1669 }
1454 while (*end); 1670 while (*end);
1455 } 1671 }
… …
1464 if (fonts[i]->loaded) 1680 if (fonts[i]->loaded)
1465 return true; 1681 return true;
1466 1682
1467 fonts[i]->loaded = true; 1683 fonts[i]->loaded = true;
1468 1684
1469 if (!fonts[i]->load (prop)) 1685 if (!fonts[i]->load (prop, force_prop))
1470 { 1686 {
1471 fonts[i]->cs = CS_UNKNOWN; 1687 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1688 return false;
1473 } 1689 }
1474 1690
… …
1480{ 1696{
1481 clear (); 1697 clear ();
1482 1698
1483 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1484 1700
1485 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1486 realize_font (0); 1702 realize_font (0);
1487 1703
1488 add_fonts (desc); 1704 add_fonts (desc);
1489 1705
1490 return true; 1706 return true;
… …
1499 1715
1500 return -1; 1716 return -1;
1501} 1717}
1502 1718
1503int 1719int
1504rxvt_fontset::find_font (unicode_t unicode) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1505{ 1721{
1506 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1507 return 0; 1723 return 0;
1508 1724
1509 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
… …
1535 goto next_font; 1751 goto next_font;
1536 1752
1537 bool careful; 1753 bool careful;
1538 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1539 { 1755 {
1540 if (careful) 1756 i = (i << 1) | careful;
1541 i |= 128;
1542 1757
1543 goto found; 1758 goto found;
1544 } 1759 }
1545 1760
1546 next_font: 1761 next_font:
1547 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1548 { 1763 {
1549 if (fallback->name) 1764 if (fallback->name)
1550 { 1765 {
1551 // search through the fallback list 1766 // search through the fallback list
1552 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1553 fallback++; 1768 fallback++;
1554 } 1769 }
1555 else 1770 else
1556 { 1771 {
1557 // try to find a new font. 1772 // try to find a new font.
… …
1559 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1560 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1561 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1562#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1563 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1564 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1565 1781
1566 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1567 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1568 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1791 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1792 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1793 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1794
1579 XftResult result; 1795 XftResult result;
1580 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1796 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1797
1582 FcPatternDestroy (p); 1798 FcPatternDestroy (p);
1583 1799
1584 if (match) 1800 if (match)
1585 { 1801 {
… …
1588 FcPatternDestroy (match); 1804 FcPatternDestroy (match);
1589 1805
1590 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1591 { 1807 {
1592 char fontname[4096]; 1808 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1594 1810
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1596 } 1812 }
1597 1813
1598 free (font); 1814 free (font);
1599 } 1815 }
1600#endif 1816#endif
… …
1612 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1613 fmap.push_back (0); 1829 fmap.push_back (0);
1614 1830
1615 if (!fmap[hi]) 1831 if (!fmap[hi])
1616 { 1832 {
1617 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1618 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1619 } 1835 }
1620 1836
1621 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1622 } 1838 }
1623 1839
1624 return i; 1840 return i;
1625} 1841}
1626 1842
1627
1628

Diff Legend

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