Commit: c8ab6a09c888ce4d3e536d968035c7685f226982 - Tera_Term_Testing (git)

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

Commit MetaInfo

• Revision: c8ab6a09c888ce4d3e536d968035c7685f226982 (tree)
• Time: 2019-03-15 00:54:31
• Author: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

LoadIME()#ttime.cのエラー表示処理を呼び元のvtdisp.cに移動した

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

Change Summary

• modified: teraterm/teraterm/ttime.c
• modified: teraterm/teraterm/ttime.h
• modified: teraterm/teraterm/vtdisp.c
• modified: teraterm/teraterm/vtwin.cpp

Incremental Difference

--- a/teraterm/teraterm/ttime.c
+++ b/teraterm/teraterm/ttime.c
@@ -45,7 +45,8 @@
 #include "buffer.h"		// for BuffGetCurrentLineData()
 #endif
 
-#if 0	// #ifndef _IMM_
+// imm.h が include できれば _IMM_ が define される → このブロック不要?
+#ifndef _IMM_
   #define _IMM_
 
   typedef DWORD HIMC;
@@ -81,32 +82,7 @@ static TImmSetOpenStatus PImmSetOpenStatus;
 static HANDLE HIMEDLL = NULL;
 static LOGFONTA lfIME;
 
-#if 1
-static void show_message()
-{
-#if 0
-  PTTSet tempts;
-#endif
-  char uimsg[MAX_UIMSG];
-    get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
-    get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
-    MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
-    WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
-    ts.UseIME = 0;
-#if 0
-    tempts = (PTTSet)malloc(sizeof(TTTSet));
-    if (tempts!=NULL)
-    {
-		GetDefaultSet(tempts);
-		tempts->UseIME = 0;
-		ChangeDefaultSet(tempts,NULL);
-		free(tempts);
-    }
-#endif
-}
-#endif
-
-BOOL LoadIME()
+BOOL LoadIME(void)
 {
   BOOL Err;
   char imm32_dll[MAX_PATH];
@@ -117,7 +93,6 @@ BOOL LoadIME()
   HIMEDLL = LoadLibraryA(imm32_dll);
   if (HIMEDLL == NULL)
   {
-	  show_message();
     return FALSE;
   }
 
@@ -179,7 +154,7 @@ void FreeIME(HWND hWnd)
   FreeLibrary(HTemp);
 }
 
-BOOL CanUseIME()
+BOOL CanUseIME(void)
 {
   return (HIMEDLL != NULL);
 }
@@ -280,7 +255,8 @@ BOOL GetIMEOpenStatus(HWND hWnd)
 
 }
 
-void SetIMEOpenStatus(HWND hWnd, BOOL stat) {
+void SetIMEOpenStatus(HWND hWnd, BOOL stat)
+{
 	HIMC hIMC;
 
 	if (HIMEDLL==NULL) return;

--- a/teraterm/teraterm/ttime.h
+++ b/teraterm/teraterm/ttime.h
@@ -34,9 +34,9 @@ extern "C" {
 #endif
 
 /* proto types */
-BOOL LoadIME();
+BOOL LoadIME(void);
 void FreeIME(HWND hWnd);
-BOOL CanUseIME();
+BOOL CanUseIME(void);
 void SetConversionWindow(HWND HWnd, int X, int Y);
 void SetConversionLogFont(HWND HWnd, PLOGFONTA lf);
 BOOL GetIMEOpenStatus(HWND hWnd);

--- a/teraterm/teraterm/vtdisp.c
+++ b/teraterm/teraterm/vtdisp.c
@@ -2058,8 +2058,14 @@ void ResetIME()
 	{
 		if (ts.UseIME==0)
 			FreeIME(HVTWin);
-		else if (! LoadIME())
+		else if (! LoadIME()) {
+			char uimsg[MAX_UIMSG];
+			get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
+			get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
+			MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
+			WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
 			ts.UseIME = 0;
+		}
 
 		if (ts.UseIME>0)
 		{

--- a/teraterm/teraterm/vtwin.cpp
+++ b/teraterm/teraterm/vtwin.cpp
@@ -3226,22 +3226,23 @@ LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 		size_t len;
 		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
 		if (lpstr != NULL) {
+			const wchar_t *output_wstr = lpstr;
 			if (len == 1 && ControlKey()) {
 				const static wchar_t code_ctrl_space = 0;
 				const static wchar_t code_ctrl_backslash = 0x1c;
 				switch(*lpstr) {
 				case 0x20:
-					lpstr = &code_ctrl_space;
+					output_wstr = &code_ctrl_space;
 					break;
 				case 0x5c: // Ctrl-\ support for NEC-PC98
-					lpstr = &code_ctrl_backslash;
+					output_wstr = &code_ctrl_backslash;
 					break;
 				}
 			}
 			if (ts.LocalEcho>0) {
-				CommTextEchoW(&cv,lpstr,len);
+				CommTextEchoW(&cv,output_wstr,len);
 			}
-			CommTextOutW(&cv,lpstr,len);
+			CommTextOutW(&cv,output_wstr,len);
 			free((void *)lpstr);
 			return 0;
 		}