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 | |
… | |
… | |
43 | const char *name; |
42 | const char *name; |
44 | } fallback_fonts[] = { |
43 | } fallback_fonts[] = { |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
48 | |
47 | |
49 | #if ENCODING_EU |
48 | #if ENCODING_EU |
50 | // cyrillic |
49 | // cyrillic |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
50 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
51 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
53 | |
52 | |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
53 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
54 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
55 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
56 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
57 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
64 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
65 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
66 | |
68 | # if XFT |
67 | # if XFT |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
68 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
69 | |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
70 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
71 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
72 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
73 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
74 | { CS_ISO8859_9, "xft::lang=tr" }, |
… | |
… | |
80 | |
79 | |
81 | // japanese |
80 | // japanese |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
81 | #if ENCODING_JP || ENCODING_JP_EXT |
83 | # if XFT |
82 | # if XFT |
84 | // prefer xft for complex scripts |
83 | // prefer xft for complex scripts |
|
|
84 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { 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" }, |
86 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
89 | # endif |
88 | # endif |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
89 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
90 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
… | |
… | |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
216 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
218 | { |
217 | { |
219 | } |
218 | } |
220 | |
219 | |
221 | void |
220 | void |
222 | rxvt_font::set_name (char *name) |
221 | rxvt_font::set_name (char *name_) |
223 | { |
222 | { |
224 | if (this->name == name) |
223 | if (name == name_) |
225 | return; |
224 | return; |
226 | |
225 | |
227 | if (this->name) free (this->name); // let the compiler optimize |
226 | if (name) free (name); // let the compiler optimize |
228 | this->name = name; |
227 | name = name_; |
229 | } |
228 | } |
230 | |
229 | |
231 | void |
230 | void |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
231 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
233 | { |
232 | { |
234 | dTermDisplay; |
233 | dTermDisplay; |
235 | dTermGC; |
234 | dTermGC; |
236 | |
235 | |
237 | if (color == Color_bg || color == Color_transparent) |
236 | if (color == Color_bg || color == Color_transparent) |
238 | XClearArea (disp, d, x, y, w, h, false); |
237 | XClearArea (disp, d, x, y, w, h, false); |
239 | else if (color >= 0) |
238 | else if (color >= 0) |
240 | { |
239 | { |
241 | #if XFT |
240 | #if XFT |
|
|
241 | Picture dst; |
|
|
242 | |
|
|
243 | # ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap |
|
|
245 | && !term->pix_colors[color].is_opaque () |
|
|
246 | && ((dst = XftDrawPicture (d)))) |
|
|
247 | { |
|
|
248 | XClearArea (disp, d, x, y, w, h, false); |
|
|
249 | |
|
|
250 | 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 | } |
|
|
253 | else |
|
|
254 | # endif |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
255 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
256 | |
243 | #else |
257 | #else |
244 | XSetForeground (disp, gc, term->pix_colors[color]); |
258 | XSetForeground (disp, gc, term->pix_colors[color]); |
245 | XFillRectangle (disp, d, gc, x, y, w, h); |
259 | XFillRectangle (disp, d, gc, x, y, w, h); |
246 | #endif |
260 | #endif |
247 | } |
261 | } |
248 | } |
262 | } |
249 | |
263 | |
250 | ///////////////////////////////////////////////////////////////////////////// |
264 | ///////////////////////////////////////////////////////////////////////////// |
251 | |
|
|
252 | #include "table/linedraw.h" |
|
|
253 | |
265 | |
254 | struct rxvt_font_default : rxvt_font { |
266 | struct rxvt_font_default : rxvt_font { |
255 | struct rxvt_fontset *fs; |
267 | struct rxvt_fontset *fs; |
256 | |
268 | |
257 | rxvt_font_default (rxvt_fontset *fs) |
269 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
293 | return false; |
305 | return false; |
294 | |
306 | |
295 | if (unicode <= 0x009f) |
307 | if (unicode <= 0x009f) |
296 | return true; |
308 | return true; |
297 | |
309 | |
|
|
310 | #ifdef BUILTIN_GLYPHS |
298 | if (unicode >= 0x2500 && unicode <= 0x259f && |
311 | if (unicode >= 0x2500 && unicode <= 0x259f && |
299 | !term->option (Opt_skipBuiltinGlyphs)) |
312 | !term->option (Opt_skipBuiltinGlyphs)) |
300 | return true; |
313 | return true; |
|
|
314 | #endif |
301 | |
315 | |
302 | if (IS_COMPOSE (unicode)) |
316 | if (IS_COMPOSE (unicode)) |
303 | return true; |
317 | return true; |
304 | |
318 | |
305 | switch (unicode) |
319 | switch (unicode) |
… | |
… | |
341 | ; |
355 | ; |
342 | |
356 | |
343 | int width = text - tp; |
357 | int width = text - tp; |
344 | int fwidth = term->fwidth * width; |
358 | int fwidth = term->fwidth * width; |
345 | |
359 | |
|
|
360 | #ifdef BUILTIN_GLYPHS |
346 | if (0x2500 <= t && t <= 0x259f) |
361 | if (0x2500 <= t && t <= 0x259f) |
347 | { |
362 | { |
|
|
363 | # include "table/linedraw.h" |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint16_t offs = linedraw_offs[t - 0x2500]; |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *a = linedraw_command + (offs >> 4); |
350 | uint32_t *b = a + (offs & 15); |
366 | uint32_t *b = a + (offs & 15); |
351 | |
367 | |
352 | int W = fwidth; |
368 | int W = fwidth; |
… | |
… | |
390 | |
406 | |
391 | case 1: // rectangle, possibly stippled |
407 | case 1: // rectangle, possibly stippled |
392 | if (a) |
408 | if (a) |
393 | { |
409 | { |
394 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
410 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
395 | |
411 | |
396 | gcv.fill_style = FillStippled; |
412 | gcv.fill_style = FillStippled; |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
413 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
398 | gcv.ts_x_origin = x; |
414 | gcv.ts_x_origin = x; |
399 | gcv.ts_y_origin = y; |
415 | gcv.ts_y_origin = y; |
400 | |
416 | |
… | |
… | |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | (a - 1) * 90*64, (b - 1) * 90*64); |
420 | break; |
436 | break; |
421 | } |
437 | } |
422 | } |
438 | } |
423 | } |
439 | } |
|
|
440 | #else |
|
|
441 | if (0) |
|
|
442 | ; |
|
|
443 | #endif |
424 | #if ENABLE_COMBINING |
444 | #if ENABLE_COMBINING |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
445 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
426 | { |
446 | { |
427 | min_it (width, 2); // we only support wcwidth up to 2 |
447 | min_it (width, 2); // we only support wcwidth up to 2 |
428 | |
448 | |
429 | text_t chrs[2]; |
449 | text_t chrs[2]; |
430 | chrs [1] = NOCHAR; |
450 | chrs [1] = NOCHAR; |
431 | |
451 | |
432 | *chrs = cc->c1; |
452 | *chrs = cc->c1; |
433 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
453 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
434 | f1->draw (d, x, y, chrs, width, fg, bg); |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
435 | |
455 | |
436 | if (cc->c2 != NOCHAR) |
456 | if (cc->c2 != NOCHAR) |
437 | { |
457 | { |
438 | bool careful; |
458 | bool careful; |
439 | |
459 | |
440 | // prefer font of first character, for no good reasons |
460 | // prefer font of first character, for no good reasons |
441 | *chrs = cc->c2; |
461 | *chrs = cc->c2; |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
443 | ? f1 |
463 | ? f1 |
444 | : (*fs)[fs->find_font (cc->c2)]; |
464 | : (*fs)[fs->find_font_idx (cc->c2)]; |
445 | |
465 | |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
447 | } |
467 | } |
448 | } |
468 | } |
449 | #endif |
469 | #endif |
… | |
… | |
462 | |
482 | |
463 | x += fwidth; |
483 | x += fwidth; |
464 | } |
484 | } |
465 | } |
485 | } |
466 | |
486 | |
|
|
487 | struct rxvt_font_overflow : rxvt_font { |
|
|
488 | struct rxvt_fontset *fs; |
|
|
489 | |
|
|
490 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
491 | : rxvt_font () |
|
|
492 | { |
|
|
493 | this->fs = fs; |
|
|
494 | } |
|
|
495 | |
|
|
496 | rxvt_fontprop properties () |
|
|
497 | { |
|
|
498 | rxvt_fontprop p; |
|
|
499 | |
|
|
500 | p.width = p.height = 1; |
|
|
501 | p.ascent = rxvt_fontprop::unset; |
|
|
502 | p.weight = rxvt_fontprop::medium; |
|
|
503 | p.slant = rxvt_fontprop::roman; |
|
|
504 | |
|
|
505 | return p; |
|
|
506 | } |
|
|
507 | |
|
|
508 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
509 | { |
|
|
510 | width = 1; height = 1; |
|
|
511 | ascent = 1; descent = 0; |
|
|
512 | |
|
|
513 | set_name (strdup ("built-in rendition overflow font")); |
|
|
514 | |
|
|
515 | return true; |
|
|
516 | } |
|
|
517 | |
|
|
518 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
519 | { |
|
|
520 | return false; |
|
|
521 | } |
|
|
522 | |
|
|
523 | void draw (rxvt_drawable &d, int x, int y, |
|
|
524 | const text_t *text, int len, |
|
|
525 | int fg, int bg) |
|
|
526 | { |
|
|
527 | while (len--) |
|
|
528 | { |
|
|
529 | int fid = fs->find_font_idx (*text); |
|
|
530 | (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); |
|
|
531 | ++text; |
|
|
532 | x += term->fwidth; |
|
|
533 | } |
|
|
534 | } |
|
|
535 | }; |
|
|
536 | |
467 | ///////////////////////////////////////////////////////////////////////////// |
537 | ///////////////////////////////////////////////////////////////////////////// |
468 | |
538 | |
469 | struct rxvt_font_x11 : rxvt_font { |
539 | struct rxvt_font_x11 : rxvt_font { |
470 | rxvt_font_x11 () { f = 0; } |
540 | rxvt_font_x11 () { f = 0; } |
471 | |
541 | |
… | |
… | |
479 | |
549 | |
480 | void draw (rxvt_drawable &d, int x, int y, |
550 | void draw (rxvt_drawable &d, int x, int y, |
481 | const text_t *text, int len, |
551 | const text_t *text, int len, |
482 | int fg, int bg); |
552 | int fg, int bg); |
483 | |
553 | |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
554 | bool slow; // whether this is a proportional font or has other funny characteristics |
485 | XFontStruct *f; |
555 | XFontStruct *f; |
486 | bool enc2b, encm; |
556 | bool enc2b, encm; |
487 | |
557 | |
488 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
558 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
489 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
559 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
497 | unsigned long value; |
567 | unsigned long value; |
498 | |
568 | |
499 | if (XGetFontProperty (f, property, &value)) |
569 | if (XGetFontProperty (f, property, &value)) |
500 | return XGetAtomName (term->dpy, value); |
570 | return XGetAtomName (term->dpy, value); |
501 | else |
571 | else |
502 | return rxvt_strdup (repl); |
572 | return repl ? strdup (repl) : 0; |
503 | } |
573 | } |
504 | |
574 | |
505 | rxvt_fontprop |
575 | rxvt_fontprop |
506 | rxvt_font_x11::properties () |
576 | rxvt_font_x11::properties () |
507 | { |
577 | { |
… | |
… | |
589 | return false; |
659 | return false; |
590 | } |
660 | } |
591 | |
661 | |
592 | // fix the size of scalable fonts |
662 | // fix the size of scalable fonts |
593 | static bool |
663 | static bool |
594 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
664 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
595 | { |
665 | { |
596 | int slashes = 0; |
666 | int slashes = 0; |
597 | const char *field, *end; |
667 | const char *field, *end; |
598 | |
668 | |
599 | for (const char *c = name; *c; c++) |
669 | for (const char *c = name; *c; c++) |
… | |
… | |
609 | break; |
679 | break; |
610 | } |
680 | } |
611 | |
681 | |
612 | if (slashes >= 13 && (!old || *field == old)) |
682 | if (slashes >= 13 && (!old || *field == old)) |
613 | { |
683 | { |
614 | // TODO: check for overflow in font-name |
684 | size_t len = field - name; |
615 | strncpy (buf, name, field - name); |
685 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
616 | buf += field - name; |
686 | memcpy (*ptr, name, len); |
617 | strcpy (buf, replace); |
687 | strcpy (*ptr + len, replace); |
618 | strcat (buf, end); |
688 | strcat (*ptr, end); |
619 | |
689 | |
620 | return true; |
690 | return true; |
621 | } |
691 | } |
622 | else |
692 | else |
623 | { |
693 | { |
624 | strcpy (buf, name); |
694 | *ptr = strdup (name); |
625 | |
695 | |
626 | return false; |
696 | return false; |
627 | } |
697 | } |
628 | } |
698 | } |
629 | |
699 | |
… | |
… | |
637 | char field_str[64]; // enough for 128 bits |
707 | char field_str[64]; // enough for 128 bits |
638 | |
708 | |
639 | // first morph the font if required |
709 | // first morph the font if required |
640 | if (force_prop) |
710 | if (force_prop) |
641 | { |
711 | { |
642 | char fname[1024]; |
712 | char *fname; |
643 | |
713 | |
644 | if (name[0] != '-') |
714 | if (name[0] != '-') |
645 | { |
715 | { |
646 | f = XLoadQueryFont (disp, name); |
716 | f = XLoadQueryFont (disp, name); |
647 | |
717 | |
… | |
… | |
659 | f = 0; |
729 | f = 0; |
660 | } |
730 | } |
661 | |
731 | |
662 | if (prop.weight != rxvt_fontprop::unset) |
732 | if (prop.weight != rxvt_fontprop::unset) |
663 | { |
733 | { |
664 | replace_field (fname, name, 2, 0, |
734 | replace_field (&fname, name, 2, 0, |
665 | prop.weight < rxvt_fontprop::bold |
735 | prop.weight < rxvt_fontprop::bold |
666 | ? "medium" : "bold"); |
736 | ? "medium" : "bold"); |
667 | set_name (strdup (fname)); |
737 | set_name (fname); |
668 | } |
738 | } |
669 | |
739 | |
670 | if (prop.slant != rxvt_fontprop::unset) |
740 | if (prop.slant != rxvt_fontprop::unset) |
671 | { |
741 | { |
672 | replace_field (fname, name, 3, 0, |
742 | replace_field (&fname, name, 3, 0, |
673 | prop.slant < rxvt_fontprop::italic |
743 | prop.slant < rxvt_fontprop::italic |
674 | ? "r" : "i"); // TODO: handle "o"blique, too |
744 | ? "r" : "i"); // TODO: handle "o"blique, too |
675 | set_name (strdup (fname)); |
745 | set_name (fname); |
676 | } |
746 | } |
677 | } |
747 | } |
678 | |
748 | |
679 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
749 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
680 | ? 0 : prop.height); |
750 | ? 0 : prop.height); |
… | |
… | |
705 | font_weight *fonts = new font_weight[count]; |
775 | font_weight *fonts = new font_weight[count]; |
706 | |
776 | |
707 | for (int i = 0; i < count; i++) |
777 | for (int i = 0; i < count; i++) |
708 | { |
778 | { |
709 | rxvt_fontprop p; |
779 | rxvt_fontprop p; |
710 | char fname[1024]; |
780 | char *fname; |
711 | |
781 | |
712 | int diff = 0; |
782 | int diff = 0; |
713 | |
783 | |
714 | if (replace_field (fname, list[i], 6, '0', field_str)) |
784 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
715 | diff += 10; // slightly penalize scalable fonts |
785 | diff += 10; // slightly penalize scalable fonts |
|
|
786 | else |
|
|
787 | { |
|
|
788 | free (fname); |
716 | else if (replace_field (fname, list[i], 11, '0', "0")) |
789 | if (replace_field (&fname, list[i], 11, '0', "0")) |
717 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
790 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
791 | } |
718 | |
792 | |
719 | if (!set_properties (p, fname)) |
793 | if (!set_properties (p, fname)) |
720 | continue; |
794 | continue; |
721 | |
795 | |
722 | if (prop.height != rxvt_fontprop::unset |
796 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
726 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
800 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
727 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
801 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
728 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
802 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
729 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
803 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
730 | |
804 | |
731 | fonts[i].name = strdup (fname); |
805 | fonts[i].name = fname; |
732 | fonts[i].diff = diff; |
806 | fonts[i].diff = diff; |
733 | } |
807 | } |
734 | |
808 | |
735 | XFreeFontNames (list); |
809 | XFreeFontNames (list); |
736 | |
810 | |
… | |
… | |
768 | return false; |
842 | return false; |
769 | |
843 | |
770 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
844 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
771 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
845 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
772 | |
846 | |
|
|
847 | cs = CS_UNKNOWN; |
|
|
848 | |
773 | if (registry && encoding) |
849 | if (registry && encoding) |
774 | { |
850 | { |
775 | char charset[64]; |
851 | char charset[64]; |
776 | snprintf (charset, 64, "%s-%s", registry, encoding); |
852 | snprintf (charset, 64, "%s-%s", registry, encoding); |
777 | |
853 | |
778 | cs = codeset_from_name (charset); |
854 | cs = codeset_from_name (charset); |
|
|
855 | |
|
|
856 | if (cs == CS_UNKNOWN) |
|
|
857 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
779 | } |
858 | } |
780 | else |
859 | |
|
|
860 | free (registry); |
|
|
861 | free (encoding); |
|
|
862 | |
|
|
863 | if (cs == CS_UNKNOWN) |
781 | { |
864 | { |
782 | const char *charset = get_property (f, XA_FONT, 0); |
865 | const char *charset = get_property (f, XA_FONT, 0); |
783 | |
866 | |
784 | if (!charset) |
867 | if (!charset) |
785 | charset = name; |
868 | charset = name; |
… | |
… | |
788 | while (*charset) |
871 | while (*charset) |
789 | if (*charset++ == '-' && !--count) |
872 | if (*charset++ == '-' && !--count) |
790 | break; |
873 | break; |
791 | |
874 | |
792 | cs = codeset_from_name (charset); |
875 | cs = codeset_from_name (charset); |
|
|
876 | if (cs == CS_UNKNOWN) |
|
|
877 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
878 | } |
|
|
879 | |
|
|
880 | if (cs == CS_UNKNOWN) |
793 | } |
881 | { |
794 | |
882 | clear (); |
795 | free (registry); |
883 | return false; |
796 | free (encoding); |
884 | } |
797 | |
885 | |
798 | if (cs == CS_UNICODE) |
886 | if (cs == CS_UNICODE) |
799 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
887 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
800 | |
888 | |
801 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
889 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
813 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
901 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
814 | |
902 | |
815 | if (encm) |
903 | if (encm) |
816 | N += (f->max_byte1 - f->min_byte1) |
904 | N += (f->max_byte1 - f->min_byte1) |
817 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
905 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
818 | |
906 | |
819 | while (N) |
907 | while (N) |
820 | { |
908 | { |
821 | if (f->per_char[N].width > width) |
909 | if (f->per_char[N].width > width) |
822 | width = f->per_char[N].width; |
910 | width = f->per_char[N].width; |
823 | |
911 | |
… | |
… | |
848 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
936 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
849 | |
937 | |
850 | if (width < g.width) width = g.width; |
938 | if (width < g.width) width = g.width; |
851 | } |
939 | } |
852 | |
940 | |
853 | if (cs == CS_UNKNOWN) |
941 | #if 0 // do it per-character |
|
|
942 | if (prop && width > prop->width) |
854 | { |
943 | { |
855 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
856 | |
|
|
857 | clear (); |
944 | clear (); |
858 | return false; |
945 | return false; |
859 | } |
946 | } |
860 | |
|
|
861 | #if 0 // do it per-character |
|
|
862 | if (prop && width > prop->width) |
|
|
863 | { |
|
|
864 | clear (); |
|
|
865 | return false; |
|
|
866 | } |
|
|
867 | #endif |
947 | #endif |
868 | |
948 | |
869 | return true; |
949 | return true; |
870 | } |
950 | } |
871 | |
951 | |
… | |
… | |
885 | uint32_t ch = FROM_UNICODE (cs, unicode); |
965 | uint32_t ch = FROM_UNICODE (cs, unicode); |
886 | |
966 | |
887 | if (ch == NOCHAR) |
967 | if (ch == NOCHAR) |
888 | return false; |
968 | return false; |
889 | |
969 | |
890 | /* check wether the character exists in _this_ font. horrible. */ |
970 | /* check whether the character exists in _this_ font. horrible. */ |
891 | XCharStruct *xcs; |
971 | XCharStruct *xcs; |
892 | |
972 | |
893 | if (encm) |
973 | if (encm) |
894 | { |
974 | { |
895 | unsigned char byte1 = ch >> 8; |
975 | unsigned char byte1 = ch >> 8; |
… | |
… | |
925 | return false; |
1005 | return false; |
926 | |
1006 | |
927 | if (!prop || prop->width == rxvt_fontprop::unset) |
1007 | if (!prop || prop->width == rxvt_fontprop::unset) |
928 | return true; |
1008 | return true; |
929 | |
1009 | |
930 | // check wether character overlaps previous/next character |
1010 | // check whether character overlaps previous/next character |
931 | int w = xcs->rbearing - xcs->lbearing; |
1011 | int w = xcs->rbearing - xcs->lbearing; |
932 | int wcw = max (WCWIDTH (unicode), 1); |
1012 | int wcw = max (WCWIDTH (unicode), 1); |
933 | |
1013 | |
934 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1014 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
935 | |
1015 | |
… | |
… | |
975 | else |
1055 | else |
976 | { |
1056 | { |
977 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1057 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
978 | |
1058 | |
979 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1059 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
980 | |
1060 | |
981 | if (slow) |
1061 | if (slow) |
982 | { |
1062 | { |
983 | do |
1063 | do |
984 | { |
1064 | { |
985 | if (xc->byte1 || xc->byte2) |
1065 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1007 | else |
1087 | else |
1008 | { |
1088 | { |
1009 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1089 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1010 | |
1090 | |
1011 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1091 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1012 | |
1092 | |
1013 | if (slow) |
1093 | if (slow) |
1014 | { |
1094 | { |
1015 | do |
1095 | do |
1016 | { |
1096 | { |
1017 | if (*xc) |
1097 | if (*xc) |
… | |
… | |
1043 | |
1123 | |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1124 | void draw (rxvt_drawable &d, int x, int y, |
1045 | const text_t *text, int len, |
1125 | const text_t *text, int len, |
1046 | int fg, int bg); |
1126 | int fg, int bg); |
1047 | |
1127 | |
1048 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1128 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1049 | |
1129 | |
1050 | protected: |
1130 | protected: |
1051 | XftFont *f; |
1131 | XftFont *f; |
1052 | }; |
1132 | }; |
1053 | |
1133 | |
… | |
… | |
1109 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1189 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1110 | |
1190 | |
1111 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1191 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1112 | // clip width, we can't do better, or can we? |
1192 | // clip width, we can't do better, or can we? |
1113 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1193 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1114 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1194 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1115 | #endif |
1195 | #endif |
1116 | |
1196 | |
1117 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1197 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1118 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1198 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1119 | |
1199 | |
… | |
… | |
1263 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1343 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1264 | const text_t *text, int len, |
1344 | const text_t *text, int len, |
1265 | int fg, int bg) |
1345 | int fg, int bg) |
1266 | { |
1346 | { |
1267 | XGlyphInfo extents; |
1347 | XGlyphInfo extents; |
1268 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1348 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1269 | XftGlyphSpec *ep = enc; |
1349 | XftGlyphSpec *ep = enc; |
1270 | |
1350 | |
1271 | dTermDisplay; |
1351 | dTermDisplay; |
1272 | dTermGC; |
1352 | dTermGC; |
1273 | |
1353 | |
1274 | int w = term->fwidth * len; |
1354 | int w = term->fwidth * len; |
1275 | int h = term->fheight; |
1355 | int h = term->fheight; |
1276 | |
1356 | |
1277 | bool buffered = bg >= 0 // we don't use a transparent bg |
1357 | bool buffered = bg >= Color_transparent |
1278 | #ifndef FORCE_UNBUFFERED_XFT |
1358 | && term->option (Opt_buffered); |
1279 | # ifdef ENABLE_TRANSPARENCY |
|
|
1280 | || !term->am_transparent // we aren't transparent |
|
|
1281 | # endif |
|
|
1282 | #endif |
|
|
1283 | ; |
|
|
1284 | |
1359 | |
1285 | // cut trailing spaces |
1360 | // cut trailing spaces |
1286 | while (len && text [len - 1] == ' ') |
1361 | while (len && text [len - 1] == ' ') |
1287 | len--; |
1362 | len--; |
1288 | |
1363 | |
… | |
… | |
1294 | int cwidth = term->fwidth; |
1369 | int cwidth = term->fwidth; |
1295 | FcChar32 fc = *text++; len--; |
1370 | FcChar32 fc = *text++; len--; |
1296 | |
1371 | |
1297 | while (len && *text == NOCHAR) |
1372 | while (len && *text == NOCHAR) |
1298 | text++, len--, cwidth += term->fwidth; |
1373 | text++, len--, cwidth += term->fwidth; |
1299 | |
1374 | |
1300 | if (fc != ' ') // skip spaces |
1375 | if (fc != ' ') // skip spaces |
1301 | { |
1376 | { |
1302 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1377 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1303 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1378 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1304 | |
1379 | |
… | |
… | |
1319 | { |
1394 | { |
1320 | if (ep != enc) |
1395 | if (ep != enc) |
1321 | { |
1396 | { |
1322 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1397 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1323 | |
1398 | |
1324 | if (0) |
1399 | #ifdef HAVE_BG_PIXMAP |
1325 | ; |
1400 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1326 | #ifdef ENABLE_TRANSPARENCY |
1401 | |
1327 | else if (bg < 0 && term->am_pixmap_trans) |
|
|
1328 | XCopyArea (disp, term->pixmap, d2, gc, |
|
|
1329 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
1330 | w, h, 0, 0); |
|
|
1331 | #endif |
|
|
1332 | #ifdef XPM_BACKGROUND |
|
|
1333 | else if (bg < 0 && term->bgPixmap.pixmap) |
1402 | if (term->bgPixmap.pixmap |
|
|
1403 | && (bg == Color_transparent || bg == Color_bg |
|
|
1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1334 | { |
1405 | { |
|
|
1406 | int src_x = x, src_y = y; |
|
|
1407 | |
|
|
1408 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1409 | { |
|
|
1410 | src_x += term->window_vt_x; |
|
|
1411 | src_y += term->window_vt_y; |
|
|
1412 | } |
|
|
1413 | |
|
|
1414 | if (term->bgPixmap.pmap_width >= src_x + w |
|
|
1415 | && term->bgPixmap.pmap_height >= src_y + h) |
|
|
1416 | { |
|
|
1417 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1418 | src_x, src_y, w, h, 0, 0); |
|
|
1419 | } |
|
|
1420 | else |
|
|
1421 | { |
1335 | XGCValues gcv; |
1422 | XGCValues gcv; |
1336 | |
1423 | |
1337 | gcv.fill_style = FillTiled; |
1424 | gcv.fill_style = FillTiled; |
1338 | gcv.tile = term->pixmap; |
1425 | gcv.tile = term->bgPixmap.pixmap; |
1339 | gcv.ts_x_origin = -x; |
1426 | gcv.ts_x_origin = -src_x; |
1340 | gcv.ts_y_origin = -y; |
1427 | gcv.ts_y_origin = -src_y; |
1341 | |
1428 | |
1342 | GC gc2 = XCreateGC (disp, d2, |
1429 | XChangeGC (disp, gc, |
1343 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1430 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1344 | &gcv); |
1431 | &gcv); |
1345 | |
1432 | |
1346 | XFillRectangle (disp, d2, gc2, 0, 0, w, h); |
1433 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1347 | |
1434 | |
1348 | XFreeGC (disp, gc2); |
1435 | gcv.fill_style = FillSolid; |
|
|
1436 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1437 | } |
|
|
1438 | |
|
|
1439 | if (dst) |
|
|
1440 | { |
|
|
1441 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1442 | |
|
|
1443 | // dst can only be set when bg >= 0 |
|
|
1444 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1445 | } |
1349 | } |
1446 | } |
1350 | #endif |
|
|
1351 | else |
1447 | else |
|
|
1448 | #endif |
1352 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1449 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1353 | |
1450 | |
1354 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1451 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1355 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1452 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1356 | } |
1453 | } |
1357 | else |
1454 | else |
… | |
… | |
1397 | fonts.clear (); |
1494 | fonts.clear (); |
1398 | |
1495 | |
1399 | fallback = fallback_fonts; |
1496 | fallback = fallback_fonts; |
1400 | } |
1497 | } |
1401 | |
1498 | |
|
|
1499 | void |
|
|
1500 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1501 | { |
|
|
1502 | font->set_term (term); |
|
|
1503 | |
|
|
1504 | font->cs = cs; |
|
|
1505 | font->loaded = false; |
|
|
1506 | } |
|
|
1507 | |
1402 | rxvt_font * |
1508 | rxvt_font * |
1403 | rxvt_fontset::new_font (const char *name, codeset cs) |
1509 | rxvt_fontset::new_font (const char *name, codeset cs) |
1404 | { |
1510 | { |
1405 | rxvt_font *f; |
1511 | rxvt_font *f; |
1406 | |
1512 | |
1407 | if (!name || !*name) |
1513 | if (!name || !*name) |
1408 | { |
1514 | { |
1409 | name = ""; |
1515 | name = ""; |
1410 | f = new rxvt_font_default (this); |
1516 | f = new rxvt_font_default (this); |
1411 | } |
1517 | } |
… | |
… | |
1422 | f = new rxvt_font_x11; |
1528 | f = new rxvt_font_x11; |
1423 | } |
1529 | } |
1424 | else |
1530 | else |
1425 | f = new rxvt_font_x11; |
1531 | f = new rxvt_font_x11; |
1426 | |
1532 | |
1427 | f->set_term (term); |
|
|
1428 | f->set_name (strdup (name)); |
1533 | f->set_name (strdup (name)); |
1429 | |
1534 | prepare_font (f, cs); |
1430 | f->cs = cs; |
|
|
1431 | f->loaded = false; |
|
|
1432 | |
1535 | |
1433 | return f; |
1536 | return f; |
1434 | } |
1537 | } |
1435 | |
1538 | |
1436 | ///////////////////////////////////////////////////////////////////////////// |
1539 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1540 | |
|
|
1541 | void |
|
|
1542 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1543 | { |
|
|
1544 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1545 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1546 | // represented in the rendition. |
|
|
1547 | if (fonts.size () == fontCount) |
|
|
1548 | { |
|
|
1549 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1550 | |
|
|
1551 | prepare_font (f, CS_UNICODE); |
|
|
1552 | fonts.push_back (f); |
|
|
1553 | } |
|
|
1554 | |
|
|
1555 | fonts.push_back (font); |
|
|
1556 | } |
1437 | |
1557 | |
1438 | void |
1558 | void |
1439 | rxvt_fontset::add_fonts (const char *desc) |
1559 | rxvt_fontset::add_fonts (const char *desc) |
1440 | { |
1560 | { |
1441 | if (desc) |
1561 | if (desc) |
… | |
… | |
1479 | if (!end) |
1599 | if (!end) |
1480 | end = desc + strlen (desc); |
1600 | end = desc + strlen (desc); |
1481 | |
1601 | |
1482 | if (end - desc < 511) |
1602 | if (end - desc < 511) |
1483 | { |
1603 | { |
1484 | strncpy (buf, desc, end - desc); |
1604 | memcpy (buf, desc, end - desc); |
1485 | buf[end - desc] = 0; |
1605 | buf[end - desc] = 0; |
1486 | |
1606 | |
1487 | fonts.push_back (new_font (buf, cs)); |
1607 | push_font (new_font (buf, cs)); |
1488 | } |
1608 | } |
1489 | else |
1609 | else |
1490 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1610 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1491 | |
1611 | |
1492 | desc = end + 1; |
1612 | desc = end + 1; |
… | |
… | |
1520 | { |
1640 | { |
1521 | clear (); |
1641 | clear (); |
1522 | |
1642 | |
1523 | fontdesc = strdup (desc); |
1643 | fontdesc = strdup (desc); |
1524 | |
1644 | |
1525 | fonts.push_back (new_font (0, CS_UNICODE)); |
1645 | push_font (new_font (0, CS_UNICODE)); |
1526 | realize_font (0); |
1646 | realize_font (0); |
1527 | |
1647 | |
1528 | add_fonts (desc); |
1648 | add_fonts (desc); |
1529 | |
1649 | |
1530 | return true; |
1650 | return true; |
… | |
… | |
1539 | |
1659 | |
1540 | return -1; |
1660 | return -1; |
1541 | } |
1661 | } |
1542 | |
1662 | |
1543 | int |
1663 | int |
1544 | rxvt_fontset::find_font (unicode_t unicode) |
1664 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1545 | { |
1665 | { |
1546 | if (unicode >= 1<<20) |
1666 | if (unicode >= 1<<20) |
1547 | return 0; |
1667 | return 0; |
1548 | |
1668 | |
1549 | unicode_t hi = unicode >> 8; |
1669 | unicode_t hi = unicode >> 8; |
… | |
… | |
1575 | goto next_font; |
1695 | goto next_font; |
1576 | |
1696 | |
1577 | bool careful; |
1697 | bool careful; |
1578 | if (f->has_char (unicode, &prop, careful)) |
1698 | if (f->has_char (unicode, &prop, careful)) |
1579 | { |
1699 | { |
1580 | if (careful) |
1700 | i = (i << 1) | careful; |
1581 | i |= 128; |
|
|
1582 | |
1701 | |
1583 | goto found; |
1702 | goto found; |
1584 | } |
1703 | } |
1585 | |
1704 | |
1586 | next_font: |
1705 | next_font: |
1587 | if (i == fonts.size () - 1) |
1706 | if (i == fonts.size () - 1) |
1588 | { |
1707 | { |
1589 | if (fallback->name) |
1708 | if (fallback->name) |
1590 | { |
1709 | { |
1591 | // search through the fallback list |
1710 | // search through the fallback list |
1592 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1711 | push_font (new_font (fallback->name, fallback->cs)); |
1593 | fallback++; |
1712 | fallback++; |
1594 | } |
1713 | } |
1595 | else |
1714 | else |
1596 | { |
1715 | { |
1597 | // try to find a new font. |
1716 | // try to find a new font. |
… | |
… | |
1628 | FcPatternDestroy (match); |
1747 | FcPatternDestroy (match); |
1629 | |
1748 | |
1630 | if (find_font (font) < 0) |
1749 | if (find_font (font) < 0) |
1631 | { |
1750 | { |
1632 | char fontname[4096]; |
1751 | char fontname[4096]; |
1633 | sprintf (fontname, "xft:%-.4090s", font); |
1752 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1634 | |
1753 | |
1635 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1754 | push_font (new_font (fontname, CS_UNICODE)); |
1636 | } |
1755 | } |
1637 | |
1756 | |
1638 | free (font); |
1757 | free (font); |
1639 | } |
1758 | } |
1640 | #endif |
1759 | #endif |
… | |
… | |
1662 | } |
1781 | } |
1663 | |
1782 | |
1664 | return i; |
1783 | return i; |
1665 | } |
1784 | } |
1666 | |
1785 | |
1667 | |
|
|
1668 | |
|
|