[Ttssh2-commit] [6513] 漢字コード設定を変更した時は内部状態をクリアする為に、

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2016年 10月 27日 (木) 12:06:40 JST


Revision: 6513
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6513
Author:   doda
Date:     2016-10-27 12:06:40 +0900 (Thu, 27 Oct 2016)
Log Message:
-----------
漢字コード設定を変更した時は内部状態をクリアする為に、
[Setup] - [Terminal] を空呼びするようにした。

Modified Paths:
--------------
    trunk/TTXKanjiMenu/ttxkanjimenu.c
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.c
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.c	2016-10-27 03:06:36 UTC (rev 6512)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c	2016-10-27 03:06:40 UTC (rev 6513)
@@ -15,6 +15,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttplugin.h"
+#include "tt_res.h"
 #include "i18n.h"
 
 #include <stdlib.h>
@@ -49,6 +50,7 @@
 	PReadIniFile origReadIniFile;
 	PWriteIniFile origWriteIniFile;
 	BOOL UseOneSetting;
+	BOOL NeedResetCharSet;
 } TInstVar;
 
 static TInstVar FAR * pvar;
@@ -65,6 +67,7 @@
 	pvar->origReadIniFile = NULL;
 	pvar->origWriteIniFile = NULL;
 	pvar->UseOneSetting = TRUE;
+	pvar->NeedResetCharSet = FALSE;
 }
 
 static BOOL FAR PASCAL TTXKanjiMenuSetupTerminal(HWND parent, PTTSet ts) {
@@ -98,8 +101,16 @@
 	return ret;
 }
 
+static BOOL FAR PASCAL ResetCharSet(HWND parent, PTTSet ts) {
+	pvar->NeedResetCharSet = FALSE;
+	return TRUE;
+}
+
 static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
-	if (pvar->UseOneSetting && (pvar->ts->Language == IdJapanese || pvar->ts->Language == IdKorean)) {
+	if (pvar->NeedResetCharSet) {
+		*hooks->SetupTerminal = ResetCharSet;
+	}
+	else if (pvar->UseOneSetting && (pvar->ts->Language == IdJapanese || pvar->ts->Language == IdKorean)) {
 		pvar->origSetupTermDlg = *hooks->SetupTerminal;
 		*hooks->SetupTerminal = TTXKanjiMenuSetupTerminal;
 	}
@@ -390,6 +401,8 @@
 			}
 			pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
 		}
+		pvar->NeedResetCharSet = TRUE;
+		SendMessage(hWin, WM_COMMAND, MAKELONG(ID_SETUP_TERMINAL, 0), 0);
 		return UpdateRecvMenu(pvar->ts->KanjiCode)?1:0;
 	}
 	else if ((cmd > ID_MI_KANJISEND) && (cmd <= ID_MI_KANJISEND+IdUTF8)) {
@@ -397,9 +410,13 @@
 		pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
 		if (pvar->UseOneSetting) {
 			pvar->cv->KanjiCodeEcho = pvar->ts->KanjiCode = val;
+			pvar->NeedResetCharSet = TRUE;
+			SendMessage(hWin, WM_COMMAND, MAKELONG(ID_SETUP_TERMINAL, 0), 0);
 			return UpdateRecvMenu(pvar->ts->KanjiCode)?1:0;
 		}
 		else {
+			pvar->NeedResetCharSet = TRUE;
+			SendMessage(hWin, WM_COMMAND, MAKELONG(ID_SETUP_TERMINAL, 0), 0);
 			return UpdateSendMenu(pvar->ts->KanjiCodeSend)?1:0;
 		}
 	}

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2016-10-27 03:06:36 UTC (rev 6512)
+++ trunk/doc/en/html/about/history.html	2016-10-27 03:06:40 UTC (rev 6513)
@@ -53,7 +53,7 @@
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.79">2.79</a></li>
-      <li></li>
+      <li>upgraded TTX KanjiMenu Plug-in to <a href="#kanjimenu_0.1.7">0.1.7</a></li>
     </ul>
   </li>
 </ul>
@@ -4382,6 +4382,11 @@
 
 <h2><a name="kanjimenu">TTX KanjiMenu</a></h2>
 
+<h3><a name="kanjimenu_0.1.7">2016.xx.xx (Ver 0.1.7)</a></h3>
+<ul class="history">
+      <!-- li>\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x95ύX\x8E\x9E\x81ATera Term\x82̓\xE0\x95\x94\x82̊\xBF\x8E\x9A\x83R\x81[\x83h\x8A֘A\x82̏\xF3\x91Ԃ\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li -->
+</ul>
+
 <h3><a name="kanjimenu_0.1.6">2009.7.5 (Ver 0.1.6)</a></h3>
 <ul class="history">
       <li>added support when the setting of Language is Korean.</li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2016-10-27 03:06:36 UTC (rev 6512)
+++ trunk/doc/ja/html/about/history.html	2016-10-27 03:06:40 UTC (rev 6513)
@@ -53,7 +53,7 @@
   <li>\x82\xBB\x82̑\xBC
     <ul>
       <li><a href="#ttssh_2.79">TTSSH(2.79)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
-      <li></li>
+      <li><a href="#kanjimenu_0.1.7">TTX KanjiMenu Plugin(0.1.7)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
   </li>
 </ul>
@@ -4387,6 +4387,11 @@
 
 <h2><a name="kanjimenu">TTX KanjiMenu</a></h2>
 
+<h3><a name="kanjimenu_0.1.7">2016.xx.xx (Ver 0.1.7)</a></h3>
+<ul class="history">
+      <li>\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x95ύX\x8E\x9E\x81ATera Term\x82̓\xE0\x95\x94\x82̊\xBF\x8E\x9A\x83R\x81[\x83h\x8A֘A\x82̏\xF3\x91Ԃ\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+</ul>
+
 <h3><a name="kanjimenu_0.1.6">2009.7.5 (Ver 0.1.6)</a></h3>
 <ul class="history">
       <li>Language \x90ݒ肪 Korean \x82̎\x9E\x82ɂ\xE0\x91Ή\x9E\x82\xB5\x82\xBD\x81B</li>



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