1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2004 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 |
… | |
… | |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
89 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
89 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
90 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
90 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
91 | #endif |
91 | #endif |
92 | |
92 | |
93 | #if ENCODING_CN || ENCODING_CN_EXT |
93 | #if ENCODING_ZH || ENCODING_ZH_EXT |
94 | # if XFT |
94 | # if XFT |
|
|
95 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
|
|
96 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
|
|
97 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
95 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
98 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
96 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
99 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
97 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
100 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
98 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
101 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
99 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
102 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
100 | # endif |
103 | # endif |
|
|
104 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
101 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
105 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
102 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
106 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
103 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
107 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
|
|
108 | { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
104 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
109 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
105 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
110 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
106 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
111 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
107 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
112 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
108 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
113 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
… | |
… | |
125 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
130 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
126 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
131 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
127 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
132 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
128 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
133 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
129 | #if XFT |
134 | #if XFT |
130 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false"}, |
135 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, |
|
|
136 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
131 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
137 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
132 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, |
138 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, |
133 | { CS_UNICODE, "xft:Courier New:antialias=false" }, |
|
|
134 | |
139 | |
135 | // FreeMono is usually uglier than x fonts, so try last only. |
140 | // FreeMono is usually uglier than x fonts, so try last only. |
136 | { CS_UNICODE, "xft:FreeMono" }, |
141 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
137 | #endif |
142 | #endif |
138 | |
143 | |
139 | { CS_UNKNOWN, 0 } |
144 | { CS_UNKNOWN, 0 } |
140 | }; |
145 | }; |
141 | |
146 | |
142 | // these characters are used to guess the font height and width |
147 | // these characters are used to guess the font height and width |
143 | // pango uses a similar algorithm and eosn't trust the font either. |
148 | // pango uses a similar algorithm and doesn't trust the font either. |
144 | static uint16_t extent_test_chars[] = { |
149 | static uint16_t extent_test_chars[] = { |
145 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
150 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
146 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
151 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
147 | 0x304c, 0x672c, // が本 |
152 | 0x304c, 0x672c, // が本 |
148 | }; |
153 | }; |
… | |
… | |
326 | void |
331 | void |
327 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
332 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
328 | const text_t *text, int len, |
333 | const text_t *text, int len, |
329 | int fg, int bg) |
334 | int fg, int bg) |
330 | { |
335 | { |
|
|
336 | Display *disp = d.display->display; |
|
|
337 | |
331 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
338 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
332 | |
339 | |
333 | XSetForeground (d.display->display, TGC, r->pix_colors[fg]); |
340 | XSetForeground (disp, TGC, r->pix_colors[fg]); |
334 | |
341 | |
335 | while (len--) |
342 | while (len) |
336 | { |
343 | { |
337 | #if ENABLE_COMBINING |
344 | #if ENABLE_COMBINING |
338 | compose_char *cc; |
345 | compose_char *cc; |
339 | #endif |
346 | #endif |
|
|
347 | const text_t *tp = text; |
340 | text_t t = *text++; |
348 | text_t t = *tp; |
|
|
349 | |
|
|
350 | while (++text, --len && *text == NOCHAR) |
|
|
351 | ; |
|
|
352 | |
|
|
353 | int width = text - tp; |
|
|
354 | int fwidth = r->TermWin.fwidth * width; |
341 | |
355 | |
342 | if (0x2500 <= t && t <= 0x259f) |
356 | if (0x2500 <= t && t <= 0x259f) |
343 | { |
357 | { |
344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
345 | uint32_t *a = linedraw_command + (offs >> 4); |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
346 | uint32_t *b = a + (offs & 15); |
360 | uint32_t *b = a + (offs & 15); |
347 | |
361 | |
348 | int W = r->TermWin.fwidth; |
362 | int W = fwidth; |
349 | int H = r->TermWin.fheight; |
363 | int H = r->TermWin.fheight; |
350 | |
364 | |
351 | int x_[16]; |
365 | int x_[16]; |
352 | int y_[16]; |
366 | int y_[16]; |
353 | |
367 | |
… | |
… | |
362 | |
376 | |
363 | XGCValues gcv; |
377 | XGCValues gcv; |
364 | |
378 | |
365 | gcv.cap_style = CapButt; |
379 | gcv.cap_style = CapButt; |
366 | gcv.line_width = 0; |
380 | gcv.line_width = 0; |
367 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
381 | XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); |
368 | |
382 | |
369 | while (a < b) |
383 | while (a < b) |
370 | { |
384 | { |
371 | uint32_t command = *a++; |
385 | uint32_t command = *a++; |
372 | |
386 | |
… | |
… | |
379 | int y2 = y_[(command >> 0) & 15]; |
393 | int y2 = y_[(command >> 0) & 15]; |
380 | |
394 | |
381 | switch (op) |
395 | switch (op) |
382 | { |
396 | { |
383 | case 0: // line |
397 | case 0: // line |
384 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
398 | XDrawLine (disp, d, TGC, x1, y1, x2, y2); |
385 | break; |
399 | break; |
386 | |
400 | |
387 | case 1: // rectangle, possibly stippled |
401 | case 1: // rectangle, possibly stippled |
388 | if (a) |
402 | if (a) |
389 | { |
403 | { |
390 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
404 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
391 | |
405 | |
392 | gcv.fill_style = FillStippled; |
406 | gcv.fill_style = FillStippled; |
393 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
407 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
394 | gcv.ts_x_origin = x; |
408 | gcv.ts_x_origin = x; |
395 | gcv.ts_y_origin = y; |
409 | gcv.ts_y_origin = y; |
396 | |
410 | |
397 | XChangeGC (d.display->display, TGC, |
411 | XChangeGC (disp, TGC, |
398 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
412 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
399 | &gcv); |
413 | &gcv); |
400 | } |
414 | } |
401 | |
415 | |
402 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
416 | XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
403 | |
417 | |
404 | if (a) |
418 | if (a) |
405 | { |
419 | { |
406 | XFreePixmap (d.display->display, gcv.stipple); |
420 | XFreePixmap (disp, gcv.stipple); |
407 | gcv.stipple = 0; |
421 | gcv.stipple = 0; |
408 | gcv.fill_style = FillSolid; |
422 | gcv.fill_style = FillSolid; |
409 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
423 | XChangeGC (disp, TGC, GCFillStyle, &gcv); |
410 | } |
424 | } |
411 | break; |
425 | break; |
412 | case 2: // arc |
426 | case 2: // arc |
413 | XDrawArc (d.display->display, d, TGC, |
427 | XDrawArc (disp, d, TGC, |
414 | x1 - W/2, y1 - H/2, W-1, H-1, |
428 | x1 - W/2, y1 - H/2, W-1, H-1, |
415 | (a - 1) * 90*64, (b - 1) * 90*64); |
429 | (a - 1) * 90*64, (b - 1) * 90*64); |
416 | break; |
430 | break; |
417 | } |
431 | } |
418 | } |
432 | } |
419 | } |
433 | } |
420 | #if ENABLE_COMBINING |
434 | #if ENABLE_COMBINING |
421 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
435 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
422 | { |
436 | { |
|
|
437 | text_t chrs[2]; |
|
|
438 | width = min (2, width); |
|
|
439 | chrs [1] = NOCHAR; |
|
|
440 | |
|
|
441 | *chrs = cc->c1; |
423 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
442 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
424 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
443 | f1->draw (d, x, y, chrs, width, fg, bg); |
|
|
444 | |
425 | if (cc->c2 != NOCHAR) |
445 | if (cc->c2 != NOCHAR) |
426 | { |
446 | { |
|
|
447 | bool careful; |
|
|
448 | |
427 | // prefer font of first character, for no good reasons |
449 | // prefer font of first character, for no good reasons |
428 | bool careful; |
450 | *chrs = cc->c2; |
429 | rxvt_font *f2 = f1->has_char (cc->c2, 0, careful) |
451 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
430 | ? f1 |
452 | ? f1 |
431 | : (*fs)[fs->find_font (cc->c2)]; |
453 | : (*fs)[fs->find_font (cc->c2)]; |
432 | |
454 | |
433 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
455 | f2->draw (d, x, y, chrs, width, fg, -1); |
434 | } |
456 | } |
435 | } |
457 | } |
436 | #endif |
458 | #endif |
437 | else |
459 | else |
438 | switch (t) |
460 | switch (t) |
… | |
… | |
441 | case ZERO_WIDTH_CHAR: |
463 | case ZERO_WIDTH_CHAR: |
442 | case NOCHAR: |
464 | case NOCHAR: |
443 | break; |
465 | break; |
444 | |
466 | |
445 | default: |
467 | default: |
446 | int w = 0; |
|
|
447 | while (len > 0 && *text == NOCHAR) |
|
|
448 | { |
|
|
449 | ++text; |
|
|
450 | --len; |
|
|
451 | w += r->TermWin.fwidth; |
|
|
452 | } |
|
|
453 | |
|
|
454 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
468 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
455 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
469 | fwidth - 4, r->TermWin.fheight - 4); |
456 | x += w; |
|
|
457 | } |
470 | } |
458 | |
471 | |
459 | x += r->TermWin.fwidth; |
472 | x += fwidth; |
460 | } |
473 | } |
461 | } |
474 | } |
462 | |
475 | |
463 | ///////////////////////////////////////////////////////////////////////////// |
476 | ///////////////////////////////////////////////////////////////////////////// |
464 | |
477 | |
… | |
… | |
520 | |
533 | |
521 | bool |
534 | bool |
522 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
535 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
523 | { |
536 | { |
524 | unsigned long height; |
537 | unsigned long height; |
|
|
538 | |
|
|
539 | #if 0 |
525 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
540 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
526 | return false; |
541 | return false; |
|
|
542 | #else |
|
|
543 | height = f->ascent + f->descent; |
|
|
544 | #endif |
527 | |
545 | |
528 | unsigned long avgwidth; |
546 | unsigned long avgwidth; |
529 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
547 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
530 | avgwidth = 0; |
548 | avgwidth = 0; |
531 | |
549 | |
… | |
… | |
614 | } |
632 | } |
615 | |
633 | |
616 | bool |
634 | bool |
617 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
635 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
618 | { |
636 | { |
|
|
637 | Display *disp = DISPLAY; |
|
|
638 | |
619 | clear (); |
639 | clear (); |
620 | |
640 | |
621 | char field_str[64]; // enough for 128 bits |
641 | char field_str[64]; // enough for 128 bits |
622 | |
642 | |
623 | // first morph the font if required |
643 | // first morph the font if required |
… | |
… | |
626 | { |
646 | { |
627 | char fname[1024]; |
647 | char fname[1024]; |
628 | |
648 | |
629 | if (name[0] != '-') |
649 | if (name[0] != '-') |
630 | { |
650 | { |
631 | f = XLoadQueryFont (DISPLAY, name); |
651 | f = XLoadQueryFont (disp, name); |
632 | |
652 | |
633 | if (!f) |
653 | if (!f) |
634 | return false; |
654 | return false; |
635 | |
655 | |
636 | char *new_name = get_property (f, "FONT", name); |
656 | char *new_name = get_property (f, "FONT", name); |
… | |
… | |
638 | if (new_name) |
658 | if (new_name) |
639 | set_name (new_name); |
659 | set_name (new_name); |
640 | else |
660 | else |
641 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
661 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
642 | |
662 | |
643 | XFreeFont (DISPLAY, f); |
663 | XFreeFont (disp, f); |
644 | f = 0; |
664 | f = 0; |
645 | } |
665 | } |
646 | |
666 | |
647 | if (prop.weight != rxvt_fontprop::unset) |
667 | if (prop.weight != rxvt_fontprop::unset) |
648 | { |
668 | { |
… | |
… | |
659 | ? "r" : "i"); // TODO: handle "o"blique, too |
679 | ? "r" : "i"); // TODO: handle "o"blique, too |
660 | set_name (strdup (fname)); |
680 | set_name (strdup (fname)); |
661 | } |
681 | } |
662 | } |
682 | } |
663 | |
683 | |
|
|
684 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
|
|
685 | ? 0 : prop.height); |
|
|
686 | |
|
|
687 | struct font_weight { |
|
|
688 | char *name; |
|
|
689 | int diff; |
|
|
690 | |
|
|
691 | void clear () |
|
|
692 | { |
|
|
693 | name = 0; |
|
|
694 | diff = 0x7fffffff; |
|
|
695 | } |
|
|
696 | |
|
|
697 | font_weight () { clear (); } |
|
|
698 | ~font_weight () { free (name); } |
|
|
699 | }; |
|
|
700 | |
664 | char **list; |
701 | char **list; |
665 | int count; |
702 | int count; |
666 | list = XListFonts (DISPLAY, name, 1024, &count); |
703 | list = XListFonts (disp, name, 4000, &count); |
667 | |
704 | |
668 | set_name (0); |
705 | set_name (0); |
669 | |
706 | |
670 | if (!list) |
707 | if (!list) |
671 | return false; |
708 | return false; |
672 | |
709 | |
673 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
710 | font_weight *fonts = new font_weight[count]; |
674 | ? 0 : prop.height); |
|
|
675 | |
711 | |
676 | int bestdiff = 0x7fffffff; |
|
|
677 | for (int i = 0; i < count; i++) |
712 | for (int i = 0; i < count; i++) |
678 | { |
713 | { |
679 | rxvt_fontprop p; |
714 | rxvt_fontprop p; |
680 | char fname[1024]; |
715 | char fname[1024]; |
681 | |
716 | |
682 | int diff = 0; |
717 | int diff = 0; |
683 | |
718 | |
684 | if (replace_field (fname, list[i], 6, '0', field_str)) |
719 | if (replace_field (fname, list[i], 6, '0', field_str)) |
685 | diff += 10; // slightly penalize scalable fonts |
720 | diff += 10; // slightly penalize scalable fonts |
686 | |
721 | |
687 | if (!set_properties (p, fname)) |
722 | if (!set_properties (p, fname)) |
688 | continue; |
723 | continue; |
… | |
… | |
694 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
729 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
695 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
730 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
696 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
731 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
697 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
732 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
698 | |
733 | |
699 | if (!name // compare against best found so far |
734 | fonts[i].name = strdup (fname); |
700 | || diff < bestdiff) |
735 | fonts[i].diff = diff; |
701 | { |
|
|
702 | set_name (strdup (fname)); |
|
|
703 | bestdiff = diff; |
|
|
704 | } |
|
|
705 | } |
736 | } |
706 | |
737 | |
707 | XFreeFontNames (list); |
738 | XFreeFontNames (list); |
708 | |
739 | |
709 | if (!name) |
740 | // this loop only iterates when the guessed font-size is too small |
710 | return false; |
741 | for (;;) |
|
|
742 | { |
|
|
743 | font_weight *best = fonts + count - 1; |
711 | |
744 | |
712 | f = XLoadQueryFont (DISPLAY, name); |
745 | for (font_weight *w = best; w-- > fonts; ) |
|
|
746 | if (w->diff < best->diff) |
|
|
747 | best = w; |
|
|
748 | |
|
|
749 | if (!best->name |
|
|
750 | || !(f = XLoadQueryFont (disp, best->name))) |
|
|
751 | break; |
|
|
752 | |
|
|
753 | set_name (best->name); |
|
|
754 | best->clear (); |
|
|
755 | |
|
|
756 | ascent = f->ascent; |
|
|
757 | descent = f->descent; |
|
|
758 | height = ascent + descent; |
|
|
759 | |
|
|
760 | if (prop.height == rxvt_fontprop::unset |
|
|
761 | || height <= prop.height) |
|
|
762 | break; // font is ready for use |
|
|
763 | |
|
|
764 | // PIXEL_SIZE small enough, but real height too large |
|
|
765 | clear (); |
|
|
766 | } |
|
|
767 | |
|
|
768 | delete [] fonts; |
713 | |
769 | |
714 | if (!f) |
770 | if (!f) |
715 | return false; |
771 | return false; |
716 | |
772 | |
717 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
773 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
… | |
… | |
745 | if (cs == CS_UNICODE) |
801 | if (cs == CS_UNICODE) |
746 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
802 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
747 | |
803 | |
748 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
804 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
749 | enc2b = encm || f->max_char_or_byte2 > 255; |
805 | enc2b = encm || f->max_char_or_byte2 > 255; |
750 | |
|
|
751 | ascent = f->ascent; |
|
|
752 | descent = f->descent; |
|
|
753 | height = ascent + descent; |
|
|
754 | |
806 | |
755 | slow = false; |
807 | slow = false; |
756 | |
808 | |
757 | #if 1 // only used for slow detection, TODO optimize |
809 | #if 1 // only used for slow detection, TODO optimize |
758 | if (f->min_bounds.width == f->max_bounds.width) |
810 | if (f->min_bounds.width == f->max_bounds.width) |
… | |
… | |
1032 | } |
1084 | } |
1033 | |
1085 | |
1034 | bool |
1086 | bool |
1035 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1087 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1036 | { |
1088 | { |
|
|
1089 | Display *disp = DISPLAY; |
|
|
1090 | |
1037 | clear (); |
1091 | clear (); |
1038 | |
1092 | |
1039 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1093 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1040 | |
1094 | |
1041 | if (!p) |
1095 | if (!p) |
1042 | return false; |
1096 | return false; |
1043 | |
1097 | |
1044 | FcValue v; |
1098 | FcValue v; |
1045 | |
1099 | |
1046 | if (prop.height != rxvt_fontprop::unset |
1100 | if (prop.height != rxvt_fontprop::unset |
1047 | && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
1101 | || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
|
|
1102 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1048 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1103 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1049 | |
1104 | |
1050 | if (prop.weight != rxvt_fontprop::unset |
1105 | if (prop.weight != rxvt_fontprop::unset |
1051 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1106 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1052 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1107 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
… | |
… | |
1066 | |
1121 | |
1067 | // store generated name so iso14755 view gives better results |
1122 | // store generated name so iso14755 view gives better results |
1068 | set_name ((char *)FcNameUnparse (p)); |
1123 | set_name ((char *)FcNameUnparse (p)); |
1069 | |
1124 | |
1070 | XftResult result; |
1125 | XftResult result; |
1071 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1126 | FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); |
1072 | |
1127 | |
1073 | FcPatternDestroy (p); |
1128 | FcPatternDestroy (p); |
1074 | |
1129 | |
1075 | if (!match) |
1130 | if (!match) |
1076 | return false; |
1131 | return false; |
… | |
… | |
1078 | int ftheight = 0; |
1133 | int ftheight = 0; |
1079 | bool success = true; |
1134 | bool success = true; |
1080 | |
1135 | |
1081 | for (;;) |
1136 | for (;;) |
1082 | { |
1137 | { |
1083 | f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); |
1138 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1084 | |
1139 | |
1085 | if (!f) |
1140 | if (!f) |
1086 | { |
1141 | { |
1087 | success = false; |
1142 | success = false; |
1088 | break; |
1143 | break; |
… | |
… | |
1112 | bool careful; |
1167 | bool careful; |
1113 | if (!has_char (*t, &prop, careful)) |
1168 | if (!has_char (*t, &prop, careful)) |
1114 | continue; |
1169 | continue; |
1115 | |
1170 | |
1116 | XGlyphInfo g; |
1171 | XGlyphInfo g; |
1117 | XftTextExtents16 (DISPLAY, f, &ch, 1, &g); |
1172 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1118 | |
1173 | |
1119 | int wcw = wcwidth (ch); |
1174 | int wcw = wcwidth (ch); |
1120 | if (wcw > 0) g.width = g.width / wcw; |
1175 | if (wcw > 0) g.width = g.width / wcw; |
1121 | |
1176 | |
1122 | if (width < g.width) width = g.width; |
1177 | if (width < g.width) width = g.width; |
… | |
… | |
1139 | ftheight -= height - prop.height; |
1194 | ftheight -= height - prop.height; |
1140 | } |
1195 | } |
1141 | else |
1196 | else |
1142 | ftheight = prop.height - 1; |
1197 | ftheight = prop.height - 1; |
1143 | |
1198 | |
1144 | XftFontClose (DISPLAY, f); |
1199 | XftFontClose (disp, f); |
1145 | FcPatternDel (match, FC_PIXEL_SIZE); |
1200 | FcPatternDel (match, FC_PIXEL_SIZE); |
1146 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1201 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1147 | } |
1202 | } |
1148 | |
1203 | |
1149 | FcPatternDestroy (match); |
1204 | FcPatternDestroy (match); |
… | |
… | |
1264 | } |
1319 | } |
1265 | |
1320 | |
1266 | void |
1321 | void |
1267 | rxvt_fontset::clear () |
1322 | rxvt_fontset::clear () |
1268 | { |
1323 | { |
|
|
1324 | prop.width = prop.height = prop.weight = prop.slant |
|
|
1325 | = rxvt_fontprop::unset; |
|
|
1326 | |
1269 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1327 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1270 | FONT_UNREF (*i); |
1328 | FONT_UNREF (*i); |
1271 | |
1329 | |
1272 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1330 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1273 | delete *p; |
1331 | delete *p; |
… | |
… | |
1323 | char buf[512]; |
1381 | char buf[512]; |
1324 | const char *end; |
1382 | const char *end; |
1325 | |
1383 | |
1326 | do |
1384 | do |
1327 | { |
1385 | { |
1328 | while (*desc <= ' ') desc++; |
1386 | while (*desc && *desc <= ' ') |
|
|
1387 | desc++; |
1329 | |
1388 | |
1330 | codeset cs = CS_UNICODE; |
1389 | codeset cs = CS_UNICODE; |
1331 | |
1390 | |
1332 | if (*desc == '[') |
1391 | if (*desc == '[') |
1333 | { |
1392 | { |
… | |
… | |
1393 | |
1452 | |
1394 | return true; |
1453 | return true; |
1395 | } |
1454 | } |
1396 | |
1455 | |
1397 | bool |
1456 | bool |
1398 | rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) |
1457 | rxvt_fontset::populate (const char *desc) |
1399 | { |
1458 | { |
1400 | clear (); |
1459 | clear (); |
1401 | |
1460 | |
1402 | fontdesc = strdup (desc); |
1461 | fontdesc = strdup (desc); |
1403 | |
1462 | |
1404 | fonts.push_back (new_font (0, CS_UNICODE)); |
1463 | fonts.push_back (new_font (0, CS_UNICODE)); |
1405 | realize_font (0); |
1464 | realize_font (0); |
1406 | |
|
|
1407 | this->prop = prop; |
|
|
1408 | |
1465 | |
1409 | add_fonts (desc); |
1466 | add_fonts (desc); |
1410 | |
1467 | |
1411 | return true; |
1468 | return true; |
1412 | } |
1469 | } |
… | |
… | |
1493 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1550 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1494 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1551 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1495 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1552 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1496 | |
1553 | |
1497 | XftResult result; |
1554 | XftResult result; |
1498 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1555 | FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); |
1499 | |
1556 | |
1500 | FcPatternDestroy (p); |
1557 | FcPatternDestroy (p); |
1501 | |
1558 | |
1502 | if (match) |
1559 | if (match) |
1503 | { |
1560 | { |