svnno****@sourc*****
svnno****@sourc*****
2009年 6月 7日 (日) 16:22:05 JST
Tera TermRevision: 3445
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3445
Author: doda
Date: 2009-06-07 16:22:05 +0900 (Sun, 07 Jun 2009)
Log Message:
-----------
UnicodeToCP932ã®2番目ã®å¼•æ•°ã¯ä½¿ã£ã¦ã„ãªã„ã®ã§å‰Šé™¤ã€‚
Modified Paths:
--------------
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2009-06-07 06:57:34 UTC (rev 3444)
+++ trunk/teraterm/teraterm/vtterm.c 2009-06-07 07:22:05 UTC (rev 3445)
@@ -3069,7 +3069,7 @@
}
-static void UnicodeToCP932(unsigned int code, int byte)
+static void UnicodeToCP932(unsigned int code)
{
int ret;
char mbchar[32];
@@ -3147,18 +3147,14 @@
// 1ƒoƒCƒg–Ú‚ªC1§Œä•¶Žš(0x80-0x9f)‚Ìê‡‚à“¯—lB
if (count == 0 || count == 1) {
if (hfsplus_mode == 1 && maybe_hfsplus == 1) {
- UnicodeToCP932(first_code, 3);
+ UnicodeToCP932(first_code);
maybe_hfsplus = 0;
}
if (count == 1) {
ParseASCII(buf[0]);
- //code = buf[0];
- //UnicodeToCP932(code, 2);
}
ParseASCII(b);
- //code = b;
- //UnicodeToCP932(code, 2);
count = 0; // reset counter
return TRUE;
@@ -3177,14 +3173,14 @@
(buf[1] & 0xc0) == 0x80) {
if (hfsplus_mode == 1 && maybe_hfsplus == 1) {
- UnicodeToCP932(first_code, 3);
+ UnicodeToCP932(first_code);
maybe_hfsplus = 0;
}
code = ((buf[0] & 0x1f) << 6);
code |= ((buf[1] & 0x3f));
- UnicodeToCP932(code, 2);
+ UnicodeToCP932(code);
// ŽŸ‚̃oƒCƒg‚ªASCII‚È‚ç‚»‚Ì‚Ü‚Ü•\Ž¦ (2006.6.30 yutaka)
if ((b & 0x80) != 0x80) { // ASCII(0x00-0x7f)
@@ -3238,7 +3234,7 @@
)) != -1) {
// 1‚‚߂̕¶Žš‚Í‚»‚Ì‚Ü‚Üo—Í‚·‚é
- UnicodeToCP932(first_code, 3);
+ UnicodeToCP932(first_code);
maybe_hfsplus = 1;
first_code = code;
@@ -3246,15 +3242,15 @@
return (TRUE);
}
- UnicodeToCP932(first_code, 3);
- UnicodeToCP932(code, 3);
+ UnicodeToCP932(first_code);
+ UnicodeToCP932(code);
count = 0;
return (TRUE);
}
}
}
- UnicodeToCP932(code, 3);
+ UnicodeToCP932(code);
skip:
count = 0;