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.97 by root, Sun Feb 19 16:34:36 2006 UTC vs.
Revision 1.207 by root, Thu Jun 17 19:42:55 2021 UTC

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

Diff Legend

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