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.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.216 by root, Sat Jun 19 10:08:10 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
… …
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 == Color_bg || color == Color_transparent) 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 if (color >= 0) 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 {
… …
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, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 468 }
448 } 469 }
449#endif 470#endif
… …
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 ();
… …
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 bool enc2b, encm; 572 bool enc2b, encm;
487 573
488 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
489 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);
… …
497 unsigned long value; 583 unsigned long value;
498 584
499 if (XGetFontProperty (f, property, &value)) 585 if (XGetFontProperty (f, property, &value))
500 return XGetAtomName (term->dpy, value); 586 return XGetAtomName (term->dpy, value);
501 else 587 else
502 return rxvt_strdup (repl); 588 return repl ? strdup (repl) : 0;
503} 589}
504 590
505rxvt_fontprop 591rxvt_fontprop
506rxvt_font_x11::properties () 592rxvt_font_x11::properties ()
507{ 593{
… …
589 return false; 675 return false;
590} 676}
591 677
592// fix the size of scalable fonts 678// fix the size of scalable fonts
593static bool 679static bool
594replace_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)
595{ 681{
596 int slashes = 0; 682 int slashes = 0;
597 const char *field, *end; 683 const char *field, *end;
598 684
599 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
609 break; 695 break;
610 } 696 }
611 697
612 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
613 { 699 {
614 // TODO: check for overflow in font-name 700 size_t len = field - name;
615 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 buf += field - name; 702 memcpy (*ptr, name, len);
617 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
618 strcat (buf, end); 704 strcat (*ptr, end);
619 705
620 return true; 706 return true;
621 } 707 }
622 else 708 else
623 { 709 {
624 strcpy (buf, name); 710 *ptr = strdup (name);
625 711
626 return false; 712 return false;
627 } 713 }
628} 714}
629 715
… …
637 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
638 724
639 // first morph the font if required 725 // first morph the font if required
640 if (force_prop) 726 if (force_prop)
641 { 727 {
642 char fname[1024]; 728 char *fname;
643 729
644 if (name[0] != '-') 730 if (name[0] != '-')
645 { 731 {
646 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
647 733
648 if (!f) 734 if (!f)
649 return false; 735 return false;
650 736
651 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
652 738
653 if (new_name) 739 if (new_name)
654 set_name (new_name); 740 set_name (new_name);
655 else 741 else
656 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
657 743
658 XFreeFont (disp, f); 744 XFreeFont (disp, f);
659 f = 0; 745 f = 0;
660 } 746 }
661 747
662 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
663 { 749 {
664 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
665 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
666 ? "medium" : "bold"); 752 ? "medium" : "bold");
667 set_name (strdup (fname)); 753 set_name (fname);
668 } 754 }
669 755
670 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
671 { 757 {
672 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
673 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
674 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
675 set_name (strdup (fname)); 761 set_name (fname);
676 } 762 }
677 } 763 }
678 764
679 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 765 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680 ? 0 : prop.height); 766 ? 0 : prop.height);
… …
705 font_weight *fonts = new font_weight[count]; 791 font_weight *fonts = new font_weight[count];
706 792
707 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
708 { 794 {
709 rxvt_fontprop p; 795 rxvt_fontprop p;
710 char fname[1024]; 796 char *fname;
711 797
712 int diff = 0; 798 int diff = 0;
713 799
714 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
715 diff += 10; // slightly penalize scalable fonts 801 diff += 10; // slightly penalize scalable fonts
802 else
803 {
804 free (fname);
716 else if (replace_field (fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
807 }
718 808
719 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);
720 continue; 815 continue;
721 816 }
722 if (prop.height != rxvt_fontprop::unset
723 && p.height > prop.height) // weed out too large fonts
724 continue;
725 817
726 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;
727 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);
728 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);
729 //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);
730 822
731 fonts[i].name = strdup (fname); 823 fonts[i].name = fname;
732 fonts[i].diff = diff; 824 fonts[i].diff = diff;
733 } 825 }
734 826
735 XFreeFontNames (list); 827 XFreeFontNames (list);
736 828
737 // 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
738 for (;;) 830 for (;;)
739 { 831 {
740 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
741 833
742 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
743 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
744 best = w; 836 best = w;
745 837
746 if (!best->name 838 if (!best->name
747 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
748 break; 840 break;
… …
768 return false; 860 return false;
769 861
770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772 864
865 cs = CS_UNKNOWN;
866
773 if (registry && encoding) 867 if (registry && encoding)
774 { 868 {
775 char charset[64]; 869 char charset[64];
776 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
777 871
778 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
779 } 873
780 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
782 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
783 885
784 if (!charset) 886 if (!charset)
785 charset = name; 887 charset = name;
786 888
787 int count = 13; 889 int count = 13;
788 while (*charset) 890 while (*charset)
789 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
790 break; 892 break;
791 893
792 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)
793 } 902 {
794 903 clear ();
795 free (registry); 904 return false;
796 free (encoding); 905 }
797 906
798 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
799 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
800 909
801 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
813 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;
814 923
815 if (encm) 924 if (encm)
816 N += (f->max_byte1 - f->min_byte1) 925 N += (f->max_byte1 - f->min_byte1)
817 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 926 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818 927
819 while (N) 928 while (N)
820 { 929 {
821 if (f->per_char[N].width > width) 930 if (f->per_char[N].width > width)
822 width = f->per_char[N].width; 931 width = f->per_char[N].width;
823 932
… …
826 } 935 }
827#endif 936#endif
828 937
829 width = 1; 938 width = 1;
830 939
831 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++)
832 { 941 {
833 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
834 continue; 943 continue;
835 944
836 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
837 bool careful; 946 bool careful;
838 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
839 continue; 948 continue;
840 949
841 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 };
842 952
843 XCharStruct g; 953 XCharStruct g;
844 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
845 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
846 956
… …
848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849 959
850 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
851 } 961 }
852 962
853 if (cs == CS_UNKNOWN) 963#if 0 // do it per-character
964 if (prop && width > prop->width)
854 { 965 {
855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857 clear (); 966 clear ();
858 return false; 967 return false;
859 } 968 }
860
861#if 0 // do it per-character
862 if (prop && width > prop->width)
863 {
864 clear ();
865 return false;
866 }
867#endif 969#endif
868 970
869 return true; 971 return true;
870} 972}
871 973
… …
880} 982}
881 983
882bool 984bool
883rxvt_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
884{ 986{
987 careful = false;
988
885 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
886 990
887 if (ch == NOCHAR) 991 if (ch == NOCHAR)
888 return false; 992 return false;
889 993
890 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
891 XCharStruct *xcs; 995 XCharStruct *xcs;
892 996
893 if (encm) 997 if (encm)
894 { 998 {
895 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
925 return false; 1029 return false;
926 1030
927 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
928 return true; 1032 return true;
929 1033
930 // check wether character overlaps previous/next character 1034 // check whether character overlaps previous/next character
931 int w = xcs->rbearing - xcs->lbearing; 1035 int w = xcs->rbearing - xcs->lbearing;
932 int wcw = max (WCWIDTH (unicode), 1); 1036 int wcw = max (WCWIDTH (unicode), 1);
933 1037
934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
935 1039
… …
952 dTermDisplay; 1056 dTermDisplay;
953 dTermGC; 1057 dTermGC;
954 1058
955 bool slow = this->slow 1059 bool slow = this->slow
956 || width != term->fwidth 1060 || width != term->fwidth
957 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
958 1063
959 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
960 1065
961 XGCValues v; 1066 XGCValues v;
962 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
975 else 1080 else
976 { 1081 {
977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1082 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978 1083
979 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCFont, &v);
980 1085
981 if (slow) 1086 if (slow)
982 { 1087 {
983 do 1088 do
984 { 1089 {
985 if (xc->byte1 || xc->byte2) 1090 if (xc->byte1 || xc->byte2)
… …
1007 else 1112 else
1008 { 1113 {
1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1114 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010 1115
1011 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1116 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1012 1117
1013 if (slow) 1118 if (slow)
1014 { 1119 {
1015 do 1120 do
1016 { 1121 {
1017 if (*xc) 1122 if (*xc)
… …
1030 1135
1031///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1032 1137
1033#if XFT 1138#if XFT
1034 1139
1035struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1036 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1037 1146
1038 void clear (); 1147 void clear ();
1039 1148
1040 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1041 1150
… …
1043 1152
1044 void draw (rxvt_drawable &d, int x, int y, 1153 void draw (rxvt_drawable &d, int x, int y,
1045 const text_t *text, int len, 1154 const text_t *text, int len,
1046 int fg, int bg); 1155 int fg, int bg);
1047 1156
1048 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;
1049 1158
1050protected: 1159protected:
1051 XftFont *f; 1160 XftFont *f;
1052}; 1161};
1053 1162
… …
1109 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110 1219
1111#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1112 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115#endif 1224#endif
1116 1225
1117 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1119 1228
… …
1131 int ftheight = 0; 1240 int ftheight = 0;
1132 bool success = true; 1241 bool success = true;
1133 1242
1134 for (;;) 1243 for (;;)
1135 { 1244 {
1245 p = FcPatternDuplicate (match);
1136 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1137 1247
1138 if (!f) 1248 if (!f)
1139 { 1249 {
1250 FcPatternDestroy (p);
1140 success = false; 1251 success = false;
1141 break; 1252 break;
1142 } 1253 }
1143 1254
1144 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1152 1263
1153 XftUnlockFace (f); 1264 XftUnlockFace (f);
1154 1265
1155 int glheight = height; 1266 int glheight = height;
1156 1267
1157 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++)
1158 { 1269 {
1159 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1160 1271
1161 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1162 && ch > 0x100 1273 && ch > 0x100
… …
1181 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1182 } 1293 }
1183 1294
1184 if (!width) 1295 if (!width)
1185 { 1296 {
1186 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);
1187 1298 width = f->max_advance_width;
1188 XftFontClose (disp, f);
1189 f = 0;
1190
1191 success = false;
1192 break; 1299 break;
1193 } 1300 }
1194 1301
1195 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1196 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1231bool 1338bool
1232rxvt_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
1233{ 1340{
1234 careful = false; 1341 careful = false;
1235 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1236 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1237 return false; 1358 return false;
1238 1359
1239 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1240 return true; 1361 return true;
1241 1362
1242 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1243 FcChar32 ch = unicode; 1364
1244 XGlyphInfo g; 1365 XGlyphInfo g;
1245 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1246 1367
1247 int w = g.width - g.x; 1368 int w = g.width - g.x;
1248 int wcw = max (WCWIDTH (unicode), 1);
1249 1369
1250 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1251 1371
1252 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1253 return false; 1373 return false;
… …
1262void 1382void
1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264 const text_t *text, int len, 1384 const text_t *text, int len,
1265 int fg, int bg) 1385 int fg, int bg)
1266{ 1386{
1267 XGlyphInfo extents; 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1269 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1270 1389
1271 dTermDisplay; 1390 dTermDisplay;
1272 dTermGC; 1391 dTermGC;
1273 1392
1274 int w = term->fwidth * len; 1393 int w = term->fwidth * len;
1275 int h = term->fheight; 1394 int h = term->fheight;
1276 1395
1277 bool buffered = bg >= 0 // we don't use a transparent bg 1396 bool buffered = bg >= Color_transparent
1278#ifndef FORCE_UNBUFFERED_XFT 1397 && term->option (Opt_buffered);
1279# ifdef ENABLE_TRANSPARENCY
1280 || !term->am_transparent // we aren't transparent
1281# endif
1282#endif
1283 ;
1284 1398
1285 // cut trailing spaces 1399 // cut trailing spaces
1286 while (len && text [len - 1] == ' ') 1400 while (len && text [len - 1] == ' ')
1287 len--; 1401 len--;
1288 1402
… …
1290 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1291 1405
1292 while (len) 1406 while (len)
1293 { 1407 {
1294 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1295 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1296 1410
1297 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1298 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1299 1413
1300 if (fc != ' ') // skip spaces 1414 if (chr != ' ') // skip spaces
1415 {
1416 // handle non-bmp chars when text_t is 16 bit
1417 #if ENABLE_COMBINING && !UNICODE_3
1418 if (ecb_expect_false (IS_COMPOSE (chr)))
1419 if (compose_char *cc = rxvt_composite [chr])
1420 if (cc->c2 == NOCHAR)
1421 chr = cc->c1;
1422 #endif
1423
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1301 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1435 }
1436 #endif
1437
1302 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1303 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304 1441
1305 ep->glyph = glyph; 1442 ep->glyph = glyph;
1306 ep->x = x_ + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1307 ep->y = y_ + ascent; 1444 ep->y = y_ + ascent;
1308 1445
1309 if (extents.xOff == 0) 1446 // the xft font cell might differ from the terminal font cell,
1310 ep->x = x_ + cwidth; 1447 // in which case we use the average between the two.
1448 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1311 1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1312 ep++; 1459 ++ep;
1313 } 1460 }
1314 1461
1315 x_ += cwidth; 1462 x_ += cwidth;
1316 } 1463 }
1317 1464
… …
1319 { 1466 {
1320 if (ep != enc) 1467 if (ep != enc)
1321 { 1468 {
1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323 1470
1324 if (0) 1471#ifdef HAVE_IMG
1325 ; 1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1326#if defined(ENABLE_TRANSPARENCY) || defined(XPM_BACKGROUND) 1473
1327 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))))))
1328 { 1477 {
1329 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w 1478 int src_x = x, src_y = y;
1330 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) 1479
1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1331 { 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 {
1332 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1333 x + term->window_vt_x, y + term->window_vt_y,
1334 w, h, 0, 0); 1490 src_x, src_y, w, h, 0, 0);
1335 } 1491 }
1336 else 1492 else
1337 { 1493 {
1338 XGCValues gcv; 1494 XGCValues gcv;
1339 1495
1340 gcv.fill_style = FillTiled; 1496 gcv.fill_style = FillTiled;
1341 gcv.tile = term->bgPixmap.pixmap; 1497 gcv.tile = term->bg_img->pm;
1342 gcv.ts_x_origin = -x; 1498 gcv.ts_x_origin = -src_x;
1343 gcv.ts_y_origin = -y; 1499 gcv.ts_y_origin = -src_y;
1344 1500
1345#if 0
1346 GC gc2 = XCreateGC (disp, d2,
1347 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1348 &gcv);
1349#endif
1350 XChangeGC (disp, gc, 1501 XChangeGC (disp, gc,
1351 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1352 &gcv); 1503 &gcv);
1353 1504
1354 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); 1505 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1355 1506
1356 gcv.fill_style = FillSolid; 1507 gcv.fill_style = FillSolid;
1357 XChangeGC (disp, gc, GCFillStyle, &gcv); 1508 XChangeGC (disp, gc, GCFillStyle, &gcv);
1358 /* XFreeGC (disp, gc2); */ 1509 }
1359 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);
1360 } 1517 }
1361 } 1518 }
1362#endif
1363 else 1519 else
1520#endif
1364 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);
1365 1522
1366 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1523 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1367 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1524 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1368 } 1525 }
1369 else 1526 else
… …
1397 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1554 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1398 = rxvt_fontprop::unset; 1555 = rxvt_fontprop::unset;
1399 force_prop = false; 1556 force_prop = false;
1400 1557
1401 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1558 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1402 FONT_UNREF (*i); 1559 (*i)->unref ();
1403 1560
1404 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1561 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1405 delete *p; 1562 delete *p;
1406 1563
1407 free (fontdesc); fontdesc = 0; 1564 free (fontdesc); fontdesc = 0;
… …
1409 fonts.clear (); 1566 fonts.clear ();
1410 1567
1411 fallback = fallback_fonts; 1568 fallback = fallback_fonts;
1412} 1569}
1413 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
1414rxvt_font * 1580rxvt_font *
1415rxvt_fontset::new_font (const char *name, codeset cs) 1581rxvt_fontset::new_font (const char *name, codeset cs)
1416{ 1582{
1417 rxvt_font *f; 1583 rxvt_font *f;
1418 1584
1419 if (!name || !*name) 1585 if (!name || !*name)
1420 { 1586 {
1421 name = ""; 1587 name = "";
1422 f = new rxvt_font_default (this); 1588 f = new rxvt_font_default (this);
1423 } 1589 }
… …
1434 f = new rxvt_font_x11; 1600 f = new rxvt_font_x11;
1435 } 1601 }
1436 else 1602 else
1437 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1438 1604
1439 f->set_term (term);
1440 f->set_name (strdup (name)); 1605 f->set_name (strdup (name));
1441 1606 prepare_font (f, cs);
1442 f->cs = cs;
1443 f->loaded = false;
1444 1607
1445 return f; 1608 return f;
1446} 1609}
1447 1610
1448///////////////////////////////////////////////////////////////////////////// 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}
1449 1629
1450void 1630void
1451rxvt_fontset::add_fonts (const char *desc) 1631rxvt_fontset::add_fonts (const char *desc)
1452{ 1632{
1453 if (desc) 1633 if (desc)
… …
1482 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1483 else 1663 else
1484 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1485 1665
1486 desc++; 1666 desc++;
1487 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1488 } 1668 }
1489 1669
1490 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1491 if (!end) 1671 if (!end)
1492 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
1493 1673
1494 if (end - desc < 511) 1674 if (end - desc < 511)
1495 { 1675 {
1496 strncpy (buf, desc, end - desc); 1676 memcpy (buf, desc, end - desc);
1497 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1498 1678
1499 fonts.push_back (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1500 } 1680 }
1501 else 1681 else
1502 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1503 1683
1504 desc = end + 1; 1684 desc = end + 1;
1505 } 1685 }
1506 while (*end); 1686 while (*end);
1507 } 1687 }
… …
1532{ 1712{
1533 clear (); 1713 clear ();
1534 1714
1535 fontdesc = strdup (desc); 1715 fontdesc = strdup (desc);
1536 1716
1537 fonts.push_back (new_font (0, CS_UNICODE)); 1717 push_font (new_font (0, CS_UNICODE));
1538 realize_font (0); 1718 realize_font (0);
1539 1719
1540 add_fonts (desc); 1720 add_fonts (desc);
1541 1721
1542 return true; 1722 return true;
… …
1551 1731
1552 return -1; 1732 return -1;
1553} 1733}
1554 1734
1555int 1735int
1556rxvt_fontset::find_font (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1557{ 1737{
1558 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1559 return 0; 1740 return 0;
1560 1741
1561 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1562 1743
1563 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1564 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1565 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1566 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1567 1748
1568 unsigned int i; 1749 unsigned int i;
1569 1750
1570 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1571 { 1752 {
… …
1587 goto next_font; 1768 goto next_font;
1588 1769
1589 bool careful; 1770 bool careful;
1590 if (f->has_char (unicode, &prop, careful)) 1771 if (f->has_char (unicode, &prop, careful))
1591 { 1772 {
1592 if (careful) 1773 i = (i << 1) | careful;
1593 i |= 128;
1594 1774
1595 goto found; 1775 goto found;
1596 } 1776 }
1597 1777
1598 next_font: 1778 next_font:
1599 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1600 { 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
1601 if (fallback->name) 1786 if (fallback->name)
1602 { 1787 {
1603 // search through the fallback list 1788 // search through the fallback list
1604 fonts.push_back (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1605 fallback++; 1790 fallback++;
1606 } 1791 }
1607 else 1792 else
1608 { 1793 {
1609 // try to find a new font. 1794 // try to find a new font.
… …
1611 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1612 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1613 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1614#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1615 // 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
1616 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1617 1803
1618 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1619 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1620 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1640 FcPatternDestroy (match); 1826 FcPatternDestroy (match);
1641 1827
1642 if (find_font (font) < 0) 1828 if (find_font (font) < 0)
1643 { 1829 {
1644 char fontname[4096]; 1830 char fontname[4096];
1645 sprintf (fontname, "xft:%-.4090s", font); 1831 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1646 1832
1647 fonts.push_back (new_font (fontname, CS_UNICODE)); 1833 push_font (new_font (fontname, CS_UNICODE));
1648 } 1834 }
1649 1835
1650 free (font); 1836 free (font);
1651 } 1837 }
1652#endif 1838#endif
… …
1664 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1665 fmap.push_back (0); 1851 fmap.push_back (0);
1666 1852
1667 if (!fmap[hi]) 1853 if (!fmap[hi])
1668 { 1854 {
1669 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1670 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1671 } 1857 }
1672 1858
1673 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1674 } 1860 }
1675 1861
1676 return i; 1862 return i;
1677} 1863}
1678 1864
1679
1680

Diff Legend

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