--- np2/x11/gtk/Attic/gtk_font.c	2005/03/12 12:36:40	1.6
+++ np2/x11/gtk/Attic/gtk_font.c	2005/04/01 15:11:31	1.7
@@ -213,26 +213,14 @@ fontmng_getsize(void *hdl, const char *s
 	int width;
 	int len;
 
-	if ((fhdl == NULL) || (str == NULL))
+	if ((fhdl == NULL) || (str == NULL)) {
 		return FAILURE;
+	}
 
 	width = 0;
-	buf[2] = '\0';
-	for (;;) {
-		buf[0] = *str++;
-		if ((((buf[0] ^ 0x20) - 0xa1) & 0xff) < 0x3c && *str != '\0') {
-			buf[1] = *str++;
-			len = 2;
-		} else if (buf[0] >= 0xa1 && buf[1] <= 0xdf) {
-			buf[1] = buf[0];
-			buf[0] = 0x8e;
-			len = 1;
-		} else if (buf[0]) {
-			buf[1] = '\0';
-			len = 1;
-		} else {
-			break;
-		}
+	while ((len = milstr_charsize(str)) != 0) {
+		memcpy(buf, str, len * sizeof(char));
+		buf[len] = '\0';
 		getlength1(fhdl, &fdat, buf, len);
 		width += fdat.pitch;
 	}
@@ -253,27 +241,15 @@ fontmng_getdrawsize(void *hdl, const cha
 	int len;
 	int posx;
 
-	if ((hdl == NULL) || (str == NULL))
+	if ((hdl == NULL) || (str == NULL)) {
 		return FAILURE;
+	}
 
 	width = 0;
 	posx = 0;
-	buf[2] = '\0';
-	for (;;) {
-		buf[0] = *str++;
-		if ((((buf[0] ^ 0x20) - 0xa1) & 0xff) < 0x3c && *str != '\0') {
-			buf[1] = *str++;
-			len = 2;
-		} else if (buf[0] >= 0xa1 && buf[0] <= 0xdf) {
-			buf[1] = buf[0];
-			buf[0] = 0x8e;
-			len = 1;
-		} else if (buf[0]) {
-			buf[1] = '\0';
-			len = 1;
-		} else {
-			break;
-		}
+	while ((len = milstr_charsize(str)) != 0) {
+		memcpy(buf, str, len * sizeof(char));
+		buf[len] = '\0';
 		getlength1(fhdl, &fdat, buf, len);
 		width = posx + max(fdat.width, fdat.pitch);
 		posx += fdat.pitch;
@@ -297,19 +273,11 @@ fontmng_get(void *hdl, const char *str)
 		return NULL;
 	}
 
-	if (((((str[0] ^ 0x20) - 0xa1) & 0xff) < 0x3c) && (str[1] != '\0')) {
-		codecnv_sjistoeuc(buf, 4, str, 2);
-		len = 2;
-	} else if ((BYTE)str[0] >= 0xa1 && (BYTE)str[0] <= 0xdf) {
-		buf[0] = 0x8e;
-		buf[1] = str[0];
-		buf[2] = '\0';
-		len = 1;
-	} else {
-		buf[0] = str[0];
-		buf[1] = '\0';
-		len = 1;
+	while ((len = milstr_charsize(str)) != 0) {
+		memcpy(buf, str, len * sizeof(char));
+		buf[len] = '\0';
+		getfont1(fhdl, fdat, buf, len);
+		str += len;
 	}
-	getfont1(fhdl, fdat, buf, len);
 	return fdat;
 }