… | |
… | |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "defaultfont.h" |
24 | #include "defaultfont.h" |
25 | |
25 | |
26 | #include <cstdlib> |
26 | #include <cstdlib> |
27 | |
27 | |
28 | #define DISPLAY r->Xdisplay |
28 | #define DISPLAY r->display->display |
29 | #define DRAWABLE r->TermWin.vt |
29 | #define DRAWABLE r->TermWin.vt |
30 | #define GC r->TermWin.gc |
30 | #define GC r->TermWin.gc |
31 | |
31 | |
32 | const struct rxvt_fallback_font { |
32 | const struct rxvt_fallback_font { |
33 | codeset cs; |
33 | codeset cs; |
… | |
… | |
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" }, |
… | |
… | |
102 | |
103 | |
103 | static void *enc_buf; |
104 | static void *enc_buf; |
104 | static uint32_t enc_len; |
105 | static uint32_t enc_len; |
105 | |
106 | |
106 | static inline void * |
107 | static inline void * |
107 | get_enc_buf (int len) |
108 | get_enc_buf (uint32_t len) |
108 | { |
109 | { |
109 | if (len > enc_len) |
110 | if (len > enc_len) |
110 | { |
111 | { |
111 | free (enc_buf); |
112 | free (enc_buf); |
112 | enc_buf = malloc (len); |
113 | enc_buf = malloc (len); |
… | |
… | |
114 | |
115 | |
115 | return enc_buf; |
116 | return enc_buf; |
116 | } |
117 | } |
117 | |
118 | |
118 | static const char * |
119 | static const char * |
119 | enc_char (const text_t *text, int len, codeset cs, bool &zero) |
120 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
120 | { |
121 | { |
121 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
122 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
122 | |
123 | |
123 | while (len--) |
124 | while (len--) |
124 | { |
125 | { |
… | |
… | |
135 | |
136 | |
136 | return (const char *)enc_buf; |
137 | return (const char *)enc_buf; |
137 | } |
138 | } |
138 | |
139 | |
139 | static const XChar2b * |
140 | static const XChar2b * |
140 | enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) |
141 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
141 | { |
142 | { |
142 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
143 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
143 | |
144 | |
144 | while (len--) |
145 | while (len--) |
145 | { |
146 | { |
… | |
… | |
427 | |
428 | |
428 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
429 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
429 | |
430 | |
430 | if (f) |
431 | if (f) |
431 | { |
432 | { |
432 | // the font should really exists now. if not, we have a problem |
433 | // the font should really exist now. if not, we have a problem |
433 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
434 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
434 | // in that case, just return garbage. |
435 | // in that case, just return garbage. |
435 | bool ret = set_properties (p, f); |
436 | bool ret = set_properties (p, f); |
436 | XFreeFont (DISPLAY, f); |
437 | XFreeFont (DISPLAY, f); |
437 | return ret; |
438 | return ret; |
… | |
… | |
514 | f = XLoadQueryFont (DISPLAY, name); |
515 | f = XLoadQueryFont (DISPLAY, name); |
515 | |
516 | |
516 | if (!f) |
517 | if (!f) |
517 | return false; |
518 | return false; |
518 | |
519 | |
519 | unsigned long value; |
|
|
520 | |
|
|
521 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
520 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
522 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
521 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
523 | |
522 | |
524 | if (registry && encoding) |
523 | if (registry && encoding) |
525 | { |
524 | { |
… | |
… | |
611 | /* check wether the character exists in _this_ font. horrible. */ |
610 | /* check wether the character exists in _this_ font. horrible. */ |
612 | XCharStruct *xcs; |
611 | XCharStruct *xcs; |
613 | |
612 | |
614 | if (encm) |
613 | if (encm) |
615 | { |
614 | { |
616 | int byte1 = ch >> 8; |
615 | unsigned char byte1 = ch >> 8; |
617 | int byte2 = ch & 255; |
616 | unsigned char byte2 = ch & 255; |
618 | |
617 | |
619 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
618 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
620 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
619 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
621 | return false; |
620 | return false; |
622 | |
621 | |
… | |
… | |
892 | rxvt_font_xft::draw (int x, int y, |
891 | rxvt_font_xft::draw (int x, int y, |
893 | const text_t *text, int len, |
892 | const text_t *text, int len, |
894 | int fg, int bg) |
893 | int fg, int bg) |
895 | { |
894 | { |
896 | if (!d) |
895 | if (!d) |
897 | { |
896 | d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap); |
898 | dR; |
|
|
899 | d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); |
|
|
900 | } |
|
|
901 | |
897 | |
902 | if (bg >= 0 && bg != Color_bg) |
898 | if (bg >= 0 && bg != Color_bg) |
903 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
899 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
904 | else |
900 | else |
905 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
901 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
… | |
… | |
946 | #endif |
942 | #endif |
947 | |
943 | |
948 | ///////////////////////////////////////////////////////////////////////////// |
944 | ///////////////////////////////////////////////////////////////////////////// |
949 | |
945 | |
950 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
946 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
951 | #ifdef EXPLICIT_CONTEXT |
|
|
952 | : r(r) |
947 | : r (r) |
953 | #endif |
|
|
954 | { |
948 | { |
955 | clear (); |
949 | clear (); |
956 | } |
950 | } |
957 | |
951 | |
958 | rxvt_fontset::~rxvt_fontset () |
952 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
961 | } |
955 | } |
962 | |
956 | |
963 | void |
957 | void |
964 | rxvt_fontset::clear () |
958 | rxvt_fontset::clear () |
965 | { |
959 | { |
966 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
960 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
967 | FONT_UNREF (*i); |
961 | FONT_UNREF (*i); |
968 | |
962 | |
969 | fonts.clear (); |
963 | fonts.clear (); |
970 | base_id = 0; |
964 | base_id = 0; |
971 | base_prop.height = 0x7fffffff; |
965 | base_prop.height = 0x7fffffff; |
… | |
… | |
1025 | |
1019 | |
1026 | if (*desc == '[') |
1020 | if (*desc == '[') |
1027 | { |
1021 | { |
1028 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1022 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1029 | |
1023 | |
1030 | const char *extra = desc++; |
1024 | //const char *extra = desc++; // not yet used |
1031 | |
1025 | |
1032 | desc = strchr (desc, ']'); |
1026 | desc = strchr (desc, ']'); |
1033 | |
1027 | |
1034 | if (!desc) |
1028 | if (!desc) |
1035 | { |
1029 | { |
… | |
… | |
1088 | |
1082 | |
1089 | if (!base_id) |
1083 | if (!base_id) |
1090 | base_id = 1; |
1084 | base_id = 1; |
1091 | |
1085 | |
1092 | // we currently need a base-font, no matter what |
1086 | // we currently need a base-font, no matter what |
1093 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1087 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1094 | { |
1088 | { |
1095 | puts ("unable to load specified font(s), falling back to 'fixed'\n"); |
1089 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
1096 | add_fonts ("fixed"); |
1090 | add_fonts ("fixed"); |
1097 | base_id = fonts.size () - 1; |
1091 | base_id = fonts.size () - 1; |
1098 | } |
1092 | } |
1099 | |
1093 | |
1100 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1094 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1101 | { |
1095 | { |
1102 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
1096 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
1103 | exit (1); |
1097 | exit (1); |
1104 | } |
1098 | } |
1105 | |
1099 | |
… | |
… | |
1107 | } |
1101 | } |
1108 | |
1102 | |
1109 | int |
1103 | int |
1110 | rxvt_fontset::find_font (uint32_t unicode) |
1104 | rxvt_fontset::find_font (uint32_t unicode) |
1111 | { |
1105 | { |
1112 | for (int i = 0; i < fonts.size (); i++) |
1106 | for (unsigned int i = 0; i < fonts.size (); i++) |
1113 | { |
1107 | { |
1114 | rxvt_font *f = fonts[i]; |
1108 | rxvt_font *f = fonts[i]; |
1115 | |
1109 | |
1116 | if (!f->loaded) |
1110 | if (!f->loaded) |
1117 | { |
1111 | { |