--- rxvt-unicode/src/table/iso8859_7.h 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/table/iso8859_7.h 2004/03/15 00:27:13 1.3 @@ -14,19 +14,9 @@ 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe }; -static const uint16_t iso8859_7_t_0[] = { - 0x00a0, 0x2018, 0x2019, 0x00a3, 0x0000, 0x0000, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x0000, 0x00ab, - 0x00ac, 0x00ad, 0x0000, 0x2015, 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x0384, 0x0385, 0x0386, 0x00b7, - 0x0388, 0x0389, 0x038a, 0x00bb, 0x038c, 0x00bd, 0x038e, 0x038f, 0x0390, 0x0391, 0x0392, 0x0393, - 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, - 0x03a0, 0x03a1, 0x0000, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, 0x03aa, 0x03ab, - 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, - 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0, 0x03c1, 0x03c2, 0x03c3, - 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce -}; struct rxvt_codeset_conv_iso8859_7 : rxvt_codeset_conv { - uint32_t from_unicode (uint32_t unicode) const { + uint32_t from_unicode (unicode_t unicode) const { if (unicode <= 0x009f) return unicode; if (unicode == 0x2015) return 0x00af; if (unicode == 0x2018) return 0x00a1; @@ -37,12 +27,6 @@ return iso8859_7_f_768[unicode - 0x0384] == 0 ? NOCHAR : iso8859_7_f_768[unicode - 0x0384]; return NOCHAR; } - uint32_t to_unicode (uint32_t enc) const { - if (enc <= 0x009f) return enc; - if (0x00a0 <= enc && enc <= 0x00fe) - return iso8859_7_t_0[enc - 0x00a0] == 0 ? NOCHAR : iso8859_7_t_0[enc - 0x00a0]; - return NOCHAR; - } } rxvt_codeset_conv_iso8859_7; #else