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.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.205 by root, Thu Jun 17 14:55:05 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 51
49#if ENCODING_EU 52#if ENCODING_EU
50 // cyrillic 53 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 56
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 70
68# if XFT 71# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 72 { CS_KOI8_U, "xft::lang=ru" },
70 73
71 { CS_ISO8859_5, "xft::lang=ru" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 76 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 77 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
136#if XFT 138#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
159}; 161};
160 162
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165 165
166///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
167 167
… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
237 if (color < 0 || color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else 239 else if (color >= 0)
240 { 240 {
241#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
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
243#else 258#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 261#endif
247 } 262 }
248} 263}
249 264
250///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
251 266
252#include "table/linedraw.h"
253
254struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
255 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
256 270
257 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
258 : rxvt_font () 272 : rxvt_font ()
259 { 273 {
… …
270 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
271 285
272 return p; 286 return p;
273 } 287 }
274 288
275 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 290 {
277 width = 1; height = 1; 291 width = 1; height = 1;
278 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
279 293
280 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
293 return false; 307 return false;
294 308
295 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
296 return true; 310 return true;
297 311
312#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 315 return true;
316#endif
301 317
302 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
303 return true; 319 // rob other fonts from taking over.
304 320
305 switch (unicode) 321 switch (unicode)
306 { 322 {
307 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
308 case NOCHAR: 324 case NOCHAR:
… …
329 345
330 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
331 347
332 while (len) 348 while (len)
333 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
334#if ENABLE_COMBINING 356#if ENABLE_COMBINING
335 compose_char *cc; 357 compose_char *cc;
336#endif 358#endif
337 const text_t *tp = text;
338 text_t t = *tp;
339
340 while (++text, --len && *text == NOCHAR)
341 ;
342
343 int width = text - tp; 359 int width = text - tp;
344 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
345 361
362#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
347 { 364 {
365# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
351 369
352 int W = fwidth; 370 int W = fwidth;
… …
390 408
391 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
392 if (a) 410 if (a)
393 { 411 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 413
396 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
400 418
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 438 break;
421 } 439 }
422 } 440 }
423 } 441 }
442#else
443 if (0)
444 ;
445#endif
424#if ENABLE_COMBINING 446#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 448 {
427 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
428 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
429 text_t chrs[2]; 473 text_t chrs[2];
430 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
431 475
432 *chrs = cc->c1; 476 *chrs = cc->c1;
433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
434 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
435 479
436 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
437 { 481 {
438 bool careful; 482 bool careful;
439 483
440 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
441 *chrs = cc->c2; 485 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 487 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
445 489
446 f2->draw (d, x, y, chrs, width, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 491 }
492 #endif
448 } 493 }
449#endif 494#endif
450 else 495 else
451 switch (t) 496 switch (t)
452 { 497 {
453 case '\t': 498 case '\t':
454 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
455 case NOCHAR: 500 case NOCHAR:
456 break; 501 break;
457 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
458 default: 512 default:
459 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
460 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
461 } 515 }
462 516
463 x += fwidth; 517 x += fwidth;
464 } 518 }
465} 519}
466 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
467///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
468 577
469struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
470 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
471 581
472 void clear (); 582 void clear ();
473 583
474 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
475 585
476 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
477 587
478 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;
479 589
480 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 591 const text_t *text, int len,
482 int fg, int bg); 592 int fg, int bg);
483 593
484 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
485 XFontStruct *f; 595 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 596 bool enc2b, encm;
488 597
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 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);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
498 unsigned long value; 607 unsigned long value;
499 608
500 if (XGetFontProperty (f, property, &value)) 609 if (XGetFontProperty (f, property, &value))
501 return XGetAtomName (term->dpy, value); 610 return XGetAtomName (term->dpy, value);
502 else 611 else
503 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
504} 613}
505 614
506rxvt_fontprop 615rxvt_fontprop
507rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
508{ 617{
… …
590 return false; 699 return false;
591} 700}
592 701
593// fix the size of scalable fonts 702// fix the size of scalable fonts
594static bool 703static bool
595replace_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)
596{ 705{
597 int slashes = 0; 706 int slashes = 0;
598 const char *field, *end; 707 const char *field, *end;
599 708
600 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
610 break; 719 break;
611 } 720 }
612 721
613 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
614 { 723 {
615 // TODO: check for overflow in font-name 724 size_t len = field - name;
616 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 726 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
619 strcat (buf, end); 728 strcat (*ptr, end);
620 729
621 return true; 730 return true;
622 } 731 }
623 else 732 else
624 { 733 {
625 strcpy (buf, name); 734 *ptr = strdup (name);
626 735
627 return false; 736 return false;
628 } 737 }
629} 738}
630 739
631bool 740bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 742{
634 dTermDisplay; 743 dTermDisplay;
635 744
636 clear (); 745 clear ();
637 746
638 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
639 748
640 // first morph the font if required 749 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 751 {
644 char fname[1024]; 752 char *fname;
645 753
646 if (name[0] != '-') 754 if (name[0] != '-')
647 { 755 {
648 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
649 757
650 if (!f) 758 if (!f)
651 return false; 759 return false;
652 760
653 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
654 762
655 if (new_name) 763 if (new_name)
656 set_name (new_name); 764 set_name (new_name);
657 else 765 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
659 767
660 XFreeFont (disp, f); 768 XFreeFont (disp, f);
661 f = 0; 769 f = 0;
662 } 770 }
663 771
664 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
665 { 773 {
666 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 776 ? "medium" : "bold");
669 set_name (strdup (fname)); 777 set_name (fname);
670 } 778 }
671 779
672 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
673 { 781 {
674 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 785 set_name (fname);
678 } 786 }
679 } 787 }
680 788
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
708 816
709 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
710 { 818 {
711 rxvt_fontprop p; 819 rxvt_fontprop p;
712 char fname[1024]; 820 char *fname;
713 821
714 int diff = 0; 822 int diff = 0;
715 823
716 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
720 832
721 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);
722 continue; 839 continue;
723 840 }
724 if (prop.height != rxvt_fontprop::unset
725 && p.height > prop.height) // weed out too large fonts
726 continue;
727 841
728 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;
729 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);
730 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);
731 //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);
732 846
733 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
734 fonts[i].diff = diff; 848 fonts[i].diff = diff;
735 } 849 }
736 850
737 XFreeFontNames (list); 851 XFreeFontNames (list);
738 852
739 // 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
740 for (;;) 854 for (;;)
741 { 855 {
742 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
743 857
744 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
745 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
746 best = w; 860 best = w;
747 861
748 if (!best->name 862 if (!best->name
749 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
750 break; 864 break;
… …
770 return false; 884 return false;
771 885
772 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774 888
889 cs = CS_UNKNOWN;
890
775 if (registry && encoding) 891 if (registry && encoding)
776 { 892 {
777 char charset[64]; 893 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
779 895
780 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
781 } 897
782 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
784 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
785 909
786 if (!charset) 910 if (!charset)
787 charset = name; 911 charset = name;
788 912
789 int count = 13; 913 int count = 13;
790 while (*charset) 914 while (*charset)
791 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
792 break; 916 break;
793 917
794 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)
795 } 926 {
796 927 clear ();
797 free (registry); 928 return false;
798 free (encoding); 929 }
799 930
800 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
801 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
802 933
803 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
815 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;
816 947
817 if (encm) 948 if (encm)
818 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
819 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820 951
821 while (N) 952 while (N)
822 { 953 {
823 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
824 width = f->per_char[N].width; 955 width = f->per_char[N].width;
825 956
… …
828 } 959 }
829#endif 960#endif
830 961
831 width = 1; 962 width = 1;
832 963
833 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++)
834 { 965 {
835 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
836 continue; 967 continue;
837 968
838 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
839 bool careful; 970 bool careful;
840 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
841 continue; 972 continue;
842 973
843 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 };
844 976
845 XCharStruct g; 977 XCharStruct g;
846 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
847 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
848 980
… …
850 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 983
852 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
853 } 985 }
854 986
855 if (cs == CS_UNKNOWN) 987#if 0 // do it per-character
988 if (prop && width > prop->width)
856 { 989 {
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859 clear (); 990 clear ();
860 return false; 991 return false;
861 } 992 }
862
863#if 0 // do it per-character
864 if (prop && width > prop->width)
865 {
866 clear ();
867 return false;
868 }
869#endif 993#endif
870 994
871 return true; 995 return true;
872} 996}
873 997
… …
882} 1006}
883 1007
884bool 1008bool
885rxvt_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
886{ 1010{
1011 careful = false;
1012
887 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
888 1014
889 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
890 return false; 1016 return false;
891 1017
892 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
893 XCharStruct *xcs; 1019 XCharStruct *xcs;
894 1020
895 if (encm) 1021 if (encm)
896 { 1022 {
897 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
927 return false; 1053 return false;
928 1054
929 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 1056 return true;
931 1057
932 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
933 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = max (WCWIDTH (unicode), 1); 1060 int wcw = max (WCWIDTH (unicode), 1);
935 1061
936 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
937 1063
… …
954 dTermDisplay; 1080 dTermDisplay;
955 dTermGC; 1081 dTermGC;
956 1082
957 bool slow = this->slow 1083 bool slow = this->slow
958 || width != term->fwidth 1084 || width != term->fwidth
959 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
960 1087
961 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
962 1089
963 XGCValues v; 1090 XGCValues v;
964 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
977 else 1104 else
978 { 1105 {
979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1106 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1107
981 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1109
983 if (slow) 1110 if (slow)
984 { 1111 {
985 do 1112 do
986 { 1113 {
987 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
… …
1009 else 1136 else
1010 { 1137 {
1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1138 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012 1139
1013 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1014 1141
1015 if (slow) 1142 if (slow)
1016 { 1143 {
1017 do 1144 do
1018 { 1145 {
1019 if (*xc) 1146 if (*xc)
… …
1032 1159
1033///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1034 1161
1035#if XFT 1162#if XFT
1036 1163
1037struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1038 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1039 1171
1040 void clear (); 1172 void clear ();
1041 1173
1042 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1043 1175
1044 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1177
1046 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1179 const text_t *text, int len,
1048 int fg, int bg); 1180 int fg, int bg);
1049 1181
1050 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;
1051 1183
1052protected: 1184protected:
1053 XftFont *f; 1185 XftFont *f;
1054}; 1186};
1055 1187
… …
1082 1214
1083 return p; 1215 return p;
1084} 1216}
1085 1217
1086bool 1218bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1220{
1089 dTermDisplay; 1221 dTermDisplay;
1090 1222
1091 clear (); 1223 clear ();
1092 1224
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1236
1105 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1240
1109 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1244
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117#endif 1249#endif
1118 1250
1119 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1121 1253
… …
1133 int ftheight = 0; 1265 int ftheight = 0;
1134 bool success = true; 1266 bool success = true;
1135 1267
1136 for (;;) 1268 for (;;)
1137 { 1269 {
1270 p = FcPatternDuplicate (match);
1138 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1139 1272
1140 if (!f) 1273 if (!f)
1141 { 1274 {
1275 FcPatternDestroy (p);
1142 success = false; 1276 success = false;
1143 break; 1277 break;
1144 } 1278 }
1145 1279
1146 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1154 1288
1155 XftUnlockFace (f); 1289 XftUnlockFace (f);
1156 1290
1157 int glheight = height; 1291 int glheight = height;
1158 1292
1159 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++)
1160 { 1294 {
1161 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1162 1296
1163 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1164 && ch > 0x100 1298 && ch > 0x100
… …
1183 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1184 } 1318 }
1185 1319
1186 if (!width) 1320 if (!width)
1187 { 1321 {
1188 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1322 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1189 1323 width = f->max_advance_width;
1190 XftFontClose (disp, f);
1191 f = 0;
1192
1193 success = false;
1194 break; 1324 break;
1195 } 1325 }
1196 1326
1197 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1198 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1233bool 1363bool
1234rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1235{ 1365{
1236 careful = false; 1366 careful = false;
1237 1367
1368#if ENABLE_COMBINING && !UNICODE_3
1369 // handle non-BMP characters when our storage uses 16 bit
1370 if (ecb_expect_false (IS_COMPOSE (unicode)))
1371 if (compose_char *cc = rxvt_composite[unicode])
1372 if (cc->c2 == NOCHAR)
1373 unicode = cc->c1;
1374#endif
1375
1238 if (!XftCharExists (term->dpy, f, unicode)) 1376 if (!XftCharExists (term->dpy, f, unicode))
1377 return false;
1378
1379 // some fonts claim they can render private use chars and then
1380 // render them as boxes.
1381 if (ecb_expect_false (IS_COMPOSE (unicode)))
1239 return false; 1382 return false;
1240 1383
1241 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1242 return true; 1385 return true;
1243 1386
… …
1265rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1408rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266 const text_t *text, int len, 1409 const text_t *text, int len,
1267 int fg, int bg) 1410 int fg, int bg)
1268{ 1411{
1269 XGlyphInfo extents; 1412 XGlyphInfo extents;
1270 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1413 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1271 XftGlyphSpec *ep = enc; 1414 XftGlyphSpec *ep = enc;
1272 1415
1273 dTermDisplay; 1416 dTermDisplay;
1274 dTermGC; 1417 dTermGC;
1275 1418
1276 int w = term->fwidth * len; 1419 int w = term->fwidth * len;
1277 int h = term->fheight; 1420 int h = term->fheight;
1278 1421
1279 bool buffered = 0 1422 bool buffered = bg >= Color_transparent
1280#ifndef FORCE_UNBUFFERED_XFT 1423 && term->option (Opt_buffered);
1281# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1282 || !term->am_transparent // we aren't transparent
1283 || term->am_pixmap_trans // we have a pixmap
1284# endif
1285 || bg >= 0; // we don't use a transparent bg
1286#endif
1287 1424
1288 // cut trailing spaces 1425 // cut trailing spaces
1289 while (len && text [len - 1] == ' ') 1426 while (len && text [len - 1] == ' ')
1290 len--; 1427 len--;
1291 1428
… …
1295 while (len) 1432 while (len)
1296 { 1433 {
1297 int cwidth = term->fwidth; 1434 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1435 FcChar32 fc = *text++; len--;
1299 1436
1437#if ENABLE_COMBINING && !UNICODE_3
1438 // handle non-BMP characters when our storage uses 16 bit
1439 if (ecb_expect_false (IS_COMPOSE (fc)))
1440 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1441 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1442#endif
1443
1300 while (len && *text == NOCHAR) 1444 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1445 text++, len--, cwidth += term->fwidth;
1302 1446
1303 if (fc != ' ') // skip spaces 1447 if (fc != ' ') // skip spaces
1304 { 1448 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1449 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1450 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1451
… …
1322 { 1466 {
1323 if (ep != enc) 1467 if (ep != enc)
1324 { 1468 {
1325 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1326 1470
1327#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1471#ifdef HAVE_IMG
1328 if (bg < 0 && term->am_pixmap_trans) 1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1329 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0); 1473
1330 else if (bg < 0 && term->bgPixmap.pixmap) 1474 if (term->bg_img
1475 && (bg == Color_transparent || bg == Color_bg
1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1331 { 1477 {
1478 int src_x = x, src_y = y;
1479
1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1481 {
1482 src_x += term->window_vt_x;
1483 src_y += term->window_vt_y;
1484 }
1485
1486 if (term->bg_img->w >= src_x + w
1487 && term->bg_img->h >= src_y + h)
1488 {
1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1490 src_x, src_y, w, h, 0, 0);
1491 }
1492 else
1493 {
1332 XGCValues gcv; 1494 XGCValues gcv;
1333 1495
1334 gcv.fill_style = FillTiled; 1496 gcv.fill_style = FillTiled;
1335 gcv.tile = term->pixmap; 1497 gcv.tile = term->bg_img->pm;
1336 gcv.ts_x_origin = -x; 1498 gcv.ts_x_origin = -src_x;
1337 gcv.ts_y_origin = -y; 1499 gcv.ts_y_origin = -src_y;
1338 1500
1339 GC gc2 = XCreateGC (disp, d2, 1501 XChangeGC (disp, gc,
1340 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1341 &gcv); 1503 &gcv);
1342 1504
1343 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1505 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1344 1506
1345 XFreeGC (disp, gc2); 1507 gcv.fill_style = FillSolid;
1508 XChangeGC (disp, gc, GCFillStyle, &gcv);
1509 }
1510
1511 if (dst)
1512 {
1513 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1514
1515 // dst can only be set when bg >= 0
1516 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1517 }
1346 } 1518 }
1347 else 1519 else
1348#endif 1520#endif
1349 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1521 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1350 1522
1351 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1523 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1352 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1524 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1353 } 1525 }
1354 else 1526 else
… …
1379void 1551void
1380rxvt_fontset::clear () 1552rxvt_fontset::clear ()
1381{ 1553{
1382 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1554 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1383 = rxvt_fontprop::unset; 1555 = rxvt_fontprop::unset;
1556 force_prop = false;
1384 1557
1385 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1558 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1386 FONT_UNREF (*i); 1559 (*i)->unref ();
1387 1560
1388 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1561 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1389 delete *p; 1562 delete *p;
1390 1563
1391 free (fontdesc); fontdesc = 0; 1564 free (fontdesc); fontdesc = 0;
… …
1393 fonts.clear (); 1566 fonts.clear ();
1394 1567
1395 fallback = fallback_fonts; 1568 fallback = fallback_fonts;
1396} 1569}
1397 1570
1571void
1572rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1573{
1574 font->set_term (term);
1575
1576 font->cs = cs;
1577 font->loaded = false;
1578}
1579
1398rxvt_font * 1580rxvt_font *
1399rxvt_fontset::new_font (const char *name, codeset cs) 1581rxvt_fontset::new_font (const char *name, codeset cs)
1400{ 1582{
1401 rxvt_font *f; 1583 rxvt_font *f;
1402 1584
1403 if (!name || !*name) 1585 if (!name || !*name)
1404 { 1586 {
1405 name = ""; 1587 name = "";
1406 f = new rxvt_font_default (this); 1588 f = new rxvt_font_default (this);
1407 } 1589 }
… …
1418 f = new rxvt_font_x11; 1600 f = new rxvt_font_x11;
1419 } 1601 }
1420 else 1602 else
1421 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1422 1604
1423 f->set_term (term);
1424 f->set_name (strdup (name)); 1605 f->set_name (strdup (name));
1425 1606 prepare_font (f, cs);
1426 f->cs = cs;
1427 f->loaded = false;
1428 1607
1429 return f; 1608 return f;
1430} 1609}
1431 1610
1432///////////////////////////////////////////////////////////////////////////// 1611/////////////////////////////////////////////////////////////////////////////
1612
1613void
1614rxvt_fontset::push_font (rxvt_font *font)
1615{
1616 // the fontCount index is reserved for the overflow font, it is only
1617 // necessary when we get fontCount or more fonts, as they cannot be
1618 // represented in the rendition.
1619 if (fonts.size () == fontCount)
1620 {
1621 rxvt_font *f = new rxvt_font_overflow (this);
1622
1623 prepare_font (f, CS_UNICODE);
1624 fonts.push_back (f);
1625 }
1626
1627 fonts.push_back (font);
1628}
1433 1629
1434void 1630void
1435rxvt_fontset::add_fonts (const char *desc) 1631rxvt_fontset::add_fonts (const char *desc)
1436{ 1632{
1437 if (desc) 1633 if (desc)
… …
1466 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1467 else 1663 else
1468 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1469 1665
1470 desc++; 1666 desc++;
1471 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1472 } 1668 }
1473 1669
1474 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1475 if (!end) 1671 if (!end)
1476 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
1477 1673
1478 if (end - desc < 511) 1674 if (end - desc < 511)
1479 { 1675 {
1480 strncpy (buf, desc, end - desc); 1676 memcpy (buf, desc, end - desc);
1481 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1482 1678
1483 fonts.push_back (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1484 } 1680 }
1485 else 1681 else
1486 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1487 1683
1488 desc = end + 1; 1684 desc = end + 1;
1489 } 1685 }
1490 while (*end); 1686 while (*end);
1491 } 1687 }
… …
1500 if (fonts[i]->loaded) 1696 if (fonts[i]->loaded)
1501 return true; 1697 return true;
1502 1698
1503 fonts[i]->loaded = true; 1699 fonts[i]->loaded = true;
1504 1700
1505 if (!fonts[i]->load (prop)) 1701 if (!fonts[i]->load (prop, force_prop))
1506 { 1702 {
1507 fonts[i]->cs = CS_UNKNOWN; 1703 fonts[i]->cs = CS_UNKNOWN;
1508 return false; 1704 return false;
1509 } 1705 }
1510 1706
… …
1516{ 1712{
1517 clear (); 1713 clear ();
1518 1714
1519 fontdesc = strdup (desc); 1715 fontdesc = strdup (desc);
1520 1716
1521 fonts.push_back (new_font (0, CS_UNICODE)); 1717 push_font (new_font (0, CS_UNICODE));
1522 realize_font (0); 1718 realize_font (0);
1523 1719
1524 add_fonts (desc); 1720 add_fonts (desc);
1525 1721
1526 return true; 1722 return true;
… …
1535 1731
1536 return -1; 1732 return -1;
1537} 1733}
1538 1734
1539int 1735int
1540rxvt_fontset::find_font (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1541{ 1737{
1542 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1543 return 0; 1740 return 0;
1544 1741
1545 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1546 1743
1547 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1548 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1549 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1550 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1551 1748
1552 unsigned int i; 1749 unsigned int i;
1553 1750
1554 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1555 { 1752 {
… …
1571 goto next_font; 1768 goto next_font;
1572 1769
1573 bool careful; 1770 bool careful;
1574 if (f->has_char (unicode, &prop, careful)) 1771 if (f->has_char (unicode, &prop, careful))
1575 { 1772 {
1576 if (careful) 1773 i = (i << 1) | careful;
1577 i |= 128;
1578 1774
1579 goto found; 1775 goto found;
1580 } 1776 }
1581 1777
1582 next_font: 1778 next_font:
1583 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1584 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1585 if (fallback->name) 1786 if (fallback->name)
1586 { 1787 {
1587 // search through the fallback list 1788 // search through the fallback list
1588 fonts.push_back (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1589 fallback++; 1790 fallback++;
1590 } 1791 }
1591 else 1792 else
1592 { 1793 {
1593 // try to find a new font. 1794 // try to find a new font.
… …
1595 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1596 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1597 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1598#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1599 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1600 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1601 1803
1602 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1603 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1604 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1624 FcPatternDestroy (match); 1826 FcPatternDestroy (match);
1625 1827
1626 if (find_font (font) < 0) 1828 if (find_font (font) < 0)
1627 { 1829 {
1628 char fontname[4096]; 1830 char fontname[4096];
1629 sprintf (fontname, "xft:%-.4090s", font); 1831 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1630 1832
1631 fonts.push_back (new_font (fontname, CS_UNICODE)); 1833 push_font (new_font (fontname, CS_UNICODE));
1632 } 1834 }
1633 1835
1634 free (font); 1836 free (font);
1635 } 1837 }
1636#endif 1838#endif
… …
1648 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1649 fmap.push_back (0); 1851 fmap.push_back (0);
1650 1852
1651 if (!fmap[hi]) 1853 if (!fmap[hi])
1652 { 1854 {
1653 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1654 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1655 } 1857 }
1656 1858
1657 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1658 } 1860 }
1659 1861
1660 return i; 1862 return i;
1661} 1863}
1662 1864
1663
1664

Diff Legend

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