[6512] EUC 設定で UTF-8 文字列を表示した後に UTF-8 設定に切り替えた時に、 (Ttssh2-commit) - Tera Term

Revision: 6512
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6512
Author:   doda
Date:     2016-10-27 12:06:36 +0900 (Thu, 27 Oct 2016)
Log Message:
-----------
EUC 設定で UTF-8 文字列を表示した後に UTF-8 設定に切り替えた時に、
漢字が正しく表示できなくなる事がある問題を修正。

再現手順:
  1. EUC 設定に変更
  2. echo "あ" | nkf -w ; cat を実行
  3. UTF-8 設定に変更
  4. Ctrl-C で cat を中断
  5. 以降、漢字が正しく表示できなくなる

原因:
  ConvJIS フラグのクリア漏れ

対処:
  vtterm.c:ResetCharSet() にて ConvJIS フラグをクリアするようにした。
  [Setup] - [Terminal] 呼び出し後 CVTWindow::SetupTerm() 経由で
  ResetCharSet() が呼び出される。
  TTXKanjiMenu で変更した場合は呼び出されないので別途対応が必要。

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	2016-10-22 13:54:26 UTC (rev 6511)
+++ trunk/doc/en/html/about/history.html	2016-10-27 03:06:36 UTC (rev 6512)
@@ -44,6 +44,7 @@
       <li>When <a href="../setup/teraterm-misc.html#DeferredLogWriteMode">DeferredLogWriteMode</a>=on is enabled and a log file is closed soon after opening the file, Tera Term rarely halts by dead-lock.</li>
       <li>Windows 7 and Vista: When special operation is done on <a href="..\menu\setup-general.html">General setup dialog</a>, an application fault occurs.</li>
       <li>When <a href="../menu/file-log.html">Log dialog</a> is closed, the memory leak of Tera Term core(ttermpro.exe) is happened.</li>
+      <!-- li>\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x82\xAA EUC \x90ݒ\xE8\x82̎\x9E\x82\xC9 UTF-8 \x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x8C\xE3\x81AUTF-8 \x90ݒ\xE8\x82ɕύX\x82\xB5\x82\xBD\x8E\x9E\x82Ɋ\xBF\x8E\x9A\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ鎖\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li -->
       <li>MACRO: When <a href="../macro/command/closesbox.html">closesbox</a> command is executed, the memory leak of Macro core(ttpmacro.exe) is happened.</li>
       <li>MACRO: The gethostname, gettitle, getmodemstatus, loginfo and logopen command will rarely be wrong.</li>
     </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2016-10-22 13:54:26 UTC (rev 6511)
+++ trunk/doc/ja/html/about/history.html	2016-10-27 03:06:36 UTC (rev 6512)
@@ -44,6 +44,7 @@
       <li><a href="../setup/teraterm-misc.html#DeferredLogWriteMode">DeferredLogWriteMode</a>=on \x82̏ꍇ\x82ɂ\xA8\x82\xA2\x82āA\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82̃I\x81[\x83v\x83\x93\x8C\xE3\x81A\x82\xB7\x82\xAE\x82ɃN\x83\x8D\x81[\x83Y\x82\xF0\x8Ds\x82\xA4\x82ƁA\x82܂\xEA\x82\xC9 Tera Term \x82\xAA\x83f\x83b\x83h\x83\x8D\x83b\x83N\x82\xB5\x82ăX\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x82Ƃ\xA2\x82\xA4\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>Windows 7 / Vista \x82\xC5 <a href="..\menu\setup-general.html">General setup \x83_\x83C\x83A\x83\x8D\x83O</a> \x82œ\xC1\x8E\xEA\x82ȑ\x80\x8D\xEC\x82\xF0\x82\xB5\x82\xBD\x8E\x9E\x82ɗ\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/file-log.html">\x83\x8D\x83O\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xF0\x95‚\xB6\x82\xBD\x8E\x9E\x81ATera Term\x96{\x91\xCC(ttermpro.exe)\x82\xAA\x83\x81\x83\x82\x83\x8A\x83\x8A\x81[\x83N\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x82\xAA EUC \x90ݒ\xE8\x82̎\x9E\x82\xC9 UTF-8 \x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x8C\xE3\x81AUTF-8 \x90ݒ\xE8\x82ɕύX\x82\xB5\x82\xBD\x8E\x9E\x82Ɋ\xBF\x8E\x9A\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ鎖\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>MACRO: <a href="../macro/command/closesbox.html">closesbox</a>\x83R\x83}\x83\x93\x83h\x82̎\xC0\x8Ds\x8E\x9E\x81A\x83}\x83N\x83\x8D\x96{\x91\xCC(ttpmacro.exe)\x82\xAA\x83\x81\x83\x82\x83\x8A\x83\x8A\x81[\x83N\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>MACRO: gethostname, gettitle, getmodemstatus, loginfo, logopen \x83R\x83}\x83\x93\x83h\x82\xAA\x8AԌ\x87\x82ŃG\x83\x89\x81[\x82ɂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2016-10-22 13:54:26 UTC (rev 6511)
+++ trunk/teraterm/teraterm/vtterm.c	2016-10-27 03:06:36 UTC (rev 6512)
@@ -341,6 +341,7 @@
   EUCkanaIn = FALSE;
   EUCsupIn = FALSE;
   SSflag = FALSE;
+  ConvJIS = FALSE;
 
   cv.Language = ts.Language;
   cv.CRSend = ts.CRSend;


Tera Term

[Ttssh2-commit] [6512] EUC 設定で UTF-8 文字列を表示した後に UTF-8 設定に切り替えた時に、