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.10 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.16 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: encoding.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2 24
3#include "encoding.h" 25#include "encoding.h"
4 26
5#include <cstdlib> 27#include <cstdlib>
… …
44 { "KOI8U", CS_KOI8_U }, 66 { "KOI8U", CS_KOI8_U },
45 67
46 { "VISCII*", CS_VISCII }, 68 { "VISCII*", CS_VISCII },
47 69
48 { "JISX0201*", CS_JIS0201_1976_0 }, 70 { "JISX0201*", CS_JIS0201_1976_0 },
49 { "JISX0208*", CS_JIS0208_1983_0 }, // also wrongly matches -1990-0 (check Encode::JP) 71 { "JISX0208*", CS_JIS0208_1990_0 }, // also wrongly matches -1987-0? (check Encode::JP)
50 { "JISX0212*", CS_JIS0212_1990_0 }, 72 { "JISX0212*", CS_JIS0212_1990_0 },
73 { "JISX021320001", CS_JIS0213_1 },
74 { "JISX021320002", CS_JIS0213_2 },
51 { "JISX0221*", CS_UNICODE }, 75 { "JISX0221*", CS_UNICODE }, // _very_ close
52 76
53 { "KSC5601*", CS_KSC5601_1987_0 }, 77 { "KSC5601*", CS_KSC5601_1987_0 },
54 { "KSX1001*", CS_KSC5601_1987_0 }, 78 { "KSX1001*", CS_KSC5601_1987_0 },
55 { "KSC5700*", CS_UNICODE }, // unicode plus extensions 79 { "KSC5700*", CS_UNICODE }, // unicode plus extensions
56 80
… …
113 137
114 return CS_UNKNOWN; 138 return CS_UNKNOWN;
115} 139}
116 140
117struct rxvt_codeset_conv_unknown : rxvt_codeset_conv { 141struct rxvt_codeset_conv_unknown : rxvt_codeset_conv {
118 uint32_t to_unicode (uint32_t enc) const { return NOCHAR; } 142 unicode_t to_unicode (uint32_t enc) const { return NOCHAR; }
119 uint32_t from_unicode (uint32_t unicode) const { return NOCHAR; } 143 uint32_t from_unicode (unicode_t unicode) const { return NOCHAR; }
120} rxvt_codeset_conv_unknown; 144} rxvt_codeset_conv_unknown;
121 145
122struct rxvt_codeset_conv_us_ascii : rxvt_codeset_conv { 146struct rxvt_codeset_conv_us_ascii : rxvt_codeset_conv {
123 uint32_t from_unicode (uint32_t unicode) const { return unicode <= 127 ? unicode : NOCHAR; } 147 uint32_t from_unicode (unicode_t unicode) const { return unicode <= 127 ? unicode : NOCHAR; }
124} rxvt_codeset_conv_us_ascii; 148} rxvt_codeset_conv_us_ascii;
125 149
126struct rxvt_codeset_conv_unicode : rxvt_codeset_conv { 150struct rxvt_codeset_conv_unicode : rxvt_codeset_conv {
127 /* transparent */ 151 /* transparent */
128} rxvt_codeset_conv_unicode; 152} rxvt_codeset_conv_unicode;
129 153
130struct rxvt_codeset_conv_unicode_16 : rxvt_codeset_conv { 154struct rxvt_codeset_conv_unicode_16 : rxvt_codeset_conv {
131 uint32_t to_unicode (uint32_t enc) const { return enc; } 155 unicode_t to_unicode (uint32_t enc) const { return enc; }
132 uint32_t from_unicode (uint32_t unicode) const { return unicode <= 65535 ? unicode : NOCHAR; } 156 uint32_t from_unicode (unicode_t unicode) const { return unicode <= 65535 ? unicode : NOCHAR; }
133} rxvt_codeset_conv_unicode_16; 157} rxvt_codeset_conv_unicode_16;
134 158
135#define ENCODING_DEFAULT 159#define ENCODING_DEFAULT
136 160
137#include "table/iso8859_1.h" 161#include "table/iso8859_1.h"
… …
183#include "table/viscii.h" 207#include "table/viscii.h"
184 208
185//#define ENCODING_JP 209//#define ENCODING_JP
186 210
187#include "table/jis0201_1976_0.h" 211#include "table/jis0201_1976_0.h"
188#include "table/jis0208_1983_0.h" 212#include "table/jis0208_1990_0.h"
189#include "table/jis0212_1990_0.h" 213#include "table/jis0212_1990_0.h"
190 214
191//#define ENCODING_JP_EXT 215//#define ENCODING_JP_EXT
192 216
193#include "table/jis0213_1.h" 217#include "table/jis0213_1.h"
… …
217 241
218 &rxvt_codeset_conv_koi8_r, 242 &rxvt_codeset_conv_koi8_r,
219 &rxvt_codeset_conv_koi8_u, 243 &rxvt_codeset_conv_koi8_u,
220 244
221 &rxvt_codeset_conv_jis0201_1976_0, 245 &rxvt_codeset_conv_jis0201_1976_0,
222 &rxvt_codeset_conv_jis0208_1983_0, 246 &rxvt_codeset_conv_jis0208_1990_0,
223 &rxvt_codeset_conv_jis0212_1990_0, 247 &rxvt_codeset_conv_jis0212_1990_0,
224 248
225 &rxvt_codeset_conv_jis0213_1, 249 &rxvt_codeset_conv_jis0213_1,
226 &rxvt_codeset_conv_jis0213_2, 250 &rxvt_codeset_conv_jis0213_2,
227 251
… …
251# define ENCODING_COMPOSE 275# define ENCODING_COMPOSE
252#endif 276#endif
253 277
254#include "table/compose.h" 278#include "table/compose.h"
255 279
256uint32_t 280unicode_t
257rxvt_compose (uint32_t c1, uint32_t c2) 281rxvt_compose (unicode_t c1, unicode_t c2)
258{ 282{
259 int l = 0; 283 int l = 0;
260 int r = sizeof (rxvt_compose_table) / sizeof (rxvt_compose_entry) - 1; 284 int r = sizeof (rxvt_compose_table) / sizeof (rxvt_compose_entry) - 1;
261 int m; 285 int m;
262 286
… …
273 return c.r; 297 return c.r;
274 } 298 }
275 299
276 return NOCHAR; 300 return NOCHAR;
277} 301}
302
303#include "table/category.h"
304
305bool unicode::is_space (unicode_t c)
306{
307 return IS_SPACE (c);
308}

Diff Legend

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