summaryrefslogtreecommitdiff
path: root/app/luit/other.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/luit/other.c')
-rw-r--r--app/luit/other.c446
1 files changed, 252 insertions, 194 deletions
diff --git a/app/luit/other.c b/app/luit/other.c
index 99ca8c175..f70a78d9d 100644
--- a/app/luit/other.c
+++ b/app/luit/other.c
@@ -19,15 +19,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/programs/luit/other.c,v 1.1 2002/10/17 01:06:09 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <X11/fonts/fontenc.h>
#include "other.h"
-#include "charset.h"
#ifndef NULL
#define NULL 0
@@ -39,11 +40,13 @@ int
init_gbk(OtherStatePtr s)
{
s->gbk.mapping =
- FontEncMapFind("gbk-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->gbk.mapping) return 0;
+ FontEncMapFind("gbk-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->gbk.mapping)
+ return 0;
s->gbk.reverse = FontMapReverse(s->gbk.mapping);
- if(!s->gbk.reverse) return 0;
+ if (!s->gbk.reverse)
+ return 0;
s->gbk.buf = -1;
return 1;
@@ -53,8 +56,10 @@ unsigned int
mapping_gbk(unsigned int n, OtherStatePtr s)
{
unsigned int r;
- if(n < 128) return n;
- if(n == 128) return EURO_10646;
+ if (n < 128)
+ return n;
+ if (n == 128)
+ return EURO_10646;
r = FontEncRecode(n, s->gbk.mapping);
return r;
}
@@ -62,30 +67,33 @@ mapping_gbk(unsigned int n, OtherStatePtr s)
unsigned int
reverse_gbk(unsigned int n, OtherStatePtr s)
{
- if(n < 128) return n;
- if(n == EURO_10646) return 128;
+ if (n < 128)
+ return n;
+ if (n == EURO_10646)
+ return 128;
return s->gbk.reverse->reverse(n, s->gbk.reverse->data);
}
int
-stack_gbk(unsigned char c, OtherStatePtr s)
+stack_gbk(unsigned c, OtherStatePtr s)
{
- if(s->gbk.buf < 0) {
- if(c < 129) return c;
- s->gbk.buf = c;
+ if (s->gbk.buf < 0) {
+ if (c < 129)
+ return (int) c;
+ s->gbk.buf = (int) c;
return -1;
} else {
- int b;
- if(c < 0x40 || c == 0x7F) {
- s->gbk.buf = -1;
- return c;
- }
- if(s->gbk.buf < 0xFF && c < 0xFF)
- b = (s->gbk.buf << 8) + c;
- else
- b = -1;
- s->gbk.buf = -1;
- return b;
+ int b;
+ if (c < 0x40 || c == 0x7F) {
+ s->gbk.buf = -1;
+ return (int) c;
+ }
+ if (s->gbk.buf < 0xFF && c < 0xFF)
+ b = (int) ((unsigned) (s->gbk.buf << 8) + c);
+ else
+ b = -1;
+ s->gbk.buf = -1;
+ return b;
}
}
@@ -97,72 +105,86 @@ init_utf8(OtherStatePtr s)
}
unsigned int
-mapping_utf8(unsigned int n, OtherStatePtr s)
+mapping_utf8(unsigned int n, OtherStatePtr s GCC_UNUSED)
{
return n;
}
unsigned int
-reverse_utf8(unsigned int n, OtherStatePtr s)
+reverse_utf8(unsigned int n, OtherStatePtr s GCC_UNUSED)
{
- if(n < 0x80)
- return n;
- if(n < 0x800)
- return 0xC080 + ((n&0x7C0)<<2) + (n&0x3F);
- if(n < 0x10000)
- return 0xE08080 + ((n&0xF000)<<4) + ((n&0xFC0)<<2) + (n&0x3F);
- return 0xF0808080 + ((n&0x1C0000)<<6) + ((n&0x3F000)<<4) +
- ((n&0xFC0)<<2) + (n&0x3F);
+ if (n < 0x80)
+ return n;
+ if (n < 0x800)
+ return 0xC080 + ((n & 0x7C0) << 2) + (n & 0x3F);
+ if (n < 0x10000)
+ return 0xE08080 + ((n & 0xF000) << 4) + ((n & 0xFC0) << 2) + (n & 0x3F);
+ return 0xF0808080 + ((n & 0x1C0000) << 6) + ((n & 0x3F000) << 4) +
+ ((n & 0xFC0) << 2) + (n & 0x3F);
}
int
-stack_utf8(unsigned char c, OtherStatePtr s)
+stack_utf8(unsigned c, OtherStatePtr s)
{
int u;
- if(c < 0x80) {
- s->utf8.buf_ptr = 0;
- return c;
+ if (c < 0x80) {
+ s->utf8.buf_ptr = 0;
+ return (int) c;
}
- if(s->utf8.buf_ptr == 0) {
- if((c & 0x40) == 0) return -1;
- s->utf8.buf[s->utf8.buf_ptr++] = c;
- if((c & 0x60) == 0x40) s->utf8.len = 2;
- else if((c & 0x70) == 0x60) s->utf8.len = 3;
- else if((c & 0x78) == 0x70) s->utf8.len = 4;
- else s->utf8.buf_ptr = 0;
- return -1;
+ if (s->utf8.buf_ptr == 0) {
+ if ((c & 0x40) == 0)
+ return -1;
+ s->utf8.buf[s->utf8.buf_ptr++] = UChar(c);
+ if ((c & 0x60) == 0x40)
+ s->utf8.len = 2;
+ else if ((c & 0x70) == 0x60)
+ s->utf8.len = 3;
+ else if ((c & 0x78) == 0x70)
+ s->utf8.len = 4;
+ else
+ s->utf8.buf_ptr = 0;
+ return -1;
}
- if((c & 0x40) != 0) {
- s->utf8.buf_ptr = 0;
- return -1;
+ if ((c & 0x40) != 0) {
+ s->utf8.buf_ptr = 0;
+ return -1;
}
- s->utf8.buf[s->utf8.buf_ptr++] = c;
- if(s->utf8.buf_ptr < s->utf8.len) return -1;
- switch(s->utf8.len) {
+ s->utf8.buf[s->utf8.buf_ptr++] = UChar(c);
+ if (s->utf8.buf_ptr < s->utf8.len)
+ return -1;
+ switch (s->utf8.len) {
case 2:
- u = ((s->utf8.buf[0] & 0x1F) << 6) | (s->utf8.buf[1] & 0x3F);
- s->utf8.buf_ptr = 0;
- if(u < 0x80) return -1; else return u;
+ u = ((s->utf8.buf[0] & 0x1F) << 6) | (s->utf8.buf[1] & 0x3F);
+ s->utf8.buf_ptr = 0;
+ if (u < 0x80)
+ return -1;
+ else
+ return u;
case 3:
- u = ((s->utf8.buf[0] & 0x0F) << 12)
- | ((s->utf8.buf[1] & 0x3F) << 6)
- | (s->utf8.buf[2] & 0x3F);
- s->utf8.buf_ptr = 0;
- if(u < 0x800) return -1; else return u;
+ u = ((s->utf8.buf[0] & 0x0F) << 12)
+ | ((s->utf8.buf[1] & 0x3F) << 6)
+ | (s->utf8.buf[2] & 0x3F);
+ s->utf8.buf_ptr = 0;
+ if (u < 0x800)
+ return -1;
+ else
+ return u;
case 4:
- u = ((s->utf8.buf[0] & 0x03) << 18)
- | ((s->utf8.buf[1] & 0x3F) << 12)
- | ((s->utf8.buf[2] & 0x3F) << 6)
- | ((s->utf8.buf[3] & 0x3F));
- s->utf8.buf_ptr = 0;
- if(u < 0x10000) return -1; else return u;
+ u = ((s->utf8.buf[0] & 0x03) << 18)
+ | ((s->utf8.buf[1] & 0x3F) << 12)
+ | ((s->utf8.buf[2] & 0x3F) << 6)
+ | ((s->utf8.buf[3] & 0x3F));
+ s->utf8.buf_ptr = 0;
+ if (u < 0x10000)
+ return -1;
+ else
+ return u;
}
s->utf8.buf_ptr = 0;
return -1;
}
-
#define HALFWIDTH_10646 0xFF61
#define YEN_SJIS 0x5C
#define YEN_10646 0x00A5
@@ -173,18 +195,22 @@ int
init_sjis(OtherStatePtr s)
{
s->sjis.x0208mapping =
- FontEncMapFind("jisx0208.1990-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->sjis.x0208mapping) return 0;
+ FontEncMapFind("jisx0208.1990-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->sjis.x0208mapping)
+ return 0;
s->sjis.x0208reverse = FontMapReverse(s->sjis.x0208mapping);
- if(!s->sjis.x0208reverse) return 0;
+ if (!s->sjis.x0208reverse)
+ return 0;
s->sjis.x0201mapping =
- FontEncMapFind("jisx0201.1976-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->sjis.x0201mapping) return 0;
+ FontEncMapFind("jisx0201.1976-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->sjis.x0201mapping)
+ return 0;
s->sjis.x0201reverse = FontMapReverse(s->sjis.x0201mapping);
- if(!s->sjis.x0201reverse) return 0;
+ if (!s->sjis.x0201reverse)
+ return 0;
s->sjis.buf = -1;
return 1;
@@ -194,53 +220,68 @@ unsigned int
mapping_sjis(unsigned int n, OtherStatePtr s)
{
unsigned int j1, j2, s1, s2;
- if(n == YEN_SJIS) return YEN_10646;
- if(n == OVERLINE_SJIS) return OVERLINE_10646;
- if(n < 0x80) return n;
- if(n >= 0xA0 && n <= 0xDF) return FontEncRecode(n, s->sjis.x0201mapping);
- s1 = ((n>>8)&0xFF);
- s2 = (n&0xFF);
- j1 = (s1 << 1) - (s1 <= 0x9F ? 0xE0 : 0x160) - (s2 < 0x9F ? 1 : 0);
- j2 = s2 - 0x1F - (s2 >= 0x7F ? 1 : 0) - (s2 >= 0x9F ? 0x5E : 0);
- return FontEncRecode((j1<<8) + j2, s->sjis.x0208mapping);
+ if (n == YEN_SJIS)
+ return YEN_10646;
+ if (n == OVERLINE_SJIS)
+ return OVERLINE_10646;
+ if (n < 0x80)
+ return n;
+ if (n >= 0xA0 && n <= 0xDF)
+ return FontEncRecode(n, s->sjis.x0201mapping);
+ s1 = ((n >> 8) & 0xFF);
+ s2 = (n & 0xFF);
+ j1 = (s1 << 1)
+ - (unsigned) (s1 <= 0x9F ? 0xE0 : 0x160)
+ - (unsigned) (s2 < 0x9F ? 1 : 0);
+ j2 = s2
+ - 0x1F
+ - (unsigned) (s2 >= 0x7F ? 1 : 0)
+ - (unsigned) (s2 >= 0x9F ? 0x5E : 0);
+ return FontEncRecode((j1 << 8) + j2, s->sjis.x0208mapping);
}
unsigned int
reverse_sjis(unsigned int n, OtherStatePtr s)
{
unsigned int j, j1, j2, s1, s2;
- if(n == YEN_10646) return YEN_SJIS;
- if(n == OVERLINE_10646) return OVERLINE_SJIS;
- if(n < 0x80) return n;
- if(n >= HALFWIDTH_10646)
- return s->sjis.x0201reverse->reverse(n, s->sjis.x0201reverse->data);
+ if (n == YEN_10646)
+ return YEN_SJIS;
+ if (n == OVERLINE_10646)
+ return OVERLINE_SJIS;
+ if (n < 0x80)
+ return n;
+ if (n >= HALFWIDTH_10646)
+ return s->sjis.x0201reverse->reverse(n, s->sjis.x0201reverse->data);
j = s->sjis.x0208reverse->reverse(n, s->sjis.x0208reverse->data);
- j1 = ((j>>8)&0xFF);
- j2 = (j&0xFF);
- s1 = ((j1 - 1) >> 1) + ((j1 <= 0x5E) ? 0x71 : 0xB1);
- s2 = j2 + ((j1 & 1) ? ((j2 < 0x60) ? 0x1F : 0x20) : 0x7E);
- return (s1<<8) + s2;
+ j1 = ((j >> 8) & 0xFF);
+ j2 = (j & 0xFF);
+ s1 = ((j1 - 1) >> 1)
+ + (unsigned) ((j1 <= 0x5E) ? 0x71 : 0xB1);
+ s2 = j2
+ + (unsigned) ((j1 & 1) ? ((j2 < 0x60) ? 0x1F : 0x20) : 0x7E);
+ return (s1 << 8) + s2;
}
int
-stack_sjis(unsigned char c, OtherStatePtr s)
+stack_sjis(unsigned c, OtherStatePtr s)
{
- if(s->sjis.buf < 0) {
- if(c < 128 || (c >= 0xA0 && c <= 0xDF)) return c;
- s->sjis.buf = c;
+ if (s->sjis.buf < 0) {
+ if (c < 128 || (c >= 0xA0 && c <= 0xDF))
+ return (int) c;
+ s->sjis.buf = (int) c;
return -1;
} else {
- int b;
- if(c < 0x40 || c == 0x7F) {
- s->sjis.buf = -1;
- return c;
- }
- if(s->sjis.buf < 0xFF && c < 0xFF)
- b = (s->sjis.buf << 8) + c;
- else
- b = -1;
- s->sjis.buf = -1;
- return b;
+ int b;
+ if (c < 0x40 || c == 0x7F) {
+ s->sjis.buf = -1;
+ return (int) c;
+ }
+ if (s->sjis.buf < 0xFF && c < 0xFF)
+ b = (int) ((unsigned) (s->sjis.buf << 8) + c);
+ else
+ b = -1;
+ s->sjis.buf = -1;
+ return b;
}
}
@@ -248,11 +289,13 @@ int
init_hkscs(OtherStatePtr s)
{
s->hkscs.mapping =
- FontEncMapFind("big5hkscs-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->hkscs.mapping) return 0;
+ FontEncMapFind("big5hkscs-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->hkscs.mapping)
+ return 0;
s->hkscs.reverse = FontMapReverse(s->hkscs.mapping);
- if(!s->hkscs.reverse) return 0;
+ if (!s->hkscs.reverse)
+ return 0;
s->hkscs.buf = -1;
return 1;
@@ -262,8 +305,10 @@ unsigned int
mapping_hkscs(unsigned int n, OtherStatePtr s)
{
unsigned int r;
- if(n < 128) return n;
- if(n == 128) return EURO_10646;
+ if (n < 128)
+ return n;
+ if (n == 128)
+ return EURO_10646;
r = FontEncRecode(n, s->hkscs.mapping);
return r;
}
@@ -271,34 +316,36 @@ mapping_hkscs(unsigned int n, OtherStatePtr s)
unsigned int
reverse_hkscs(unsigned int n, OtherStatePtr s)
{
- if(n < 128) return n;
- if(n == EURO_10646) return 128;
+ if (n < 128)
+ return n;
+ if (n == EURO_10646)
+ return 128;
return s->hkscs.reverse->reverse(n, s->hkscs.reverse->data);
}
int
-stack_hkscs(unsigned char c, OtherStatePtr s)
+stack_hkscs(unsigned c, OtherStatePtr s)
{
- if(s->hkscs.buf < 0) {
- if(c < 129) return c;
- s->hkscs.buf = c;
+ if (s->hkscs.buf < 0) {
+ if (c < 129)
+ return (int) c;
+ s->hkscs.buf = (int) c;
return -1;
} else {
- int b;
- if(c < 0x40 || c == 0x7F) {
- s->hkscs.buf = -1;
- return c;
- }
- if(s->hkscs.buf < 0xFF && c < 0xFF)
- b = (s->hkscs.buf << 8) + c;
- else
- b = -1;
- s->hkscs.buf = -1;
- return b;
+ int b;
+ if (c < 0x40 || c == 0x7F) {
+ s->hkscs.buf = -1;
+ return (int) c;
+ }
+ if (s->hkscs.buf < 0xFF && c < 0xFF)
+ b = (int) ((unsigned) (s->hkscs.buf << 8) + c);
+ else
+ b = -1;
+ s->hkscs.buf = -1;
+ return b;
}
}
-
/*
* Because of the 1 ~ 4 multi-bytes nature of GB18030.
* CharSet encoding is split to 2 subset (besides latin)
@@ -319,20 +366,24 @@ int
init_gb18030(OtherStatePtr s)
{
s->gb18030.cs0_mapping =
- FontEncMapFind("gb18030.2000-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->gb18030.cs0_mapping) return 0;
+ FontEncMapFind("gb18030.2000-0", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->gb18030.cs0_mapping)
+ return 0;
s->gb18030.cs0_reverse = FontMapReverse(s->gb18030.cs0_mapping);
- if(!s->gb18030.cs0_reverse) return 0;
+ if (!s->gb18030.cs0_reverse)
+ return 0;
s->gb18030.cs1_mapping =
- FontEncMapFind("gb18030.2000-1", FONT_ENCODING_UNICODE, -1, -1, NULL);
- if(!s->gb18030.cs1_mapping) return 0;
+ FontEncMapFind("gb18030.2000-1", FONT_ENCODING_UNICODE, -1, -1, NULL);
+ if (!s->gb18030.cs1_mapping)
+ return 0;
s->gb18030.cs1_reverse = FontMapReverse(s->gb18030.cs1_mapping);
- if(!s->gb18030.cs1_reverse) return 0;
+ if (!s->gb18030.cs1_reverse)
+ return 0;
- s->gb18030.linear = 0;
+ s->gb18030.linear = 0;
s->gb18030.buf_ptr = 0;
return 1;
}
@@ -340,11 +391,13 @@ init_gb18030(OtherStatePtr s)
unsigned int
mapping_gb18030(unsigned int n, OtherStatePtr s)
{
- if(n <= 0x80) return n; /* 0x80 is valid but unassigned codepoint */
- if(n >= 0xFFFF) return '?';
-
+ if (n <= 0x80)
+ return n; /* 0x80 is valid but unassigned codepoint */
+ if (n >= 0xFFFF)
+ return '?';
+
return FontEncRecode(n,
- (s->gb18030.linear)?s->gb18030.cs1_mapping:s->gb18030.cs0_mapping);
+ (s->gb18030.linear) ? s->gb18030.cs1_mapping : s->gb18030.cs0_mapping);
}
unsigned int
@@ -353,73 +406,78 @@ reverse_gb18030(unsigned int n, OtherStatePtr s)
/* when lookup in 2000-0 failed. */
/* lookup in 2000-1 and then try to unlinear'd */
unsigned int r;
- if(n <= 0x80) return n;
+ if (n <= 0x80)
+ return n;
r = s->gb18030.cs0_reverse->reverse(n, s->gb18030.cs0_reverse->data);
if (r != 0)
- return r;
+ return r;
r = s->gb18030.cs1_reverse->reverse(n, s->gb18030.cs1_reverse->data);
if (r != 0) {
- unsigned char bytes[4];
-
- bytes[3] = 0x30 + r % 10; r /= 10;
- bytes[2] = 0x81 + r % 126; r /= 126;
- bytes[1] = 0x30 + r % 10; r /= 10;
- bytes[0] = 0x81 + r;
-
- r = (unsigned int)bytes[0] << 24;
- r |= (unsigned int)bytes[1] << 16;
- r |= (unsigned int)bytes[2] << 8;
- r |= (unsigned int)bytes[3];
+ unsigned char bytes[4];
+
+ bytes[3] = UChar(0x30 + r % 10);
+ r /= 10;
+ bytes[2] = UChar(0x81 + r % 126);
+ r /= 126;
+ bytes[1] = UChar(0x30 + r % 10);
+ r /= 10;
+ bytes[0] = UChar(0x81 + r);
+
+ r = (unsigned int) bytes[0] << 24;
+ r |= (unsigned int) bytes[1] << 16;
+ r |= (unsigned int) bytes[2] << 8;
+ r |= (unsigned int) bytes[3];
}
return r;
}
int
-stack_gb18030(unsigned char c, OtherStatePtr s)
+stack_gb18030(unsigned c, OtherStatePtr s)
{
/* if set gb18030.linear => True. the return value is "linear'd" */
- if(s->gb18030.buf_ptr == 0) {
- if(c <= 0x80) return c;
- if (c == 0xFF) return -1;
- s->gb18030.linear = 0;
- s->gb18030.buf[s->gb18030.buf_ptr++] = c;
- return -1;
+ if (s->gb18030.buf_ptr == 0) {
+ if (c <= 0x80)
+ return (int) c;
+ if (c == 0xFF)
+ return -1;
+ s->gb18030.linear = 0;
+ s->gb18030.buf[s->gb18030.buf_ptr++] = (int) c;
+ return -1;
} else if (s->gb18030.buf_ptr == 1) {
- if (c >= 0x40) {
- s->gb18030.buf_ptr = 0;
- if ((c == 0x80) || (c == 0xFF))
- return -1;
- else
- return (s->gb18030.buf[0] << 8) + c;
- } else if (c >= 30) { /* 2Byte is (0x30 -> 0x39) */
- s->gb18030.buf[s->gb18030.buf_ptr++] = c;
- return -1;
- } else {
- s->gb18030.buf_ptr = 0;
- return c;
- }
+ if (c >= 0x40) {
+ s->gb18030.buf_ptr = 0;
+ if ((c == 0x80) || (c == 0xFF))
+ return -1;
+ else
+ return (int) ((unsigned) (s->gb18030.buf[0] << 8) + c);
+ } else if (c >= 30) { /* 2Byte is (0x30 -> 0x39) */
+ s->gb18030.buf[s->gb18030.buf_ptr++] = (int) c;
+ return -1;
+ } else {
+ s->gb18030.buf_ptr = 0;
+ return (int) c;
+ }
} else if (s->gb18030.buf_ptr == 2) {
- if ((c >= 0x81) && (c <= 0xFE)) {
- s->gb18030.buf[s->gb18030.buf_ptr++] = c;
- return -1;
- } else {
- s->gb18030.buf_ptr = 0;
- return c;
- }
+ if ((c >= 0x81) && (c <= 0xFE)) {
+ s->gb18030.buf[s->gb18030.buf_ptr++] = (int) c;
+ return -1;
+ } else {
+ s->gb18030.buf_ptr = 0;
+ return (int) c;
+ }
} else {
- int r = 0;
- s->gb18030.buf_ptr = 0;
- if ((c >= 0x30) && (c <= 0x39)) {
- s->gb18030.linear = 1;
- r = (((s->gb18030.buf[0] - 0x81) * 10
- + (s->gb18030.buf[1] - 0x30)) * 126
- + (s->gb18030.buf[2] - 0x81)) * 10
- + (c - 0x30);
- return r;
- }
- return -1;
+ int r = 0;
+ s->gb18030.buf_ptr = 0;
+ if ((c >= 0x30) && (c <= 0x39)) {
+ s->gb18030.linear = 1;
+ r = (((s->gb18030.buf[0] - 0x81) * 10
+ + (s->gb18030.buf[1] - 0x30)) * 126
+ + (s->gb18030.buf[2] - 0x81)) * 10
+ + ((int) c - 0x30);
+ return r;
+ }
+ return -1;
}
}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:33:07 +0000