1 | /*----------------------------------------------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 3 of the License, or |
10 | * (at your option) any later version. |
10 | * (at your option) any later version. |
11 | * |
11 | * |
12 | * This program is distributed in the hope that it will be useful, |
12 | * This program is distributed in the hope that it will be useful, |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtlib.h" |
|
|
25 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
27 | |
26 | |
28 | #include <cstdlib> |
27 | #include <stdlib.h> |
29 | |
28 | |
30 | #include <inttypes.h> |
29 | #include <inttypes.h> |
|
|
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
31 | |
34 | |
32 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
34 | |
37 | |
35 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
36 | (prop)->slant >= rxvt_fontprop::italic \ |
39 | (prop)->slant >= rxvt_fontprop::italic \ |
37 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
38 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
39 | )) |
42 | )) |
40 | |
43 | |
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 | |
… | |
… | |
212 | } |
212 | } |
213 | |
213 | |
214 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
215 | |
215 | |
216 | rxvt_font::rxvt_font () |
216 | rxvt_font::rxvt_font () |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false) |
218 | { |
218 | { |
219 | } |
219 | } |
220 | |
220 | |
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_IMG |
|
|
245 | if (term->bg_img |
|
|
246 | && !term->pix_colors[color].is_opaque () |
|
|
247 | && ((dst = XftDrawPicture (d)))) |
|
|
248 | { |
|
|
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
250 | |
|
|
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
253 | } |
|
|
254 | else |
|
|
255 | # endif |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
256 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
257 | |
243 | #else |
258 | #else |
244 | XSetForeground (disp, gc, term->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
245 | XFillRectangle (disp, d, gc, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
246 | #endif |
261 | #endif |
247 | } |
262 | } |
248 | } |
263 | } |
249 | |
264 | |
250 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
251 | |
266 | |
252 | #include "table/linedraw.h" |
|
|
253 | |
|
|
254 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
255 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
256 | |
270 | |
257 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
258 | : rxvt_font () |
272 | : rxvt_font () |
259 | { |
273 | { |
… | |
… | |
293 | return false; |
307 | return false; |
294 | |
308 | |
295 | if (unicode <= 0x009f) |
309 | if (unicode <= 0x009f) |
296 | return true; |
310 | return true; |
297 | |
311 | |
|
|
312 | #ifdef BUILTIN_GLYPHS |
298 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
299 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
300 | return true; |
315 | return true; |
|
|
316 | #endif |
301 | |
317 | |
302 | if (IS_COMPOSE (unicode)) |
318 | // we do not check for IS_COMPOSE here, as this would |
303 | return true; |
319 | // rob other fonts from taking over. |
304 | |
320 | |
305 | switch (unicode) |
321 | switch (unicode) |
306 | { |
322 | { |
307 | case ZERO_WIDTH_CHAR: |
323 | case ZERO_WIDTH_CHAR: |
308 | case NOCHAR: |
324 | case NOCHAR: |
… | |
… | |
329 | |
345 | |
330 | XSetForeground (disp, gc, term->pix_colors[fg]); |
346 | XSetForeground (disp, gc, term->pix_colors[fg]); |
331 | |
347 | |
332 | while (len) |
348 | while (len) |
333 | { |
349 | { |
|
|
350 | const text_t *tp = text; |
|
|
351 | text_t t = *tp; |
|
|
352 | |
|
|
353 | while (++text, --len && *text == NOCHAR) |
|
|
354 | ; |
|
|
355 | |
334 | #if ENABLE_COMBINING |
356 | #if ENABLE_COMBINING |
335 | compose_char *cc; |
357 | compose_char *cc; |
336 | #endif |
358 | #endif |
337 | const text_t *tp = text; |
|
|
338 | text_t t = *tp; |
|
|
339 | |
|
|
340 | while (++text, --len && *text == NOCHAR) |
|
|
341 | ; |
|
|
342 | |
|
|
343 | int width = text - tp; |
359 | int width = text - tp; |
344 | int fwidth = term->fwidth * width; |
360 | int fwidth = term->fwidth * width; |
345 | |
361 | |
|
|
362 | #ifdef BUILTIN_GLYPHS |
346 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
347 | { |
364 | { |
|
|
365 | # include "table/linedraw.h" |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
366 | uint16_t offs = linedraw_offs[t - 0x2500]; |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
367 | uint32_t *a = linedraw_command + (offs >> 4); |
350 | uint32_t *b = a + (offs & 15); |
368 | uint32_t *b = a + (offs & 15); |
351 | |
369 | |
352 | int W = fwidth; |
370 | int W = fwidth; |
… | |
… | |
390 | |
408 | |
391 | case 1: // rectangle, possibly stippled |
409 | case 1: // rectangle, possibly stippled |
392 | if (a) |
410 | if (a) |
393 | { |
411 | { |
394 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
412 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
395 | |
413 | |
396 | gcv.fill_style = FillStippled; |
414 | gcv.fill_style = FillStippled; |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
415 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
398 | gcv.ts_x_origin = x; |
416 | gcv.ts_x_origin = x; |
399 | gcv.ts_y_origin = y; |
417 | gcv.ts_y_origin = y; |
400 | |
418 | |
… | |
… | |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
437 | (a - 1) * 90*64, (b - 1) * 90*64); |
420 | break; |
438 | break; |
421 | } |
439 | } |
422 | } |
440 | } |
423 | } |
441 | } |
|
|
442 | #else |
|
|
443 | if (0) |
|
|
444 | ; |
|
|
445 | #endif |
424 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
426 | { |
448 | { |
427 | min_it (width, 2); // we only support wcwidth up to 2 |
449 | min_it (width, 2); // we only support wcwidth up to 2 |
428 | |
450 | |
|
|
451 | #if NOT_YET |
|
|
452 | vector<text_t> chrs; |
|
|
453 | chrs.reserve (rxvt_composite.expand (t)); |
|
|
454 | rxvt_composite.expand (t, &chrs[0]); |
|
|
455 | |
|
|
456 | while (!chrs.empty ()) |
|
|
457 | { |
|
|
458 | rxvt_font *f1 = fs->find_font_idx (chrs[0]) |
|
|
459 | |
|
|
460 | int i = 0; |
|
|
461 | while (i < chrs.size () - 1 |
|
|
462 | && f1->can_combine |
|
|
463 | && f1->has-char (chrs[i + 1], careful) |
|
|
464 | && !careful |
|
|
465 | ++i; |
|
|
466 | |
|
|
467 | (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg); |
|
|
468 | chrs.erase (&chrs[0], &chrs[i]); |
|
|
469 | } |
|
|
470 | #endif |
|
|
471 | |
|
|
472 | #if 1 |
429 | text_t chrs[2]; |
473 | text_t chrs[2]; |
430 | chrs [1] = NOCHAR; |
474 | chrs [1] = NOCHAR; |
431 | |
475 | |
432 | *chrs = cc->c1; |
476 | *chrs = cc->c1; |
433 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
477 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
434 | f1->draw (d, x, y, chrs, width, fg, bg); |
478 | f1->draw (d, x, y, chrs, width, fg, bg); |
435 | |
479 | |
436 | if (cc->c2 != NOCHAR) |
480 | if (cc->c2 != NOCHAR) |
437 | { |
481 | { |
438 | bool careful; |
482 | bool careful; |
439 | |
483 | |
440 | // prefer font of first character, for no good reasons |
484 | // prefer font of first character, for no good reasons |
441 | *chrs = cc->c2; |
485 | *chrs = cc->c2; |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
486 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
443 | ? f1 |
487 | ? f1 |
444 | : (*fs)[fs->find_font (cc->c2)]; |
488 | : (*fs)[fs->find_font_idx (cc->c2)]; |
445 | |
489 | |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
490 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
447 | } |
491 | } |
|
|
492 | #endif |
448 | } |
493 | } |
449 | #endif |
494 | #endif |
450 | else |
495 | else |
451 | switch (t) |
496 | switch (t) |
452 | { |
497 | { |
453 | case '\t': |
498 | case '\t': |
454 | case ZERO_WIDTH_CHAR: |
499 | case ZERO_WIDTH_CHAR: |
455 | case NOCHAR: |
500 | case NOCHAR: |
456 | break; |
501 | break; |
457 | |
502 | |
|
|
503 | /* |
|
|
504 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
505 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
506 | * decided against that until more data is available. |
|
|
507 | */ |
|
|
508 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
509 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
510 | break; |
|
|
511 | |
458 | default: |
512 | default: |
459 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
513 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
460 | fwidth - 4, term->fheight - 4); |
514 | fwidth - 4, term->fheight - 4); |
461 | } |
515 | } |
462 | |
516 | |
463 | x += fwidth; |
517 | x += fwidth; |
464 | } |
518 | } |
465 | } |
519 | } |
466 | |
520 | |
|
|
521 | struct rxvt_font_overflow : rxvt_font |
|
|
522 | { |
|
|
523 | struct rxvt_fontset *fs; |
|
|
524 | |
|
|
525 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
526 | : rxvt_font () |
|
|
527 | { |
|
|
528 | this->fs = fs; |
|
|
529 | } |
|
|
530 | |
|
|
531 | rxvt_fontprop properties () |
|
|
532 | { |
|
|
533 | rxvt_fontprop p; |
|
|
534 | |
|
|
535 | p.width = p.height = 1; |
|
|
536 | p.ascent = rxvt_fontprop::unset; |
|
|
537 | p.weight = rxvt_fontprop::medium; |
|
|
538 | p.slant = rxvt_fontprop::roman; |
|
|
539 | |
|
|
540 | return p; |
|
|
541 | } |
|
|
542 | |
|
|
543 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
544 | { |
|
|
545 | width = 1; height = 1; |
|
|
546 | ascent = 1; descent = 0; |
|
|
547 | |
|
|
548 | set_name (strdup ("built-in rendition overflow font")); |
|
|
549 | |
|
|
550 | return true; |
|
|
551 | } |
|
|
552 | |
|
|
553 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
554 | { |
|
|
555 | return false; |
|
|
556 | } |
|
|
557 | |
|
|
558 | void draw (rxvt_drawable &d, int x, int y, |
|
|
559 | const text_t *text, int len, |
|
|
560 | int fg, int bg) |
|
|
561 | { |
|
|
562 | while (len) |
|
|
563 | { |
|
|
564 | int fid = fs->find_font_idx (*text); |
|
|
565 | int w = 1; |
|
|
566 | while (w < len && text[w] == NOCHAR) |
|
|
567 | w++; |
|
|
568 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
569 | text += w; |
|
|
570 | len -= w; |
|
|
571 | x += term->fwidth * w; |
|
|
572 | } |
|
|
573 | } |
|
|
574 | }; |
|
|
575 | |
467 | ///////////////////////////////////////////////////////////////////////////// |
576 | ///////////////////////////////////////////////////////////////////////////// |
468 | |
577 | |
469 | struct rxvt_font_x11 : rxvt_font { |
578 | struct rxvt_font_x11 : rxvt_font |
|
|
579 | { |
470 | rxvt_font_x11 () { f = 0; } |
580 | rxvt_font_x11 () { f = 0; } |
471 | |
581 | |
472 | void clear (); |
582 | void clear (); |
473 | |
583 | |
474 | rxvt_fontprop properties (); |
584 | rxvt_fontprop properties (); |
… | |
… | |
479 | |
589 | |
480 | void draw (rxvt_drawable &d, int x, int y, |
590 | void draw (rxvt_drawable &d, int x, int y, |
481 | const text_t *text, int len, |
591 | const text_t *text, int len, |
482 | int fg, int bg); |
592 | int fg, int bg); |
483 | |
593 | |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
594 | bool slow; // whether this is a proportional font or has other funny characteristics |
485 | XFontStruct *f; |
595 | XFontStruct *f; |
486 | bool enc2b, encm; |
596 | bool enc2b, encm; |
487 | |
597 | |
488 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
598 | 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); |
599 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
497 | unsigned long value; |
607 | unsigned long value; |
498 | |
608 | |
499 | if (XGetFontProperty (f, property, &value)) |
609 | if (XGetFontProperty (f, property, &value)) |
500 | return XGetAtomName (term->dpy, value); |
610 | return XGetAtomName (term->dpy, value); |
501 | else |
611 | else |
502 | return rxvt_strdup (repl); |
612 | return repl ? strdup (repl) : 0; |
503 | } |
613 | } |
504 | |
614 | |
505 | rxvt_fontprop |
615 | rxvt_fontprop |
506 | rxvt_font_x11::properties () |
616 | rxvt_font_x11::properties () |
507 | { |
617 | { |
… | |
… | |
589 | return false; |
699 | return false; |
590 | } |
700 | } |
591 | |
701 | |
592 | // fix the size of scalable fonts |
702 | // fix the size of scalable fonts |
593 | static bool |
703 | static bool |
594 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
704 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
595 | { |
705 | { |
596 | int slashes = 0; |
706 | int slashes = 0; |
597 | const char *field, *end; |
707 | const char *field, *end; |
598 | |
708 | |
599 | for (const char *c = name; *c; c++) |
709 | for (const char *c = name; *c; c++) |
… | |
… | |
609 | break; |
719 | break; |
610 | } |
720 | } |
611 | |
721 | |
612 | if (slashes >= 13 && (!old || *field == old)) |
722 | if (slashes >= 13 && (!old || *field == old)) |
613 | { |
723 | { |
614 | // TODO: check for overflow in font-name |
724 | size_t len = field - name; |
615 | strncpy (buf, name, field - name); |
725 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
616 | buf += field - name; |
726 | memcpy (*ptr, name, len); |
617 | strcpy (buf, replace); |
727 | strcpy (*ptr + len, replace); |
618 | strcat (buf, end); |
728 | strcat (*ptr, end); |
619 | |
729 | |
620 | return true; |
730 | return true; |
621 | } |
731 | } |
622 | else |
732 | else |
623 | { |
733 | { |
624 | strcpy (buf, name); |
734 | *ptr = strdup (name); |
625 | |
735 | |
626 | return false; |
736 | return false; |
627 | } |
737 | } |
628 | } |
738 | } |
629 | |
739 | |
… | |
… | |
637 | char field_str[64]; // enough for 128 bits |
747 | char field_str[64]; // enough for 128 bits |
638 | |
748 | |
639 | // first morph the font if required |
749 | // first morph the font if required |
640 | if (force_prop) |
750 | if (force_prop) |
641 | { |
751 | { |
642 | char fname[1024]; |
752 | char *fname; |
643 | |
753 | |
644 | if (name[0] != '-') |
754 | if (name[0] != '-') |
645 | { |
755 | { |
646 | f = XLoadQueryFont (disp, name); |
756 | f = XLoadQueryFont (disp, name); |
647 | |
757 | |
648 | if (!f) |
758 | if (!f) |
649 | return false; |
759 | return false; |
650 | |
760 | |
651 | char *new_name = get_property (f, XA_FONT, name); |
761 | char *new_name = get_property (f, XA_FONT, 0); |
652 | |
762 | |
653 | if (new_name) |
763 | if (new_name) |
654 | set_name (new_name); |
764 | set_name (new_name); |
655 | else |
765 | else |
656 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
766 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
657 | |
767 | |
658 | XFreeFont (disp, f); |
768 | XFreeFont (disp, f); |
659 | f = 0; |
769 | f = 0; |
660 | } |
770 | } |
661 | |
771 | |
662 | if (prop.weight != rxvt_fontprop::unset) |
772 | if (prop.weight != rxvt_fontprop::unset) |
663 | { |
773 | { |
664 | replace_field (fname, name, 2, 0, |
774 | replace_field (&fname, name, 2, 0, |
665 | prop.weight < rxvt_fontprop::bold |
775 | prop.weight < rxvt_fontprop::bold |
666 | ? "medium" : "bold"); |
776 | ? "medium" : "bold"); |
667 | set_name (strdup (fname)); |
777 | set_name (fname); |
668 | } |
778 | } |
669 | |
779 | |
670 | if (prop.slant != rxvt_fontprop::unset) |
780 | if (prop.slant != rxvt_fontprop::unset) |
671 | { |
781 | { |
672 | replace_field (fname, name, 3, 0, |
782 | replace_field (&fname, name, 3, 0, |
673 | prop.slant < rxvt_fontprop::italic |
783 | prop.slant < rxvt_fontprop::italic |
674 | ? "r" : "i"); // TODO: handle "o"blique, too |
784 | ? "r" : "i"); // TODO: handle "o"blique, too |
675 | set_name (strdup (fname)); |
785 | set_name (fname); |
676 | } |
786 | } |
677 | } |
787 | } |
678 | |
788 | |
679 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
789 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
680 | ? 0 : prop.height); |
790 | ? 0 : prop.height); |
… | |
… | |
705 | font_weight *fonts = new font_weight[count]; |
815 | font_weight *fonts = new font_weight[count]; |
706 | |
816 | |
707 | for (int i = 0; i < count; i++) |
817 | for (int i = 0; i < count; i++) |
708 | { |
818 | { |
709 | rxvt_fontprop p; |
819 | rxvt_fontprop p; |
710 | char fname[1024]; |
820 | char *fname; |
711 | |
821 | |
712 | int diff = 0; |
822 | int diff = 0; |
713 | |
823 | |
714 | if (replace_field (fname, list[i], 6, '0', field_str)) |
824 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
715 | diff += 10; // slightly penalize scalable fonts |
825 | diff += 10; // slightly penalize scalable fonts |
|
|
826 | else |
|
|
827 | { |
|
|
828 | free (fname); |
716 | else if (replace_field (fname, list[i], 11, '0', "0")) |
829 | if (replace_field (&fname, list[i], 11, '0', "0")) |
717 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
830 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
831 | } |
718 | |
832 | |
719 | 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); |
720 | continue; |
839 | continue; |
721 | |
840 | } |
722 | if (prop.height != rxvt_fontprop::unset |
|
|
723 | && p.height > prop.height) // weed out too large fonts |
|
|
724 | continue; |
|
|
725 | |
841 | |
726 | 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; |
727 | 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); |
728 | 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); |
729 | //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); |
730 | |
846 | |
731 | fonts[i].name = strdup (fname); |
847 | fonts[i].name = fname; |
732 | fonts[i].diff = diff; |
848 | fonts[i].diff = diff; |
733 | } |
849 | } |
734 | |
850 | |
735 | XFreeFontNames (list); |
851 | XFreeFontNames (list); |
736 | |
852 | |
737 | // 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 |
738 | for (;;) |
854 | for (;;) |
739 | { |
855 | { |
740 | font_weight *best = fonts + count - 1; |
856 | font_weight *best = fonts; |
741 | |
857 | |
742 | for (font_weight *w = best; w-- > fonts; ) |
858 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
743 | if (w->diff <= best->diff) |
859 | if (w->diff < best->diff) |
744 | best = w; |
860 | best = w; |
745 | |
861 | |
746 | if (!best->name |
862 | if (!best->name |
747 | || !(f = XLoadQueryFont (disp, best->name))) |
863 | || !(f = XLoadQueryFont (disp, best->name))) |
748 | break; |
864 | break; |
… | |
… | |
768 | return false; |
884 | return false; |
769 | |
885 | |
770 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
886 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
771 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
887 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
772 | |
888 | |
|
|
889 | cs = CS_UNKNOWN; |
|
|
890 | |
773 | if (registry && encoding) |
891 | if (registry && encoding) |
774 | { |
892 | { |
775 | char charset[64]; |
893 | char charset[64]; |
776 | snprintf (charset, 64, "%s-%s", registry, encoding); |
894 | snprintf (charset, 64, "%s-%s", registry, encoding); |
777 | |
895 | |
778 | cs = codeset_from_name (charset); |
896 | cs = codeset_from_name (charset); |
779 | } |
897 | |
780 | else |
898 | if (cs == CS_UNKNOWN) |
|
|
899 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
781 | { |
900 | } |
|
|
901 | |
|
|
902 | free (registry); |
|
|
903 | free (encoding); |
|
|
904 | |
|
|
905 | if (cs == CS_UNKNOWN) |
|
|
906 | { |
782 | const char *charset = get_property (f, XA_FONT, 0); |
907 | char *value = get_property (f, XA_FONT, 0); |
|
|
908 | const char *charset = value; |
783 | |
909 | |
784 | if (!charset) |
910 | if (!charset) |
785 | charset = name; |
911 | charset = name; |
786 | |
912 | |
787 | int count = 13; |
913 | int count = 13; |
788 | while (*charset) |
914 | while (*charset) |
789 | if (*charset++ == '-' && !--count) |
915 | if (*charset++ == '-' && !--count) |
790 | break; |
916 | break; |
791 | |
917 | |
792 | 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) |
793 | } |
926 | { |
794 | |
927 | clear (); |
795 | free (registry); |
928 | return false; |
796 | free (encoding); |
929 | } |
797 | |
930 | |
798 | if (cs == CS_UNICODE) |
931 | if (cs == CS_UNICODE) |
799 | 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 |
800 | |
933 | |
801 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
934 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
813 | 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; |
814 | |
947 | |
815 | if (encm) |
948 | if (encm) |
816 | N += (f->max_byte1 - f->min_byte1) |
949 | N += (f->max_byte1 - f->min_byte1) |
817 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
950 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
818 | |
951 | |
819 | while (N) |
952 | while (N) |
820 | { |
953 | { |
821 | if (f->per_char[N].width > width) |
954 | if (f->per_char[N].width > width) |
822 | width = f->per_char[N].width; |
955 | width = f->per_char[N].width; |
823 | |
956 | |
… | |
… | |
826 | } |
959 | } |
827 | #endif |
960 | #endif |
828 | |
961 | |
829 | width = 1; |
962 | width = 1; |
830 | |
963 | |
831 | 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++) |
832 | { |
965 | { |
833 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
966 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
834 | continue; |
967 | continue; |
835 | |
968 | |
836 | // ignore characters we wouldn't use anyways |
969 | // ignore characters we wouldn't use anyways |
837 | bool careful; |
970 | bool careful; |
838 | if (!has_char (*t, &prop, careful)) |
971 | if (!has_char (*t, &prop, careful)) |
839 | continue; |
972 | continue; |
840 | |
973 | |
841 | 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 }; |
842 | |
976 | |
843 | XCharStruct g; |
977 | XCharStruct g; |
844 | int dir_ret, asc_ret, des_ret; |
978 | int dir_ret, asc_ret, des_ret; |
845 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
979 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
846 | |
980 | |
… | |
… | |
848 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
982 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
849 | |
983 | |
850 | if (width < g.width) width = g.width; |
984 | if (width < g.width) width = g.width; |
851 | } |
985 | } |
852 | |
986 | |
853 | if (cs == CS_UNKNOWN) |
987 | #if 0 // do it per-character |
|
|
988 | if (prop && width > prop->width) |
854 | { |
989 | { |
855 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
856 | |
|
|
857 | clear (); |
990 | clear (); |
858 | return false; |
991 | return false; |
859 | } |
992 | } |
860 | |
|
|
861 | #if 0 // do it per-character |
|
|
862 | if (prop && width > prop->width) |
|
|
863 | { |
|
|
864 | clear (); |
|
|
865 | return false; |
|
|
866 | } |
|
|
867 | #endif |
993 | #endif |
868 | |
994 | |
869 | return true; |
995 | return true; |
870 | } |
996 | } |
871 | |
997 | |
… | |
… | |
880 | } |
1006 | } |
881 | |
1007 | |
882 | bool |
1008 | bool |
883 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1009 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
884 | { |
1010 | { |
|
|
1011 | careful = false; |
|
|
1012 | |
885 | uint32_t ch = FROM_UNICODE (cs, unicode); |
1013 | uint32_t ch = FROM_UNICODE (cs, unicode); |
886 | |
1014 | |
887 | if (ch == NOCHAR) |
1015 | if (ch == NOCHAR) |
888 | return false; |
1016 | return false; |
889 | |
1017 | |
890 | /* check wether the character exists in _this_ font. horrible. */ |
1018 | /* check whether the character exists in _this_ font. horrible. */ |
891 | XCharStruct *xcs; |
1019 | XCharStruct *xcs; |
892 | |
1020 | |
893 | if (encm) |
1021 | if (encm) |
894 | { |
1022 | { |
895 | unsigned char byte1 = ch >> 8; |
1023 | unsigned char byte1 = ch >> 8; |
… | |
… | |
925 | return false; |
1053 | return false; |
926 | |
1054 | |
927 | if (!prop || prop->width == rxvt_fontprop::unset) |
1055 | if (!prop || prop->width == rxvt_fontprop::unset) |
928 | return true; |
1056 | return true; |
929 | |
1057 | |
930 | // check wether character overlaps previous/next character |
1058 | // check whether character overlaps previous/next character |
931 | int w = xcs->rbearing - xcs->lbearing; |
1059 | int w = xcs->rbearing - xcs->lbearing; |
932 | int wcw = max (WCWIDTH (unicode), 1); |
1060 | int wcw = max (WCWIDTH (unicode), 1); |
933 | |
1061 | |
934 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1062 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
935 | |
1063 | |
… | |
… | |
952 | dTermDisplay; |
1080 | dTermDisplay; |
953 | dTermGC; |
1081 | dTermGC; |
954 | |
1082 | |
955 | bool slow = this->slow |
1083 | bool slow = this->slow |
956 | || width != term->fwidth |
1084 | || width != term->fwidth |
957 | || height != term->fheight; |
1085 | || height != term->fheight |
|
|
1086 | || ascent != f->ascent; |
958 | |
1087 | |
959 | int base = ascent; // sorry, incorrect: term->fbase; |
1088 | int base = ascent; // sorry, incorrect: term->fbase; |
960 | |
1089 | |
961 | XGCValues v; |
1090 | XGCValues v; |
962 | v.foreground = term->pix_colors[fg]; |
1091 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
975 | else |
1104 | else |
976 | { |
1105 | { |
977 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1106 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
978 | |
1107 | |
979 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1108 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
980 | |
1109 | |
981 | if (slow) |
1110 | if (slow) |
982 | { |
1111 | { |
983 | do |
1112 | do |
984 | { |
1113 | { |
985 | if (xc->byte1 || xc->byte2) |
1114 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1007 | else |
1136 | else |
1008 | { |
1137 | { |
1009 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1138 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1010 | |
1139 | |
1011 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1140 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1012 | |
1141 | |
1013 | if (slow) |
1142 | if (slow) |
1014 | { |
1143 | { |
1015 | do |
1144 | do |
1016 | { |
1145 | { |
1017 | if (*xc) |
1146 | if (*xc) |
… | |
… | |
1030 | |
1159 | |
1031 | ///////////////////////////////////////////////////////////////////////////// |
1160 | ///////////////////////////////////////////////////////////////////////////// |
1032 | |
1161 | |
1033 | #if XFT |
1162 | #if XFT |
1034 | |
1163 | |
1035 | struct rxvt_font_xft : rxvt_font { |
1164 | struct rxvt_font_xft : rxvt_font |
|
|
1165 | { |
1036 | rxvt_font_xft () { f = 0; } |
1166 | rxvt_font_xft () |
|
|
1167 | { |
|
|
1168 | can_compose = true; |
|
|
1169 | f = 0; |
|
|
1170 | } |
1037 | |
1171 | |
1038 | void clear (); |
1172 | void clear (); |
1039 | |
1173 | |
1040 | rxvt_fontprop properties (); |
1174 | rxvt_fontprop properties (); |
1041 | |
1175 | |
… | |
… | |
1043 | |
1177 | |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1178 | void draw (rxvt_drawable &d, int x, int y, |
1045 | const text_t *text, int len, |
1179 | const text_t *text, int len, |
1046 | int fg, int bg); |
1180 | int fg, int bg); |
1047 | |
1181 | |
1048 | 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; |
1049 | |
1183 | |
1050 | protected: |
1184 | protected: |
1051 | XftFont *f; |
1185 | XftFont *f; |
1052 | }; |
1186 | }; |
1053 | |
1187 | |
… | |
… | |
1109 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1243 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1110 | |
1244 | |
1111 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1245 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1112 | // clip width, we can't do better, or can we? |
1246 | // clip width, we can't do better, or can we? |
1113 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1247 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1114 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1248 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1115 | #endif |
1249 | #endif |
1116 | |
1250 | |
1117 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1251 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1118 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1252 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1119 | |
1253 | |
… | |
… | |
1131 | int ftheight = 0; |
1265 | int ftheight = 0; |
1132 | bool success = true; |
1266 | bool success = true; |
1133 | |
1267 | |
1134 | for (;;) |
1268 | for (;;) |
1135 | { |
1269 | { |
|
|
1270 | p = FcPatternDuplicate (match); |
1136 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1271 | f = XftFontOpenPattern (disp, p); |
1137 | |
1272 | |
1138 | if (!f) |
1273 | if (!f) |
1139 | { |
1274 | { |
|
|
1275 | FcPatternDestroy (p); |
1140 | success = false; |
1276 | success = false; |
1141 | break; |
1277 | break; |
1142 | } |
1278 | } |
1143 | |
1279 | |
1144 | FT_Face face = XftLockFace (f); |
1280 | FT_Face face = XftLockFace (f); |
… | |
… | |
1152 | |
1288 | |
1153 | XftUnlockFace (f); |
1289 | XftUnlockFace (f); |
1154 | |
1290 | |
1155 | int glheight = height; |
1291 | int glheight = height; |
1156 | |
1292 | |
1157 | 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++) |
1158 | { |
1294 | { |
1159 | FcChar16 ch = *t; |
1295 | FcChar16 ch = *t; |
1160 | |
1296 | |
1161 | if (cs != CS_UNICODE |
1297 | if (cs != CS_UNICODE |
1162 | && ch > 0x100 |
1298 | && ch > 0x100 |
… | |
… | |
1231 | bool |
1367 | bool |
1232 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1368 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1233 | { |
1369 | { |
1234 | careful = false; |
1370 | careful = false; |
1235 | |
1371 | |
|
|
1372 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1373 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
|
|
1374 | if (compose_char *cc = rxvt_composite[unicode]) |
|
|
1375 | if (cc->c2 == NOCHAR) |
|
|
1376 | unicode = cc->c1; |
|
|
1377 | #endif |
|
|
1378 | |
1236 | if (!XftCharExists (term->dpy, f, unicode)) |
1379 | if (!XftCharExists (term->dpy, f, unicode)) |
1237 | return false; |
1380 | return false; |
1238 | |
1381 | |
1239 | if (!prop || prop->width == rxvt_fontprop::unset) |
1382 | if (!prop || prop->width == rxvt_fontprop::unset) |
1240 | return true; |
1383 | return true; |
… | |
… | |
1263 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1406 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1264 | const text_t *text, int len, |
1407 | const text_t *text, int len, |
1265 | int fg, int bg) |
1408 | int fg, int bg) |
1266 | { |
1409 | { |
1267 | XGlyphInfo extents; |
1410 | XGlyphInfo extents; |
1268 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1411 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1269 | XftGlyphSpec *ep = enc; |
1412 | XftGlyphSpec *ep = enc; |
1270 | |
1413 | |
1271 | dTermDisplay; |
1414 | dTermDisplay; |
1272 | dTermGC; |
1415 | dTermGC; |
1273 | |
1416 | |
1274 | int w = term->fwidth * len; |
1417 | int w = term->fwidth * len; |
1275 | int h = term->fheight; |
1418 | int h = term->fheight; |
1276 | |
1419 | |
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1420 | bool buffered = bg >= Color_transparent |
1278 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1421 | && term->option (Opt_buffered); |
1279 | * good idea from the perspective of packaging for wide variety of user configs. |
1422 | |
1280 | */ |
|
|
1281 | bool buffered = true |
|
|
1282 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1283 | && bg >= 0 |
|
|
1284 | #endif |
|
|
1285 | ; |
|
|
1286 | // cut trailing spaces |
1423 | // cut trailing spaces |
1287 | while (len && text [len - 1] == ' ') |
1424 | while (len && text [len - 1] == ' ') |
1288 | len--; |
1425 | len--; |
1289 | |
1426 | |
1290 | int x_ = buffered ? 0 : x; |
1427 | int x_ = buffered ? 0 : x; |
… | |
… | |
1293 | while (len) |
1430 | while (len) |
1294 | { |
1431 | { |
1295 | int cwidth = term->fwidth; |
1432 | int cwidth = term->fwidth; |
1296 | FcChar32 fc = *text++; len--; |
1433 | FcChar32 fc = *text++; len--; |
1297 | |
1434 | |
|
|
1435 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1436 | if (ecb_expect_false (IS_COMPOSE (fc))) |
|
|
1437 | if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry |
|
|
1438 | fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way |
|
|
1439 | #endif |
|
|
1440 | |
1298 | while (len && *text == NOCHAR) |
1441 | while (len && *text == NOCHAR) |
1299 | text++, len--, cwidth += term->fwidth; |
1442 | text++, len--, cwidth += term->fwidth; |
1300 | |
1443 | |
1301 | if (fc != ' ') // skip spaces |
1444 | if (fc != ' ') // skip spaces |
1302 | { |
1445 | { |
1303 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1446 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1304 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1447 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1305 | |
1448 | |
… | |
… | |
1319 | if (buffered) |
1462 | if (buffered) |
1320 | { |
1463 | { |
1321 | if (ep != enc) |
1464 | if (ep != enc) |
1322 | { |
1465 | { |
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1466 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1324 | bool back_rendered = false; |
|
|
1325 | |
1467 | |
1326 | #ifdef HAVE_BG_PIXMAP |
1468 | #ifdef HAVE_IMG |
|
|
1469 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1470 | |
1327 | if (term->bgPixmap.pixmap) |
1471 | if (term->bg_img |
|
|
1472 | && (bg == Color_transparent || bg == Color_bg |
|
|
1473 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1328 | { |
1474 | { |
1329 | Picture dst = 0; |
1475 | int src_x = x, src_y = y; |
1330 | |
1476 | |
1331 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1477 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1332 | dst = XftDrawPicture (d2); |
|
|
1333 | |
|
|
1334 | if (bg < 0 || dst != 0) |
|
|
1335 | { |
1478 | { |
1336 | int src_x = x, src_y = y ; |
|
|
1337 | |
|
|
1338 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1339 | { |
|
|
1340 | src_x += term->window_vt_x; |
1479 | src_x += term->window_vt_x; |
1341 | src_y += term->window_vt_y; |
1480 | src_y += term->window_vt_y; |
1342 | } |
1481 | } |
1343 | |
1482 | |
1344 | if (term->bgPixmap.pmap_width >= src_x+w |
1483 | if (term->bg_img->w >= src_x + w |
1345 | && term->bgPixmap.pmap_height >= src_y+h) |
1484 | && term->bg_img->h >= src_y + h) |
1346 | { |
1485 | { |
1347 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1486 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1348 | src_x, src_y, w, h, 0, 0); |
1487 | src_x, src_y, w, h, 0, 0); |
1349 | } |
1488 | } |
1350 | else |
1489 | else |
1351 | { |
1490 | { |
1352 | XGCValues gcv; |
1491 | XGCValues gcv; |
1353 | |
1492 | |
1354 | gcv.fill_style = FillTiled; |
1493 | gcv.fill_style = FillTiled; |
1355 | gcv.tile = term->bgPixmap.pixmap; |
1494 | gcv.tile = term->bg_img->pm; |
1356 | gcv.ts_x_origin = -src_x; |
1495 | gcv.ts_x_origin = -src_x; |
1357 | gcv.ts_y_origin = -src_y; |
1496 | gcv.ts_y_origin = -src_y; |
1358 | |
1497 | |
1359 | XChangeGC (disp, gc, |
1498 | XChangeGC (disp, gc, |
1360 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1499 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1361 | &gcv); |
1500 | &gcv); |
1362 | |
1501 | |
1363 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1502 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1364 | |
1503 | |
1365 | gcv.fill_style = FillSolid; |
1504 | gcv.fill_style = FillSolid; |
1366 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1505 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1367 | } |
1506 | } |
1368 | |
1507 | |
1369 | if (bg >= 0) |
1508 | if (dst) |
1370 | { |
1509 | { |
1371 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1510 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1511 | |
|
|
1512 | // dst can only be set when bg >= 0 |
1372 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1513 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1373 | } |
|
|
1374 | |
|
|
1375 | back_rendered = true; |
|
|
1376 | } |
1514 | } |
1377 | } |
1515 | } |
|
|
1516 | else |
1378 | #endif |
1517 | #endif |
1379 | |
|
|
1380 | if (bg >= 0 && !back_rendered) |
|
|
1381 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1518 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1382 | |
1519 | |
1383 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1520 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1384 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1521 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1385 | } |
1522 | } |
1386 | else |
1523 | else |
… | |
… | |
1414 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1551 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1415 | = rxvt_fontprop::unset; |
1552 | = rxvt_fontprop::unset; |
1416 | force_prop = false; |
1553 | force_prop = false; |
1417 | |
1554 | |
1418 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1555 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1419 | FONT_UNREF (*i); |
1556 | (*i)->unref (); |
1420 | |
1557 | |
1421 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1558 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1422 | delete *p; |
1559 | delete *p; |
1423 | |
1560 | |
1424 | free (fontdesc); fontdesc = 0; |
1561 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1426 | fonts.clear (); |
1563 | fonts.clear (); |
1427 | |
1564 | |
1428 | fallback = fallback_fonts; |
1565 | fallback = fallback_fonts; |
1429 | } |
1566 | } |
1430 | |
1567 | |
|
|
1568 | void |
|
|
1569 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1570 | { |
|
|
1571 | font->set_term (term); |
|
|
1572 | |
|
|
1573 | font->cs = cs; |
|
|
1574 | font->loaded = false; |
|
|
1575 | } |
|
|
1576 | |
1431 | rxvt_font * |
1577 | rxvt_font * |
1432 | rxvt_fontset::new_font (const char *name, codeset cs) |
1578 | rxvt_fontset::new_font (const char *name, codeset cs) |
1433 | { |
1579 | { |
1434 | rxvt_font *f; |
1580 | rxvt_font *f; |
1435 | |
1581 | |
1436 | if (!name || !*name) |
1582 | if (!name || !*name) |
1437 | { |
1583 | { |
1438 | name = ""; |
1584 | name = ""; |
1439 | f = new rxvt_font_default (this); |
1585 | f = new rxvt_font_default (this); |
1440 | } |
1586 | } |
… | |
… | |
1451 | f = new rxvt_font_x11; |
1597 | f = new rxvt_font_x11; |
1452 | } |
1598 | } |
1453 | else |
1599 | else |
1454 | f = new rxvt_font_x11; |
1600 | f = new rxvt_font_x11; |
1455 | |
1601 | |
1456 | f->set_term (term); |
|
|
1457 | f->set_name (strdup (name)); |
1602 | f->set_name (strdup (name)); |
1458 | |
1603 | prepare_font (f, cs); |
1459 | f->cs = cs; |
|
|
1460 | f->loaded = false; |
|
|
1461 | |
1604 | |
1462 | return f; |
1605 | return f; |
1463 | } |
1606 | } |
1464 | |
1607 | |
1465 | ///////////////////////////////////////////////////////////////////////////// |
1608 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1609 | |
|
|
1610 | void |
|
|
1611 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1612 | { |
|
|
1613 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1614 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1615 | // represented in the rendition. |
|
|
1616 | if (fonts.size () == fontCount) |
|
|
1617 | { |
|
|
1618 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1619 | |
|
|
1620 | prepare_font (f, CS_UNICODE); |
|
|
1621 | fonts.push_back (f); |
|
|
1622 | } |
|
|
1623 | |
|
|
1624 | fonts.push_back (font); |
|
|
1625 | } |
1466 | |
1626 | |
1467 | void |
1627 | void |
1468 | rxvt_fontset::add_fonts (const char *desc) |
1628 | rxvt_fontset::add_fonts (const char *desc) |
1469 | { |
1629 | { |
1470 | if (desc) |
1630 | if (desc) |
… | |
… | |
1499 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1659 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1500 | else |
1660 | else |
1501 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1661 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1502 | |
1662 | |
1503 | desc++; |
1663 | desc++; |
1504 | while (*desc <= ' ') desc++; |
1664 | while (*desc <= ' ' && *desc) desc++; |
1505 | } |
1665 | } |
1506 | |
1666 | |
1507 | end = strchr (desc, ','); |
1667 | end = strchr (desc, ','); |
1508 | if (!end) |
1668 | if (!end) |
1509 | end = desc + strlen (desc); |
1669 | end = desc + strlen (desc); |
1510 | |
1670 | |
1511 | if (end - desc < 511) |
1671 | if (end - desc < 511) |
1512 | { |
1672 | { |
1513 | strncpy (buf, desc, end - desc); |
1673 | memcpy (buf, desc, end - desc); |
1514 | buf[end - desc] = 0; |
1674 | buf[end - desc] = 0; |
1515 | |
1675 | |
1516 | fonts.push_back (new_font (buf, cs)); |
1676 | push_font (new_font (buf, cs)); |
1517 | } |
1677 | } |
1518 | else |
1678 | else |
1519 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1679 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1520 | |
1680 | |
1521 | desc = end + 1; |
1681 | desc = end + 1; |
1522 | } |
1682 | } |
1523 | while (*end); |
1683 | while (*end); |
1524 | } |
1684 | } |
… | |
… | |
1549 | { |
1709 | { |
1550 | clear (); |
1710 | clear (); |
1551 | |
1711 | |
1552 | fontdesc = strdup (desc); |
1712 | fontdesc = strdup (desc); |
1553 | |
1713 | |
1554 | fonts.push_back (new_font (0, CS_UNICODE)); |
1714 | push_font (new_font (0, CS_UNICODE)); |
1555 | realize_font (0); |
1715 | realize_font (0); |
1556 | |
1716 | |
1557 | add_fonts (desc); |
1717 | add_fonts (desc); |
1558 | |
1718 | |
1559 | return true; |
1719 | return true; |
… | |
… | |
1568 | |
1728 | |
1569 | return -1; |
1729 | return -1; |
1570 | } |
1730 | } |
1571 | |
1731 | |
1572 | int |
1732 | int |
1573 | rxvt_fontset::find_font (unicode_t unicode) |
1733 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1574 | { |
1734 | { |
1575 | if (unicode >= 1<<20) |
1735 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
|
|
1736 | if (unicode > 0x1fffff) |
1576 | return 0; |
1737 | return 0; |
1577 | |
1738 | |
1578 | unicode_t hi = unicode >> 8; |
1739 | unicode_t hi = unicode >> 8; |
1579 | |
1740 | |
1580 | if (hi < fmap.size () |
1741 | if (hi < fmap.size () |
… | |
… | |
1604 | goto next_font; |
1765 | goto next_font; |
1605 | |
1766 | |
1606 | bool careful; |
1767 | bool careful; |
1607 | if (f->has_char (unicode, &prop, careful)) |
1768 | if (f->has_char (unicode, &prop, careful)) |
1608 | { |
1769 | { |
1609 | if (careful) |
1770 | i = (i << 1) | careful; |
1610 | i |= 128; |
|
|
1611 | |
1771 | |
1612 | goto found; |
1772 | goto found; |
1613 | } |
1773 | } |
1614 | |
1774 | |
1615 | next_font: |
1775 | next_font: |
1616 | if (i == fonts.size () - 1) |
1776 | if (i == fonts.size () - 1) |
1617 | { |
1777 | { |
|
|
1778 | // compose characters are handled by the default font, unless another font takes over |
|
|
1779 | // we do not go via the fallback list for speed reasons. |
|
|
1780 | if (IS_COMPOSE (unicode)) |
|
|
1781 | return 0; |
|
|
1782 | |
1618 | if (fallback->name) |
1783 | if (fallback->name) |
1619 | { |
1784 | { |
1620 | // search through the fallback list |
1785 | // search through the fallback list |
1621 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1786 | push_font (new_font (fallback->name, fallback->cs)); |
1622 | fallback++; |
1787 | fallback++; |
1623 | } |
1788 | } |
1624 | else |
1789 | else |
1625 | { |
1790 | { |
1626 | // try to find a new font. |
1791 | // try to find a new font. |
… | |
… | |
1628 | // way to configure this and xft is easier to hack in, |
1793 | // way to configure this and xft is easier to hack in, |
1629 | // while x11 has more framework in place already. |
1794 | // while x11 has more framework in place already. |
1630 | // TODO: this is a real resource hog, xft takes ages(?) |
1795 | // TODO: this is a real resource hog, xft takes ages(?) |
1631 | #if XFT && USE_SLOW_LOOKUP |
1796 | #if XFT && USE_SLOW_LOOKUP |
1632 | // grab the first xft font that seems suitable |
1797 | // grab the first xft font that seems suitable |
|
|
1798 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1633 | FcPattern *p = FcPatternCreate (); |
1799 | FcPattern *p = FcPatternCreate (); |
1634 | |
1800 | |
1635 | FcCharSet *s = FcCharSetCreate (); |
1801 | FcCharSet *s = FcCharSetCreate (); |
1636 | FcCharSetAddChar (s, unicode); |
1802 | FcCharSetAddChar (s, unicode); |
1637 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1803 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1657 | FcPatternDestroy (match); |
1823 | FcPatternDestroy (match); |
1658 | |
1824 | |
1659 | if (find_font (font) < 0) |
1825 | if (find_font (font) < 0) |
1660 | { |
1826 | { |
1661 | char fontname[4096]; |
1827 | char fontname[4096]; |
1662 | sprintf (fontname, "xft:%-.4090s", font); |
1828 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1663 | |
1829 | |
1664 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1830 | push_font (new_font (fontname, CS_UNICODE)); |
1665 | } |
1831 | } |
1666 | |
1832 | |
1667 | free (font); |
1833 | free (font); |
1668 | } |
1834 | } |
1669 | #endif |
1835 | #endif |
… | |
… | |
1681 | while (hi >= fmap.size ()) |
1847 | while (hi >= fmap.size ()) |
1682 | fmap.push_back (0); |
1848 | fmap.push_back (0); |
1683 | |
1849 | |
1684 | if (!fmap[hi]) |
1850 | if (!fmap[hi]) |
1685 | { |
1851 | { |
1686 | fmap[hi] = (pagemap *)new pagemap; |
1852 | fmap[hi] = new pagemap; |
1687 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1853 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1688 | } |
1854 | } |
1689 | |
1855 | |
1690 | (*fmap[hi])[unicode & 0xff] = i; |
1856 | (*fmap[hi])[unicode & 0xff] = i; |
1691 | } |
1857 | } |
1692 | |
1858 | |
1693 | return i; |
1859 | return i; |
1694 | } |
1860 | } |
1695 | |
1861 | |
1696 | |
|
|
1697 | |
|
|