1 | /*--------------------------------*-C-*---------------------------------* |
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-2006 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
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" }, |
… | |
… | |
158 | 0x304c, 0x672c, // が本 |
157 | 0x304c, 0x672c, // が本 |
159 | }; |
158 | }; |
160 | |
159 | |
161 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
162 | |
161 | |
163 | #define dTermDisplay Display *disp = term->xdisp |
162 | #define dTermDisplay Display *disp = term->dpy |
164 | #define dTermGC GC gc = term->gc |
163 | #define dTermGC GC gc = term->gc |
165 | |
|
|
166 | ///////////////////////////////////////////////////////////////////////////// |
|
|
167 | |
|
|
168 | #if XFT |
|
|
169 | rxvt_drawable::~rxvt_drawable () |
|
|
170 | { |
|
|
171 | if (xftdrawable) |
|
|
172 | XftDrawDestroy (xftdrawable); |
|
|
173 | } |
|
|
174 | |
|
|
175 | rxvt_drawable::operator XftDraw *() |
|
|
176 | { |
|
|
177 | if (!xftdrawable) |
|
|
178 | xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap); |
|
|
179 | |
|
|
180 | return xftdrawable; |
|
|
181 | } |
|
|
182 | #endif |
|
|
183 | |
164 | |
184 | ///////////////////////////////////////////////////////////////////////////// |
165 | ///////////////////////////////////////////////////////////////////////////// |
185 | |
166 | |
186 | static const char * |
167 | static const char * |
187 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
168 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
… | |
… | |
249 | void |
230 | void |
250 | 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 |
251 | { |
232 | { |
252 | dTermDisplay; |
233 | dTermDisplay; |
253 | dTermGC; |
234 | dTermGC; |
254 | |
235 | |
255 | if (color == Color_bg) |
236 | if (color == Color_bg || color == Color_transparent) |
256 | XClearArea (disp, d, x, y, w, h, false); |
237 | XClearArea (disp, d, x, y, w, h, false); |
257 | else if (color >= 0) |
238 | else if (color >= 0) |
258 | { |
239 | { |
259 | #if XFT |
240 | #if XFT |
|
|
241 | bool done = false; |
|
|
242 | |
|
|
243 | # ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) |
|
|
245 | { |
|
|
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | |
|
|
248 | if (dst != 0) |
|
|
249 | { |
|
|
250 | XClearArea (disp, d, x, y, w, h, false); |
|
|
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
253 | done = true; |
|
|
254 | } |
|
|
255 | } |
|
|
256 | # endif |
|
|
257 | if (!done) |
260 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
259 | |
261 | #else |
260 | #else |
262 | XSetForeground (disp, gc, term->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
263 | XFillRectangle (disp, d, gc, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
264 | #endif |
263 | #endif |
265 | } |
264 | } |
266 | } |
265 | } |
267 | |
266 | |
268 | ///////////////////////////////////////////////////////////////////////////// |
267 | ///////////////////////////////////////////////////////////////////////////// |
269 | |
|
|
270 | #include "table/linedraw.h" |
|
|
271 | |
268 | |
272 | struct rxvt_font_default : rxvt_font { |
269 | struct rxvt_font_default : rxvt_font { |
273 | struct rxvt_fontset *fs; |
270 | struct rxvt_fontset *fs; |
274 | |
271 | |
275 | rxvt_font_default (rxvt_fontset *fs) |
272 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
288 | p.slant = rxvt_fontprop::roman; |
285 | p.slant = rxvt_fontprop::roman; |
289 | |
286 | |
290 | return p; |
287 | return p; |
291 | } |
288 | } |
292 | |
289 | |
293 | bool load (const rxvt_fontprop &prop) |
290 | bool load (const rxvt_fontprop &prop, bool force_prop) |
294 | { |
291 | { |
295 | width = 1; height = 1; |
292 | width = 1; height = 1; |
296 | ascent = 1; descent = 0; |
293 | ascent = 1; descent = 0; |
297 | |
294 | |
298 | set_name (strdup ("built-in support font")); |
295 | set_name (strdup ("built-in support font")); |
… | |
… | |
311 | return false; |
308 | return false; |
312 | |
309 | |
313 | if (unicode <= 0x009f) |
310 | if (unicode <= 0x009f) |
314 | return true; |
311 | return true; |
315 | |
312 | |
|
|
313 | #ifdef BUILTIN_GLYPHS |
316 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | if (unicode >= 0x2500 && unicode <= 0x259f && |
317 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | !term->option (Opt_skipBuiltinGlyphs)) |
318 | return true; |
316 | return true; |
|
|
317 | #endif |
319 | |
318 | |
320 | if (IS_COMPOSE (unicode)) |
319 | if (IS_COMPOSE (unicode)) |
321 | return true; |
320 | return true; |
322 | |
321 | |
323 | switch (unicode) |
322 | switch (unicode) |
… | |
… | |
359 | ; |
358 | ; |
360 | |
359 | |
361 | int width = text - tp; |
360 | int width = text - tp; |
362 | int fwidth = term->fwidth * width; |
361 | int fwidth = term->fwidth * width; |
363 | |
362 | |
|
|
363 | #ifdef BUILTIN_GLYPHS |
364 | if (0x2500 <= t && t <= 0x259f) |
364 | if (0x2500 <= t && t <= 0x259f) |
365 | { |
365 | { |
|
|
366 | # include "table/linedraw.h" |
366 | uint16_t offs = linedraw_offs[t - 0x2500]; |
367 | uint16_t offs = linedraw_offs[t - 0x2500]; |
367 | uint32_t *a = linedraw_command + (offs >> 4); |
368 | uint32_t *a = linedraw_command + (offs >> 4); |
368 | uint32_t *b = a + (offs & 15); |
369 | uint32_t *b = a + (offs & 15); |
369 | |
370 | |
370 | int W = fwidth; |
371 | int W = fwidth; |
… | |
… | |
408 | |
409 | |
409 | case 1: // rectangle, possibly stippled |
410 | case 1: // rectangle, possibly stippled |
410 | if (a) |
411 | if (a) |
411 | { |
412 | { |
412 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
413 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
413 | |
414 | |
414 | gcv.fill_style = FillStippled; |
415 | gcv.fill_style = FillStippled; |
415 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
416 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
416 | gcv.ts_x_origin = x; |
417 | gcv.ts_x_origin = x; |
417 | gcv.ts_y_origin = y; |
418 | gcv.ts_y_origin = y; |
418 | |
419 | |
… | |
… | |
437 | (a - 1) * 90*64, (b - 1) * 90*64); |
438 | (a - 1) * 90*64, (b - 1) * 90*64); |
438 | break; |
439 | break; |
439 | } |
440 | } |
440 | } |
441 | } |
441 | } |
442 | } |
|
|
443 | #else |
|
|
444 | if (0) |
|
|
445 | ; |
|
|
446 | #endif |
442 | #if ENABLE_COMBINING |
447 | #if ENABLE_COMBINING |
443 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
448 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
444 | { |
449 | { |
445 | min_it (width, 2); // we only support wcwidth up to 2 |
450 | min_it (width, 2); // we only support wcwidth up to 2 |
446 | |
451 | |
… | |
… | |
459 | *chrs = cc->c2; |
464 | *chrs = cc->c2; |
460 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
465 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
461 | ? f1 |
466 | ? f1 |
462 | : (*fs)[fs->find_font (cc->c2)]; |
467 | : (*fs)[fs->find_font (cc->c2)]; |
463 | |
468 | |
464 | f2->draw (d, x, y, chrs, width, fg, -1); |
469 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
465 | } |
470 | } |
466 | } |
471 | } |
467 | #endif |
472 | #endif |
468 | else |
473 | else |
469 | switch (t) |
474 | switch (t) |
… | |
… | |
489 | |
494 | |
490 | void clear (); |
495 | void clear (); |
491 | |
496 | |
492 | rxvt_fontprop properties (); |
497 | rxvt_fontprop properties (); |
493 | |
498 | |
494 | bool load (const rxvt_fontprop &prop); |
499 | bool load (const rxvt_fontprop &prop, bool force_prop); |
495 | |
500 | |
496 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
501 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
497 | |
502 | |
498 | void draw (rxvt_drawable &d, int x, int y, |
503 | void draw (rxvt_drawable &d, int x, int y, |
499 | const text_t *text, int len, |
504 | const text_t *text, int len, |
500 | int fg, int bg); |
505 | int fg, int bg); |
501 | |
506 | |
502 | bool slow; // wether this is a proportional font or has other funny characteristics |
507 | bool slow; // wether this is a proportional font or has other funny characteristics |
503 | XFontStruct *f; |
508 | XFontStruct *f; |
504 | codeset cs; |
|
|
505 | bool enc2b, encm; |
509 | bool enc2b, encm; |
506 | |
510 | |
507 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
511 | 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); |
512 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
509 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
513 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
… | |
… | |
514 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
518 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
515 | { |
519 | { |
516 | unsigned long value; |
520 | unsigned long value; |
517 | |
521 | |
518 | if (XGetFontProperty (f, property, &value)) |
522 | if (XGetFontProperty (f, property, &value)) |
519 | return XGetAtomName (term->xdisp, value); |
523 | return XGetAtomName (term->dpy, value); |
520 | else |
524 | else |
521 | return rxvt_strdup (repl); |
525 | return repl ? strdup (repl) : 0; |
522 | } |
526 | } |
523 | |
527 | |
524 | rxvt_fontprop |
528 | rxvt_fontprop |
525 | rxvt_font_x11::properties () |
529 | rxvt_font_x11::properties () |
526 | { |
530 | { |
… | |
… | |
547 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
551 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
548 | { |
552 | { |
549 | unsigned long height; |
553 | unsigned long height; |
550 | |
554 | |
551 | #if 0 |
555 | #if 0 |
552 | if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) |
556 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
553 | return false; |
557 | return false; |
554 | #else |
558 | #else |
555 | height = f->ascent + f->descent; |
559 | height = f->ascent + f->descent; |
556 | #endif |
560 | #endif |
557 | |
561 | |
… | |
… | |
608 | return false; |
612 | return false; |
609 | } |
613 | } |
610 | |
614 | |
611 | // fix the size of scalable fonts |
615 | // fix the size of scalable fonts |
612 | static bool |
616 | static bool |
613 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
617 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
614 | { |
618 | { |
615 | int slashes = 0; |
619 | int slashes = 0; |
616 | const char *field, *end; |
620 | const char *field, *end; |
617 | |
621 | |
618 | for (const char *c = name; *c; c++) |
622 | for (const char *c = name; *c; c++) |
… | |
… | |
628 | break; |
632 | break; |
629 | } |
633 | } |
630 | |
634 | |
631 | if (slashes >= 13 && (!old || *field == old)) |
635 | if (slashes >= 13 && (!old || *field == old)) |
632 | { |
636 | { |
633 | // TODO: check for overflow in font-name |
637 | size_t len = field - name; |
634 | strncpy (buf, name, field - name); |
638 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
635 | buf += field - name; |
639 | memcpy (*ptr, name, len); |
636 | strcpy (buf, replace); |
640 | strcpy (*ptr + len, replace); |
637 | strcat (buf, end); |
641 | strcat (*ptr, end); |
638 | |
642 | |
639 | return true; |
643 | return true; |
640 | } |
644 | } |
641 | else |
645 | else |
642 | { |
646 | { |
643 | strcpy (buf, name); |
647 | *ptr = strdup (name); |
644 | |
648 | |
645 | return false; |
649 | return false; |
646 | } |
650 | } |
647 | } |
651 | } |
648 | |
652 | |
649 | bool |
653 | bool |
650 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
654 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
651 | { |
655 | { |
652 | dTermDisplay; |
656 | dTermDisplay; |
653 | |
657 | |
654 | clear (); |
658 | clear (); |
655 | |
659 | |
656 | char field_str[64]; // enough for 128 bits |
660 | char field_str[64]; // enough for 128 bits |
657 | |
661 | |
658 | // first morph the font if required |
662 | // first morph the font if required |
659 | if (prop.weight != rxvt_fontprop::unset |
663 | if (force_prop) |
660 | || prop.slant != rxvt_fontprop::unset) |
|
|
661 | { |
664 | { |
662 | char fname[1024]; |
665 | char *fname; |
663 | |
666 | |
664 | if (name[0] != '-') |
667 | if (name[0] != '-') |
665 | { |
668 | { |
666 | f = XLoadQueryFont (disp, name); |
669 | f = XLoadQueryFont (disp, name); |
667 | |
670 | |
… | |
… | |
679 | f = 0; |
682 | f = 0; |
680 | } |
683 | } |
681 | |
684 | |
682 | if (prop.weight != rxvt_fontprop::unset) |
685 | if (prop.weight != rxvt_fontprop::unset) |
683 | { |
686 | { |
684 | replace_field (fname, name, 2, 0, |
687 | replace_field (&fname, name, 2, 0, |
685 | prop.weight < rxvt_fontprop::bold |
688 | prop.weight < rxvt_fontprop::bold |
686 | ? "medium" : "bold"); |
689 | ? "medium" : "bold"); |
687 | set_name (strdup (fname)); |
690 | set_name (fname); |
688 | } |
691 | } |
689 | |
692 | |
690 | if (prop.slant != rxvt_fontprop::unset) |
693 | if (prop.slant != rxvt_fontprop::unset) |
691 | { |
694 | { |
692 | replace_field (fname, name, 3, 0, |
695 | replace_field (&fname, name, 3, 0, |
693 | prop.slant < rxvt_fontprop::italic |
696 | prop.slant < rxvt_fontprop::italic |
694 | ? "r" : "i"); // TODO: handle "o"blique, too |
697 | ? "r" : "i"); // TODO: handle "o"blique, too |
695 | set_name (strdup (fname)); |
698 | set_name (fname); |
696 | } |
699 | } |
697 | } |
700 | } |
698 | |
701 | |
699 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
702 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
700 | ? 0 : prop.height); |
703 | ? 0 : prop.height); |
… | |
… | |
725 | font_weight *fonts = new font_weight[count]; |
728 | font_weight *fonts = new font_weight[count]; |
726 | |
729 | |
727 | for (int i = 0; i < count; i++) |
730 | for (int i = 0; i < count; i++) |
728 | { |
731 | { |
729 | rxvt_fontprop p; |
732 | rxvt_fontprop p; |
730 | char fname[1024]; |
733 | char *fname; |
731 | |
734 | |
732 | int diff = 0; |
735 | int diff = 0; |
733 | |
736 | |
734 | if (replace_field (fname, list[i], 6, '0', field_str)) |
737 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
735 | diff += 10; // slightly penalize scalable fonts |
738 | diff += 10; // slightly penalize scalable fonts |
|
|
739 | else |
|
|
740 | { |
|
|
741 | free (fname); |
736 | else if (replace_field (fname, list[i], 11, '0', "0")) |
742 | if (replace_field (&fname, list[i], 11, '0', "0")) |
737 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
743 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
744 | } |
738 | |
745 | |
739 | if (!set_properties (p, fname)) |
746 | if (!set_properties (p, fname)) |
740 | continue; |
747 | continue; |
741 | |
748 | |
742 | if (prop.height != rxvt_fontprop::unset |
749 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
746 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
753 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
747 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
754 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
748 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
755 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
749 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
756 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
750 | |
757 | |
751 | fonts[i].name = strdup (fname); |
758 | fonts[i].name = fname; |
752 | fonts[i].diff = diff; |
759 | fonts[i].diff = diff; |
753 | } |
760 | } |
754 | |
761 | |
755 | XFreeFontNames (list); |
762 | XFreeFontNames (list); |
756 | |
763 | |
… | |
… | |
833 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
840 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
834 | |
841 | |
835 | if (encm) |
842 | if (encm) |
836 | N += (f->max_byte1 - f->min_byte1) |
843 | N += (f->max_byte1 - f->min_byte1) |
837 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
844 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
838 | |
845 | |
839 | while (N) |
846 | while (N) |
840 | { |
847 | { |
841 | if (f->per_char[N].width > width) |
848 | if (f->per_char[N].width > width) |
842 | width = f->per_char[N].width; |
849 | width = f->per_char[N].width; |
843 | |
850 | |
… | |
… | |
892 | void |
899 | void |
893 | rxvt_font_x11::clear () |
900 | rxvt_font_x11::clear () |
894 | { |
901 | { |
895 | if (f) |
902 | if (f) |
896 | { |
903 | { |
897 | XFreeFont (term->xdisp, f); |
904 | XFreeFont (term->dpy, f); |
898 | f = 0; |
905 | f = 0; |
899 | } |
906 | } |
900 | } |
907 | } |
901 | |
908 | |
902 | bool |
909 | bool |
… | |
… | |
995 | else |
1002 | else |
996 | { |
1003 | { |
997 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1004 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
998 | |
1005 | |
999 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1006 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1000 | |
1007 | |
1001 | if (slow) |
1008 | if (slow) |
1002 | { |
1009 | { |
1003 | do |
1010 | do |
1004 | { |
1011 | { |
1005 | if (xc->byte1 || xc->byte2) |
1012 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1027 | else |
1034 | else |
1028 | { |
1035 | { |
1029 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1036 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1030 | |
1037 | |
1031 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1038 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1032 | |
1039 | |
1033 | if (slow) |
1040 | if (slow) |
1034 | { |
1041 | { |
1035 | do |
1042 | do |
1036 | { |
1043 | { |
1037 | if (*xc) |
1044 | if (*xc) |
… | |
… | |
1057 | |
1064 | |
1058 | void clear (); |
1065 | void clear (); |
1059 | |
1066 | |
1060 | rxvt_fontprop properties (); |
1067 | rxvt_fontprop properties (); |
1061 | |
1068 | |
1062 | bool load (const rxvt_fontprop &prop); |
1069 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1063 | |
1070 | |
1064 | void draw (rxvt_drawable &d, int x, int y, |
1071 | void draw (rxvt_drawable &d, int x, int y, |
1065 | const text_t *text, int len, |
1072 | const text_t *text, int len, |
1066 | int fg, int bg); |
1073 | int fg, int bg); |
1067 | |
1074 | |
1068 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1075 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1069 | |
1076 | |
1070 | protected: |
1077 | protected: |
1071 | XftFont *f; |
1078 | XftFont *f; |
1072 | }; |
1079 | }; |
1073 | |
1080 | |
1074 | void |
1081 | void |
1075 | rxvt_font_xft::clear () |
1082 | rxvt_font_xft::clear () |
1076 | { |
1083 | { |
1077 | if (f) |
1084 | if (f) |
1078 | { |
1085 | { |
1079 | XftFontClose (term->xdisp, f); |
1086 | XftFontClose (term->dpy, f); |
1080 | f = 0; |
1087 | f = 0; |
1081 | } |
1088 | } |
1082 | } |
1089 | } |
1083 | |
1090 | |
1084 | rxvt_fontprop |
1091 | rxvt_fontprop |
… | |
… | |
1100 | |
1107 | |
1101 | return p; |
1108 | return p; |
1102 | } |
1109 | } |
1103 | |
1110 | |
1104 | bool |
1111 | bool |
1105 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1112 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1106 | { |
1113 | { |
1107 | dTermDisplay; |
1114 | dTermDisplay; |
1108 | |
1115 | |
1109 | clear (); |
1116 | clear (); |
1110 | |
1117 | |
… | |
… | |
1119 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1126 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1120 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1127 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1121 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1128 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1122 | |
1129 | |
1123 | if (prop.weight != rxvt_fontprop::unset |
1130 | if (prop.weight != rxvt_fontprop::unset |
1124 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1131 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1125 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1132 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1126 | |
1133 | |
1127 | if (prop.slant != rxvt_fontprop::unset |
1134 | if (prop.slant != rxvt_fontprop::unset |
1128 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1135 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1129 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1136 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1130 | |
1137 | |
1131 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1138 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1132 | // clip width, we can't do better, or can we? |
1139 | // clip width, we can't do better, or can we? |
1133 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1140 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1251 | bool |
1258 | bool |
1252 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1259 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1253 | { |
1260 | { |
1254 | careful = false; |
1261 | careful = false; |
1255 | |
1262 | |
1256 | if (!XftCharExists (term->xdisp, f, unicode)) |
1263 | if (!XftCharExists (term->dpy, f, unicode)) |
1257 | return false; |
1264 | return false; |
1258 | |
1265 | |
1259 | if (!prop || prop->width == rxvt_fontprop::unset) |
1266 | if (!prop || prop->width == rxvt_fontprop::unset) |
1260 | return true; |
1267 | return true; |
1261 | |
1268 | |
1262 | // check character against base font bounding box |
1269 | // check character against base font bounding box |
1263 | FcChar32 ch = unicode; |
1270 | FcChar32 ch = unicode; |
1264 | XGlyphInfo g; |
1271 | XGlyphInfo g; |
1265 | XftTextExtents32 (term->xdisp, f, &ch, 1, &g); |
1272 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1266 | |
1273 | |
1267 | int w = g.width - g.x; |
1274 | int w = g.width - g.x; |
1268 | int wcw = max (WCWIDTH (unicode), 1); |
1275 | int wcw = max (WCWIDTH (unicode), 1); |
1269 | |
1276 | |
1270 | careful = g.x > 0 || w > prop->width * wcw; |
1277 | careful = g.x > 0 || w > prop->width * wcw; |
… | |
… | |
1282 | void |
1289 | void |
1283 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1290 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1284 | const text_t *text, int len, |
1291 | const text_t *text, int len, |
1285 | int fg, int bg) |
1292 | int fg, int bg) |
1286 | { |
1293 | { |
1287 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
|
|
1288 | |
|
|
1289 | XGlyphInfo extents; |
1294 | XGlyphInfo extents; |
1290 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1295 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1291 | XftGlyphSpec *ep = enc; |
1296 | XftGlyphSpec *ep = enc; |
1292 | |
1297 | |
1293 | dTermDisplay; |
1298 | dTermDisplay; |
1294 | dTermGC; |
1299 | dTermGC; |
1295 | |
1300 | |
|
|
1301 | int w = term->fwidth * len; |
|
|
1302 | int h = term->fheight; |
|
|
1303 | |
|
|
1304 | /* |
|
|
1305 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1306 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1307 | */ |
|
|
1308 | bool buffered = bg >= Color_transparent; |
|
|
1309 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1310 | buffered = false; |
|
|
1311 | #endif |
|
|
1312 | |
1296 | // cut trailing spaces |
1313 | // cut trailing spaces |
1297 | while (len && text [len - 1] == ' ') |
1314 | while (len && text [len - 1] == ' ') |
1298 | len--; |
1315 | len--; |
1299 | |
1316 | |
|
|
1317 | int x_ = buffered ? 0 : x; |
|
|
1318 | int y_ = buffered ? 0 : y; |
|
|
1319 | |
1300 | while (len) |
1320 | while (len) |
1301 | { |
1321 | { |
1302 | int cwidth = term->fwidth; |
1322 | int cwidth = term->fwidth; |
1303 | FcChar32 fc = *text++; len--; |
1323 | FcChar32 fc = *text++; len--; |
1304 | |
1324 | |
1305 | while (len && *text == NOCHAR) |
1325 | while (len && *text == NOCHAR) |
1306 | text++, len--, cwidth += term->fwidth; |
1326 | text++, len--, cwidth += term->fwidth; |
1307 | |
1327 | |
1308 | if (fc != ' ') // skip spaces |
1328 | if (fc != ' ') // skip spaces |
1309 | { |
1329 | { |
1310 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1330 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1311 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1331 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1312 | |
1332 | |
1313 | ep->glyph = glyph; |
1333 | ep->glyph = glyph; |
1314 | ep->x = x + (cwidth - extents.xOff >> 1); |
1334 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1315 | ep->y = y + ascent; |
1335 | ep->y = y_ + ascent; |
1316 | |
1336 | |
1317 | if (extents.xOff == 0) |
1337 | if (extents.xOff == 0) |
1318 | ep->x = x + cwidth; |
1338 | ep->x = x_ + cwidth; |
1319 | |
1339 | |
1320 | ep++; |
1340 | ep++; |
1321 | } |
1341 | } |
1322 | |
1342 | |
1323 | x += cwidth; |
1343 | x_ += cwidth; |
|
|
1344 | } |
|
|
1345 | |
|
|
1346 | if (buffered) |
1324 | } |
1347 | { |
1325 | |
|
|
1326 | if (ep != enc) |
1348 | if (ep != enc) |
|
|
1349 | { |
|
|
1350 | bool back_rendered = false; |
|
|
1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1352 | |
|
|
1353 | #ifdef HAVE_BG_PIXMAP |
|
|
1354 | if (term->bgPixmap.pixmap) |
|
|
1355 | { |
|
|
1356 | Picture dst = 0; |
|
|
1357 | |
|
|
1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
|
|
1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1360 | else |
|
|
1361 | dst = XftDrawPicture (d2); |
|
|
1362 | |
|
|
1363 | if (dst) |
|
|
1364 | { |
|
|
1365 | int src_x = x, src_y = y; |
|
|
1366 | |
|
|
1367 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1368 | { |
|
|
1369 | src_x += term->window_vt_x; |
|
|
1370 | src_y += term->window_vt_y; |
|
|
1371 | } |
|
|
1372 | |
|
|
1373 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1374 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1375 | { |
|
|
1376 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1377 | src_x, src_y, w, h, 0, 0); |
|
|
1378 | } |
|
|
1379 | else |
|
|
1380 | { |
|
|
1381 | XGCValues gcv; |
|
|
1382 | |
|
|
1383 | gcv.fill_style = FillTiled; |
|
|
1384 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1385 | gcv.ts_x_origin = -src_x; |
|
|
1386 | gcv.ts_y_origin = -src_y; |
|
|
1387 | |
|
|
1388 | XChangeGC (disp, gc, |
|
|
1389 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1390 | &gcv); |
|
|
1391 | |
|
|
1392 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1393 | |
|
|
1394 | gcv.fill_style = FillSolid; |
|
|
1395 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1396 | } |
|
|
1397 | |
|
|
1398 | if (bg >= 0) |
|
|
1399 | { |
|
|
1400 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1401 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1402 | } |
|
|
1403 | |
|
|
1404 | back_rendered = true; |
|
|
1405 | } |
|
|
1406 | } |
|
|
1407 | #endif |
|
|
1408 | |
|
|
1409 | if (!back_rendered) |
|
|
1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
|
|
1411 | |
|
|
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1414 | } |
|
|
1415 | else |
|
|
1416 | clear_rect (d, x, y, w, h, bg); |
|
|
1417 | } |
|
|
1418 | else |
|
|
1419 | { |
|
|
1420 | clear_rect (d, x, y, w, h, bg); |
1327 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1421 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1422 | } |
1328 | } |
1423 | } |
|
|
1424 | |
1329 | #endif |
1425 | #endif |
1330 | |
1426 | |
1331 | ///////////////////////////////////////////////////////////////////////////// |
1427 | ///////////////////////////////////////////////////////////////////////////// |
1332 | |
1428 | |
1333 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1429 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
… | |
… | |
1344 | void |
1440 | void |
1345 | rxvt_fontset::clear () |
1441 | rxvt_fontset::clear () |
1346 | { |
1442 | { |
1347 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1443 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1348 | = rxvt_fontprop::unset; |
1444 | = rxvt_fontprop::unset; |
|
|
1445 | force_prop = false; |
1349 | |
1446 | |
1350 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1447 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1351 | FONT_UNREF (*i); |
1448 | FONT_UNREF (*i); |
1352 | |
1449 | |
1353 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1450 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1362 | |
1459 | |
1363 | rxvt_font * |
1460 | rxvt_font * |
1364 | rxvt_fontset::new_font (const char *name, codeset cs) |
1461 | rxvt_fontset::new_font (const char *name, codeset cs) |
1365 | { |
1462 | { |
1366 | rxvt_font *f; |
1463 | rxvt_font *f; |
1367 | |
1464 | |
1368 | if (!name || !*name) |
1465 | if (!name || !*name) |
1369 | { |
1466 | { |
1370 | name = ""; |
1467 | name = ""; |
1371 | f = new rxvt_font_default (this); |
1468 | f = new rxvt_font_default (this); |
1372 | } |
1469 | } |
… | |
… | |
1440 | if (!end) |
1537 | if (!end) |
1441 | end = desc + strlen (desc); |
1538 | end = desc + strlen (desc); |
1442 | |
1539 | |
1443 | if (end - desc < 511) |
1540 | if (end - desc < 511) |
1444 | { |
1541 | { |
1445 | strncpy (buf, desc, end - desc); |
1542 | memcpy (buf, desc, end - desc); |
1446 | buf[end - desc] = 0; |
1543 | buf[end - desc] = 0; |
1447 | |
1544 | |
1448 | fonts.push_back (new_font (buf, cs)); |
1545 | fonts.push_back (new_font (buf, cs)); |
1449 | } |
1546 | } |
1450 | else |
1547 | else |
… | |
… | |
1465 | if (fonts[i]->loaded) |
1562 | if (fonts[i]->loaded) |
1466 | return true; |
1563 | return true; |
1467 | |
1564 | |
1468 | fonts[i]->loaded = true; |
1565 | fonts[i]->loaded = true; |
1469 | |
1566 | |
1470 | if (!fonts[i]->load (prop)) |
1567 | if (!fonts[i]->load (prop, force_prop)) |
1471 | { |
1568 | { |
1472 | fonts[i]->cs = CS_UNKNOWN; |
1569 | fonts[i]->cs = CS_UNKNOWN; |
1473 | return false; |
1570 | return false; |
1474 | } |
1571 | } |
1475 | |
1572 | |
… | |
… | |
1576 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1673 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1577 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1674 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1578 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1675 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1579 | |
1676 | |
1580 | XftResult result; |
1677 | XftResult result; |
1581 | FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); |
1678 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1582 | |
1679 | |
1583 | FcPatternDestroy (p); |
1680 | FcPatternDestroy (p); |
1584 | |
1681 | |
1585 | if (match) |
1682 | if (match) |
1586 | { |
1683 | { |
… | |
… | |
1591 | if (find_font (font) < 0) |
1688 | if (find_font (font) < 0) |
1592 | { |
1689 | { |
1593 | char fontname[4096]; |
1690 | char fontname[4096]; |
1594 | sprintf (fontname, "xft:%-.4090s", font); |
1691 | sprintf (fontname, "xft:%-.4090s", font); |
1595 | |
1692 | |
1596 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1693 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1597 | } |
1694 | } |
1598 | |
1695 | |
1599 | free (font); |
1696 | free (font); |
1600 | } |
1697 | } |
1601 | #endif |
1698 | #endif |