提交: 866eaa0b8abd476d32876bc7aa41ba1030d44477 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• 修订版: 866eaa0b8abd476d32876bc7aa41ba1030d44477 (tree)
• 时间: 2020-04-26 23:35:19
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

描画APIをUnicode/ANSI切り替えできるようにした

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@8748 f5f01b69-1e22-0410-acbf-894ab4bd6246

更改概述

• modified: teraterm/teraterm/buffer.c
• modified: teraterm/teraterm/buffer.h
• modified: teraterm/teraterm/vtwin.cpp

差异

--- a/teraterm/teraterm/buffer.c
+++ b/teraterm/teraterm/buffer.c
@@ -107,6 +107,7 @@ static POINT DblClkStart, DblClkEnd;
 // 描画
 static int StrChangeStart;	// 描画開始 X (Y=CursorY)
 static int StrChangeCount;	// 描画キャラクタ数(半角単位),0のとき描画するものがない
+static BOOL UseUnicodeApi;
 
 static BOOL SeveralPageSelect;  // add (2005.5.15 yutaka)
 
@@ -458,10 +459,12 @@ allocate_error:
 	return FALSE;
 }
 
-void InitBuffer()
+void InitBuffer(BOOL use_unicode_api)
 {
 	int Ny;
 
+	UseUnicodeApi = use_unicode_api;
+
 	/* setup terminal */
 	NumOfColumns = ts.TerminalWidth;
 	NumOfLines = ts.TerminalHeight;
@@ -3190,11 +3193,12 @@ static void BuffDrawLineI(int DrawX, int DrawY, int SY, int IStart, int IEnd)
 #endif
 
 			DispSetupDC(CurAttr, CurSelected);
-#if UNICODE_DISPLAY
-			DispStrW(bufW, bufWW, lenW, Y, &X);
-#else
-			DispStr(bufA, lenA, Y, &X);
-#endif
+			if (UseUnicodeApi) {
+				DispStrW(bufW, bufWW, lenW, Y, &X);
+			}
+			else {
+				DispStr(bufA, lenA, Y, &X);
+			}
 
 			lenA = 0;
 			lenW = 0;

--- a/teraterm/teraterm/buffer.h
+++ b/teraterm/teraterm/buffer.h
@@ -73,7 +73,7 @@ typedef struct {
 
 typedef TCharAttr *PCharAttr;
 
-void InitBuffer();
+void InitBuffer(BOOL use_unicode_api);
 void LockBuffer();
 void UnlockBuffer();
 void FreeBuffer();

--- a/teraterm/teraterm/vtwin.cpp
+++ b/teraterm/teraterm/vtwin.cpp
@@ -644,7 +644,7 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 #endif
 
 	/* Initialize scroll buffer */
-	InitBuffer();
+	InitBuffer(IsWindowsNTKernel() ? TRUE : FALSE);
 
 	InitDisp();