--- rxvt-unicode/src/table/iso8859_2.h 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/table/iso8859_2.h 2004/08/04 03:29:29 1.4 @@ -21,19 +21,8 @@ 0xde, 0xfe, 0xab, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0xf9, 0xdb, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0xbc, 0xaf, 0xbf, 0xae, 0xbe }; -static const uint16_t iso8859_2_t_0[] = { - 0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, 0x00a8, 0x0160, 0x015e, 0x0164, - 0x0179, 0x00ad, 0x017d, 0x017b, 0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7, - 0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, 0x0154, 0x00c1, 0x00c2, 0x0102, - 0x00c4, 0x0139, 0x0106, 0x00c7, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, - 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, 0x0158, 0x016e, 0x00da, 0x0170, - 0x00dc, 0x00dd, 0x0162, 0x00df, 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, - 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, 0x0111, 0x0144, 0x0148, 0x00f3, - 0x00f4, 0x0151, 0x00f6, 0x00f7, 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9 -}; -struct rxvt_codeset_conv_iso8859_2 : rxvt_codeset_conv { - uint32_t from_unicode (uint32_t unicode) const { +static uint32_t cs_iso8859_2_from_unicode (unicode_t unicode) { if (unicode <= 0x009f) return unicode; if (unicode == 0x02c7) return 0x00b7; if (unicode == 0x02d8) return 0x00a2; @@ -45,17 +34,11 @@ if (0x0102 <= unicode && unicode <= 0x017e) return iso8859_2_f_256[unicode - 0x0102] == 0 ? NOCHAR : iso8859_2_f_256[unicode - 0x0102]; return NOCHAR; - } - uint32_t to_unicode (uint32_t enc) const { - if (enc <= 0x009f) return enc; - if (0x00a0 <= enc && enc <= 0x00ff) - return iso8859_2_t_0[enc - 0x00a0]; - return NOCHAR; - } -} rxvt_codeset_conv_iso8859_2; +} #else -#define rxvt_codeset_conv_iso8859_2 rxvt_codeset_conv_unknown +#define cs_iso8859_2_from_unicode cs_unknown_from_unicode +#define cs_iso8859_2_to_unicode cs_unknown_to_unicode #endif