ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/encoding.C
(Generate patch)

Comparing rxvt-unicode/src/encoding.C (file contents):
Revision 1.25 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.30 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

… …
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include "../config.h" 23#include "../config.h"
24 24
25#include "encoding.h" 25#include "encoding.h"
26#include "rxvtutil.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <cstring> 29#include <cstring>
29 30
30const struct n2cs { 31static const struct n2cs {
31 const char *name; 32 const char *name;
32 codeset cs; 33 codeset cs;
33} n2cs[] = { 34} n2cs[] = {
34 /* first one found is the normalized one */ 35 /* first one found is the normalized one */
35 { "ISO88591", CS_ISO8859_1 }, 36 { "ISO88591", CS_ISO8859_1 },
… …
47 { "ISO885913", CS_ISO8859_13 }, 48 { "ISO885913", CS_ISO8859_13 },
48 { "ISO885914", CS_ISO8859_14 }, 49 { "ISO885914", CS_ISO8859_14 },
49 { "ISO885915", CS_ISO8859_15 }, 50 { "ISO885915", CS_ISO8859_15 },
50 { "FCD885915", CS_ISO8859_15 }, 51 { "FCD885915", CS_ISO8859_15 },
51 { "ISO885916", CS_ISO8859_16 }, 52 { "ISO885916", CS_ISO8859_16 },
52 53
53 { "TIS620*", CS_ISO8859_11 }, // close enough 54 { "TIS620*", CS_ISO8859_11 }, // close enough
54 55
55 { "ISO10646*", CS_UNICODE }, 56 { "ISO10646*", CS_UNICODE },
56 { "UNICODE", CS_UNICODE }, 57 { "UNICODE", CS_UNICODE },
57 { "UTF8", CS_UNICODE }, 58 { "UTF8", CS_UNICODE },
58 59
59 { "ASCII", CS_US_ASCII }, 60 { "ASCII", CS_US_ASCII },
60 { "USASCII", CS_US_ASCII }, 61 { "USASCII", CS_US_ASCII },
61 { "ANSIX341968", CS_US_ASCII }, 62 { "ANSIX341968", CS_US_ASCII },
62 { "ISO646.1991-IRV", CS_US_ASCII }, // older versions used the currency sign 63 { "ISO6461991IRV", CS_US_ASCII }, // older versions used the currency sign
63 64
64 { "KOI8R*", CS_KOI8_R }, 65 { "KOI8R*", CS_KOI8_R },
65 { "GOST1976874*", CS_KOI8_R }, 66 { "GOST1976874*", CS_KOI8_R },
66 { "KOI8RU", CS_KOI8_U }, 67 { "KOI8RU", CS_KOI8_U },
67 { "KOI8U", CS_KOI8_U }, 68 { "KOI8U", CS_KOI8_U },
68 69
69 { "VISCII*", CS_VISCII }, 70 { "VISCII*", CS_VISCII },
70 71
71 { "JISX0201*", CS_JIS0201_1976_0 }, 72 { "JISX0201*", CS_JIS0201_1976_0 },
72 { "JISC6226*", CS_JIS0208_1990_0 }, // also wrongly matches -1987-0? (check Encode::JP) 73 { "JISC6226*", CS_JIS0208_1990_0 }, // also wrongly matches -1987-0? (check Encode::JP)
73 { "JISX0208*", CS_JIS0208_1990_0 }, // also wrongly matches -1987-0? (check Encode::JP) 74 { "JISX0208*", CS_JIS0208_1990_0 }, // also wrongly matches -1987-0? (check Encode::JP)
74 { "JISX0212*", CS_JIS0212_1990_0 }, 75 { "JISX0212*", CS_JIS0212_1990_0 },
75 { "JISX021320001", CS_JIS0213_1 }, 76 { "JISX021320001", CS_JIS0213_1 },
76 { "JISX021320002", CS_JIS0213_2 }, 77 { "JISX021320002", CS_JIS0213_2 },
77 { "JISX0221*", CS_UNICODE }, // _very_ close 78 { "JISX0221*", CS_UNICODE }, // _very_ close
78 79
79 { "KSC5601*", CS_KSC5601_1987_0 }, 80 { "KSC5601*", CS_KSC5601_1987_0 },
80 { "KSX1001*", CS_KSC5601_1987_0 }, 81 { "KSX1001*", CS_KSC5601_1987_0 },
81 { "KSC5700*", CS_UNICODE }, // unicode plus extensions 82 { "KSC5700*", CS_UNICODE }, // unicode plus extensions
82 83
83 { "BIG5P*", CS_BIG5_PLUS }, 84 { "BIG5P*", CS_BIG5_PLUS },
84 { "BIG5ETEN*", CS_BIG5_EXT }, 85 { "BIG5ETEN*", CS_BIG5_EXT },
85 { "BIG5*", CS_BIG5 }, 86 { "BIG5*", CS_BIG5 },
86 { "GB2312*", CS_GB2312_1980_0 }, 87 { "GB2312*", CS_GB2312_1980_0 },
87 { "GBK*", CS_GBK_0 }, 88 { "GBK*", CS_GBK_0 },
… …
218#if ENCODING_TO_UNICODE 219#if ENCODING_TO_UNICODE
219# define ENC(base) { cs_ ## base ## _from_unicode, cs_ ## base ## _to_unicode } 220# define ENC(base) { cs_ ## base ## _from_unicode, cs_ ## base ## _to_unicode }
220#else 221#else
221# define ENC(base) { cs_ ## base ## _from_unicode } 222# define ENC(base) { cs_ ## base ## _from_unicode }
222#endif 223#endif
223 224
224 225
225// order must match table in encoding.h(!) 226// order must match table in encoding.h(!)
226const rxvt_codeset_conv rxvt_codeset[NUM_CODESETS] = { 227const rxvt_codeset_conv rxvt_codeset[NUM_CODESETS] = {
227 ENC (unknown), 228 ENC (unknown),
228 229
… …
285 286
286unicode_t 287unicode_t
287rxvt_compose (unicode_t c1, unicode_t c2) 288rxvt_compose (unicode_t c1, unicode_t c2)
288{ 289{
289 int l = 0; 290 int l = 0;
290 int r = sizeof (rxvt_compose_table) / sizeof (rxvt_compose_entry) - 1; 291 int r = ARRAY_LENGTH(rxvt_compose_table) - 1;
291 int m; 292 int m;
292 293
293 while (r > l) 294 while (r >= l)
294 { 295 {
295 m = (l + r) / 2; 296 m = (l + r) / 2;
296 rxvt_compose_entry &c = rxvt_compose_table[m]; 297 rxvt_compose_entry &c = rxvt_compose_table[m];
297 298
298 if (c.c1 < c1 || (c.c1 == c1 && c.c2 < c2)) 299 if (c.c1 < c1 || (c.c1 == c1 && c.c2 < c2))

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines