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

Diff Legend

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