--- rxvt-unicode/src/table/iso8859_6.h 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/table/iso8859_6.h 2004/03/15 00:27:13 1.3 @@ -10,18 +10,9 @@ 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2 }; -static const uint16_t iso8859_6_t_0[] = { - 0x00a0, 0x0000, 0x0000, 0x0000, 0x00a4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x060c, 0x00ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, 0x0000, 0x0621, 0x0622, 0x0623, - 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063a, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, - 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651, 0x0652 -}; struct rxvt_codeset_conv_iso8859_6 : 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 == 0x00a0) return 0x00a0; if (unicode == 0x00a4) return 0x00a4; @@ -30,12 +21,6 @@ return iso8859_6_f_1536[unicode - 0x060c] == 0 ? NOCHAR : iso8859_6_f_1536[unicode - 0x060c]; return NOCHAR; } - uint32_t to_unicode (uint32_t enc) const { - if (enc <= 0x009f) return enc; - if (0x00a0 <= enc && enc <= 0x00f2) - return iso8859_6_t_0[enc - 0x00a0] == 0 ? NOCHAR : iso8859_6_t_0[enc - 0x00a0]; - return NOCHAR; - } } rxvt_codeset_conv_iso8859_6; #else