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 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
268 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
269 | |
270 | |
270 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
271 | : rxvt_font () |
272 | : rxvt_font () |
272 | { |
273 | { |
… | |
… | |
306 | return false; |
307 | return false; |
307 | |
308 | |
308 | if (unicode <= 0x009f) |
309 | if (unicode <= 0x009f) |
309 | return true; |
310 | return true; |
310 | |
311 | |
|
|
312 | #ifdef BUILTIN_GLYPHS |
311 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
312 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
313 | return true; |
315 | return true; |
|
|
316 | #endif |
314 | |
317 | |
315 | if (IS_COMPOSE (unicode)) |
318 | if (IS_COMPOSE (unicode)) |
316 | return true; |
319 | return true; |
317 | |
320 | |
318 | switch (unicode) |
321 | switch (unicode) |
… | |
… | |
447 | |
450 | |
448 | text_t chrs[2]; |
451 | text_t chrs[2]; |
449 | chrs [1] = NOCHAR; |
452 | chrs [1] = NOCHAR; |
450 | |
453 | |
451 | *chrs = cc->c1; |
454 | *chrs = cc->c1; |
452 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
455 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
453 | f1->draw (d, x, y, chrs, width, fg, bg); |
456 | f1->draw (d, x, y, chrs, width, fg, bg); |
454 | |
457 | |
455 | if (cc->c2 != NOCHAR) |
458 | if (cc->c2 != NOCHAR) |
456 | { |
459 | { |
457 | bool careful; |
460 | bool careful; |
458 | |
461 | |
459 | // prefer font of first character, for no good reasons |
462 | // prefer font of first character, for no good reasons |
460 | *chrs = cc->c2; |
463 | *chrs = cc->c2; |
461 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
464 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
462 | ? f1 |
465 | ? f1 |
463 | : (*fs)[fs->find_font (cc->c2)]; |
466 | : (*fs)[fs->find_font_idx (cc->c2)]; |
464 | |
467 | |
465 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
468 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
466 | } |
469 | } |
467 | } |
470 | } |
468 | #endif |
471 | #endif |
… | |
… | |
472 | case '\t': |
475 | case '\t': |
473 | case ZERO_WIDTH_CHAR: |
476 | case ZERO_WIDTH_CHAR: |
474 | case NOCHAR: |
477 | case NOCHAR: |
475 | break; |
478 | break; |
476 | |
479 | |
|
|
480 | /* |
|
|
481 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
482 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
483 | * decided against that until more data is available. |
|
|
484 | */ |
|
|
485 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
486 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
487 | break; |
|
|
488 | |
477 | default: |
489 | default: |
478 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
490 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
479 | fwidth - 4, term->fheight - 4); |
491 | fwidth - 4, term->fheight - 4); |
480 | } |
492 | } |
481 | |
493 | |
482 | x += fwidth; |
494 | x += fwidth; |
483 | } |
495 | } |
484 | } |
496 | } |
485 | |
497 | |
|
|
498 | struct rxvt_font_overflow : rxvt_font |
|
|
499 | { |
|
|
500 | struct rxvt_fontset *fs; |
|
|
501 | |
|
|
502 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
503 | : rxvt_font () |
|
|
504 | { |
|
|
505 | this->fs = fs; |
|
|
506 | } |
|
|
507 | |
|
|
508 | rxvt_fontprop properties () |
|
|
509 | { |
|
|
510 | rxvt_fontprop p; |
|
|
511 | |
|
|
512 | p.width = p.height = 1; |
|
|
513 | p.ascent = rxvt_fontprop::unset; |
|
|
514 | p.weight = rxvt_fontprop::medium; |
|
|
515 | p.slant = rxvt_fontprop::roman; |
|
|
516 | |
|
|
517 | return p; |
|
|
518 | } |
|
|
519 | |
|
|
520 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
521 | { |
|
|
522 | width = 1; height = 1; |
|
|
523 | ascent = 1; descent = 0; |
|
|
524 | |
|
|
525 | set_name (strdup ("built-in rendition overflow font")); |
|
|
526 | |
|
|
527 | return true; |
|
|
528 | } |
|
|
529 | |
|
|
530 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
531 | { |
|
|
532 | return false; |
|
|
533 | } |
|
|
534 | |
|
|
535 | void draw (rxvt_drawable &d, int x, int y, |
|
|
536 | const text_t *text, int len, |
|
|
537 | int fg, int bg) |
|
|
538 | { |
|
|
539 | while (len) |
|
|
540 | { |
|
|
541 | int fid = fs->find_font_idx (*text); |
|
|
542 | int w = 1; |
|
|
543 | while (w < len && text[w] == NOCHAR) |
|
|
544 | w++; |
|
|
545 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
546 | text += w; |
|
|
547 | len -= w; |
|
|
548 | x += term->fwidth * w; |
|
|
549 | } |
|
|
550 | } |
|
|
551 | }; |
|
|
552 | |
486 | ///////////////////////////////////////////////////////////////////////////// |
553 | ///////////////////////////////////////////////////////////////////////////// |
487 | |
554 | |
488 | struct rxvt_font_x11 : rxvt_font { |
555 | struct rxvt_font_x11 : rxvt_font |
|
|
556 | { |
489 | rxvt_font_x11 () { f = 0; } |
557 | rxvt_font_x11 () { f = 0; } |
490 | |
558 | |
491 | void clear (); |
559 | void clear (); |
492 | |
560 | |
493 | rxvt_fontprop properties (); |
561 | rxvt_fontprop properties (); |
… | |
… | |
498 | |
566 | |
499 | void draw (rxvt_drawable &d, int x, int y, |
567 | void draw (rxvt_drawable &d, int x, int y, |
500 | const text_t *text, int len, |
568 | const text_t *text, int len, |
501 | int fg, int bg); |
569 | int fg, int bg); |
502 | |
570 | |
503 | bool slow; // wether this is a proportional font or has other funny characteristics |
571 | bool slow; // whether this is a proportional font or has other funny characteristics |
504 | XFontStruct *f; |
572 | XFontStruct *f; |
505 | bool enc2b, encm; |
573 | bool enc2b, encm; |
506 | |
574 | |
507 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
575 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
508 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
576 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
608 | return false; |
676 | return false; |
609 | } |
677 | } |
610 | |
678 | |
611 | // fix the size of scalable fonts |
679 | // fix the size of scalable fonts |
612 | static bool |
680 | static bool |
613 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
681 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
614 | { |
682 | { |
615 | int slashes = 0; |
683 | int slashes = 0; |
616 | const char *field, *end; |
684 | const char *field, *end; |
617 | |
685 | |
618 | for (const char *c = name; *c; c++) |
686 | for (const char *c = name; *c; c++) |
… | |
… | |
628 | break; |
696 | break; |
629 | } |
697 | } |
630 | |
698 | |
631 | if (slashes >= 13 && (!old || *field == old)) |
699 | if (slashes >= 13 && (!old || *field == old)) |
632 | { |
700 | { |
633 | // TODO: check for overflow in font-name |
701 | size_t len = field - name; |
634 | strncpy (buf, name, field - name); |
702 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
635 | buf += field - name; |
703 | memcpy (*ptr, name, len); |
636 | strcpy (buf, replace); |
704 | strcpy (*ptr + len, replace); |
637 | strcat (buf, end); |
705 | strcat (*ptr, end); |
638 | |
706 | |
639 | return true; |
707 | return true; |
640 | } |
708 | } |
641 | else |
709 | else |
642 | { |
710 | { |
643 | strcpy (buf, name); |
711 | *ptr = strdup (name); |
644 | |
712 | |
645 | return false; |
713 | return false; |
646 | } |
714 | } |
647 | } |
715 | } |
648 | |
716 | |
… | |
… | |
656 | char field_str[64]; // enough for 128 bits |
724 | char field_str[64]; // enough for 128 bits |
657 | |
725 | |
658 | // first morph the font if required |
726 | // first morph the font if required |
659 | if (force_prop) |
727 | if (force_prop) |
660 | { |
728 | { |
661 | char fname[1024]; |
729 | char *fname; |
662 | |
730 | |
663 | if (name[0] != '-') |
731 | if (name[0] != '-') |
664 | { |
732 | { |
665 | f = XLoadQueryFont (disp, name); |
733 | f = XLoadQueryFont (disp, name); |
666 | |
734 | |
667 | if (!f) |
735 | if (!f) |
668 | return false; |
736 | return false; |
669 | |
737 | |
670 | char *new_name = get_property (f, XA_FONT, name); |
738 | char *new_name = get_property (f, XA_FONT, 0); |
671 | |
739 | |
672 | if (new_name) |
740 | if (new_name) |
673 | set_name (new_name); |
741 | set_name (new_name); |
674 | else |
742 | else |
675 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
743 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
676 | |
744 | |
677 | XFreeFont (disp, f); |
745 | XFreeFont (disp, f); |
678 | f = 0; |
746 | f = 0; |
679 | } |
747 | } |
680 | |
748 | |
681 | if (prop.weight != rxvt_fontprop::unset) |
749 | if (prop.weight != rxvt_fontprop::unset) |
682 | { |
750 | { |
683 | replace_field (fname, name, 2, 0, |
751 | replace_field (&fname, name, 2, 0, |
684 | prop.weight < rxvt_fontprop::bold |
752 | prop.weight < rxvt_fontprop::bold |
685 | ? "medium" : "bold"); |
753 | ? "medium" : "bold"); |
686 | set_name (strdup (fname)); |
754 | set_name (fname); |
687 | } |
755 | } |
688 | |
756 | |
689 | if (prop.slant != rxvt_fontprop::unset) |
757 | if (prop.slant != rxvt_fontprop::unset) |
690 | { |
758 | { |
691 | replace_field (fname, name, 3, 0, |
759 | replace_field (&fname, name, 3, 0, |
692 | prop.slant < rxvt_fontprop::italic |
760 | prop.slant < rxvt_fontprop::italic |
693 | ? "r" : "i"); // TODO: handle "o"blique, too |
761 | ? "r" : "i"); // TODO: handle "o"blique, too |
694 | set_name (strdup (fname)); |
762 | set_name (fname); |
695 | } |
763 | } |
696 | } |
764 | } |
697 | |
765 | |
698 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
766 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
699 | ? 0 : prop.height); |
767 | ? 0 : prop.height); |
… | |
… | |
724 | font_weight *fonts = new font_weight[count]; |
792 | font_weight *fonts = new font_weight[count]; |
725 | |
793 | |
726 | for (int i = 0; i < count; i++) |
794 | for (int i = 0; i < count; i++) |
727 | { |
795 | { |
728 | rxvt_fontprop p; |
796 | rxvt_fontprop p; |
729 | char fname[1024]; |
797 | char *fname; |
730 | |
798 | |
731 | int diff = 0; |
799 | int diff = 0; |
732 | |
800 | |
733 | if (replace_field (fname, list[i], 6, '0', field_str)) |
801 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
734 | diff += 10; // slightly penalize scalable fonts |
802 | diff += 10; // slightly penalize scalable fonts |
|
|
803 | else |
|
|
804 | { |
|
|
805 | free (fname); |
735 | else if (replace_field (fname, list[i], 11, '0', "0")) |
806 | if (replace_field (&fname, list[i], 11, '0', "0")) |
736 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
807 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
808 | } |
737 | |
809 | |
738 | if (!set_properties (p, fname)) |
810 | if (!set_properties (p, fname) |
|
|
811 | // also weed out too large fonts |
|
|
812 | || (prop.height != rxvt_fontprop::unset |
|
|
813 | && p.height > prop.height)) |
|
|
814 | { |
|
|
815 | free (fname); |
739 | continue; |
816 | continue; |
740 | |
817 | } |
741 | if (prop.height != rxvt_fontprop::unset |
|
|
742 | && p.height > prop.height) // weed out too large fonts |
|
|
743 | continue; |
|
|
744 | |
818 | |
745 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
819 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
746 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
820 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
747 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
821 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
748 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
822 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
749 | |
823 | |
750 | fonts[i].name = strdup (fname); |
824 | fonts[i].name = fname; |
751 | fonts[i].diff = diff; |
825 | fonts[i].diff = diff; |
752 | } |
826 | } |
753 | |
827 | |
754 | XFreeFontNames (list); |
828 | XFreeFontNames (list); |
755 | |
829 | |
756 | // this loop only iterates when the guessed font-size is too small |
830 | // this loop only iterates when the guessed font-size is too small |
757 | for (;;) |
831 | for (;;) |
758 | { |
832 | { |
759 | font_weight *best = fonts + count - 1; |
833 | font_weight *best = fonts; |
760 | |
834 | |
761 | for (font_weight *w = best; w-- > fonts; ) |
835 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
762 | if (w->diff <= best->diff) |
836 | if (w->diff < best->diff) |
763 | best = w; |
837 | best = w; |
764 | |
838 | |
765 | if (!best->name |
839 | if (!best->name |
766 | || !(f = XLoadQueryFont (disp, best->name))) |
840 | || !(f = XLoadQueryFont (disp, best->name))) |
767 | break; |
841 | break; |
… | |
… | |
787 | return false; |
861 | return false; |
788 | |
862 | |
789 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
863 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
790 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
864 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
791 | |
865 | |
|
|
866 | cs = CS_UNKNOWN; |
|
|
867 | |
792 | if (registry && encoding) |
868 | if (registry && encoding) |
793 | { |
869 | { |
794 | char charset[64]; |
870 | char charset[64]; |
795 | snprintf (charset, 64, "%s-%s", registry, encoding); |
871 | snprintf (charset, 64, "%s-%s", registry, encoding); |
796 | |
872 | |
797 | cs = codeset_from_name (charset); |
873 | cs = codeset_from_name (charset); |
798 | } |
874 | |
799 | else |
875 | if (cs == CS_UNKNOWN) |
|
|
876 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
800 | { |
877 | } |
|
|
878 | |
|
|
879 | free (registry); |
|
|
880 | free (encoding); |
|
|
881 | |
|
|
882 | if (cs == CS_UNKNOWN) |
|
|
883 | { |
801 | const char *charset = get_property (f, XA_FONT, 0); |
884 | char *value = get_property (f, XA_FONT, 0); |
|
|
885 | const char *charset = value; |
802 | |
886 | |
803 | if (!charset) |
887 | if (!charset) |
804 | charset = name; |
888 | charset = name; |
805 | |
889 | |
806 | int count = 13; |
890 | int count = 13; |
807 | while (*charset) |
891 | while (*charset) |
808 | if (*charset++ == '-' && !--count) |
892 | if (*charset++ == '-' && !--count) |
809 | break; |
893 | break; |
810 | |
894 | |
811 | cs = codeset_from_name (charset); |
895 | cs = codeset_from_name (charset); |
|
|
896 | if (cs == CS_UNKNOWN) |
|
|
897 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
898 | |
|
|
899 | free (value); |
|
|
900 | } |
|
|
901 | |
|
|
902 | if (cs == CS_UNKNOWN) |
812 | } |
903 | { |
813 | |
904 | clear (); |
814 | free (registry); |
905 | return false; |
815 | free (encoding); |
906 | } |
816 | |
907 | |
817 | if (cs == CS_UNICODE) |
908 | if (cs == CS_UNICODE) |
818 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
909 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
819 | |
910 | |
820 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
911 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
845 | } |
936 | } |
846 | #endif |
937 | #endif |
847 | |
938 | |
848 | width = 1; |
939 | width = 1; |
849 | |
940 | |
850 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
941 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
851 | { |
942 | { |
852 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
943 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
853 | continue; |
944 | continue; |
854 | |
945 | |
855 | // ignore characters we wouldn't use anyways |
946 | // ignore characters we wouldn't use anyways |
856 | bool careful; |
947 | bool careful; |
857 | if (!has_char (*t, &prop, careful)) |
948 | if (!has_char (*t, &prop, careful)) |
858 | continue; |
949 | continue; |
859 | |
950 | |
860 | XChar2b ch = { *t >> 8, *t }; |
951 | // the casts are needed in C++11 (see 8.5.1) |
|
|
952 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
861 | |
953 | |
862 | XCharStruct g; |
954 | XCharStruct g; |
863 | int dir_ret, asc_ret, des_ret; |
955 | int dir_ret, asc_ret, des_ret; |
864 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
956 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
865 | |
957 | |
… | |
… | |
867 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
959 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
868 | |
960 | |
869 | if (width < g.width) width = g.width; |
961 | if (width < g.width) width = g.width; |
870 | } |
962 | } |
871 | |
963 | |
872 | if (cs == CS_UNKNOWN) |
964 | #if 0 // do it per-character |
|
|
965 | if (prop && width > prop->width) |
873 | { |
966 | { |
874 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
875 | |
|
|
876 | clear (); |
967 | clear (); |
877 | return false; |
968 | return false; |
878 | } |
969 | } |
879 | |
|
|
880 | #if 0 // do it per-character |
|
|
881 | if (prop && width > prop->width) |
|
|
882 | { |
|
|
883 | clear (); |
|
|
884 | return false; |
|
|
885 | } |
|
|
886 | #endif |
970 | #endif |
887 | |
971 | |
888 | return true; |
972 | return true; |
889 | } |
973 | } |
890 | |
974 | |
… | |
… | |
899 | } |
983 | } |
900 | |
984 | |
901 | bool |
985 | bool |
902 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
986 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
903 | { |
987 | { |
|
|
988 | careful = false; |
|
|
989 | |
904 | uint32_t ch = FROM_UNICODE (cs, unicode); |
990 | uint32_t ch = FROM_UNICODE (cs, unicode); |
905 | |
991 | |
906 | if (ch == NOCHAR) |
992 | if (ch == NOCHAR) |
907 | return false; |
993 | return false; |
908 | |
994 | |
909 | /* check wether the character exists in _this_ font. horrible. */ |
995 | /* check whether the character exists in _this_ font. horrible. */ |
910 | XCharStruct *xcs; |
996 | XCharStruct *xcs; |
911 | |
997 | |
912 | if (encm) |
998 | if (encm) |
913 | { |
999 | { |
914 | unsigned char byte1 = ch >> 8; |
1000 | unsigned char byte1 = ch >> 8; |
… | |
… | |
944 | return false; |
1030 | return false; |
945 | |
1031 | |
946 | if (!prop || prop->width == rxvt_fontprop::unset) |
1032 | if (!prop || prop->width == rxvt_fontprop::unset) |
947 | return true; |
1033 | return true; |
948 | |
1034 | |
949 | // check wether character overlaps previous/next character |
1035 | // check whether character overlaps previous/next character |
950 | int w = xcs->rbearing - xcs->lbearing; |
1036 | int w = xcs->rbearing - xcs->lbearing; |
951 | int wcw = max (WCWIDTH (unicode), 1); |
1037 | int wcw = max (WCWIDTH (unicode), 1); |
952 | |
1038 | |
953 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1039 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
954 | |
1040 | |
… | |
… | |
971 | dTermDisplay; |
1057 | dTermDisplay; |
972 | dTermGC; |
1058 | dTermGC; |
973 | |
1059 | |
974 | bool slow = this->slow |
1060 | bool slow = this->slow |
975 | || width != term->fwidth |
1061 | || width != term->fwidth |
976 | || height != term->fheight; |
1062 | || height != term->fheight |
|
|
1063 | || ascent != f->ascent; |
977 | |
1064 | |
978 | int base = ascent; // sorry, incorrect: term->fbase; |
1065 | int base = ascent; // sorry, incorrect: term->fbase; |
979 | |
1066 | |
980 | XGCValues v; |
1067 | XGCValues v; |
981 | v.foreground = term->pix_colors[fg]; |
1068 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1049 | |
1136 | |
1050 | ///////////////////////////////////////////////////////////////////////////// |
1137 | ///////////////////////////////////////////////////////////////////////////// |
1051 | |
1138 | |
1052 | #if XFT |
1139 | #if XFT |
1053 | |
1140 | |
1054 | struct rxvt_font_xft : rxvt_font { |
1141 | struct rxvt_font_xft : rxvt_font |
|
|
1142 | { |
1055 | rxvt_font_xft () { f = 0; } |
1143 | rxvt_font_xft () |
|
|
1144 | { |
|
|
1145 | f = 0; |
|
|
1146 | } |
1056 | |
1147 | |
1057 | void clear (); |
1148 | void clear (); |
1058 | |
1149 | |
1059 | rxvt_fontprop properties (); |
1150 | rxvt_fontprop properties (); |
1060 | |
1151 | |
… | |
… | |
1128 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1219 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1129 | |
1220 | |
1130 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1221 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1131 | // clip width, we can't do better, or can we? |
1222 | // clip width, we can't do better, or can we? |
1132 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1223 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1133 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1224 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1134 | #endif |
1225 | #endif |
1135 | |
1226 | |
1136 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1227 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1137 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1228 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1138 | |
1229 | |
… | |
… | |
1150 | int ftheight = 0; |
1241 | int ftheight = 0; |
1151 | bool success = true; |
1242 | bool success = true; |
1152 | |
1243 | |
1153 | for (;;) |
1244 | for (;;) |
1154 | { |
1245 | { |
|
|
1246 | p = FcPatternDuplicate (match); |
1155 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1247 | f = XftFontOpenPattern (disp, p); |
1156 | |
1248 | |
1157 | if (!f) |
1249 | if (!f) |
1158 | { |
1250 | { |
|
|
1251 | FcPatternDestroy (p); |
1159 | success = false; |
1252 | success = false; |
1160 | break; |
1253 | break; |
1161 | } |
1254 | } |
1162 | |
1255 | |
1163 | FT_Face face = XftLockFace (f); |
1256 | FT_Face face = XftLockFace (f); |
… | |
… | |
1171 | |
1264 | |
1172 | XftUnlockFace (f); |
1265 | XftUnlockFace (f); |
1173 | |
1266 | |
1174 | int glheight = height; |
1267 | int glheight = height; |
1175 | |
1268 | |
1176 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1269 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1177 | { |
1270 | { |
1178 | FcChar16 ch = *t; |
1271 | FcChar16 ch = *t; |
1179 | |
1272 | |
1180 | if (cs != CS_UNICODE |
1273 | if (cs != CS_UNICODE |
1181 | && ch > 0x100 |
1274 | && ch > 0x100 |
… | |
… | |
1282 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1375 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1283 | const text_t *text, int len, |
1376 | const text_t *text, int len, |
1284 | int fg, int bg) |
1377 | int fg, int bg) |
1285 | { |
1378 | { |
1286 | XGlyphInfo extents; |
1379 | XGlyphInfo extents; |
1287 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1380 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1288 | XftGlyphSpec *ep = enc; |
1381 | XftGlyphSpec *ep = enc; |
1289 | |
1382 | |
1290 | dTermDisplay; |
1383 | dTermDisplay; |
1291 | dTermGC; |
1384 | dTermGC; |
1292 | |
1385 | |
1293 | int w = term->fwidth * len; |
1386 | int w = term->fwidth * len; |
1294 | int h = term->fheight; |
1387 | int h = term->fheight; |
1295 | |
1388 | |
1296 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1389 | bool buffered = bg >= Color_transparent |
1297 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1390 | && term->option (Opt_buffered); |
1298 | * good idea from the perspective of packaging for wide variety of user configs. |
1391 | |
1299 | */ |
|
|
1300 | bool buffered = true |
|
|
1301 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1302 | && bg >= 0 |
|
|
1303 | #endif |
|
|
1304 | ; |
|
|
1305 | // cut trailing spaces |
1392 | // cut trailing spaces |
1306 | while (len && text [len - 1] == ' ') |
1393 | while (len && text [len - 1] == ' ') |
1307 | len--; |
1394 | len--; |
1308 | |
1395 | |
1309 | int x_ = buffered ? 0 : x; |
1396 | int x_ = buffered ? 0 : x; |
… | |
… | |
1335 | x_ += cwidth; |
1422 | x_ += cwidth; |
1336 | } |
1423 | } |
1337 | |
1424 | |
1338 | if (buffered) |
1425 | if (buffered) |
1339 | { |
1426 | { |
1340 | bool back_rendered = false; |
|
|
1341 | if (ep != enc) |
1427 | if (ep != enc) |
1342 | { |
1428 | { |
1343 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1429 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1344 | |
1430 | |
1345 | #ifdef HAVE_BG_PIXMAP |
1431 | #ifdef HAVE_IMG |
|
|
1432 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1433 | |
1346 | if (term->bgPixmap.pixmap) |
1434 | if (term->bg_img |
|
|
1435 | && (bg == Color_transparent || bg == Color_bg |
|
|
1436 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1347 | { |
1437 | { |
1348 | Picture dst = 0; |
1438 | int src_x = x, src_y = y; |
1349 | |
1439 | |
1350 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1440 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1351 | dst = XftDrawPicture (d2); |
|
|
1352 | |
|
|
1353 | if (bg < 0 || dst != 0) |
|
|
1354 | { |
1441 | { |
1355 | int src_x = x, src_y = y ; |
|
|
1356 | |
|
|
1357 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1358 | { |
|
|
1359 | src_x += term->window_vt_x; |
1442 | src_x += term->window_vt_x; |
1360 | src_y += term->window_vt_y; |
1443 | src_y += term->window_vt_y; |
1361 | } |
1444 | } |
1362 | |
1445 | |
1363 | if (term->bgPixmap.pmap_width >= src_x+w |
1446 | if (term->bg_img->w >= src_x + w |
1364 | && term->bgPixmap.pmap_height >= src_y+h) |
1447 | && term->bg_img->h >= src_y + h) |
1365 | { |
1448 | { |
1366 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1449 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1367 | src_x, src_y, w, h, 0, 0); |
1450 | src_x, src_y, w, h, 0, 0); |
1368 | } |
1451 | } |
1369 | else |
1452 | else |
1370 | { |
1453 | { |
1371 | XGCValues gcv; |
1454 | XGCValues gcv; |
1372 | |
1455 | |
1373 | gcv.fill_style = FillTiled; |
1456 | gcv.fill_style = FillTiled; |
1374 | gcv.tile = term->bgPixmap.pixmap; |
1457 | gcv.tile = term->bg_img->pm; |
1375 | gcv.ts_x_origin = -src_x; |
1458 | gcv.ts_x_origin = -src_x; |
1376 | gcv.ts_y_origin = -src_y; |
1459 | gcv.ts_y_origin = -src_y; |
1377 | |
1460 | |
1378 | XChangeGC (disp, gc, |
1461 | XChangeGC (disp, gc, |
1379 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1462 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1380 | &gcv); |
1463 | &gcv); |
1381 | |
1464 | |
1382 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1465 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1383 | |
1466 | |
1384 | gcv.fill_style = FillSolid; |
1467 | gcv.fill_style = FillSolid; |
1385 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1468 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1386 | } |
1469 | } |
1387 | |
1470 | |
1388 | if (bg >= 0) |
1471 | if (dst) |
1389 | { |
1472 | { |
1390 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1473 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1474 | |
|
|
1475 | // dst can only be set when bg >= 0 |
1391 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1476 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1392 | } |
|
|
1393 | |
|
|
1394 | back_rendered = true; |
|
|
1395 | } |
1477 | } |
1396 | } |
1478 | } |
|
|
1479 | else |
1397 | #endif |
1480 | #endif |
1398 | |
|
|
1399 | if (bg >= 0 && !back_rendered) |
|
|
1400 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1481 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1401 | |
1482 | |
1402 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1483 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1403 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1484 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1404 | } |
1485 | } |
1405 | else |
1486 | else |
… | |
… | |
1433 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1514 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1434 | = rxvt_fontprop::unset; |
1515 | = rxvt_fontprop::unset; |
1435 | force_prop = false; |
1516 | force_prop = false; |
1436 | |
1517 | |
1437 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1518 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1438 | FONT_UNREF (*i); |
1519 | (*i)->unref (); |
1439 | |
1520 | |
1440 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1521 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1441 | delete *p; |
1522 | delete *p; |
1442 | |
1523 | |
1443 | free (fontdesc); fontdesc = 0; |
1524 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1445 | fonts.clear (); |
1526 | fonts.clear (); |
1446 | |
1527 | |
1447 | fallback = fallback_fonts; |
1528 | fallback = fallback_fonts; |
1448 | } |
1529 | } |
1449 | |
1530 | |
|
|
1531 | void |
|
|
1532 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1533 | { |
|
|
1534 | font->set_term (term); |
|
|
1535 | |
|
|
1536 | font->cs = cs; |
|
|
1537 | font->loaded = false; |
|
|
1538 | } |
|
|
1539 | |
1450 | rxvt_font * |
1540 | rxvt_font * |
1451 | rxvt_fontset::new_font (const char *name, codeset cs) |
1541 | rxvt_fontset::new_font (const char *name, codeset cs) |
1452 | { |
1542 | { |
1453 | rxvt_font *f; |
1543 | rxvt_font *f; |
1454 | |
1544 | |
… | |
… | |
1470 | f = new rxvt_font_x11; |
1560 | f = new rxvt_font_x11; |
1471 | } |
1561 | } |
1472 | else |
1562 | else |
1473 | f = new rxvt_font_x11; |
1563 | f = new rxvt_font_x11; |
1474 | |
1564 | |
1475 | f->set_term (term); |
|
|
1476 | f->set_name (strdup (name)); |
1565 | f->set_name (strdup (name)); |
1477 | |
1566 | prepare_font (f, cs); |
1478 | f->cs = cs; |
|
|
1479 | f->loaded = false; |
|
|
1480 | |
1567 | |
1481 | return f; |
1568 | return f; |
1482 | } |
1569 | } |
1483 | |
1570 | |
1484 | ///////////////////////////////////////////////////////////////////////////// |
1571 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1572 | |
|
|
1573 | void |
|
|
1574 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1575 | { |
|
|
1576 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1577 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1578 | // represented in the rendition. |
|
|
1579 | if (fonts.size () == fontCount) |
|
|
1580 | { |
|
|
1581 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1582 | |
|
|
1583 | prepare_font (f, CS_UNICODE); |
|
|
1584 | fonts.push_back (f); |
|
|
1585 | } |
|
|
1586 | |
|
|
1587 | fonts.push_back (font); |
|
|
1588 | } |
1485 | |
1589 | |
1486 | void |
1590 | void |
1487 | rxvt_fontset::add_fonts (const char *desc) |
1591 | rxvt_fontset::add_fonts (const char *desc) |
1488 | { |
1592 | { |
1489 | if (desc) |
1593 | if (desc) |
… | |
… | |
1518 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1622 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1519 | else |
1623 | else |
1520 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1624 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1521 | |
1625 | |
1522 | desc++; |
1626 | desc++; |
1523 | while (*desc <= ' ') desc++; |
1627 | while (*desc <= ' ' && *desc) desc++; |
1524 | } |
1628 | } |
1525 | |
1629 | |
1526 | end = strchr (desc, ','); |
1630 | end = strchr (desc, ','); |
1527 | if (!end) |
1631 | if (!end) |
1528 | end = desc + strlen (desc); |
1632 | end = desc + strlen (desc); |
1529 | |
1633 | |
1530 | if (end - desc < 511) |
1634 | if (end - desc < 511) |
1531 | { |
1635 | { |
1532 | strncpy (buf, desc, end - desc); |
1636 | memcpy (buf, desc, end - desc); |
1533 | buf[end - desc] = 0; |
1637 | buf[end - desc] = 0; |
1534 | |
1638 | |
1535 | fonts.push_back (new_font (buf, cs)); |
1639 | push_font (new_font (buf, cs)); |
1536 | } |
1640 | } |
1537 | else |
1641 | else |
1538 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1642 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1539 | |
1643 | |
1540 | desc = end + 1; |
1644 | desc = end + 1; |
1541 | } |
1645 | } |
1542 | while (*end); |
1646 | while (*end); |
1543 | } |
1647 | } |
… | |
… | |
1568 | { |
1672 | { |
1569 | clear (); |
1673 | clear (); |
1570 | |
1674 | |
1571 | fontdesc = strdup (desc); |
1675 | fontdesc = strdup (desc); |
1572 | |
1676 | |
1573 | fonts.push_back (new_font (0, CS_UNICODE)); |
1677 | push_font (new_font (0, CS_UNICODE)); |
1574 | realize_font (0); |
1678 | realize_font (0); |
1575 | |
1679 | |
1576 | add_fonts (desc); |
1680 | add_fonts (desc); |
1577 | |
1681 | |
1578 | return true; |
1682 | return true; |
… | |
… | |
1587 | |
1691 | |
1588 | return -1; |
1692 | return -1; |
1589 | } |
1693 | } |
1590 | |
1694 | |
1591 | int |
1695 | int |
1592 | rxvt_fontset::find_font (unicode_t unicode) |
1696 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1593 | { |
1697 | { |
1594 | if (unicode >= 1<<20) |
1698 | if (unicode >= 1<<20) |
1595 | return 0; |
1699 | return 0; |
1596 | |
1700 | |
1597 | unicode_t hi = unicode >> 8; |
1701 | unicode_t hi = unicode >> 8; |
… | |
… | |
1623 | goto next_font; |
1727 | goto next_font; |
1624 | |
1728 | |
1625 | bool careful; |
1729 | bool careful; |
1626 | if (f->has_char (unicode, &prop, careful)) |
1730 | if (f->has_char (unicode, &prop, careful)) |
1627 | { |
1731 | { |
1628 | if (careful) |
1732 | i = (i << 1) | careful; |
1629 | i |= 128; |
|
|
1630 | |
1733 | |
1631 | goto found; |
1734 | goto found; |
1632 | } |
1735 | } |
1633 | |
1736 | |
1634 | next_font: |
1737 | next_font: |
1635 | if (i == fonts.size () - 1) |
1738 | if (i == fonts.size () - 1) |
1636 | { |
1739 | { |
1637 | if (fallback->name) |
1740 | if (fallback->name) |
1638 | { |
1741 | { |
1639 | // search through the fallback list |
1742 | // search through the fallback list |
1640 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1743 | push_font (new_font (fallback->name, fallback->cs)); |
1641 | fallback++; |
1744 | fallback++; |
1642 | } |
1745 | } |
1643 | else |
1746 | else |
1644 | { |
1747 | { |
1645 | // try to find a new font. |
1748 | // try to find a new font. |
… | |
… | |
1647 | // way to configure this and xft is easier to hack in, |
1750 | // way to configure this and xft is easier to hack in, |
1648 | // while x11 has more framework in place already. |
1751 | // while x11 has more framework in place already. |
1649 | // TODO: this is a real resource hog, xft takes ages(?) |
1752 | // TODO: this is a real resource hog, xft takes ages(?) |
1650 | #if XFT && USE_SLOW_LOOKUP |
1753 | #if XFT && USE_SLOW_LOOKUP |
1651 | // grab the first xft font that seems suitable |
1754 | // grab the first xft font that seems suitable |
|
|
1755 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1652 | FcPattern *p = FcPatternCreate (); |
1756 | FcPattern *p = FcPatternCreate (); |
1653 | |
1757 | |
1654 | FcCharSet *s = FcCharSetCreate (); |
1758 | FcCharSet *s = FcCharSetCreate (); |
1655 | FcCharSetAddChar (s, unicode); |
1759 | FcCharSetAddChar (s, unicode); |
1656 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1760 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1676 | FcPatternDestroy (match); |
1780 | FcPatternDestroy (match); |
1677 | |
1781 | |
1678 | if (find_font (font) < 0) |
1782 | if (find_font (font) < 0) |
1679 | { |
1783 | { |
1680 | char fontname[4096]; |
1784 | char fontname[4096]; |
1681 | sprintf (fontname, "xft:%-.4090s", font); |
1785 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1682 | |
1786 | |
1683 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1787 | push_font (new_font (fontname, CS_UNICODE)); |
1684 | } |
1788 | } |
1685 | |
1789 | |
1686 | free (font); |
1790 | free (font); |
1687 | } |
1791 | } |
1688 | #endif |
1792 | #endif |
… | |
… | |
1700 | while (hi >= fmap.size ()) |
1804 | while (hi >= fmap.size ()) |
1701 | fmap.push_back (0); |
1805 | fmap.push_back (0); |
1702 | |
1806 | |
1703 | if (!fmap[hi]) |
1807 | if (!fmap[hi]) |
1704 | { |
1808 | { |
1705 | fmap[hi] = (pagemap *)new pagemap; |
1809 | fmap[hi] = new pagemap; |
1706 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1810 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1707 | } |
1811 | } |
1708 | |
1812 | |
1709 | (*fmap[hi])[unicode & 0xff] = i; |
1813 | (*fmap[hi])[unicode & 0xff] = i; |
1710 | } |
1814 | } |
1711 | |
1815 | |
1712 | return i; |
1816 | return i; |
1713 | } |
1817 | } |
1714 | |
1818 | |
1715 | |
|
|
1716 | |
|
|