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" }, |
… | |
… | |
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 | { |
… | |
… | |
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 | bool done = false; |
242 | Picture dst; |
243 | #ifdef HAVE_BG_PIXMAP |
243 | |
244 | if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) |
244 | # ifdef HAVE_IMG |
245 | { |
245 | if (term->bg_img |
|
|
246 | && !term->pix_colors[color].is_opaque () |
246 | Picture dst = XftDrawPicture (d); |
247 | && ((dst = XftDrawPicture (d)))) |
247 | if (dst != 0) |
|
|
248 | { |
248 | { |
249 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
250 | |
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
251 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
252 | done = true; |
|
|
253 | } |
253 | } |
254 | } |
254 | else |
255 | #endif |
255 | # endif |
256 | if (!done) |
|
|
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
256 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
257 | |
258 | #else |
258 | #else |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
261 | #endif |
262 | } |
262 | } |
263 | } |
263 | } |
264 | |
264 | |
265 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
266 | |
267 | #include "table/linedraw.h" |
|
|
268 | |
|
|
269 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
270 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
271 | |
270 | |
272 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
273 | : rxvt_font () |
272 | : rxvt_font () |
274 | { |
273 | { |
… | |
… | |
308 | return false; |
307 | return false; |
309 | |
308 | |
310 | if (unicode <= 0x009f) |
309 | if (unicode <= 0x009f) |
311 | return true; |
310 | return true; |
312 | |
311 | |
|
|
312 | #ifdef BUILTIN_GLYPHS |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | return true; |
315 | return true; |
|
|
316 | #endif |
316 | |
317 | |
317 | if (IS_COMPOSE (unicode)) |
318 | // we do not check for IS_COMPOSE here, as this would |
318 | return true; |
319 | // rob other fonts from taking over. |
319 | |
320 | |
320 | switch (unicode) |
321 | switch (unicode) |
321 | { |
322 | { |
322 | case ZERO_WIDTH_CHAR: |
323 | case ZERO_WIDTH_CHAR: |
323 | case NOCHAR: |
324 | case NOCHAR: |
… | |
… | |
344 | |
345 | |
345 | XSetForeground (disp, gc, term->pix_colors[fg]); |
346 | XSetForeground (disp, gc, term->pix_colors[fg]); |
346 | |
347 | |
347 | while (len) |
348 | while (len) |
348 | { |
349 | { |
|
|
350 | const text_t *tp = text; |
|
|
351 | text_t t = *tp; |
|
|
352 | |
|
|
353 | while (++text, --len && *text == NOCHAR) |
|
|
354 | ; |
|
|
355 | |
349 | #if ENABLE_COMBINING |
356 | #if ENABLE_COMBINING |
350 | compose_char *cc; |
357 | compose_char *cc; |
351 | #endif |
358 | #endif |
352 | const text_t *tp = text; |
|
|
353 | text_t t = *tp; |
|
|
354 | |
|
|
355 | while (++text, --len && *text == NOCHAR) |
|
|
356 | ; |
|
|
357 | |
|
|
358 | int width = text - tp; |
359 | int width = text - tp; |
359 | int fwidth = term->fwidth * width; |
360 | int fwidth = term->fwidth * width; |
360 | |
361 | |
|
|
362 | #ifdef BUILTIN_GLYPHS |
361 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
362 | { |
364 | { |
|
|
365 | # include "table/linedraw.h" |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
366 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
367 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *b = a + (offs & 15); |
368 | uint32_t *b = a + (offs & 15); |
366 | |
369 | |
367 | int W = fwidth; |
370 | int W = fwidth; |
… | |
… | |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
437 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | break; |
438 | break; |
436 | } |
439 | } |
437 | } |
440 | } |
438 | } |
441 | } |
|
|
442 | #else |
|
|
443 | if (0) |
|
|
444 | ; |
|
|
445 | #endif |
439 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
441 | { |
448 | { |
442 | min_it (width, 2); // we only support wcwidth up to 2 |
449 | min_it (width, 2); // we only support wcwidth up to 2 |
443 | |
|
|
444 | text_t chrs[2]; |
450 | text_t chrs[2]; |
445 | chrs [1] = NOCHAR; |
451 | chrs [1] = NOCHAR; |
446 | |
452 | |
447 | *chrs = cc->c1; |
453 | *chrs = cc->c1; |
448 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
449 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | f1->draw (d, x, y, chrs, width, fg, bg); |
450 | |
456 | |
451 | if (cc->c2 != NOCHAR) |
457 | if (cc->c2 != NOCHAR) |
452 | { |
458 | { |
453 | bool careful; |
459 | bool careful; |
454 | |
460 | |
455 | // prefer font of first character, for no good reasons |
461 | // prefer font of first character, for no good reasons |
456 | *chrs = cc->c2; |
462 | *chrs = cc->c2; |
457 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
458 | ? f1 |
464 | ? f1 |
459 | : (*fs)[fs->find_font (cc->c2)]; |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
460 | |
466 | |
461 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
462 | } |
468 | } |
463 | } |
469 | } |
464 | #endif |
470 | #endif |
… | |
… | |
468 | case '\t': |
474 | case '\t': |
469 | case ZERO_WIDTH_CHAR: |
475 | case ZERO_WIDTH_CHAR: |
470 | case NOCHAR: |
476 | case NOCHAR: |
471 | break; |
477 | break; |
472 | |
478 | |
|
|
479 | /* |
|
|
480 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
481 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
482 | * decided against that until more data is available. |
|
|
483 | */ |
|
|
484 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
485 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
486 | break; |
|
|
487 | |
473 | default: |
488 | default: |
474 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
489 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
475 | fwidth - 4, term->fheight - 4); |
490 | fwidth - 4, term->fheight - 4); |
476 | } |
491 | } |
477 | |
492 | |
478 | x += fwidth; |
493 | x += fwidth; |
479 | } |
494 | } |
480 | } |
495 | } |
481 | |
496 | |
|
|
497 | struct rxvt_font_overflow : rxvt_font |
|
|
498 | { |
|
|
499 | struct rxvt_fontset *fs; |
|
|
500 | |
|
|
501 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
502 | : rxvt_font () |
|
|
503 | { |
|
|
504 | this->fs = fs; |
|
|
505 | } |
|
|
506 | |
|
|
507 | rxvt_fontprop properties () |
|
|
508 | { |
|
|
509 | rxvt_fontprop p; |
|
|
510 | |
|
|
511 | p.width = p.height = 1; |
|
|
512 | p.ascent = rxvt_fontprop::unset; |
|
|
513 | p.weight = rxvt_fontprop::medium; |
|
|
514 | p.slant = rxvt_fontprop::roman; |
|
|
515 | |
|
|
516 | return p; |
|
|
517 | } |
|
|
518 | |
|
|
519 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
520 | { |
|
|
521 | width = 1; height = 1; |
|
|
522 | ascent = 1; descent = 0; |
|
|
523 | |
|
|
524 | set_name (strdup ("built-in rendition overflow font")); |
|
|
525 | |
|
|
526 | return true; |
|
|
527 | } |
|
|
528 | |
|
|
529 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
530 | { |
|
|
531 | return false; |
|
|
532 | } |
|
|
533 | |
|
|
534 | void draw (rxvt_drawable &d, int x, int y, |
|
|
535 | const text_t *text, int len, |
|
|
536 | int fg, int bg) |
|
|
537 | { |
|
|
538 | while (len) |
|
|
539 | { |
|
|
540 | int fid = fs->find_font_idx (*text); |
|
|
541 | int w = 1; |
|
|
542 | while (w < len && text[w] == NOCHAR) |
|
|
543 | w++; |
|
|
544 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
545 | text += w; |
|
|
546 | len -= w; |
|
|
547 | x += term->fwidth * w; |
|
|
548 | } |
|
|
549 | } |
|
|
550 | }; |
|
|
551 | |
482 | ///////////////////////////////////////////////////////////////////////////// |
552 | ///////////////////////////////////////////////////////////////////////////// |
483 | |
553 | |
484 | struct rxvt_font_x11 : rxvt_font { |
554 | struct rxvt_font_x11 : rxvt_font |
|
|
555 | { |
485 | rxvt_font_x11 () { f = 0; } |
556 | rxvt_font_x11 () { f = 0; } |
486 | |
557 | |
487 | void clear (); |
558 | void clear (); |
488 | |
559 | |
489 | rxvt_fontprop properties (); |
560 | rxvt_fontprop properties (); |
… | |
… | |
494 | |
565 | |
495 | void draw (rxvt_drawable &d, int x, int y, |
566 | void draw (rxvt_drawable &d, int x, int y, |
496 | const text_t *text, int len, |
567 | const text_t *text, int len, |
497 | int fg, int bg); |
568 | int fg, int bg); |
498 | |
569 | |
499 | bool slow; // wether this is a proportional font or has other funny characteristics |
570 | bool slow; // whether this is a proportional font or has other funny characteristics |
500 | XFontStruct *f; |
571 | XFontStruct *f; |
501 | bool enc2b, encm; |
572 | bool enc2b, encm; |
502 | |
573 | |
503 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
574 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
504 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
575 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
604 | return false; |
675 | return false; |
605 | } |
676 | } |
606 | |
677 | |
607 | // fix the size of scalable fonts |
678 | // fix the size of scalable fonts |
608 | static bool |
679 | static bool |
609 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
680 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
610 | { |
681 | { |
611 | int slashes = 0; |
682 | int slashes = 0; |
612 | const char *field, *end; |
683 | const char *field, *end; |
613 | |
684 | |
614 | for (const char *c = name; *c; c++) |
685 | for (const char *c = name; *c; c++) |
… | |
… | |
624 | break; |
695 | break; |
625 | } |
696 | } |
626 | |
697 | |
627 | if (slashes >= 13 && (!old || *field == old)) |
698 | if (slashes >= 13 && (!old || *field == old)) |
628 | { |
699 | { |
629 | // TODO: check for overflow in font-name |
700 | size_t len = field - name; |
630 | strncpy (buf, name, field - name); |
701 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
631 | buf += field - name; |
702 | memcpy (*ptr, name, len); |
632 | strcpy (buf, replace); |
703 | strcpy (*ptr + len, replace); |
633 | strcat (buf, end); |
704 | strcat (*ptr, end); |
634 | |
705 | |
635 | return true; |
706 | return true; |
636 | } |
707 | } |
637 | else |
708 | else |
638 | { |
709 | { |
639 | strcpy (buf, name); |
710 | *ptr = strdup (name); |
640 | |
711 | |
641 | return false; |
712 | return false; |
642 | } |
713 | } |
643 | } |
714 | } |
644 | |
715 | |
… | |
… | |
652 | char field_str[64]; // enough for 128 bits |
723 | char field_str[64]; // enough for 128 bits |
653 | |
724 | |
654 | // first morph the font if required |
725 | // first morph the font if required |
655 | if (force_prop) |
726 | if (force_prop) |
656 | { |
727 | { |
657 | char fname[1024]; |
728 | char *fname; |
658 | |
729 | |
659 | if (name[0] != '-') |
730 | if (name[0] != '-') |
660 | { |
731 | { |
661 | f = XLoadQueryFont (disp, name); |
732 | f = XLoadQueryFont (disp, name); |
662 | |
733 | |
663 | if (!f) |
734 | if (!f) |
664 | return false; |
735 | return false; |
665 | |
736 | |
666 | char *new_name = get_property (f, XA_FONT, name); |
737 | char *new_name = get_property (f, XA_FONT, 0); |
667 | |
738 | |
668 | if (new_name) |
739 | if (new_name) |
669 | set_name (new_name); |
740 | set_name (new_name); |
670 | else |
741 | else |
671 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
742 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
672 | |
743 | |
673 | XFreeFont (disp, f); |
744 | XFreeFont (disp, f); |
674 | f = 0; |
745 | f = 0; |
675 | } |
746 | } |
676 | |
747 | |
677 | if (prop.weight != rxvt_fontprop::unset) |
748 | if (prop.weight != rxvt_fontprop::unset) |
678 | { |
749 | { |
679 | replace_field (fname, name, 2, 0, |
750 | replace_field (&fname, name, 2, 0, |
680 | prop.weight < rxvt_fontprop::bold |
751 | prop.weight < rxvt_fontprop::bold |
681 | ? "medium" : "bold"); |
752 | ? "medium" : "bold"); |
682 | set_name (strdup (fname)); |
753 | set_name (fname); |
683 | } |
754 | } |
684 | |
755 | |
685 | if (prop.slant != rxvt_fontprop::unset) |
756 | if (prop.slant != rxvt_fontprop::unset) |
686 | { |
757 | { |
687 | replace_field (fname, name, 3, 0, |
758 | replace_field (&fname, name, 3, 0, |
688 | prop.slant < rxvt_fontprop::italic |
759 | prop.slant < rxvt_fontprop::italic |
689 | ? "r" : "i"); // TODO: handle "o"blique, too |
760 | ? "r" : "i"); // TODO: handle "o"blique, too |
690 | set_name (strdup (fname)); |
761 | set_name (fname); |
691 | } |
762 | } |
692 | } |
763 | } |
693 | |
764 | |
694 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
765 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
695 | ? 0 : prop.height); |
766 | ? 0 : prop.height); |
… | |
… | |
720 | font_weight *fonts = new font_weight[count]; |
791 | font_weight *fonts = new font_weight[count]; |
721 | |
792 | |
722 | for (int i = 0; i < count; i++) |
793 | for (int i = 0; i < count; i++) |
723 | { |
794 | { |
724 | rxvt_fontprop p; |
795 | rxvt_fontprop p; |
725 | char fname[1024]; |
796 | char *fname; |
726 | |
797 | |
727 | int diff = 0; |
798 | int diff = 0; |
728 | |
799 | |
729 | if (replace_field (fname, list[i], 6, '0', field_str)) |
800 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
730 | diff += 10; // slightly penalize scalable fonts |
801 | diff += 10; // slightly penalize scalable fonts |
|
|
802 | else |
|
|
803 | { |
|
|
804 | free (fname); |
731 | else if (replace_field (fname, list[i], 11, '0', "0")) |
805 | if (replace_field (&fname, list[i], 11, '0', "0")) |
732 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
806 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
807 | } |
733 | |
808 | |
734 | if (!set_properties (p, fname)) |
809 | if (!set_properties (p, fname) |
|
|
810 | // also weed out too large fonts |
|
|
811 | || (prop.height != rxvt_fontprop::unset |
|
|
812 | && p.height > prop.height)) |
|
|
813 | { |
|
|
814 | free (fname); |
735 | continue; |
815 | continue; |
736 | |
816 | } |
737 | if (prop.height != rxvt_fontprop::unset |
|
|
738 | && p.height > prop.height) // weed out too large fonts |
|
|
739 | continue; |
|
|
740 | |
817 | |
741 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
818 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
742 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
819 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
743 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
820 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
744 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
821 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
745 | |
822 | |
746 | fonts[i].name = strdup (fname); |
823 | fonts[i].name = fname; |
747 | fonts[i].diff = diff; |
824 | fonts[i].diff = diff; |
748 | } |
825 | } |
749 | |
826 | |
750 | XFreeFontNames (list); |
827 | XFreeFontNames (list); |
751 | |
828 | |
752 | // this loop only iterates when the guessed font-size is too small |
829 | // this loop only iterates when the guessed font-size is too small |
753 | for (;;) |
830 | for (;;) |
754 | { |
831 | { |
755 | font_weight *best = fonts + count - 1; |
832 | font_weight *best = fonts; |
756 | |
833 | |
757 | for (font_weight *w = best; w-- > fonts; ) |
834 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
758 | if (w->diff <= best->diff) |
835 | if (w->diff < best->diff) |
759 | best = w; |
836 | best = w; |
760 | |
837 | |
761 | if (!best->name |
838 | if (!best->name |
762 | || !(f = XLoadQueryFont (disp, best->name))) |
839 | || !(f = XLoadQueryFont (disp, best->name))) |
763 | break; |
840 | break; |
… | |
… | |
783 | return false; |
860 | return false; |
784 | |
861 | |
785 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
862 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
786 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
863 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
787 | |
864 | |
|
|
865 | cs = CS_UNKNOWN; |
|
|
866 | |
788 | if (registry && encoding) |
867 | if (registry && encoding) |
789 | { |
868 | { |
790 | char charset[64]; |
869 | char charset[64]; |
791 | snprintf (charset, 64, "%s-%s", registry, encoding); |
870 | snprintf (charset, 64, "%s-%s", registry, encoding); |
792 | |
871 | |
793 | cs = codeset_from_name (charset); |
872 | cs = codeset_from_name (charset); |
794 | } |
873 | |
795 | else |
874 | if (cs == CS_UNKNOWN) |
|
|
875 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
796 | { |
876 | } |
|
|
877 | |
|
|
878 | free (registry); |
|
|
879 | free (encoding); |
|
|
880 | |
|
|
881 | if (cs == CS_UNKNOWN) |
|
|
882 | { |
797 | const char *charset = get_property (f, XA_FONT, 0); |
883 | char *value = get_property (f, XA_FONT, 0); |
|
|
884 | const char *charset = value; |
798 | |
885 | |
799 | if (!charset) |
886 | if (!charset) |
800 | charset = name; |
887 | charset = name; |
801 | |
888 | |
802 | int count = 13; |
889 | int count = 13; |
803 | while (*charset) |
890 | while (*charset) |
804 | if (*charset++ == '-' && !--count) |
891 | if (*charset++ == '-' && !--count) |
805 | break; |
892 | break; |
806 | |
893 | |
807 | cs = codeset_from_name (charset); |
894 | cs = codeset_from_name (charset); |
|
|
895 | if (cs == CS_UNKNOWN) |
|
|
896 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
897 | |
|
|
898 | free (value); |
|
|
899 | } |
|
|
900 | |
|
|
901 | if (cs == CS_UNKNOWN) |
808 | } |
902 | { |
809 | |
903 | clear (); |
810 | free (registry); |
904 | return false; |
811 | free (encoding); |
905 | } |
812 | |
906 | |
813 | if (cs == CS_UNICODE) |
907 | if (cs == CS_UNICODE) |
814 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
908 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
815 | |
909 | |
816 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
910 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
841 | } |
935 | } |
842 | #endif |
936 | #endif |
843 | |
937 | |
844 | width = 1; |
938 | width = 1; |
845 | |
939 | |
846 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
940 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
847 | { |
941 | { |
848 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
942 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
849 | continue; |
943 | continue; |
850 | |
944 | |
851 | // ignore characters we wouldn't use anyways |
945 | // ignore characters we wouldn't use anyways |
852 | bool careful; |
946 | bool careful; |
853 | if (!has_char (*t, &prop, careful)) |
947 | if (!has_char (*t, &prop, careful)) |
854 | continue; |
948 | continue; |
855 | |
949 | |
856 | XChar2b ch = { *t >> 8, *t }; |
950 | // the casts are needed in C++11 (see 8.5.1) |
|
|
951 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
857 | |
952 | |
858 | XCharStruct g; |
953 | XCharStruct g; |
859 | int dir_ret, asc_ret, des_ret; |
954 | int dir_ret, asc_ret, des_ret; |
860 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
955 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
861 | |
956 | |
… | |
… | |
863 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
958 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
864 | |
959 | |
865 | if (width < g.width) width = g.width; |
960 | if (width < g.width) width = g.width; |
866 | } |
961 | } |
867 | |
962 | |
868 | if (cs == CS_UNKNOWN) |
963 | #if 0 // do it per-character |
|
|
964 | if (prop && width > prop->width) |
869 | { |
965 | { |
870 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
871 | |
|
|
872 | clear (); |
966 | clear (); |
873 | return false; |
967 | return false; |
874 | } |
968 | } |
875 | |
|
|
876 | #if 0 // do it per-character |
|
|
877 | if (prop && width > prop->width) |
|
|
878 | { |
|
|
879 | clear (); |
|
|
880 | return false; |
|
|
881 | } |
|
|
882 | #endif |
969 | #endif |
883 | |
970 | |
884 | return true; |
971 | return true; |
885 | } |
972 | } |
886 | |
973 | |
… | |
… | |
895 | } |
982 | } |
896 | |
983 | |
897 | bool |
984 | bool |
898 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
985 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
899 | { |
986 | { |
|
|
987 | careful = false; |
|
|
988 | |
900 | uint32_t ch = FROM_UNICODE (cs, unicode); |
989 | uint32_t ch = FROM_UNICODE (cs, unicode); |
901 | |
990 | |
902 | if (ch == NOCHAR) |
991 | if (ch == NOCHAR) |
903 | return false; |
992 | return false; |
904 | |
993 | |
905 | /* check wether the character exists in _this_ font. horrible. */ |
994 | /* check whether the character exists in _this_ font. horrible. */ |
906 | XCharStruct *xcs; |
995 | XCharStruct *xcs; |
907 | |
996 | |
908 | if (encm) |
997 | if (encm) |
909 | { |
998 | { |
910 | unsigned char byte1 = ch >> 8; |
999 | unsigned char byte1 = ch >> 8; |
… | |
… | |
940 | return false; |
1029 | return false; |
941 | |
1030 | |
942 | if (!prop || prop->width == rxvt_fontprop::unset) |
1031 | if (!prop || prop->width == rxvt_fontprop::unset) |
943 | return true; |
1032 | return true; |
944 | |
1033 | |
945 | // check wether character overlaps previous/next character |
1034 | // check whether character overlaps previous/next character |
946 | int w = xcs->rbearing - xcs->lbearing; |
1035 | int w = xcs->rbearing - xcs->lbearing; |
947 | int wcw = max (WCWIDTH (unicode), 1); |
1036 | int wcw = max (WCWIDTH (unicode), 1); |
948 | |
1037 | |
949 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1038 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
950 | |
1039 | |
… | |
… | |
967 | dTermDisplay; |
1056 | dTermDisplay; |
968 | dTermGC; |
1057 | dTermGC; |
969 | |
1058 | |
970 | bool slow = this->slow |
1059 | bool slow = this->slow |
971 | || width != term->fwidth |
1060 | || width != term->fwidth |
972 | || height != term->fheight; |
1061 | || height != term->fheight |
|
|
1062 | || ascent != f->ascent; |
973 | |
1063 | |
974 | int base = ascent; // sorry, incorrect: term->fbase; |
1064 | int base = ascent; // sorry, incorrect: term->fbase; |
975 | |
1065 | |
976 | XGCValues v; |
1066 | XGCValues v; |
977 | v.foreground = term->pix_colors[fg]; |
1067 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1045 | |
1135 | |
1046 | ///////////////////////////////////////////////////////////////////////////// |
1136 | ///////////////////////////////////////////////////////////////////////////// |
1047 | |
1137 | |
1048 | #if XFT |
1138 | #if XFT |
1049 | |
1139 | |
1050 | struct rxvt_font_xft : rxvt_font { |
1140 | struct rxvt_font_xft : rxvt_font |
|
|
1141 | { |
1051 | rxvt_font_xft () { f = 0; } |
1142 | rxvt_font_xft () |
|
|
1143 | { |
|
|
1144 | f = 0; |
|
|
1145 | } |
1052 | |
1146 | |
1053 | void clear (); |
1147 | void clear (); |
1054 | |
1148 | |
1055 | rxvt_fontprop properties (); |
1149 | rxvt_fontprop properties (); |
1056 | |
1150 | |
… | |
… | |
1124 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1218 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1125 | |
1219 | |
1126 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1220 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1127 | // clip width, we can't do better, or can we? |
1221 | // clip width, we can't do better, or can we? |
1128 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1222 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1129 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1223 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1130 | #endif |
1224 | #endif |
1131 | |
1225 | |
1132 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1226 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1133 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1227 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1134 | |
1228 | |
… | |
… | |
1146 | int ftheight = 0; |
1240 | int ftheight = 0; |
1147 | bool success = true; |
1241 | bool success = true; |
1148 | |
1242 | |
1149 | for (;;) |
1243 | for (;;) |
1150 | { |
1244 | { |
|
|
1245 | p = FcPatternDuplicate (match); |
1151 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1246 | f = XftFontOpenPattern (disp, p); |
1152 | |
1247 | |
1153 | if (!f) |
1248 | if (!f) |
1154 | { |
1249 | { |
|
|
1250 | FcPatternDestroy (p); |
1155 | success = false; |
1251 | success = false; |
1156 | break; |
1252 | break; |
1157 | } |
1253 | } |
1158 | |
1254 | |
1159 | FT_Face face = XftLockFace (f); |
1255 | FT_Face face = XftLockFace (f); |
… | |
… | |
1167 | |
1263 | |
1168 | XftUnlockFace (f); |
1264 | XftUnlockFace (f); |
1169 | |
1265 | |
1170 | int glheight = height; |
1266 | int glheight = height; |
1171 | |
1267 | |
1172 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1268 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1173 | { |
1269 | { |
1174 | FcChar16 ch = *t; |
1270 | FcChar16 ch = *t; |
1175 | |
1271 | |
1176 | if (cs != CS_UNICODE |
1272 | if (cs != CS_UNICODE |
1177 | && ch > 0x100 |
1273 | && ch > 0x100 |
… | |
… | |
1196 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1292 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1197 | } |
1293 | } |
1198 | |
1294 | |
1199 | if (!width) |
1295 | if (!width) |
1200 | { |
1296 | { |
1201 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
1297 | rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name); |
1202 | |
1298 | width = f->max_advance_width; |
1203 | XftFontClose (disp, f); |
|
|
1204 | f = 0; |
|
|
1205 | |
|
|
1206 | success = false; |
|
|
1207 | break; |
1299 | break; |
1208 | } |
1300 | } |
1209 | |
1301 | |
1210 | if (prop.height == rxvt_fontprop::unset |
1302 | if (prop.height == rxvt_fontprop::unset |
1211 | || (height <= prop.height && glheight <= prop.height) |
1303 | || (height <= prop.height && glheight <= prop.height) |
… | |
… | |
1246 | bool |
1338 | bool |
1247 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1339 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1248 | { |
1340 | { |
1249 | careful = false; |
1341 | careful = false; |
1250 | |
1342 | |
|
|
1343 | rxvt_compose_expand_static<FcChar32> exp; |
|
|
1344 | FcChar32 *chrs = exp (unicode); |
|
|
1345 | int nchrs = exp.length (chrs); |
|
|
1346 | |
|
|
1347 | // allm chars in sequence must be available |
|
|
1348 | for (int i = 0; i < nchrs; ++i) |
1251 | if (!XftCharExists (term->dpy, f, unicode)) |
1349 | if (!XftCharExists (term->dpy, f, chrs [i])) |
1252 | return false; |
1350 | return false; |
1253 | |
1351 | |
1254 | if (!prop || prop->width == rxvt_fontprop::unset) |
1352 | if (!prop || prop->width == rxvt_fontprop::unset) |
1255 | return true; |
1353 | return true; |
1256 | |
1354 | |
1257 | // check character against base font bounding box |
1355 | int wcw = max (WCWIDTH (chrs [0]), 1); |
1258 | FcChar32 ch = unicode; |
1356 | |
|
|
1357 | // we check against all glyph sizes. this is probably wrong, |
|
|
1358 | // due to the way ->draw positions these glyphs. |
|
|
1359 | for (int i = 0; i < nchrs; ++i) |
|
|
1360 | { |
1259 | XGlyphInfo g; |
1361 | XGlyphInfo g; |
1260 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1362 | XftTextExtents32 (term->dpy, f, chrs + i, 1, &g); |
1261 | |
1363 | |
1262 | int w = g.width - g.x; |
1364 | int w = g.width - g.x; |
1263 | int wcw = max (WCWIDTH (unicode), 1); |
|
|
1264 | |
1365 | |
1265 | careful = g.x > 0 || w > prop->width * wcw; |
1366 | careful = g.x > 0 || w > prop->width * wcw; |
1266 | |
1367 | |
1267 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1368 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1268 | return false; |
1369 | return false; |
1269 | |
1370 | |
1270 | // this weeds out _totally_ broken fonts, or glyphs |
1371 | // this weeds out _totally_ broken fonts, or glyphs |
1271 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1372 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1272 | return false; |
1373 | return false; |
|
|
1374 | } |
1273 | |
1375 | |
1274 | return true; |
1376 | return true; |
1275 | } |
1377 | } |
1276 | |
1378 | |
1277 | void |
1379 | void |
1278 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1380 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1279 | const text_t *text, int len, |
1381 | const text_t *text, int len, |
1280 | int fg, int bg) |
1382 | int fg, int bg) |
1281 | { |
1383 | { |
1282 | XGlyphInfo extents; |
1384 | //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D |
1283 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
|
|
1284 | XftGlyphSpec *ep = enc; |
1385 | //XftGlyphSpec *ep = enc;//D |
|
|
1386 | static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow |
1285 | |
1387 | |
1286 | dTermDisplay; |
1388 | dTermDisplay; |
1287 | dTermGC; |
1389 | dTermGC; |
1288 | |
1390 | |
1289 | int w = term->fwidth * len; |
1391 | int w = term->fwidth * len; |
1290 | int h = term->fheight; |
1392 | int h = term->fheight; |
1291 | |
1393 | |
1292 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1394 | bool buffered = bg >= Color_transparent |
1293 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1395 | && term->option (Opt_buffered); |
1294 | * good idea from the perspective of packaging for wide variety of user configs. |
1396 | |
1295 | */ |
|
|
1296 | bool buffered = true |
|
|
1297 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1298 | && bg >= 0 |
|
|
1299 | #endif |
|
|
1300 | ; |
|
|
1301 | // cut trailing spaces |
1397 | // cut trailing spaces |
1302 | while (len && text [len - 1] == ' ') |
1398 | while (len && text [len - 1] == ' ') |
1303 | len--; |
1399 | len--; |
1304 | |
1400 | |
1305 | int x_ = buffered ? 0 : x; |
1401 | int x_ = buffered ? 0 : x; |
1306 | int y_ = buffered ? 0 : y; |
1402 | int y_ = buffered ? 0 : y; |
1307 | |
1403 | |
1308 | while (len) |
1404 | while (len) |
1309 | { |
1405 | { |
1310 | int cwidth = term->fwidth; |
1406 | int cwidth = term->fwidth; |
|
|
1407 | |
|
|
1408 | rxvt_compose_expand_static<FcChar32> exp; |
1311 | FcChar32 fc = *text++; len--; |
1409 | FcChar32 *chrs = exp (*text++); len--; |
|
|
1410 | int nchrs = exp.length (chrs); |
1312 | |
1411 | |
1313 | while (len && *text == NOCHAR) |
1412 | while (len && *text == NOCHAR) |
1314 | text++, len--, cwidth += term->fwidth; |
1413 | text++, len--, cwidth += term->fwidth; |
1315 | |
1414 | |
1316 | if (fc != ' ') // skip spaces |
1415 | if (chrs [0] != ' ') // skip spaces |
|
|
1416 | { |
|
|
1417 | #if 1 |
|
|
1418 | FT_UInt glyphs [decltype (exp)::max_size]; |
|
|
1419 | |
|
|
1420 | for (int i = 0; i < nchrs; ++i) |
|
|
1421 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
|
|
1422 | |
|
|
1423 | for (int i = 0; i < nchrs; ++i) |
1317 | { |
1424 | { |
|
|
1425 | XGlyphInfo ep; |
|
|
1426 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
|
|
1427 | printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height); |
|
|
1428 | } |
|
|
1429 | #endif |
|
|
1430 | |
1318 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1431 | FT_UInt glyph = XftCharIndex (disp, f, chrs [0]); |
|
|
1432 | XGlyphInfo extents0; |
1319 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1433 | XftGlyphExtents (disp, f, &glyph, 1, &extents0); |
1320 | |
1434 | |
|
|
1435 | int cx = x_ + (cwidth - extents0.xOff >> 1); |
|
|
1436 | int cy = y_ + ascent; |
|
|
1437 | |
|
|
1438 | XftGlyphSpec ep; |
1321 | ep->glyph = glyph; |
1439 | ep.glyph = glyph; |
1322 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1440 | ep.x = cx + (extents0.xOff ? 0 : extents0.xOff); |
1323 | ep->y = y_ + ascent; |
1441 | ep.y = cy; |
1324 | |
1442 | |
1325 | if (extents.xOff == 0) |
1443 | enc.push_back (ep); |
1326 | ep->x = x_ + cwidth; |
|
|
1327 | |
1444 | |
1328 | ep++; |
1445 | for (int i = 1; ecb_expect_false (i < nchrs); ++i) |
|
|
1446 | { |
|
|
1447 | FT_UInt glyph = XftCharIndex (disp, f, chrs [i]); |
|
|
1448 | XGlyphInfo extents; |
|
|
1449 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1450 | |
|
|
1451 | ep.glyph = glyph; |
|
|
1452 | ep.x = cx + (extents.xOff ? 0 : extents0.xOff); |
|
|
1453 | |
|
|
1454 | enc.push_back (ep); |
|
|
1455 | } |
1329 | } |
1456 | } |
1330 | |
1457 | |
1331 | x_ += cwidth; |
1458 | x_ += cwidth; |
1332 | } |
1459 | } |
1333 | |
1460 | |
1334 | if (buffered) |
1461 | if (buffered) |
1335 | { |
1462 | { |
1336 | bool back_rendered = false; |
1463 | if (!enc.empty ()) |
1337 | if (ep != enc) |
|
|
1338 | { |
1464 | { |
1339 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1465 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1340 | |
1466 | |
1341 | #ifdef HAVE_BG_PIXMAP |
1467 | #ifdef HAVE_IMG |
|
|
1468 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1469 | |
1342 | if (term->bgPixmap.pixmap) |
1470 | if (term->bg_img |
|
|
1471 | && (bg == Color_transparent || bg == Color_bg |
|
|
1472 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1343 | { |
1473 | { |
1344 | Picture dst = 0; |
1474 | int src_x = x, src_y = y; |
1345 | |
1475 | |
1346 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1476 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1347 | dst = XftDrawPicture (d2); |
|
|
1348 | |
|
|
1349 | if (bg < 0 || dst != 0) |
|
|
1350 | { |
1477 | { |
1351 | int src_x = x, src_y = y ; |
|
|
1352 | |
|
|
1353 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1354 | { |
|
|
1355 | src_x += term->window_vt_x; |
1478 | src_x += term->window_vt_x; |
1356 | src_y += term->window_vt_y; |
1479 | src_y += term->window_vt_y; |
1357 | } |
1480 | } |
1358 | |
1481 | |
1359 | if (term->bgPixmap.pmap_width >= src_x+w |
1482 | if (term->bg_img->w >= src_x + w |
1360 | && term->bgPixmap.pmap_height >= src_y+h) |
1483 | && term->bg_img->h >= src_y + h) |
1361 | { |
1484 | { |
1362 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1485 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1363 | src_x, src_y, w, h, 0, 0); |
1486 | src_x, src_y, w, h, 0, 0); |
1364 | } |
1487 | } |
1365 | else |
1488 | else |
1366 | { |
1489 | { |
1367 | XGCValues gcv; |
1490 | XGCValues gcv; |
1368 | |
1491 | |
1369 | gcv.fill_style = FillTiled; |
1492 | gcv.fill_style = FillTiled; |
1370 | gcv.tile = term->bgPixmap.pixmap; |
1493 | gcv.tile = term->bg_img->pm; |
1371 | gcv.ts_x_origin = -src_x; |
1494 | gcv.ts_x_origin = -src_x; |
1372 | gcv.ts_y_origin = -src_y; |
1495 | gcv.ts_y_origin = -src_y; |
1373 | |
1496 | |
1374 | XChangeGC (disp, gc, |
1497 | XChangeGC (disp, gc, |
1375 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1498 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1376 | &gcv); |
1499 | &gcv); |
1377 | |
1500 | |
1378 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1501 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1379 | |
1502 | |
1380 | gcv.fill_style = FillSolid; |
1503 | gcv.fill_style = FillSolid; |
1381 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1504 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1382 | } |
1505 | } |
1383 | |
1506 | |
1384 | if (bg >= 0) |
1507 | if (dst) |
1385 | { |
1508 | { |
1386 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1509 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1510 | |
|
|
1511 | // dst can only be set when bg >= 0 |
1387 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1512 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1388 | } |
|
|
1389 | |
|
|
1390 | back_rendered = true; |
|
|
1391 | } |
1513 | } |
1392 | } |
1514 | } |
|
|
1515 | else |
1393 | #endif |
1516 | #endif |
1394 | |
|
|
1395 | if (bg >= 0 && !back_rendered) |
|
|
1396 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1517 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1397 | |
1518 | |
1398 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1519 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1399 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1520 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1400 | } |
1521 | } |
1401 | else |
1522 | else |
1402 | clear_rect (d, x, y, w, h, bg); |
1523 | clear_rect (d, x, y, w, h, bg); |
1403 | } |
1524 | } |
1404 | else |
1525 | else |
1405 | { |
1526 | { |
1406 | clear_rect (d, x, y, w, h, bg); |
1527 | clear_rect (d, x, y, w, h, bg); |
1407 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1528 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ()); |
1408 | } |
1529 | } |
1409 | } |
1530 | } |
1410 | |
1531 | |
1411 | #endif |
1532 | #endif |
1412 | |
1533 | |
… | |
… | |
1429 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1550 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1430 | = rxvt_fontprop::unset; |
1551 | = rxvt_fontprop::unset; |
1431 | force_prop = false; |
1552 | force_prop = false; |
1432 | |
1553 | |
1433 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1554 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1434 | FONT_UNREF (*i); |
1555 | (*i)->unref (); |
1435 | |
1556 | |
1436 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1557 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1437 | delete *p; |
1558 | delete *p; |
1438 | |
1559 | |
1439 | free (fontdesc); fontdesc = 0; |
1560 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1441 | fonts.clear (); |
1562 | fonts.clear (); |
1442 | |
1563 | |
1443 | fallback = fallback_fonts; |
1564 | fallback = fallback_fonts; |
1444 | } |
1565 | } |
1445 | |
1566 | |
|
|
1567 | void |
|
|
1568 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1569 | { |
|
|
1570 | font->set_term (term); |
|
|
1571 | |
|
|
1572 | font->cs = cs; |
|
|
1573 | font->loaded = false; |
|
|
1574 | } |
|
|
1575 | |
1446 | rxvt_font * |
1576 | rxvt_font * |
1447 | rxvt_fontset::new_font (const char *name, codeset cs) |
1577 | rxvt_fontset::new_font (const char *name, codeset cs) |
1448 | { |
1578 | { |
1449 | rxvt_font *f; |
1579 | rxvt_font *f; |
1450 | |
1580 | |
… | |
… | |
1466 | f = new rxvt_font_x11; |
1596 | f = new rxvt_font_x11; |
1467 | } |
1597 | } |
1468 | else |
1598 | else |
1469 | f = new rxvt_font_x11; |
1599 | f = new rxvt_font_x11; |
1470 | |
1600 | |
1471 | f->set_term (term); |
|
|
1472 | f->set_name (strdup (name)); |
1601 | f->set_name (strdup (name)); |
1473 | |
1602 | prepare_font (f, cs); |
1474 | f->cs = cs; |
|
|
1475 | f->loaded = false; |
|
|
1476 | |
1603 | |
1477 | return f; |
1604 | return f; |
1478 | } |
1605 | } |
1479 | |
1606 | |
1480 | ///////////////////////////////////////////////////////////////////////////// |
1607 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1608 | |
|
|
1609 | void |
|
|
1610 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1611 | { |
|
|
1612 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1613 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1614 | // represented in the rendition. |
|
|
1615 | if (fonts.size () == fontCount) |
|
|
1616 | { |
|
|
1617 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1618 | |
|
|
1619 | prepare_font (f, CS_UNICODE); |
|
|
1620 | fonts.push_back (f); |
|
|
1621 | } |
|
|
1622 | |
|
|
1623 | fonts.push_back (font); |
|
|
1624 | } |
1481 | |
1625 | |
1482 | void |
1626 | void |
1483 | rxvt_fontset::add_fonts (const char *desc) |
1627 | rxvt_fontset::add_fonts (const char *desc) |
1484 | { |
1628 | { |
1485 | if (desc) |
1629 | if (desc) |
… | |
… | |
1514 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1658 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1515 | else |
1659 | else |
1516 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1660 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1517 | |
1661 | |
1518 | desc++; |
1662 | desc++; |
1519 | while (*desc <= ' ') desc++; |
1663 | while (*desc <= ' ' && *desc) desc++; |
1520 | } |
1664 | } |
1521 | |
1665 | |
1522 | end = strchr (desc, ','); |
1666 | end = strchr (desc, ','); |
1523 | if (!end) |
1667 | if (!end) |
1524 | end = desc + strlen (desc); |
1668 | end = desc + strlen (desc); |
1525 | |
1669 | |
1526 | if (end - desc < 511) |
1670 | if (end - desc < 511) |
1527 | { |
1671 | { |
1528 | strncpy (buf, desc, end - desc); |
1672 | memcpy (buf, desc, end - desc); |
1529 | buf[end - desc] = 0; |
1673 | buf[end - desc] = 0; |
1530 | |
1674 | |
1531 | fonts.push_back (new_font (buf, cs)); |
1675 | push_font (new_font (buf, cs)); |
1532 | } |
1676 | } |
1533 | else |
1677 | else |
1534 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1678 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1535 | |
1679 | |
1536 | desc = end + 1; |
1680 | desc = end + 1; |
1537 | } |
1681 | } |
1538 | while (*end); |
1682 | while (*end); |
1539 | } |
1683 | } |
… | |
… | |
1564 | { |
1708 | { |
1565 | clear (); |
1709 | clear (); |
1566 | |
1710 | |
1567 | fontdesc = strdup (desc); |
1711 | fontdesc = strdup (desc); |
1568 | |
1712 | |
1569 | fonts.push_back (new_font (0, CS_UNICODE)); |
1713 | push_font (new_font (0, CS_UNICODE)); |
1570 | realize_font (0); |
1714 | realize_font (0); |
1571 | |
1715 | |
1572 | add_fonts (desc); |
1716 | add_fonts (desc); |
1573 | |
1717 | |
1574 | return true; |
1718 | return true; |
… | |
… | |
1583 | |
1727 | |
1584 | return -1; |
1728 | return -1; |
1585 | } |
1729 | } |
1586 | |
1730 | |
1587 | int |
1731 | int |
1588 | rxvt_fontset::find_font (unicode_t unicode) |
1732 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1589 | { |
1733 | { |
1590 | if (unicode >= 1<<20) |
1734 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
|
|
1735 | if (unicode > 0x1fffff) |
1591 | return 0; |
1736 | return 0; |
1592 | |
1737 | |
1593 | unicode_t hi = unicode >> 8; |
1738 | unicode_t hi = unicode >> 8; |
1594 | |
1739 | |
1595 | if (hi < fmap.size () |
1740 | if (hi < fmap.size ()) |
1596 | && fmap[hi] |
1741 | if (pagemap *pm = fmap[hi]) |
1597 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1742 | if ((*pm)[unicode & 0xff] != 0xff) |
1598 | return (*fmap[hi])[unicode & 0xff]; |
1743 | return (*pm)[unicode & 0xff]; |
1599 | |
1744 | |
1600 | unsigned int i; |
1745 | unsigned int i; |
1601 | |
1746 | |
1602 | for (i = 0; i < fonts.size (); i++) |
1747 | for (i = 0; i < fonts.size (); i++) |
1603 | { |
1748 | { |
… | |
… | |
1619 | goto next_font; |
1764 | goto next_font; |
1620 | |
1765 | |
1621 | bool careful; |
1766 | bool careful; |
1622 | if (f->has_char (unicode, &prop, careful)) |
1767 | if (f->has_char (unicode, &prop, careful)) |
1623 | { |
1768 | { |
1624 | if (careful) |
1769 | i = (i << 1) | careful; |
1625 | i |= 128; |
|
|
1626 | |
1770 | |
1627 | goto found; |
1771 | goto found; |
1628 | } |
1772 | } |
1629 | |
1773 | |
1630 | next_font: |
1774 | next_font: |
1631 | if (i == fonts.size () - 1) |
1775 | if (i == fonts.size () - 1) |
1632 | { |
1776 | { |
|
|
1777 | // compose characters are handled by the default font, unless another font takes over |
|
|
1778 | // we do not go via the fallback list for speed reasons. |
|
|
1779 | if (IS_COMPOSE (unicode)) |
|
|
1780 | return 0; |
|
|
1781 | |
1633 | if (fallback->name) |
1782 | if (fallback->name) |
1634 | { |
1783 | { |
1635 | // search through the fallback list |
1784 | // search through the fallback list |
1636 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1785 | push_font (new_font (fallback->name, fallback->cs)); |
1637 | fallback++; |
1786 | fallback++; |
1638 | } |
1787 | } |
1639 | else |
1788 | else |
1640 | { |
1789 | { |
1641 | // try to find a new font. |
1790 | // try to find a new font. |
… | |
… | |
1643 | // way to configure this and xft is easier to hack in, |
1792 | // way to configure this and xft is easier to hack in, |
1644 | // while x11 has more framework in place already. |
1793 | // while x11 has more framework in place already. |
1645 | // TODO: this is a real resource hog, xft takes ages(?) |
1794 | // TODO: this is a real resource hog, xft takes ages(?) |
1646 | #if XFT && USE_SLOW_LOOKUP |
1795 | #if XFT && USE_SLOW_LOOKUP |
1647 | // grab the first xft font that seems suitable |
1796 | // grab the first xft font that seems suitable |
|
|
1797 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1648 | FcPattern *p = FcPatternCreate (); |
1798 | FcPattern *p = FcPatternCreate (); |
1649 | |
1799 | |
1650 | FcCharSet *s = FcCharSetCreate (); |
1800 | FcCharSet *s = FcCharSetCreate (); |
1651 | FcCharSetAddChar (s, unicode); |
1801 | FcCharSetAddChar (s, unicode); |
1652 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1802 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1672 | FcPatternDestroy (match); |
1822 | FcPatternDestroy (match); |
1673 | |
1823 | |
1674 | if (find_font (font) < 0) |
1824 | if (find_font (font) < 0) |
1675 | { |
1825 | { |
1676 | char fontname[4096]; |
1826 | char fontname[4096]; |
1677 | sprintf (fontname, "xft:%-.4090s", font); |
1827 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1678 | |
1828 | |
1679 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1829 | push_font (new_font (fontname, CS_UNICODE)); |
1680 | } |
1830 | } |
1681 | |
1831 | |
1682 | free (font); |
1832 | free (font); |
1683 | } |
1833 | } |
1684 | #endif |
1834 | #endif |
… | |
… | |
1696 | while (hi >= fmap.size ()) |
1846 | while (hi >= fmap.size ()) |
1697 | fmap.push_back (0); |
1847 | fmap.push_back (0); |
1698 | |
1848 | |
1699 | if (!fmap[hi]) |
1849 | if (!fmap[hi]) |
1700 | { |
1850 | { |
1701 | fmap[hi] = (pagemap *)new pagemap; |
1851 | fmap[hi] = new pagemap; |
1702 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1852 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1703 | } |
1853 | } |
1704 | |
1854 | |
1705 | (*fmap[hi])[unicode & 0xff] = i; |
1855 | (*fmap[hi])[unicode & 0xff] = i; |
1706 | } |
1856 | } |
1707 | |
1857 | |
1708 | return i; |
1858 | return i; |
1709 | } |
1859 | } |
1710 | |
1860 | |
1711 | |
|
|
1712 | |
|
|