[ttssh2-commit] [10732] IdRussian 時の文字コード変換を charset.c へ移動

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 6月 4日 (日) 01:55:39 JST


Revision: 10732
          https://osdn.net/projects/ttssh2/scm/svn/commits/10732
Author:   zmatsuo
Date:     2023-06-04 01:55:39 +0900 (Sun, 04 Jun 2023)
Log Message:
-----------
IdRussian 時の文字コード変換を charset.c へ移動

- vtterm.c から charset.c へ移動

Modified Paths:
--------------
    branches/input_charset/teraterm/teraterm/charset.c
    branches/input_charset/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: branches/input_charset/teraterm/teraterm/charset.c
===================================================================
--- branches/input_charset/teraterm/teraterm/charset.c	2023-06-03 16:55:29 UTC (rev 10731)
+++ branches/input_charset/teraterm/teraterm/charset.c	2023-06-03 16:55:39 UTC (rev 10732)
@@ -676,11 +676,12 @@
 static BOOL ParseFirstRus(BYTE b)
 // returns if b is processed
 {
-	if (b>=128) {
-		PutChar(b);
-		return TRUE;
-	}
-	return FALSE;
+	// CP1251\x82ɕϊ\xB7
+	BYTE c = RussConv(ts.KanjiCode, IdWindows, b);
+	// CP1251->Unicode
+	unsigned long u32 = MBCP_UTF32(c, 1251);
+	PutU32(u32);
+	return TRUE;
 }
 
 static BOOL ParseEnglish(BYTE b)

Modified: branches/input_charset/teraterm/teraterm/vtterm.c
===================================================================
--- branches/input_charset/teraterm/teraterm/vtterm.c	2023-06-03 16:55:29 UTC (rev 10731)
+++ branches/input_charset/teraterm/teraterm/vtterm.c	2023-06-03 16:55:39 UTC (rev 10732)
@@ -834,12 +834,15 @@
 			BuffPutUnicode(b, CharAttrTmp, InsertMode);
 			break;
 		}
+#if 0
 	} else if (ts.Language == IdRussian) {
+		assert(FALSE);
 		// CP1251\x82ɕϊ\xB7
 		BYTE c = RussConv(ts.KanjiCode, IdWindows, b);
 		// CP1251->Unicode
 		unsigned long u32 = MBCP_UTF32(c, 1251);
 		BuffPutUnicode(u32, CharAttrTmp, InsertMode);
+#endif
 	} else {
 		BuffPutUnicode(b, CharAttrTmp, InsertMode);
 	}


ttssh2-commit メーリングリストの案内
Back to archive index