svnno****@sourc*****
svnno****@sourc*****
2009年 6月 9日 (火) 04:12:25 JST
Tera TermRevision: 3458
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3458
Author: doda
Date: 2009-06-09 04:12:25 +0900 (Tue, 09 Jun 2009)
Log Message:
-----------
ãƒãƒ¼ã‚«ãƒ«ã‚¨ã‚³ãƒ¼ã®ãƒ«ãƒ¼ãƒãƒ³ã‚’日本語/韓国語/UTF-8ã§å…±ç”¨ã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚
Modified Paths:
--------------
trunk/teraterm/ttpcmn/ttcmn.c
-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2009-06-08 17:06:29 UTC (rev 3457)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2009-06-08 19:12:25 UTC (rev 3458)
@@ -1403,7 +1403,7 @@
return i;
}
-int FAR PASCAL TextEchoJP(PComVar cv, PCHAR B, int C)
+int FAR PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
{
int i, TempLen;
WORD K;
@@ -1565,87 +1565,6 @@
return i;
}
-int FAR PASCAL TextEchoKR(PComVar cv, PCHAR B, int C)
-{
- int i, TempLen;
- WORD K;
- char TempStr[11];
- int EchoCodeNew;
- BYTE d;
- BOOL Full, KanjiFlagNew;
-
- Full = FALSE;
- i = 0;
- while (! Full && (i < C)) {
- TempLen = 0;
- d = (BYTE)B[i];
- EchoCodeNew = cv->EchoCode;
- KanjiFlagNew = FALSE;
-
- if (cv->EchoKanjiFlag) {
- EchoCodeNew = IdKanji;
-
- K = (cv->EchoKanjiFirst << 8) + d;
-
- // UTF-8‚Ö‚Ì•ÏŠ·‚ðs‚¤B1`3ƒoƒCƒg‚܂ł̑Ήž‚È‚Ì‚Å’ˆÓB
- if (cv->KanjiCodeEcho == IdUTF8) {
- TempLen += OutputTextUTF8(K, TempStr, cv);
- }
- else {
- TempStr[TempLen++] = HIBYTE(K);
- TempStr[TempLen++] = LOBYTE(K);
- }
- }
- else if (IsDBCSLeadByteEx(*cv->CodePage, d)) {
- KanjiFlagNew = TRUE;
- cv->EchoKanjiFirst = d;
- EchoCodeNew = IdKanji;
- }
- else {
- EchoCodeNew = IdASCII;
-
- if (d==0x0d) {
- TempStr[TempLen++] = 0x0d;
- if (cv->CRSend==IdCRLF) {
- TempStr[TempLen++] = 0x0a;
- }
- else if ((cv->CRSend==IdCR) &&
- cv->TelFlag && ! cv->TelBinSend) {
- TempStr[TempLen++] = 0;
- }
- }
- else if ((d>=0x80) && (cv->KanjiCodeEcho==IdUTF8)) {
- TempLen += OutputTextUTF8((WORD)d, TempStr, cv);
- }
- else {
- TempStr[TempLen++] = d;
- if (cv->TelFlag && (d==0xff)) {
- TempStr[TempLen++] = (char)0xff;
- }
- }
- } // if (cv->EchoKanjiFlag) else if ... else ... end
-
- if (TempLen == 0) {
- i++;
- cv->EchoCode = EchoCodeNew;
- cv->EchoKanjiFlag = KanjiFlagNew;
- }
- else {
- Full = InBuffSize-cv->InBuffCount-TempLen < 0;
- if (! Full) {
- i++;
- cv->EchoCode = EchoCodeNew;
- cv->EchoKanjiFlag = KanjiFlagNew;
- memcpy(&(cv->InBuff[cv->InBuffCount]),TempStr,TempLen);
- cv->InBuffCount = cv->InBuffCount + TempLen;
- }
- }
-
- } // end of "while {}"
-
- return i;
-}
-
int FAR PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
{
int i, TempLen;
@@ -1665,10 +1584,8 @@
switch (cv->Language) {
case IdUtf8:
case IdJapanese:
- return TextEchoJP(cv,B,C);
- break;
case IdKorean:
- return TextEchoKR(cv,B,C);
+ return TextEchoMBCS(cv,B,C);
break;
}