… | |
… | |
73 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
73 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
74 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
74 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
75 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
75 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
76 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
76 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
77 | # endif |
77 | # endif |
|
|
78 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0 }, |
78 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, |
79 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
79 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, |
80 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
80 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, |
81 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
81 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, |
82 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
82 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, |
83 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
83 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, |
84 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
84 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, |
85 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
85 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, |
86 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
86 | #endif |
87 | #endif |
87 | |
88 | |
88 | #if XFT |
89 | #if XFT |
89 | { CS_UNICODE, "xft:Andale Mono" }, |
90 | { CS_UNICODE, "xft:Andale Mono" }, |
90 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
91 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
… | |
… | |
337 | rxvt_font_x11 () { f = 0; } |
338 | rxvt_font_x11 () { f = 0; } |
338 | |
339 | |
339 | void clear (); |
340 | void clear (); |
340 | |
341 | |
341 | rxvt_fontprop properties (); |
342 | rxvt_fontprop properties (); |
342 | rxvt_fontprop properties (XFontStruct *f); |
|
|
343 | |
343 | |
344 | bool load (const rxvt_fontprop &prop); |
344 | bool load (const rxvt_fontprop &prop); |
345 | |
345 | |
346 | bool has_codepoint (uint32_t unicode); |
346 | bool has_codepoint (uint32_t unicode); |
347 | |
347 | |
… | |
… | |
352 | XFontStruct *f; |
352 | XFontStruct *f; |
353 | codeset cs; |
353 | codeset cs; |
354 | bool enc2b, encm; |
354 | bool enc2b, encm; |
355 | |
355 | |
356 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
356 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
|
|
357 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
|
|
358 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
|
|
359 | bool set_properties (rxvt_fontprop &p, const char *name); |
357 | }; |
360 | }; |
358 | |
361 | |
359 | const char * |
362 | const char * |
360 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
363 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
361 | { |
364 | { |
… | |
… | |
368 | } |
371 | } |
369 | |
372 | |
370 | rxvt_fontprop |
373 | rxvt_fontprop |
371 | rxvt_font_x11::properties () |
374 | rxvt_font_x11::properties () |
372 | { |
375 | { |
373 | return properties (f); |
|
|
374 | } |
|
|
375 | |
|
|
376 | rxvt_fontprop |
|
|
377 | rxvt_font_x11::properties (XFontStruct *f) |
|
|
378 | { |
|
|
379 | rxvt_fontprop p; |
376 | rxvt_fontprop p; |
|
|
377 | set_properties (p, f); |
|
|
378 | return p; |
|
|
379 | } |
380 | |
380 | |
|
|
381 | bool |
|
|
382 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
|
|
383 | { |
|
|
384 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
|
|
385 | p.height = height; |
|
|
386 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
387 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
388 | |
|
|
389 | return true; |
|
|
390 | } |
|
|
391 | |
|
|
392 | bool |
|
|
393 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
|
|
394 | { |
381 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
395 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
382 | const char *slant = get_property (f, "SLANT", "r"); |
396 | const char *slant = get_property (f, "SLANT", "r"); |
383 | |
397 | |
|
|
398 | unsigned long height; |
|
|
399 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
|
|
400 | return false; |
|
|
401 | |
384 | unsigned long avgwidth; |
402 | unsigned long avgwidth; |
385 | p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth) |
403 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
386 | ? avgwidth / 10 |
404 | avgwidth = 0; |
387 | : (height + 1) / 2; |
|
|
388 | p.height = height; |
|
|
389 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
390 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
391 | |
405 | |
392 | return p; |
406 | return set_properties (p, height, weight, slant, avgwidth); |
|
|
407 | } |
|
|
408 | |
|
|
409 | bool |
|
|
410 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
|
|
411 | { |
|
|
412 | int slashes = 0; |
|
|
413 | const char *comp[12]; |
|
|
414 | |
|
|
415 | for (const char *c = name; *c; c++) |
|
|
416 | if (*c == '-') |
|
|
417 | { |
|
|
418 | comp[slashes++] = c + 1; |
|
|
419 | if (slashes >= 13) |
|
|
420 | break; |
|
|
421 | } |
|
|
422 | |
|
|
423 | /* can we short-circuit the costly XLoadQueryFont? */ |
|
|
424 | if (slashes >= 13 |
|
|
425 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
|
|
426 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
|
|
427 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
|
|
428 | |
|
|
429 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
|
|
430 | |
|
|
431 | if (f) |
|
|
432 | { |
|
|
433 | // the font should really exists now. if not, we have a problem |
|
|
434 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
|
|
435 | // in that case, just return garbage. |
|
|
436 | bool ret = set_properties (p, f); |
|
|
437 | XFreeFont (DISPLAY, f); |
|
|
438 | return ret; |
|
|
439 | } |
|
|
440 | else |
|
|
441 | return false; |
|
|
442 | } |
|
|
443 | |
|
|
444 | // fix the size of scalable fonts |
|
|
445 | static void |
|
|
446 | fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) |
|
|
447 | { |
|
|
448 | int slashes = 0; |
|
|
449 | const char *size; |
|
|
450 | |
|
|
451 | for (const char *c = name; *c; c++) |
|
|
452 | if (*c == '-') |
|
|
453 | { |
|
|
454 | if (slashes == 6) |
|
|
455 | size = c + 1; |
|
|
456 | |
|
|
457 | if (++slashes >= 13) |
|
|
458 | break; |
|
|
459 | } |
|
|
460 | |
|
|
461 | if (slashes >= 13 && size[0] == '0') |
|
|
462 | { |
|
|
463 | strncpy (buf, name, size - name); |
|
|
464 | buf += size - name; |
|
|
465 | buf += sprintf (buf, "%d", prop.height); |
|
|
466 | strcpy (buf, size + 1); |
|
|
467 | } |
|
|
468 | else |
|
|
469 | strcpy (buf, name); |
393 | } |
470 | } |
394 | |
471 | |
395 | bool |
472 | bool |
396 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
473 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
397 | { |
474 | { |
398 | clear (); |
475 | clear (); |
399 | |
476 | |
400 | char **list; |
477 | char **list; |
401 | int count; |
478 | int count; |
402 | XFontStruct *info; |
|
|
403 | list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); |
479 | list = XListFonts (DISPLAY, name, 512, &count); |
|
|
480 | set_name (0); |
404 | |
481 | |
405 | if (!list) |
482 | if (!list) |
406 | return false; |
483 | return false; |
407 | |
484 | |
408 | int bestdiff = 0x7fffffff; |
485 | int bestdiff = 0x7fffffff; |
409 | XFontStruct *best = 0; |
|
|
410 | for (int i = 0; i < count; i++) |
486 | for (int i = 0; i < count; i++) |
411 | { |
487 | { |
412 | XFontStruct *f = info + i; |
488 | rxvt_fontprop p; |
|
|
489 | char fname[1024]; |
|
|
490 | fix_scalable (fname, list[i], prop); |
413 | |
491 | |
|
|
492 | if (!set_properties (p, fname)) |
|
|
493 | continue; |
|
|
494 | |
414 | if (f->ascent + f->descent <= prop.height) // weed out too large fonts |
495 | if (p.height > prop.height) // weed out too large fonts |
415 | { |
496 | continue; |
416 | rxvt_fontprop p = properties (f); |
497 | |
417 | int diff = (prop.height - f->ascent + f->descent) * 32 |
498 | int diff = (prop.height - p.height) * 32 |
418 | + abs (prop.weight - p.weight) |
499 | + abs (prop.weight - p.weight) |
419 | + abs (prop.slant - p.slant ); |
500 | + abs (prop.slant - p.slant ); |
420 | |
501 | |
421 | if (!best // compare against best found so far |
502 | if (!name // compare against best found so far |
422 | || diff < bestdiff) |
503 | || diff < bestdiff) |
423 | { |
504 | { |
424 | best = f; |
505 | set_name (strdup (fname)); |
425 | bestdiff = diff; |
506 | bestdiff = diff; |
426 | } |
507 | } |
427 | } |
|
|
428 | } |
508 | } |
429 | |
509 | |
|
|
510 | XFreeFontNames (list); |
|
|
511 | |
430 | if (!best) |
512 | if (!name) |
431 | return false; |
513 | return false; |
432 | |
|
|
433 | set_name (strdup (list[best - info])); |
|
|
434 | |
|
|
435 | XFreeFontInfo (list, info, count); |
|
|
436 | |
514 | |
437 | f = XLoadQueryFont (DISPLAY, name); |
515 | f = XLoadQueryFont (DISPLAY, name); |
438 | |
516 | |
439 | if (!f) |
517 | if (!f) |
440 | return false; |
518 | return false; |
… | |
… | |
736 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
814 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
737 | |
815 | |
738 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
816 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
739 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
817 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
740 | |
818 | |
|
|
819 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
741 | // clip width, we can't do better, or can we? |
820 | // clip width, we can't do better, or can we? |
742 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
821 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
743 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
822 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
|
|
823 | #endif |
744 | |
824 | |
745 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
825 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
746 | |
826 | |
747 | XftResult result; |
827 | XftResult result; |
748 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
828 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
… | |
… | |
823 | if (bg >= 0 && bg != Color_bg) |
903 | if (bg >= 0 && bg != Color_bg) |
824 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
904 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
825 | else |
905 | else |
826 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
906 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
827 | |
907 | |
828 | if (!slow && width == r->TermWin.fwidth) |
908 | if (!slow && width == r->TermWin.fwidth && 0) |
829 | { |
909 | { |
830 | if (sizeof (text_t) == sizeof (FcChar16)) |
910 | if (sizeof (text_t) == sizeof (FcChar16)) |
831 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
911 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
832 | else |
912 | else |
833 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
913 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
… | |
… | |
836 | { |
916 | { |
837 | while (len) |
917 | while (len) |
838 | { |
918 | { |
839 | if (*text != NOCHAR && *text != ' ') |
919 | if (*text != NOCHAR && *text != ' ') |
840 | { |
920 | { |
|
|
921 | int fwidth = r->TermWin.fwidth; |
|
|
922 | if (len >= 2 && text[1] == NOCHAR) |
|
|
923 | fwidth *= 2; |
|
|
924 | |
|
|
925 | XGlyphInfo extents; |
841 | if (sizeof (text_t) == sizeof (FcChar16)) |
926 | if (sizeof (text_t) == sizeof (FcChar16)) |
842 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
927 | { |
|
|
928 | XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); |
|
|
929 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
930 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
|
|
931 | } |
843 | else |
932 | else |
844 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
933 | { |
|
|
934 | XGlyphInfo extents; |
|
|
935 | XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); |
|
|
936 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
937 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
|
|
938 | } |
845 | } |
939 | } |
846 | |
940 | |
847 | x += r->TermWin.fwidth; |
941 | x += r->TermWin.fwidth; |
848 | text++; |
942 | text++; |
849 | len--; |
943 | len--; |
… | |
… | |
997 | base_id = 1; |
1091 | base_id = 1; |
998 | |
1092 | |
999 | // we currently need a base-font, no matter what |
1093 | // we currently need a base-font, no matter what |
1000 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1094 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1001 | { |
1095 | { |
|
|
1096 | puts ("unable to load specified font(s), falling back to 'fixed'\n"); |
1002 | add_fonts ("fixed"); |
1097 | add_fonts ("fixed"); |
1003 | base_id = fonts.size () - 1; |
1098 | base_id = fonts.size () - 1; |
1004 | } |
1099 | } |
1005 | |
1100 | |
1006 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1101 | if (fonts.size () <= base_id || !realize_font (base_id)) |