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 <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtlib.h" |
|
|
25 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
27 | |
26 | |
28 | #include <cstdlib> |
27 | #include <cstdlib> |
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) <= ( \ |
… | |
… | |
43 | const char *name; |
46 | const char *name; |
44 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
50 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
48 | |
51 | |
49 | #if ENCODING_EU |
52 | #if ENCODING_EU |
50 | // cyrillic |
53 | // cyrillic |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
54 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
55 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
53 | |
56 | |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
57 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
58 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
59 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
60 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
61 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
68 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
69 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
70 | |
68 | # if XFT |
71 | # if XFT |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
72 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
73 | |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
74 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
75 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
76 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
77 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
78 | { CS_ISO8859_9, "xft::lang=tr" }, |
… | |
… | |
80 | |
83 | |
81 | // japanese |
84 | // japanese |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
85 | #if ENCODING_JP || ENCODING_JP_EXT |
83 | # if XFT |
86 | # if XFT |
84 | // prefer xft for complex scripts |
87 | // prefer xft for complex scripts |
|
|
88 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
89 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
|
|
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
90 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
91 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
89 | # endif |
92 | # endif |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
94 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
… | |
… | |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
220 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
218 | { |
221 | { |
219 | } |
222 | } |
220 | |
223 | |
221 | void |
224 | void |
222 | rxvt_font::set_name (char *name) |
225 | rxvt_font::set_name (char *name_) |
223 | { |
226 | { |
224 | if (this->name == name) |
227 | if (name == name_) |
225 | return; |
228 | return; |
226 | |
229 | |
227 | if (this->name) free (this->name); // let the compiler optimize |
230 | if (name) free (name); // let the compiler optimize |
228 | this->name = name; |
231 | name = name_; |
229 | } |
232 | } |
230 | |
233 | |
231 | void |
234 | void |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
235 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
233 | { |
236 | { |
234 | dTermDisplay; |
237 | dTermDisplay; |
235 | dTermGC; |
238 | dTermGC; |
236 | |
239 | |
237 | if (color == Color_bg || color == Color_transparent) |
240 | if (color == Color_bg || color == Color_transparent) |
238 | XClearArea (disp, d, x, y, w, h, false); |
241 | XClearArea (disp, d, x, y, w, h, false); |
239 | else if (color >= 0) |
242 | else if (color >= 0) |
240 | { |
243 | { |
241 | #if XFT |
244 | #if XFT |
242 | bool done = false; |
245 | Picture dst; |
|
|
246 | |
243 | #ifdef HAVE_BG_PIXMAP |
247 | # ifdef HAVE_BG_PIXMAP |
244 | if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) |
248 | if (term->bgPixmap.pixmap |
245 | { |
249 | && !term->pix_colors[color].is_opaque () |
246 | Picture dst = XftDrawPicture (d); |
250 | && ((dst = XftDrawPicture (d)))) |
247 | if (dst != 0) |
|
|
248 | { |
251 | { |
249 | XClearArea (disp, d, x, y, w, h, false); |
252 | XClearArea (disp, d, x, y, w, h, false); |
|
|
253 | |
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
254 | 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); |
255 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
252 | done = true; |
|
|
253 | } |
256 | } |
254 | } |
257 | else |
255 | #endif |
258 | # endif |
256 | if (!done) |
|
|
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
259 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
260 | |
258 | #else |
261 | #else |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
262 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
263 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
264 | #endif |
262 | } |
265 | } |
263 | } |
266 | } |
264 | |
267 | |
265 | ///////////////////////////////////////////////////////////////////////////// |
268 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
|
|
267 | #include "table/linedraw.h" |
|
|
268 | |
269 | |
269 | struct rxvt_font_default : rxvt_font { |
270 | struct rxvt_font_default : rxvt_font { |
270 | struct rxvt_fontset *fs; |
271 | struct rxvt_fontset *fs; |
271 | |
272 | |
272 | rxvt_font_default (rxvt_fontset *fs) |
273 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
308 | return false; |
309 | return false; |
309 | |
310 | |
310 | if (unicode <= 0x009f) |
311 | if (unicode <= 0x009f) |
311 | return true; |
312 | return true; |
312 | |
313 | |
|
|
314 | #ifdef BUILTIN_GLYPHS |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
315 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
316 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | return true; |
317 | return true; |
|
|
318 | #endif |
316 | |
319 | |
317 | if (IS_COMPOSE (unicode)) |
320 | if (IS_COMPOSE (unicode)) |
318 | return true; |
321 | return true; |
319 | |
322 | |
320 | switch (unicode) |
323 | switch (unicode) |
… | |
… | |
356 | ; |
359 | ; |
357 | |
360 | |
358 | int width = text - tp; |
361 | int width = text - tp; |
359 | int fwidth = term->fwidth * width; |
362 | int fwidth = term->fwidth * width; |
360 | |
363 | |
|
|
364 | #ifdef BUILTIN_GLYPHS |
361 | if (0x2500 <= t && t <= 0x259f) |
365 | if (0x2500 <= t && t <= 0x259f) |
362 | { |
366 | { |
|
|
367 | # include "table/linedraw.h" |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
368 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
369 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *b = a + (offs & 15); |
370 | uint32_t *b = a + (offs & 15); |
366 | |
371 | |
367 | int W = fwidth; |
372 | int W = fwidth; |
… | |
… | |
405 | |
410 | |
406 | case 1: // rectangle, possibly stippled |
411 | case 1: // rectangle, possibly stippled |
407 | if (a) |
412 | if (a) |
408 | { |
413 | { |
409 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
414 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
410 | |
415 | |
411 | gcv.fill_style = FillStippled; |
416 | gcv.fill_style = FillStippled; |
412 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
417 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
413 | gcv.ts_x_origin = x; |
418 | gcv.ts_x_origin = x; |
414 | gcv.ts_y_origin = y; |
419 | gcv.ts_y_origin = y; |
415 | |
420 | |
… | |
… | |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
439 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | break; |
440 | break; |
436 | } |
441 | } |
437 | } |
442 | } |
438 | } |
443 | } |
|
|
444 | #else |
|
|
445 | if (0) |
|
|
446 | ; |
|
|
447 | #endif |
439 | #if ENABLE_COMBINING |
448 | #if ENABLE_COMBINING |
440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
449 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
441 | { |
450 | { |
442 | min_it (width, 2); // we only support wcwidth up to 2 |
451 | min_it (width, 2); // we only support wcwidth up to 2 |
443 | |
452 | |
444 | text_t chrs[2]; |
453 | text_t chrs[2]; |
445 | chrs [1] = NOCHAR; |
454 | chrs [1] = NOCHAR; |
446 | |
455 | |
447 | *chrs = cc->c1; |
456 | *chrs = cc->c1; |
448 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
457 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
449 | f1->draw (d, x, y, chrs, width, fg, bg); |
458 | f1->draw (d, x, y, chrs, width, fg, bg); |
450 | |
459 | |
451 | if (cc->c2 != NOCHAR) |
460 | if (cc->c2 != NOCHAR) |
452 | { |
461 | { |
453 | bool careful; |
462 | bool careful; |
454 | |
463 | |
455 | // prefer font of first character, for no good reasons |
464 | // prefer font of first character, for no good reasons |
456 | *chrs = cc->c2; |
465 | *chrs = cc->c2; |
457 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
466 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
458 | ? f1 |
467 | ? f1 |
459 | : (*fs)[fs->find_font (cc->c2)]; |
468 | : (*fs)[fs->find_font_idx (cc->c2)]; |
460 | |
469 | |
461 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
470 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
462 | } |
471 | } |
463 | } |
472 | } |
464 | #endif |
473 | #endif |
… | |
… | |
477 | |
486 | |
478 | x += fwidth; |
487 | x += fwidth; |
479 | } |
488 | } |
480 | } |
489 | } |
481 | |
490 | |
|
|
491 | struct rxvt_font_overflow : rxvt_font { |
|
|
492 | struct rxvt_fontset *fs; |
|
|
493 | |
|
|
494 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
495 | : rxvt_font () |
|
|
496 | { |
|
|
497 | this->fs = fs; |
|
|
498 | } |
|
|
499 | |
|
|
500 | rxvt_fontprop properties () |
|
|
501 | { |
|
|
502 | rxvt_fontprop p; |
|
|
503 | |
|
|
504 | p.width = p.height = 1; |
|
|
505 | p.ascent = rxvt_fontprop::unset; |
|
|
506 | p.weight = rxvt_fontprop::medium; |
|
|
507 | p.slant = rxvt_fontprop::roman; |
|
|
508 | |
|
|
509 | return p; |
|
|
510 | } |
|
|
511 | |
|
|
512 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
513 | { |
|
|
514 | width = 1; height = 1; |
|
|
515 | ascent = 1; descent = 0; |
|
|
516 | |
|
|
517 | set_name (strdup ("built-in rendition overflow font")); |
|
|
518 | |
|
|
519 | return true; |
|
|
520 | } |
|
|
521 | |
|
|
522 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
523 | { |
|
|
524 | return false; |
|
|
525 | } |
|
|
526 | |
|
|
527 | void draw (rxvt_drawable &d, int x, int y, |
|
|
528 | const text_t *text, int len, |
|
|
529 | int fg, int bg) |
|
|
530 | { |
|
|
531 | while (len--) |
|
|
532 | { |
|
|
533 | int fid = fs->find_font_idx (*text); |
|
|
534 | (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); |
|
|
535 | ++text; |
|
|
536 | x += term->fwidth; |
|
|
537 | } |
|
|
538 | } |
|
|
539 | }; |
|
|
540 | |
482 | ///////////////////////////////////////////////////////////////////////////// |
541 | ///////////////////////////////////////////////////////////////////////////// |
483 | |
542 | |
484 | struct rxvt_font_x11 : rxvt_font { |
543 | struct rxvt_font_x11 : rxvt_font { |
485 | rxvt_font_x11 () { f = 0; } |
544 | rxvt_font_x11 () { f = 0; } |
486 | |
545 | |
… | |
… | |
494 | |
553 | |
495 | void draw (rxvt_drawable &d, int x, int y, |
554 | void draw (rxvt_drawable &d, int x, int y, |
496 | const text_t *text, int len, |
555 | const text_t *text, int len, |
497 | int fg, int bg); |
556 | int fg, int bg); |
498 | |
557 | |
499 | bool slow; // wether this is a proportional font or has other funny characteristics |
558 | bool slow; // whether this is a proportional font or has other funny characteristics |
500 | XFontStruct *f; |
559 | XFontStruct *f; |
501 | bool enc2b, encm; |
560 | bool enc2b, encm; |
502 | |
561 | |
503 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
562 | 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); |
563 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
604 | return false; |
663 | return false; |
605 | } |
664 | } |
606 | |
665 | |
607 | // fix the size of scalable fonts |
666 | // fix the size of scalable fonts |
608 | static bool |
667 | static bool |
609 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
668 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
610 | { |
669 | { |
611 | int slashes = 0; |
670 | int slashes = 0; |
612 | const char *field, *end; |
671 | const char *field, *end; |
613 | |
672 | |
614 | for (const char *c = name; *c; c++) |
673 | for (const char *c = name; *c; c++) |
… | |
… | |
624 | break; |
683 | break; |
625 | } |
684 | } |
626 | |
685 | |
627 | if (slashes >= 13 && (!old || *field == old)) |
686 | if (slashes >= 13 && (!old || *field == old)) |
628 | { |
687 | { |
629 | // TODO: check for overflow in font-name |
688 | size_t len = field - name; |
630 | strncpy (buf, name, field - name); |
689 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
631 | buf += field - name; |
690 | memcpy (*ptr, name, len); |
632 | strcpy (buf, replace); |
691 | strcpy (*ptr + len, replace); |
633 | strcat (buf, end); |
692 | strcat (*ptr, end); |
634 | |
693 | |
635 | return true; |
694 | return true; |
636 | } |
695 | } |
637 | else |
696 | else |
638 | { |
697 | { |
639 | strcpy (buf, name); |
698 | *ptr = strdup (name); |
640 | |
699 | |
641 | return false; |
700 | return false; |
642 | } |
701 | } |
643 | } |
702 | } |
644 | |
703 | |
… | |
… | |
652 | char field_str[64]; // enough for 128 bits |
711 | char field_str[64]; // enough for 128 bits |
653 | |
712 | |
654 | // first morph the font if required |
713 | // first morph the font if required |
655 | if (force_prop) |
714 | if (force_prop) |
656 | { |
715 | { |
657 | char fname[1024]; |
716 | char *fname; |
658 | |
717 | |
659 | if (name[0] != '-') |
718 | if (name[0] != '-') |
660 | { |
719 | { |
661 | f = XLoadQueryFont (disp, name); |
720 | f = XLoadQueryFont (disp, name); |
662 | |
721 | |
… | |
… | |
674 | f = 0; |
733 | f = 0; |
675 | } |
734 | } |
676 | |
735 | |
677 | if (prop.weight != rxvt_fontprop::unset) |
736 | if (prop.weight != rxvt_fontprop::unset) |
678 | { |
737 | { |
679 | replace_field (fname, name, 2, 0, |
738 | replace_field (&fname, name, 2, 0, |
680 | prop.weight < rxvt_fontprop::bold |
739 | prop.weight < rxvt_fontprop::bold |
681 | ? "medium" : "bold"); |
740 | ? "medium" : "bold"); |
682 | set_name (strdup (fname)); |
741 | set_name (fname); |
683 | } |
742 | } |
684 | |
743 | |
685 | if (prop.slant != rxvt_fontprop::unset) |
744 | if (prop.slant != rxvt_fontprop::unset) |
686 | { |
745 | { |
687 | replace_field (fname, name, 3, 0, |
746 | replace_field (&fname, name, 3, 0, |
688 | prop.slant < rxvt_fontprop::italic |
747 | prop.slant < rxvt_fontprop::italic |
689 | ? "r" : "i"); // TODO: handle "o"blique, too |
748 | ? "r" : "i"); // TODO: handle "o"blique, too |
690 | set_name (strdup (fname)); |
749 | set_name (fname); |
691 | } |
750 | } |
692 | } |
751 | } |
693 | |
752 | |
694 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
753 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
695 | ? 0 : prop.height); |
754 | ? 0 : prop.height); |
… | |
… | |
720 | font_weight *fonts = new font_weight[count]; |
779 | font_weight *fonts = new font_weight[count]; |
721 | |
780 | |
722 | for (int i = 0; i < count; i++) |
781 | for (int i = 0; i < count; i++) |
723 | { |
782 | { |
724 | rxvt_fontprop p; |
783 | rxvt_fontprop p; |
725 | char fname[1024]; |
784 | char *fname; |
726 | |
785 | |
727 | int diff = 0; |
786 | int diff = 0; |
728 | |
787 | |
729 | if (replace_field (fname, list[i], 6, '0', field_str)) |
788 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
730 | diff += 10; // slightly penalize scalable fonts |
789 | diff += 10; // slightly penalize scalable fonts |
|
|
790 | else |
|
|
791 | { |
|
|
792 | free (fname); |
731 | else if (replace_field (fname, list[i], 11, '0', "0")) |
793 | if (replace_field (&fname, list[i], 11, '0', "0")) |
732 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
794 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
795 | } |
733 | |
796 | |
734 | if (!set_properties (p, fname)) |
797 | if (!set_properties (p, fname)) |
735 | continue; |
798 | continue; |
736 | |
799 | |
737 | if (prop.height != rxvt_fontprop::unset |
800 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
741 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
804 | 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); |
805 | 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); |
806 | 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); |
807 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
745 | |
808 | |
746 | fonts[i].name = strdup (fname); |
809 | fonts[i].name = fname; |
747 | fonts[i].diff = diff; |
810 | fonts[i].diff = diff; |
748 | } |
811 | } |
749 | |
812 | |
750 | XFreeFontNames (list); |
813 | XFreeFontNames (list); |
751 | |
814 | |
… | |
… | |
783 | return false; |
846 | return false; |
784 | |
847 | |
785 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
848 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
786 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
849 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
787 | |
850 | |
|
|
851 | cs = CS_UNKNOWN; |
|
|
852 | |
788 | if (registry && encoding) |
853 | if (registry && encoding) |
789 | { |
854 | { |
790 | char charset[64]; |
855 | char charset[64]; |
791 | snprintf (charset, 64, "%s-%s", registry, encoding); |
856 | snprintf (charset, 64, "%s-%s", registry, encoding); |
792 | |
857 | |
793 | cs = codeset_from_name (charset); |
858 | cs = codeset_from_name (charset); |
|
|
859 | |
|
|
860 | if (cs == CS_UNKNOWN) |
|
|
861 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
794 | } |
862 | } |
795 | else |
863 | |
|
|
864 | free (registry); |
|
|
865 | free (encoding); |
|
|
866 | |
|
|
867 | if (cs == CS_UNKNOWN) |
796 | { |
868 | { |
797 | const char *charset = get_property (f, XA_FONT, 0); |
869 | const char *charset = get_property (f, XA_FONT, 0); |
798 | |
870 | |
799 | if (!charset) |
871 | if (!charset) |
800 | charset = name; |
872 | charset = name; |
… | |
… | |
803 | while (*charset) |
875 | while (*charset) |
804 | if (*charset++ == '-' && !--count) |
876 | if (*charset++ == '-' && !--count) |
805 | break; |
877 | break; |
806 | |
878 | |
807 | cs = codeset_from_name (charset); |
879 | cs = codeset_from_name (charset); |
|
|
880 | if (cs == CS_UNKNOWN) |
|
|
881 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
882 | } |
|
|
883 | |
|
|
884 | if (cs == CS_UNKNOWN) |
808 | } |
885 | { |
809 | |
886 | clear (); |
810 | free (registry); |
887 | return false; |
811 | free (encoding); |
888 | } |
812 | |
889 | |
813 | if (cs == CS_UNICODE) |
890 | if (cs == CS_UNICODE) |
814 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
891 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
815 | |
892 | |
816 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
893 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
828 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
905 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
829 | |
906 | |
830 | if (encm) |
907 | if (encm) |
831 | N += (f->max_byte1 - f->min_byte1) |
908 | N += (f->max_byte1 - f->min_byte1) |
832 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
909 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
833 | |
910 | |
834 | while (N) |
911 | while (N) |
835 | { |
912 | { |
836 | if (f->per_char[N].width > width) |
913 | if (f->per_char[N].width > width) |
837 | width = f->per_char[N].width; |
914 | width = f->per_char[N].width; |
838 | |
915 | |
… | |
… | |
863 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
940 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
864 | |
941 | |
865 | if (width < g.width) width = g.width; |
942 | if (width < g.width) width = g.width; |
866 | } |
943 | } |
867 | |
944 | |
868 | if (cs == CS_UNKNOWN) |
945 | #if 0 // do it per-character |
|
|
946 | if (prop && width > prop->width) |
869 | { |
947 | { |
870 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
871 | |
|
|
872 | clear (); |
948 | clear (); |
873 | return false; |
949 | return false; |
874 | } |
950 | } |
875 | |
|
|
876 | #if 0 // do it per-character |
|
|
877 | if (prop && width > prop->width) |
|
|
878 | { |
|
|
879 | clear (); |
|
|
880 | return false; |
|
|
881 | } |
|
|
882 | #endif |
951 | #endif |
883 | |
952 | |
884 | return true; |
953 | return true; |
885 | } |
954 | } |
886 | |
955 | |
… | |
… | |
900 | uint32_t ch = FROM_UNICODE (cs, unicode); |
969 | uint32_t ch = FROM_UNICODE (cs, unicode); |
901 | |
970 | |
902 | if (ch == NOCHAR) |
971 | if (ch == NOCHAR) |
903 | return false; |
972 | return false; |
904 | |
973 | |
905 | /* check wether the character exists in _this_ font. horrible. */ |
974 | /* check whether the character exists in _this_ font. horrible. */ |
906 | XCharStruct *xcs; |
975 | XCharStruct *xcs; |
907 | |
976 | |
908 | if (encm) |
977 | if (encm) |
909 | { |
978 | { |
910 | unsigned char byte1 = ch >> 8; |
979 | unsigned char byte1 = ch >> 8; |
… | |
… | |
940 | return false; |
1009 | return false; |
941 | |
1010 | |
942 | if (!prop || prop->width == rxvt_fontprop::unset) |
1011 | if (!prop || prop->width == rxvt_fontprop::unset) |
943 | return true; |
1012 | return true; |
944 | |
1013 | |
945 | // check wether character overlaps previous/next character |
1014 | // check whether character overlaps previous/next character |
946 | int w = xcs->rbearing - xcs->lbearing; |
1015 | int w = xcs->rbearing - xcs->lbearing; |
947 | int wcw = max (WCWIDTH (unicode), 1); |
1016 | int wcw = max (WCWIDTH (unicode), 1); |
948 | |
1017 | |
949 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1018 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
950 | |
1019 | |
… | |
… | |
990 | else |
1059 | else |
991 | { |
1060 | { |
992 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1061 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
993 | |
1062 | |
994 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1063 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
995 | |
1064 | |
996 | if (slow) |
1065 | if (slow) |
997 | { |
1066 | { |
998 | do |
1067 | do |
999 | { |
1068 | { |
1000 | if (xc->byte1 || xc->byte2) |
1069 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1022 | else |
1091 | else |
1023 | { |
1092 | { |
1024 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1093 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1025 | |
1094 | |
1026 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1095 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1027 | |
1096 | |
1028 | if (slow) |
1097 | if (slow) |
1029 | { |
1098 | { |
1030 | do |
1099 | do |
1031 | { |
1100 | { |
1032 | if (*xc) |
1101 | if (*xc) |
… | |
… | |
1124 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1193 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1125 | |
1194 | |
1126 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1195 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1127 | // clip width, we can't do better, or can we? |
1196 | // clip width, we can't do better, or can we? |
1128 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1197 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1129 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1198 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1130 | #endif |
1199 | #endif |
1131 | |
1200 | |
1132 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1201 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1133 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1202 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1134 | |
1203 | |
… | |
… | |
1278 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1347 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1279 | const text_t *text, int len, |
1348 | const text_t *text, int len, |
1280 | int fg, int bg) |
1349 | int fg, int bg) |
1281 | { |
1350 | { |
1282 | XGlyphInfo extents; |
1351 | XGlyphInfo extents; |
1283 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1352 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1284 | XftGlyphSpec *ep = enc; |
1353 | XftGlyphSpec *ep = enc; |
1285 | |
1354 | |
1286 | dTermDisplay; |
1355 | dTermDisplay; |
1287 | dTermGC; |
1356 | dTermGC; |
1288 | |
1357 | |
1289 | int w = term->fwidth * len; |
1358 | int w = term->fwidth * len; |
1290 | int h = term->fheight; |
1359 | int h = term->fheight; |
1291 | |
1360 | |
1292 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1361 | bool buffered = bg >= Color_transparent |
1293 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1362 | && term->option (Opt_buffered); |
1294 | * good idea from the perspective of packaging for wide variety of user configs. |
1363 | |
1295 | */ |
|
|
1296 | bool buffered = true |
|
|
1297 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1298 | && bg >= 0 |
|
|
1299 | #endif |
|
|
1300 | ; |
|
|
1301 | // cut trailing spaces |
1364 | // cut trailing spaces |
1302 | while (len && text [len - 1] == ' ') |
1365 | while (len && text [len - 1] == ' ') |
1303 | len--; |
1366 | len--; |
1304 | |
1367 | |
1305 | int x_ = buffered ? 0 : x; |
1368 | int x_ = buffered ? 0 : x; |
… | |
… | |
1310 | int cwidth = term->fwidth; |
1373 | int cwidth = term->fwidth; |
1311 | FcChar32 fc = *text++; len--; |
1374 | FcChar32 fc = *text++; len--; |
1312 | |
1375 | |
1313 | while (len && *text == NOCHAR) |
1376 | while (len && *text == NOCHAR) |
1314 | text++, len--, cwidth += term->fwidth; |
1377 | text++, len--, cwidth += term->fwidth; |
1315 | |
1378 | |
1316 | if (fc != ' ') // skip spaces |
1379 | if (fc != ' ') // skip spaces |
1317 | { |
1380 | { |
1318 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1381 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1319 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1382 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1320 | |
1383 | |
… | |
… | |
1331 | x_ += cwidth; |
1394 | x_ += cwidth; |
1332 | } |
1395 | } |
1333 | |
1396 | |
1334 | if (buffered) |
1397 | if (buffered) |
1335 | { |
1398 | { |
1336 | bool back_rendered = false; |
|
|
1337 | if (ep != enc) |
1399 | if (ep != enc) |
1338 | { |
1400 | { |
1339 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1401 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1340 | |
1402 | |
1341 | #ifdef HAVE_BG_PIXMAP |
1403 | #ifdef HAVE_BG_PIXMAP |
|
|
1404 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1405 | |
1342 | if (term->bgPixmap.pixmap) |
1406 | if (term->bgPixmap.pixmap |
|
|
1407 | && (bg == Color_transparent || bg == Color_bg |
|
|
1408 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1343 | { |
1409 | { |
1344 | Picture dst = 0; |
1410 | int src_x = x, src_y = y; |
1345 | |
1411 | |
1346 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1412 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1347 | dst = XftDrawPicture (d2); |
|
|
1348 | |
|
|
1349 | if (bg < 0 || dst != 0) |
|
|
1350 | { |
1413 | { |
1351 | int src_x = x, src_y = y ; |
|
|
1352 | |
|
|
1353 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1354 | { |
|
|
1355 | src_x += term->window_vt_x; |
1414 | src_x += term->window_vt_x; |
1356 | src_y += term->window_vt_y; |
1415 | src_y += term->window_vt_y; |
1357 | } |
1416 | } |
1358 | |
1417 | |
1359 | if (term->bgPixmap.pmap_width >= src_x+w |
1418 | if (term->bgPixmap.pmap_width >= src_x + w |
1360 | && term->bgPixmap.pmap_height >= src_y+h) |
1419 | && term->bgPixmap.pmap_height >= src_y + h) |
1361 | { |
1420 | { |
1362 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1421 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1363 | src_x, src_y, w, h, 0, 0); |
1422 | src_x, src_y, w, h, 0, 0); |
1364 | } |
1423 | } |
1365 | else |
1424 | else |
1366 | { |
1425 | { |
1367 | XGCValues gcv; |
1426 | XGCValues gcv; |
1368 | |
1427 | |
1369 | gcv.fill_style = FillTiled; |
1428 | gcv.fill_style = FillTiled; |
1370 | gcv.tile = term->bgPixmap.pixmap; |
1429 | gcv.tile = term->bgPixmap.pixmap; |
1371 | gcv.ts_x_origin = -src_x; |
1430 | gcv.ts_x_origin = -src_x; |
1372 | gcv.ts_y_origin = -src_y; |
1431 | gcv.ts_y_origin = -src_y; |
1373 | |
1432 | |
1374 | XChangeGC (disp, gc, |
1433 | XChangeGC (disp, gc, |
1375 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1434 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1376 | &gcv); |
1435 | &gcv); |
1377 | |
1436 | |
1378 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1437 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1379 | |
1438 | |
1380 | gcv.fill_style = FillSolid; |
1439 | gcv.fill_style = FillSolid; |
1381 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1440 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1382 | } |
1441 | } |
1383 | |
1442 | |
1384 | if (bg >= 0) |
1443 | if (dst) |
1385 | { |
1444 | { |
1386 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1445 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1446 | |
|
|
1447 | // 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); |
1448 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1388 | } |
|
|
1389 | |
|
|
1390 | back_rendered = true; |
|
|
1391 | } |
1449 | } |
1392 | } |
1450 | } |
|
|
1451 | else |
1393 | #endif |
1452 | #endif |
1394 | |
|
|
1395 | if (bg >= 0 && !back_rendered) |
|
|
1396 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1453 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1397 | |
1454 | |
1398 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1455 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1399 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1456 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1400 | } |
1457 | } |
1401 | else |
1458 | else |
… | |
… | |
1429 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1486 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1430 | = rxvt_fontprop::unset; |
1487 | = rxvt_fontprop::unset; |
1431 | force_prop = false; |
1488 | force_prop = false; |
1432 | |
1489 | |
1433 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1490 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1434 | FONT_UNREF (*i); |
1491 | (*i)->unref (); |
1435 | |
1492 | |
1436 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1493 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1437 | delete *p; |
1494 | delete *p; |
1438 | |
1495 | |
1439 | free (fontdesc); fontdesc = 0; |
1496 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1441 | fonts.clear (); |
1498 | fonts.clear (); |
1442 | |
1499 | |
1443 | fallback = fallback_fonts; |
1500 | fallback = fallback_fonts; |
1444 | } |
1501 | } |
1445 | |
1502 | |
|
|
1503 | void |
|
|
1504 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1505 | { |
|
|
1506 | font->set_term (term); |
|
|
1507 | |
|
|
1508 | font->cs = cs; |
|
|
1509 | font->loaded = false; |
|
|
1510 | } |
|
|
1511 | |
1446 | rxvt_font * |
1512 | rxvt_font * |
1447 | rxvt_fontset::new_font (const char *name, codeset cs) |
1513 | rxvt_fontset::new_font (const char *name, codeset cs) |
1448 | { |
1514 | { |
1449 | rxvt_font *f; |
1515 | rxvt_font *f; |
1450 | |
1516 | |
1451 | if (!name || !*name) |
1517 | if (!name || !*name) |
1452 | { |
1518 | { |
1453 | name = ""; |
1519 | name = ""; |
1454 | f = new rxvt_font_default (this); |
1520 | f = new rxvt_font_default (this); |
1455 | } |
1521 | } |
… | |
… | |
1466 | f = new rxvt_font_x11; |
1532 | f = new rxvt_font_x11; |
1467 | } |
1533 | } |
1468 | else |
1534 | else |
1469 | f = new rxvt_font_x11; |
1535 | f = new rxvt_font_x11; |
1470 | |
1536 | |
1471 | f->set_term (term); |
|
|
1472 | f->set_name (strdup (name)); |
1537 | f->set_name (strdup (name)); |
1473 | |
1538 | prepare_font (f, cs); |
1474 | f->cs = cs; |
|
|
1475 | f->loaded = false; |
|
|
1476 | |
1539 | |
1477 | return f; |
1540 | return f; |
1478 | } |
1541 | } |
1479 | |
1542 | |
1480 | ///////////////////////////////////////////////////////////////////////////// |
1543 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1544 | |
|
|
1545 | void |
|
|
1546 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1547 | { |
|
|
1548 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1549 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1550 | // represented in the rendition. |
|
|
1551 | if (fonts.size () == fontCount) |
|
|
1552 | { |
|
|
1553 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1554 | |
|
|
1555 | prepare_font (f, CS_UNICODE); |
|
|
1556 | fonts.push_back (f); |
|
|
1557 | } |
|
|
1558 | |
|
|
1559 | fonts.push_back (font); |
|
|
1560 | } |
1481 | |
1561 | |
1482 | void |
1562 | void |
1483 | rxvt_fontset::add_fonts (const char *desc) |
1563 | rxvt_fontset::add_fonts (const char *desc) |
1484 | { |
1564 | { |
1485 | if (desc) |
1565 | if (desc) |
… | |
… | |
1523 | if (!end) |
1603 | if (!end) |
1524 | end = desc + strlen (desc); |
1604 | end = desc + strlen (desc); |
1525 | |
1605 | |
1526 | if (end - desc < 511) |
1606 | if (end - desc < 511) |
1527 | { |
1607 | { |
1528 | strncpy (buf, desc, end - desc); |
1608 | memcpy (buf, desc, end - desc); |
1529 | buf[end - desc] = 0; |
1609 | buf[end - desc] = 0; |
1530 | |
1610 | |
1531 | fonts.push_back (new_font (buf, cs)); |
1611 | push_font (new_font (buf, cs)); |
1532 | } |
1612 | } |
1533 | else |
1613 | else |
1534 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1614 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1535 | |
1615 | |
1536 | desc = end + 1; |
1616 | desc = end + 1; |
… | |
… | |
1564 | { |
1644 | { |
1565 | clear (); |
1645 | clear (); |
1566 | |
1646 | |
1567 | fontdesc = strdup (desc); |
1647 | fontdesc = strdup (desc); |
1568 | |
1648 | |
1569 | fonts.push_back (new_font (0, CS_UNICODE)); |
1649 | push_font (new_font (0, CS_UNICODE)); |
1570 | realize_font (0); |
1650 | realize_font (0); |
1571 | |
1651 | |
1572 | add_fonts (desc); |
1652 | add_fonts (desc); |
1573 | |
1653 | |
1574 | return true; |
1654 | return true; |
… | |
… | |
1583 | |
1663 | |
1584 | return -1; |
1664 | return -1; |
1585 | } |
1665 | } |
1586 | |
1666 | |
1587 | int |
1667 | int |
1588 | rxvt_fontset::find_font (unicode_t unicode) |
1668 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1589 | { |
1669 | { |
1590 | if (unicode >= 1<<20) |
1670 | if (unicode >= 1<<20) |
1591 | return 0; |
1671 | return 0; |
1592 | |
1672 | |
1593 | unicode_t hi = unicode >> 8; |
1673 | unicode_t hi = unicode >> 8; |
… | |
… | |
1619 | goto next_font; |
1699 | goto next_font; |
1620 | |
1700 | |
1621 | bool careful; |
1701 | bool careful; |
1622 | if (f->has_char (unicode, &prop, careful)) |
1702 | if (f->has_char (unicode, &prop, careful)) |
1623 | { |
1703 | { |
1624 | if (careful) |
1704 | i = (i << 1) | careful; |
1625 | i |= 128; |
|
|
1626 | |
1705 | |
1627 | goto found; |
1706 | goto found; |
1628 | } |
1707 | } |
1629 | |
1708 | |
1630 | next_font: |
1709 | next_font: |
1631 | if (i == fonts.size () - 1) |
1710 | if (i == fonts.size () - 1) |
1632 | { |
1711 | { |
1633 | if (fallback->name) |
1712 | if (fallback->name) |
1634 | { |
1713 | { |
1635 | // search through the fallback list |
1714 | // search through the fallback list |
1636 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1715 | push_font (new_font (fallback->name, fallback->cs)); |
1637 | fallback++; |
1716 | fallback++; |
1638 | } |
1717 | } |
1639 | else |
1718 | else |
1640 | { |
1719 | { |
1641 | // try to find a new font. |
1720 | // try to find a new font. |
… | |
… | |
1672 | FcPatternDestroy (match); |
1751 | FcPatternDestroy (match); |
1673 | |
1752 | |
1674 | if (find_font (font) < 0) |
1753 | if (find_font (font) < 0) |
1675 | { |
1754 | { |
1676 | char fontname[4096]; |
1755 | char fontname[4096]; |
1677 | sprintf (fontname, "xft:%-.4090s", font); |
1756 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1678 | |
1757 | |
1679 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1758 | push_font (new_font (fontname, CS_UNICODE)); |
1680 | } |
1759 | } |
1681 | |
1760 | |
1682 | free (font); |
1761 | free (font); |
1683 | } |
1762 | } |
1684 | #endif |
1763 | #endif |
… | |
… | |
1706 | } |
1785 | } |
1707 | |
1786 | |
1708 | return i; |
1787 | return i; |
1709 | } |
1788 | } |
1710 | |
1789 | |
1711 | |
|
|
1712 | |
|
|