svnno****@sourc*****
svnno****@sourc*****
2012年 5月 11日 (金) 00:40:39 JST
Tera TermRevision: 4938
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4938
Author: yutakapon
Date: 2012-05-11 00:40:38 +0900 (Fri, 11 May 2012)
Log Message:
-----------
IME前後フィードバック機能が、"IME=off"の場合は作動しないようにした。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/doc/en/html/about/history.html 2012-05-10 15:40:38 UTC (rev 4938)
@@ -72,7 +72,7 @@
</ul></li>
<li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
<li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
- <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well.</li>
+ <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/doc/ja/html/about/history.html 2012-05-10 15:40:38 UTC (rev 4938)
@@ -72,7 +72,7 @@
</ul></li>
<li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90ݒ\xE8\x95ۑ\xB6\x82ł\xAB\x82\xBD\x8Fꍇ\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
- <li>IME\x82̑O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς݁BMS-IME2010\x82ł͓\xAE\x8D\xEC\x95s\x89B</li>
+ <li>IME\x82̑O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς݁BMS-IME2010\x82ł͓\xAE\x8D\xEC\x95s\x89B"IME=off"(teraterm.ini)\x82̏ꍇ\x82͋@\x94\\x96\xB3\x8C\xF8\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/teraterm/teraterm/vtwin.cpp 2012-05-10 15:40:38 UTC (rev 4938)
@@ -3009,7 +3009,9 @@
char buf[512], newbuf[1024];
HIMC hIMC;
- if (wParam == IMR_DOCUMENTFEED) {
+ // "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
+ if (ts.UseIME > 0 &&
+ wParam == IMR_DOCUMENTFEED) {
size = NumOfColumns + 1; // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
if (lParam == 0) { // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5