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 2 of the License, or |
… | |
… | |
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 | |
41 | const struct rxvt_fallback_font { |
44 | static 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 | |
221 | void |
221 | void |
222 | rxvt_font::set_name (char *name) |
222 | rxvt_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 | |
231 | void |
231 | void |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_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_BG_PIXMAP |
|
|
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 | |
|
|
252 | #include "table/linedraw.h" |
|
|
253 | |
266 | |
254 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font { |
255 | struct rxvt_fontset *fs; |
268 | struct rxvt_fontset *fs; |
256 | |
269 | |
257 | rxvt_font_default (rxvt_fontset *fs) |
270 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
293 | return false; |
306 | return false; |
294 | |
307 | |
295 | if (unicode <= 0x009f) |
308 | if (unicode <= 0x009f) |
296 | return true; |
309 | return true; |
297 | |
310 | |
|
|
311 | #ifdef BUILTIN_GLYPHS |
298 | if (unicode >= 0x2500 && unicode <= 0x259f && |
312 | if (unicode >= 0x2500 && unicode <= 0x259f && |
299 | !term->option (Opt_skipBuiltinGlyphs)) |
313 | !term->option (Opt_skipBuiltinGlyphs)) |
300 | return true; |
314 | return true; |
|
|
315 | #endif |
301 | |
316 | |
302 | if (IS_COMPOSE (unicode)) |
317 | if (IS_COMPOSE (unicode)) |
303 | return true; |
318 | return true; |
304 | |
319 | |
305 | switch (unicode) |
320 | switch (unicode) |
… | |
… | |
341 | ; |
356 | ; |
342 | |
357 | |
343 | int width = text - tp; |
358 | int width = text - tp; |
344 | int fwidth = term->fwidth * width; |
359 | int fwidth = term->fwidth * width; |
345 | |
360 | |
|
|
361 | #ifdef BUILTIN_GLYPHS |
346 | if (0x2500 <= t && t <= 0x259f) |
362 | if (0x2500 <= t && t <= 0x259f) |
347 | { |
363 | { |
|
|
364 | # include "table/linedraw.h" |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
350 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
351 | |
368 | |
352 | int W = fwidth; |
369 | int W = fwidth; |
… | |
… | |
390 | |
407 | |
391 | case 1: // rectangle, possibly stippled |
408 | case 1: // rectangle, possibly stippled |
392 | if (a) |
409 | if (a) |
393 | { |
410 | { |
394 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
395 | |
412 | |
396 | gcv.fill_style = FillStippled; |
413 | gcv.fill_style = FillStippled; |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
398 | gcv.ts_x_origin = x; |
415 | gcv.ts_x_origin = x; |
399 | gcv.ts_y_origin = y; |
416 | gcv.ts_y_origin = y; |
400 | |
417 | |
… | |
… | |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
420 | break; |
437 | break; |
421 | } |
438 | } |
422 | } |
439 | } |
423 | } |
440 | } |
|
|
441 | #else |
|
|
442 | if (0) |
|
|
443 | ; |
|
|
444 | #endif |
424 | #if ENABLE_COMBINING |
445 | #if ENABLE_COMBINING |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
446 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
426 | { |
447 | { |
427 | min_it (width, 2); // we only support wcwidth up to 2 |
448 | min_it (width, 2); // we only support wcwidth up to 2 |
428 | |
449 | |
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 |
… | |
… | |
462 | |
483 | |
463 | x += fwidth; |
484 | x += fwidth; |
464 | } |
485 | } |
465 | } |
486 | } |
466 | |
487 | |
|
|
488 | struct rxvt_font_overflow : rxvt_font { |
|
|
489 | struct rxvt_fontset *fs; |
|
|
490 | |
|
|
491 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
492 | : rxvt_font () |
|
|
493 | { |
|
|
494 | this->fs = fs; |
|
|
495 | } |
|
|
496 | |
|
|
497 | rxvt_fontprop properties () |
|
|
498 | { |
|
|
499 | rxvt_fontprop p; |
|
|
500 | |
|
|
501 | p.width = p.height = 1; |
|
|
502 | p.ascent = rxvt_fontprop::unset; |
|
|
503 | p.weight = rxvt_fontprop::medium; |
|
|
504 | p.slant = rxvt_fontprop::roman; |
|
|
505 | |
|
|
506 | return p; |
|
|
507 | } |
|
|
508 | |
|
|
509 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
510 | { |
|
|
511 | width = 1; height = 1; |
|
|
512 | ascent = 1; descent = 0; |
|
|
513 | |
|
|
514 | set_name (strdup ("built-in rendition overflow font")); |
|
|
515 | |
|
|
516 | return true; |
|
|
517 | } |
|
|
518 | |
|
|
519 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
520 | { |
|
|
521 | return false; |
|
|
522 | } |
|
|
523 | |
|
|
524 | void draw (rxvt_drawable &d, int x, int y, |
|
|
525 | const text_t *text, int len, |
|
|
526 | int fg, int bg) |
|
|
527 | { |
|
|
528 | while (len) |
|
|
529 | { |
|
|
530 | int fid = fs->find_font_idx (*text); |
|
|
531 | int w = 1; |
|
|
532 | while (w < len && text[w] == NOCHAR) |
|
|
533 | w++; |
|
|
534 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
535 | text += w; |
|
|
536 | len -= w; |
|
|
537 | x += term->fwidth * w; |
|
|
538 | } |
|
|
539 | } |
|
|
540 | }; |
|
|
541 | |
467 | ///////////////////////////////////////////////////////////////////////////// |
542 | ///////////////////////////////////////////////////////////////////////////// |
468 | |
543 | |
469 | struct rxvt_font_x11 : rxvt_font { |
544 | struct rxvt_font_x11 : rxvt_font { |
470 | rxvt_font_x11 () { f = 0; } |
545 | rxvt_font_x11 () { f = 0; } |
471 | |
546 | |
… | |
… | |
479 | |
554 | |
480 | void draw (rxvt_drawable &d, int x, int y, |
555 | void draw (rxvt_drawable &d, int x, int y, |
481 | const text_t *text, int len, |
556 | const text_t *text, int len, |
482 | int fg, int bg); |
557 | int fg, int bg); |
483 | |
558 | |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
559 | bool slow; // whether this is a proportional font or has other funny characteristics |
485 | XFontStruct *f; |
560 | XFontStruct *f; |
486 | bool enc2b, encm; |
561 | bool enc2b, encm; |
487 | |
562 | |
488 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
563 | 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); |
564 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
497 | unsigned long value; |
572 | unsigned long value; |
498 | |
573 | |
499 | if (XGetFontProperty (f, property, &value)) |
574 | if (XGetFontProperty (f, property, &value)) |
500 | return XGetAtomName (term->dpy, value); |
575 | return XGetAtomName (term->dpy, value); |
501 | else |
576 | else |
502 | return rxvt_strdup (repl); |
577 | return repl ? strdup (repl) : 0; |
503 | } |
578 | } |
504 | |
579 | |
505 | rxvt_fontprop |
580 | rxvt_fontprop |
506 | rxvt_font_x11::properties () |
581 | rxvt_font_x11::properties () |
507 | { |
582 | { |
… | |
… | |
589 | return false; |
664 | return false; |
590 | } |
665 | } |
591 | |
666 | |
592 | // fix the size of scalable fonts |
667 | // fix the size of scalable fonts |
593 | static bool |
668 | static bool |
594 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
669 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
595 | { |
670 | { |
596 | int slashes = 0; |
671 | int slashes = 0; |
597 | const char *field, *end; |
672 | const char *field, *end; |
598 | |
673 | |
599 | for (const char *c = name; *c; c++) |
674 | for (const char *c = name; *c; c++) |
… | |
… | |
609 | break; |
684 | break; |
610 | } |
685 | } |
611 | |
686 | |
612 | if (slashes >= 13 && (!old || *field == old)) |
687 | if (slashes >= 13 && (!old || *field == old)) |
613 | { |
688 | { |
614 | // TODO: check for overflow in font-name |
689 | size_t len = field - name; |
615 | strncpy (buf, name, field - name); |
690 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
616 | buf += field - name; |
691 | memcpy (*ptr, name, len); |
617 | strcpy (buf, replace); |
692 | strcpy (*ptr + len, replace); |
618 | strcat (buf, end); |
693 | strcat (*ptr, end); |
619 | |
694 | |
620 | return true; |
695 | return true; |
621 | } |
696 | } |
622 | else |
697 | else |
623 | { |
698 | { |
624 | strcpy (buf, name); |
699 | *ptr = strdup (name); |
625 | |
700 | |
626 | return false; |
701 | return false; |
627 | } |
702 | } |
628 | } |
703 | } |
629 | |
704 | |
… | |
… | |
637 | char field_str[64]; // enough for 128 bits |
712 | char field_str[64]; // enough for 128 bits |
638 | |
713 | |
639 | // first morph the font if required |
714 | // first morph the font if required |
640 | if (force_prop) |
715 | if (force_prop) |
641 | { |
716 | { |
642 | char fname[1024]; |
717 | char *fname; |
643 | |
718 | |
644 | if (name[0] != '-') |
719 | if (name[0] != '-') |
645 | { |
720 | { |
646 | f = XLoadQueryFont (disp, name); |
721 | f = XLoadQueryFont (disp, name); |
647 | |
722 | |
648 | if (!f) |
723 | if (!f) |
649 | return false; |
724 | return false; |
650 | |
725 | |
651 | char *new_name = get_property (f, XA_FONT, name); |
726 | char *new_name = get_property (f, XA_FONT, 0); |
652 | |
727 | |
653 | if (new_name) |
728 | if (new_name) |
654 | set_name (new_name); |
729 | set_name (new_name); |
655 | else |
730 | else |
656 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
731 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
657 | |
732 | |
658 | XFreeFont (disp, f); |
733 | XFreeFont (disp, f); |
659 | f = 0; |
734 | f = 0; |
660 | } |
735 | } |
661 | |
736 | |
662 | if (prop.weight != rxvt_fontprop::unset) |
737 | if (prop.weight != rxvt_fontprop::unset) |
663 | { |
738 | { |
664 | replace_field (fname, name, 2, 0, |
739 | replace_field (&fname, name, 2, 0, |
665 | prop.weight < rxvt_fontprop::bold |
740 | prop.weight < rxvt_fontprop::bold |
666 | ? "medium" : "bold"); |
741 | ? "medium" : "bold"); |
667 | set_name (strdup (fname)); |
742 | set_name (fname); |
668 | } |
743 | } |
669 | |
744 | |
670 | if (prop.slant != rxvt_fontprop::unset) |
745 | if (prop.slant != rxvt_fontprop::unset) |
671 | { |
746 | { |
672 | replace_field (fname, name, 3, 0, |
747 | replace_field (&fname, name, 3, 0, |
673 | prop.slant < rxvt_fontprop::italic |
748 | prop.slant < rxvt_fontprop::italic |
674 | ? "r" : "i"); // TODO: handle "o"blique, too |
749 | ? "r" : "i"); // TODO: handle "o"blique, too |
675 | set_name (strdup (fname)); |
750 | set_name (fname); |
676 | } |
751 | } |
677 | } |
752 | } |
678 | |
753 | |
679 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
754 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
680 | ? 0 : prop.height); |
755 | ? 0 : prop.height); |
… | |
… | |
705 | font_weight *fonts = new font_weight[count]; |
780 | font_weight *fonts = new font_weight[count]; |
706 | |
781 | |
707 | for (int i = 0; i < count; i++) |
782 | for (int i = 0; i < count; i++) |
708 | { |
783 | { |
709 | rxvt_fontprop p; |
784 | rxvt_fontprop p; |
710 | char fname[1024]; |
785 | char *fname; |
711 | |
786 | |
712 | int diff = 0; |
787 | int diff = 0; |
713 | |
788 | |
714 | if (replace_field (fname, list[i], 6, '0', field_str)) |
789 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
715 | diff += 10; // slightly penalize scalable fonts |
790 | diff += 10; // slightly penalize scalable fonts |
|
|
791 | else |
|
|
792 | { |
|
|
793 | free (fname); |
716 | else if (replace_field (fname, list[i], 11, '0', "0")) |
794 | if (replace_field (&fname, list[i], 11, '0', "0")) |
717 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
795 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
796 | } |
718 | |
797 | |
719 | if (!set_properties (p, fname)) |
798 | if (!set_properties (p, fname) |
|
|
799 | // also weed out too large fonts |
|
|
800 | || (prop.height != rxvt_fontprop::unset |
|
|
801 | && p.height > prop.height)) |
|
|
802 | { |
|
|
803 | free (fname); |
720 | continue; |
804 | continue; |
721 | |
805 | } |
722 | if (prop.height != rxvt_fontprop::unset |
|
|
723 | && p.height > prop.height) // weed out too large fonts |
|
|
724 | continue; |
|
|
725 | |
806 | |
726 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
807 | 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); |
808 | 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); |
809 | 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); |
810 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
730 | |
811 | |
731 | fonts[i].name = strdup (fname); |
812 | fonts[i].name = fname; |
732 | fonts[i].diff = diff; |
813 | fonts[i].diff = diff; |
733 | } |
814 | } |
734 | |
815 | |
735 | XFreeFontNames (list); |
816 | XFreeFontNames (list); |
736 | |
817 | |
737 | // this loop only iterates when the guessed font-size is too small |
818 | // this loop only iterates when the guessed font-size is too small |
738 | for (;;) |
819 | for (;;) |
739 | { |
820 | { |
740 | font_weight *best = fonts + count - 1; |
821 | font_weight *best = fonts; |
741 | |
822 | |
742 | for (font_weight *w = best; w-- > fonts; ) |
823 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
743 | if (w->diff <= best->diff) |
824 | if (w->diff < best->diff) |
744 | best = w; |
825 | best = w; |
745 | |
826 | |
746 | if (!best->name |
827 | if (!best->name |
747 | || !(f = XLoadQueryFont (disp, best->name))) |
828 | || !(f = XLoadQueryFont (disp, best->name))) |
748 | break; |
829 | break; |
… | |
… | |
768 | return false; |
849 | return false; |
769 | |
850 | |
770 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
851 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
771 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
852 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
772 | |
853 | |
|
|
854 | cs = CS_UNKNOWN; |
|
|
855 | |
773 | if (registry && encoding) |
856 | if (registry && encoding) |
774 | { |
857 | { |
775 | char charset[64]; |
858 | char charset[64]; |
776 | snprintf (charset, 64, "%s-%s", registry, encoding); |
859 | snprintf (charset, 64, "%s-%s", registry, encoding); |
777 | |
860 | |
778 | cs = codeset_from_name (charset); |
861 | cs = codeset_from_name (charset); |
779 | } |
862 | |
780 | else |
863 | if (cs == CS_UNKNOWN) |
|
|
864 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
781 | { |
865 | } |
|
|
866 | |
|
|
867 | free (registry); |
|
|
868 | free (encoding); |
|
|
869 | |
|
|
870 | if (cs == CS_UNKNOWN) |
|
|
871 | { |
782 | const char *charset = get_property (f, XA_FONT, 0); |
872 | char *value = get_property (f, XA_FONT, 0); |
|
|
873 | const char *charset = value; |
783 | |
874 | |
784 | if (!charset) |
875 | if (!charset) |
785 | charset = name; |
876 | charset = name; |
786 | |
877 | |
787 | int count = 13; |
878 | int count = 13; |
788 | while (*charset) |
879 | while (*charset) |
789 | if (*charset++ == '-' && !--count) |
880 | if (*charset++ == '-' && !--count) |
790 | break; |
881 | break; |
791 | |
882 | |
792 | cs = codeset_from_name (charset); |
883 | cs = codeset_from_name (charset); |
|
|
884 | if (cs == CS_UNKNOWN) |
|
|
885 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
886 | |
|
|
887 | free (value); |
|
|
888 | } |
|
|
889 | |
|
|
890 | if (cs == CS_UNKNOWN) |
793 | } |
891 | { |
794 | |
892 | clear (); |
795 | free (registry); |
893 | return false; |
796 | free (encoding); |
894 | } |
797 | |
895 | |
798 | if (cs == CS_UNICODE) |
896 | if (cs == CS_UNICODE) |
799 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
897 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
800 | |
898 | |
801 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
899 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
813 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
911 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
814 | |
912 | |
815 | if (encm) |
913 | if (encm) |
816 | N += (f->max_byte1 - f->min_byte1) |
914 | N += (f->max_byte1 - f->min_byte1) |
817 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
915 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
818 | |
916 | |
819 | while (N) |
917 | while (N) |
820 | { |
918 | { |
821 | if (f->per_char[N].width > width) |
919 | if (f->per_char[N].width > width) |
822 | width = f->per_char[N].width; |
920 | width = f->per_char[N].width; |
823 | |
921 | |
… | |
… | |
826 | } |
924 | } |
827 | #endif |
925 | #endif |
828 | |
926 | |
829 | width = 1; |
927 | width = 1; |
830 | |
928 | |
831 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
929 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
832 | { |
930 | { |
833 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
931 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
834 | continue; |
932 | continue; |
835 | |
933 | |
836 | // ignore characters we wouldn't use anyways |
934 | // ignore characters we wouldn't use anyways |
… | |
… | |
848 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
946 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
849 | |
947 | |
850 | if (width < g.width) width = g.width; |
948 | if (width < g.width) width = g.width; |
851 | } |
949 | } |
852 | |
950 | |
853 | if (cs == CS_UNKNOWN) |
951 | #if 0 // do it per-character |
|
|
952 | if (prop && width > prop->width) |
854 | { |
953 | { |
855 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
856 | |
|
|
857 | clear (); |
954 | clear (); |
858 | return false; |
955 | return false; |
859 | } |
956 | } |
860 | |
|
|
861 | #if 0 // do it per-character |
|
|
862 | if (prop && width > prop->width) |
|
|
863 | { |
|
|
864 | clear (); |
|
|
865 | return false; |
|
|
866 | } |
|
|
867 | #endif |
957 | #endif |
868 | |
958 | |
869 | return true; |
959 | return true; |
870 | } |
960 | } |
871 | |
961 | |
… | |
… | |
880 | } |
970 | } |
881 | |
971 | |
882 | bool |
972 | bool |
883 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
973 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
884 | { |
974 | { |
|
|
975 | careful = false; |
|
|
976 | |
885 | uint32_t ch = FROM_UNICODE (cs, unicode); |
977 | uint32_t ch = FROM_UNICODE (cs, unicode); |
886 | |
978 | |
887 | if (ch == NOCHAR) |
979 | if (ch == NOCHAR) |
888 | return false; |
980 | return false; |
889 | |
981 | |
890 | /* check wether the character exists in _this_ font. horrible. */ |
982 | /* check whether the character exists in _this_ font. horrible. */ |
891 | XCharStruct *xcs; |
983 | XCharStruct *xcs; |
892 | |
984 | |
893 | if (encm) |
985 | if (encm) |
894 | { |
986 | { |
895 | unsigned char byte1 = ch >> 8; |
987 | unsigned char byte1 = ch >> 8; |
… | |
… | |
925 | return false; |
1017 | return false; |
926 | |
1018 | |
927 | if (!prop || prop->width == rxvt_fontprop::unset) |
1019 | if (!prop || prop->width == rxvt_fontprop::unset) |
928 | return true; |
1020 | return true; |
929 | |
1021 | |
930 | // check wether character overlaps previous/next character |
1022 | // check whether character overlaps previous/next character |
931 | int w = xcs->rbearing - xcs->lbearing; |
1023 | int w = xcs->rbearing - xcs->lbearing; |
932 | int wcw = max (WCWIDTH (unicode), 1); |
1024 | int wcw = max (WCWIDTH (unicode), 1); |
933 | |
1025 | |
934 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1026 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
935 | |
1027 | |
… | |
… | |
975 | else |
1067 | else |
976 | { |
1068 | { |
977 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1069 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
978 | |
1070 | |
979 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1071 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
980 | |
1072 | |
981 | if (slow) |
1073 | if (slow) |
982 | { |
1074 | { |
983 | do |
1075 | do |
984 | { |
1076 | { |
985 | if (xc->byte1 || xc->byte2) |
1077 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1007 | else |
1099 | else |
1008 | { |
1100 | { |
1009 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1101 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1010 | |
1102 | |
1011 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1103 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1012 | |
1104 | |
1013 | if (slow) |
1105 | if (slow) |
1014 | { |
1106 | { |
1015 | do |
1107 | do |
1016 | { |
1108 | { |
1017 | if (*xc) |
1109 | if (*xc) |
… | |
… | |
1043 | |
1135 | |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1136 | void draw (rxvt_drawable &d, int x, int y, |
1045 | const text_t *text, int len, |
1137 | const text_t *text, int len, |
1046 | int fg, int bg); |
1138 | int fg, int bg); |
1047 | |
1139 | |
1048 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1140 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1049 | |
1141 | |
1050 | protected: |
1142 | protected: |
1051 | XftFont *f; |
1143 | XftFont *f; |
1052 | }; |
1144 | }; |
1053 | |
1145 | |
… | |
… | |
1109 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1201 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1110 | |
1202 | |
1111 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1203 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1112 | // clip width, we can't do better, or can we? |
1204 | // clip width, we can't do better, or can we? |
1113 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1205 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1114 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1206 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1115 | #endif |
1207 | #endif |
1116 | |
1208 | |
1117 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1209 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1118 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1210 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1119 | |
1211 | |
… | |
… | |
1131 | int ftheight = 0; |
1223 | int ftheight = 0; |
1132 | bool success = true; |
1224 | bool success = true; |
1133 | |
1225 | |
1134 | for (;;) |
1226 | for (;;) |
1135 | { |
1227 | { |
|
|
1228 | p = FcPatternDuplicate (match); |
1136 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1229 | f = XftFontOpenPattern (disp, p); |
1137 | |
1230 | |
1138 | if (!f) |
1231 | if (!f) |
1139 | { |
1232 | { |
|
|
1233 | FcPatternDestroy (p); |
1140 | success = false; |
1234 | success = false; |
1141 | break; |
1235 | break; |
1142 | } |
1236 | } |
1143 | |
1237 | |
1144 | FT_Face face = XftLockFace (f); |
1238 | FT_Face face = XftLockFace (f); |
… | |
… | |
1152 | |
1246 | |
1153 | XftUnlockFace (f); |
1247 | XftUnlockFace (f); |
1154 | |
1248 | |
1155 | int glheight = height; |
1249 | int glheight = height; |
1156 | |
1250 | |
1157 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1251 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1158 | { |
1252 | { |
1159 | FcChar16 ch = *t; |
1253 | FcChar16 ch = *t; |
1160 | |
1254 | |
1161 | if (cs != CS_UNICODE |
1255 | if (cs != CS_UNICODE |
1162 | && ch > 0x100 |
1256 | && ch > 0x100 |
… | |
… | |
1263 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1357 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1264 | const text_t *text, int len, |
1358 | const text_t *text, int len, |
1265 | int fg, int bg) |
1359 | int fg, int bg) |
1266 | { |
1360 | { |
1267 | XGlyphInfo extents; |
1361 | XGlyphInfo extents; |
1268 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1362 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1269 | XftGlyphSpec *ep = enc; |
1363 | XftGlyphSpec *ep = enc; |
1270 | |
1364 | |
1271 | dTermDisplay; |
1365 | dTermDisplay; |
1272 | dTermGC; |
1366 | dTermGC; |
1273 | |
1367 | |
1274 | int w = term->fwidth * len; |
1368 | int w = term->fwidth * len; |
1275 | int h = term->fheight; |
1369 | int h = term->fheight; |
1276 | |
1370 | |
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1371 | bool buffered = bg >= Color_transparent |
1278 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1372 | && term->option (Opt_buffered); |
1279 | * good idea from the perspective of packaging for wide variety of user configs. |
1373 | |
1280 | */ |
|
|
1281 | bool buffered = true |
|
|
1282 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1283 | && bg >= 0 |
|
|
1284 | #endif |
|
|
1285 | ; |
|
|
1286 | // cut trailing spaces |
1374 | // cut trailing spaces |
1287 | while (len && text [len - 1] == ' ') |
1375 | while (len && text [len - 1] == ' ') |
1288 | len--; |
1376 | len--; |
1289 | |
1377 | |
1290 | int x_ = buffered ? 0 : x; |
1378 | int x_ = buffered ? 0 : x; |
… | |
… | |
1295 | int cwidth = term->fwidth; |
1383 | int cwidth = term->fwidth; |
1296 | FcChar32 fc = *text++; len--; |
1384 | FcChar32 fc = *text++; len--; |
1297 | |
1385 | |
1298 | while (len && *text == NOCHAR) |
1386 | while (len && *text == NOCHAR) |
1299 | text++, len--, cwidth += term->fwidth; |
1387 | text++, len--, cwidth += term->fwidth; |
1300 | |
1388 | |
1301 | if (fc != ' ') // skip spaces |
1389 | if (fc != ' ') // skip spaces |
1302 | { |
1390 | { |
1303 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1391 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1304 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1392 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1305 | |
1393 | |
… | |
… | |
1319 | if (buffered) |
1407 | if (buffered) |
1320 | { |
1408 | { |
1321 | if (ep != enc) |
1409 | if (ep != enc) |
1322 | { |
1410 | { |
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1411 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1324 | bool back_rendered = false; |
|
|
1325 | |
1412 | |
1326 | #ifdef HAVE_BG_PIXMAP |
1413 | #ifdef HAVE_BG_PIXMAP |
|
|
1414 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1415 | |
1327 | if (term->bgPixmap.pixmap) |
1416 | if (term->bg_img |
|
|
1417 | && (bg == Color_transparent || bg == Color_bg |
|
|
1418 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1328 | { |
1419 | { |
1329 | Picture dst = 0; |
1420 | int src_x = x, src_y = y; |
1330 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1421 | |
1331 | dst = XftDrawPicture(d2); |
1422 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1332 | |
|
|
1333 | if (bg < 0 || dst != 0) |
|
|
1334 | { |
1423 | { |
1335 | if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w |
1424 | src_x += term->window_vt_x; |
1336 | && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) |
1425 | src_y += term->window_vt_y; |
1337 | { |
|
|
1338 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1339 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
1340 | w, h, 0, 0); |
|
|
1341 | } |
1426 | } |
|
|
1427 | |
|
|
1428 | if (term->bg_img->w >= src_x + w |
|
|
1429 | && term->bg_img->h >= src_y + h) |
|
|
1430 | { |
|
|
1431 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
|
|
1432 | src_x, src_y, w, h, 0, 0); |
|
|
1433 | } |
1342 | else |
1434 | else |
1343 | { |
1435 | { |
1344 | XGCValues gcv; |
1436 | XGCValues gcv; |
1345 | |
1437 | |
1346 | gcv.fill_style = FillTiled; |
1438 | gcv.fill_style = FillTiled; |
1347 | gcv.tile = term->bgPixmap.pixmap; |
1439 | gcv.tile = term->bg_img->pm; |
1348 | gcv.ts_x_origin = -x; |
1440 | gcv.ts_x_origin = -src_x; |
1349 | gcv.ts_y_origin = -y; |
1441 | gcv.ts_y_origin = -src_y; |
1350 | |
1442 | |
1351 | #if 0 |
|
|
1352 | GC gc2 = XCreateGC (disp, d2, |
|
|
1353 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1354 | &gcv); |
|
|
1355 | #endif |
|
|
1356 | XChangeGC (disp, gc, |
1443 | XChangeGC (disp, gc, |
1357 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1444 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1358 | &gcv); |
1445 | &gcv); |
1359 | |
1446 | |
1360 | XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); |
1447 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1361 | |
1448 | |
1362 | gcv.fill_style = FillSolid; |
1449 | gcv.fill_style = FillSolid; |
1363 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1450 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1364 | /* XFreeGC (disp, gc2); */ |
|
|
1365 | |
|
|
1366 | } |
1451 | } |
1367 | if (bg >= 0) |
1452 | |
|
|
1453 | if (dst) |
1368 | { |
1454 | { |
1369 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1455 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1456 | |
|
|
1457 | // dst can only be set when bg >= 0 |
1370 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1458 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1371 | } |
|
|
1372 | back_rendered = true; |
|
|
1373 | } |
1459 | } |
1374 | } |
1460 | } |
|
|
1461 | else |
1375 | #endif |
1462 | #endif |
1376 | |
|
|
1377 | if(bg >= 0 && !back_rendered) |
|
|
1378 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1463 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1379 | |
1464 | |
1380 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1465 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1381 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1466 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1382 | } |
1467 | } |
1383 | else |
1468 | else |
… | |
… | |
1411 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1496 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1412 | = rxvt_fontprop::unset; |
1497 | = rxvt_fontprop::unset; |
1413 | force_prop = false; |
1498 | force_prop = false; |
1414 | |
1499 | |
1415 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1500 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1416 | FONT_UNREF (*i); |
1501 | (*i)->unref (); |
1417 | |
1502 | |
1418 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1503 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1419 | delete *p; |
1504 | delete *p; |
1420 | |
1505 | |
1421 | free (fontdesc); fontdesc = 0; |
1506 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1423 | fonts.clear (); |
1508 | fonts.clear (); |
1424 | |
1509 | |
1425 | fallback = fallback_fonts; |
1510 | fallback = fallback_fonts; |
1426 | } |
1511 | } |
1427 | |
1512 | |
|
|
1513 | void |
|
|
1514 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1515 | { |
|
|
1516 | font->set_term (term); |
|
|
1517 | |
|
|
1518 | font->cs = cs; |
|
|
1519 | font->loaded = false; |
|
|
1520 | } |
|
|
1521 | |
1428 | rxvt_font * |
1522 | rxvt_font * |
1429 | rxvt_fontset::new_font (const char *name, codeset cs) |
1523 | rxvt_fontset::new_font (const char *name, codeset cs) |
1430 | { |
1524 | { |
1431 | rxvt_font *f; |
1525 | rxvt_font *f; |
1432 | |
1526 | |
1433 | if (!name || !*name) |
1527 | if (!name || !*name) |
1434 | { |
1528 | { |
1435 | name = ""; |
1529 | name = ""; |
1436 | f = new rxvt_font_default (this); |
1530 | f = new rxvt_font_default (this); |
1437 | } |
1531 | } |
… | |
… | |
1448 | f = new rxvt_font_x11; |
1542 | f = new rxvt_font_x11; |
1449 | } |
1543 | } |
1450 | else |
1544 | else |
1451 | f = new rxvt_font_x11; |
1545 | f = new rxvt_font_x11; |
1452 | |
1546 | |
1453 | f->set_term (term); |
|
|
1454 | f->set_name (strdup (name)); |
1547 | f->set_name (strdup (name)); |
1455 | |
1548 | prepare_font (f, cs); |
1456 | f->cs = cs; |
|
|
1457 | f->loaded = false; |
|
|
1458 | |
1549 | |
1459 | return f; |
1550 | return f; |
1460 | } |
1551 | } |
1461 | |
1552 | |
1462 | ///////////////////////////////////////////////////////////////////////////// |
1553 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1554 | |
|
|
1555 | void |
|
|
1556 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1557 | { |
|
|
1558 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1559 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1560 | // represented in the rendition. |
|
|
1561 | if (fonts.size () == fontCount) |
|
|
1562 | { |
|
|
1563 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1564 | |
|
|
1565 | prepare_font (f, CS_UNICODE); |
|
|
1566 | fonts.push_back (f); |
|
|
1567 | } |
|
|
1568 | |
|
|
1569 | fonts.push_back (font); |
|
|
1570 | } |
1463 | |
1571 | |
1464 | void |
1572 | void |
1465 | rxvt_fontset::add_fonts (const char *desc) |
1573 | rxvt_fontset::add_fonts (const char *desc) |
1466 | { |
1574 | { |
1467 | if (desc) |
1575 | if (desc) |
… | |
… | |
1505 | if (!end) |
1613 | if (!end) |
1506 | end = desc + strlen (desc); |
1614 | end = desc + strlen (desc); |
1507 | |
1615 | |
1508 | if (end - desc < 511) |
1616 | if (end - desc < 511) |
1509 | { |
1617 | { |
1510 | strncpy (buf, desc, end - desc); |
1618 | memcpy (buf, desc, end - desc); |
1511 | buf[end - desc] = 0; |
1619 | buf[end - desc] = 0; |
1512 | |
1620 | |
1513 | fonts.push_back (new_font (buf, cs)); |
1621 | push_font (new_font (buf, cs)); |
1514 | } |
1622 | } |
1515 | else |
1623 | else |
1516 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1624 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1517 | |
1625 | |
1518 | desc = end + 1; |
1626 | desc = end + 1; |
1519 | } |
1627 | } |
1520 | while (*end); |
1628 | while (*end); |
1521 | } |
1629 | } |
… | |
… | |
1546 | { |
1654 | { |
1547 | clear (); |
1655 | clear (); |
1548 | |
1656 | |
1549 | fontdesc = strdup (desc); |
1657 | fontdesc = strdup (desc); |
1550 | |
1658 | |
1551 | fonts.push_back (new_font (0, CS_UNICODE)); |
1659 | push_font (new_font (0, CS_UNICODE)); |
1552 | realize_font (0); |
1660 | realize_font (0); |
1553 | |
1661 | |
1554 | add_fonts (desc); |
1662 | add_fonts (desc); |
1555 | |
1663 | |
1556 | return true; |
1664 | return true; |
… | |
… | |
1565 | |
1673 | |
1566 | return -1; |
1674 | return -1; |
1567 | } |
1675 | } |
1568 | |
1676 | |
1569 | int |
1677 | int |
1570 | rxvt_fontset::find_font (unicode_t unicode) |
1678 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1571 | { |
1679 | { |
1572 | if (unicode >= 1<<20) |
1680 | if (unicode >= 1<<20) |
1573 | return 0; |
1681 | return 0; |
1574 | |
1682 | |
1575 | unicode_t hi = unicode >> 8; |
1683 | unicode_t hi = unicode >> 8; |
… | |
… | |
1601 | goto next_font; |
1709 | goto next_font; |
1602 | |
1710 | |
1603 | bool careful; |
1711 | bool careful; |
1604 | if (f->has_char (unicode, &prop, careful)) |
1712 | if (f->has_char (unicode, &prop, careful)) |
1605 | { |
1713 | { |
1606 | if (careful) |
1714 | i = (i << 1) | careful; |
1607 | i |= 128; |
|
|
1608 | |
1715 | |
1609 | goto found; |
1716 | goto found; |
1610 | } |
1717 | } |
1611 | |
1718 | |
1612 | next_font: |
1719 | next_font: |
1613 | if (i == fonts.size () - 1) |
1720 | if (i == fonts.size () - 1) |
1614 | { |
1721 | { |
1615 | if (fallback->name) |
1722 | if (fallback->name) |
1616 | { |
1723 | { |
1617 | // search through the fallback list |
1724 | // search through the fallback list |
1618 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1725 | push_font (new_font (fallback->name, fallback->cs)); |
1619 | fallback++; |
1726 | fallback++; |
1620 | } |
1727 | } |
1621 | else |
1728 | else |
1622 | { |
1729 | { |
1623 | // try to find a new font. |
1730 | // try to find a new font. |
… | |
… | |
1654 | FcPatternDestroy (match); |
1761 | FcPatternDestroy (match); |
1655 | |
1762 | |
1656 | if (find_font (font) < 0) |
1763 | if (find_font (font) < 0) |
1657 | { |
1764 | { |
1658 | char fontname[4096]; |
1765 | char fontname[4096]; |
1659 | sprintf (fontname, "xft:%-.4090s", font); |
1766 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1660 | |
1767 | |
1661 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1768 | push_font (new_font (fontname, CS_UNICODE)); |
1662 | } |
1769 | } |
1663 | |
1770 | |
1664 | free (font); |
1771 | free (font); |
1665 | } |
1772 | } |
1666 | #endif |
1773 | #endif |
… | |
… | |
1678 | while (hi >= fmap.size ()) |
1785 | while (hi >= fmap.size ()) |
1679 | fmap.push_back (0); |
1786 | fmap.push_back (0); |
1680 | |
1787 | |
1681 | if (!fmap[hi]) |
1788 | if (!fmap[hi]) |
1682 | { |
1789 | { |
1683 | fmap[hi] = (pagemap *)new pagemap; |
1790 | fmap[hi] = new pagemap; |
1684 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1791 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1685 | } |
1792 | } |
1686 | |
1793 | |
1687 | (*fmap[hi])[unicode & 0xff] = i; |
1794 | (*fmap[hi])[unicode & 0xff] = i; |
1688 | } |
1795 | } |
1689 | |
1796 | |
1690 | return i; |
1797 | return i; |
1691 | } |
1798 | } |
1692 | |
1799 | |
1693 | |
|
|
1694 | |
|
|