[Ttssh2-commit] [8330] TTIMESV/TTIMERS が正しく働かないのを修正。

scmno****@osdn***** scmno****@osdn*****
2019年 10月 25日 (金) 20:31:34 JST


Revision: 8330
          https://osdn.net/projects/ttssh2/scm/svn/commits/8330
Author:   doda
Date:     2019-10-25 20:31:34 +0900 (Fri, 25 Oct 2019)
Log Message:
-----------
TTIMESV/TTIMERS が正しく働かないのを修正。

Ticket: #39702

問題:
  TTIMESV(IME状態保存)/TTIMERS(IME状態復元)制御シーケンスが働かない。

原因:
  IMEの現在の状態を記憶しておく変数と、制御シーケンス用にIMEの状態を
  保存しておく変数に同じ物を使っていた為。

対処:
  制御シーケンス用のIME状態保存変数を変更した。

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/39702

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-10-24 10:41:21 UTC (rev 8329)
+++ trunk/doc/en/html/about/history.html	2019-10-25 11:31:34 UTC (rev 8330)
@@ -68,6 +68,7 @@
       <li>The toolchip during resizing can not be displayed on the left and top edge of the desktop. This bug was introduced in 4.103.</li>
       <li>Eterm look-feel: When a image file is randomly selected with the wallpaper, invalid file may be selected. </li>
       <li>The help button of File-Log, File-Trasnfer, Setup-Font and Printer dialog does not work well. This bug was introduced in 4.104.</li>
+      <li>Fixed a problem that TTIMESV (Save IME status) / TTIMERS (Restore IME status) control sequences do not work.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-10-24 10:41:21 UTC (rev 8329)
+++ trunk/doc/ja/html/about/history.html	2019-10-25 11:31:34 UTC (rev 8330)
@@ -68,6 +68,7 @@
       <li>\x83\x8A\x83T\x83C\x83Y\x92\x86\x82̏c\x89\xA1\x83T\x83C\x83Y\x83c\x81[\x83\x8B\x83`\x83b\x83v\x82\xAA\x81A\x83f\x83X\x83N\x83g\x83b\x83v\x82̍\xB6\x92[\x82Ə\xE3\x92[\x82ŕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
       <li>Eterm look-feel: \x95ǎ\x86\x82ƍ\xAC\x8D\x87\x82\xB7\x82\xE9\x89摜\x83t\x83@\x83C\x83\x8B\x82\xF0\x83\x89\x83\x93\x83_\x83\x80\x82ɑI\x91\xF0\x82\xB7\x82\xE9\x8DہA\x96\xB3\x8A֌W\x82ȃt\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB7\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>\x83\x8D\x83O\x8D̎\xE6\x81E\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x81E\x83t\x83H\x83\x93\x83g\x81E\x88\xF3\x8D\xFC\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x8B@\x94\\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.104\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li>TTIMESV(IME\x8F\xF3\x91ԕۑ\xB6)/TTIMERS(IME\x8F\xF3\x91ԕ\x9C\x8C\xB3)\x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x82\xA9\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-10-24 10:41:21 UTC (rev 8329)
+++ trunk/teraterm/teraterm/vtterm.c	2019-10-25 11:31:34 UTC (rev 8330)
@@ -206,6 +206,9 @@
 static int ButtonStat;
 static int FilterTop, FilterBottom, FilterLeft, FilterRight;
 
+/* Saved IME status */
+static BOOL SavedIMEstatus;
+
 /* Beep over-used */
 static DWORD BeepStartTime = 0;
 static DWORD BeepSuppressTime = 0;
@@ -337,7 +340,7 @@
 	BracketedPaste = FALSE;
 
 	// Saved IME Status
-	IMEstat = FALSE;
+	SavedIMEstatus = FALSE;
 
 	// previous received character
 	PrevCharacter = -1;	// none
@@ -2729,13 +2732,13 @@
 	switch (b) {
 	  case 'r':
 		if (CanUseIME()) {
-			SetIMEOpenStatus(HVTWin, IMEstat);
+			SetIMEOpenStatus(HVTWin, SavedIMEstatus);
 		}
 		break;
 
 	  case 's':
 		if (CanUseIME()) {
-			IMEstat = GetIMEOpenStatus(HVTWin);
+			SavedIMEstatus = GetIMEOpenStatus(HVTWin);
 		}
 		break;
 


Ttssh2-commit メーリングリストの案内