svnno****@sourc*****
svnno****@sourc*****
2012年 2月 4日 (土) 23:20:57 JST
Revision: 4822 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4822 Author: maya Date: 2012-02-04 23:20:57 +0900 (Sat, 04 Feb 2012) Log Message: ----------- ログ取得開始時にログウィンドウが一瞬アクティブになる動作を修正 http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=27375 ダイアログを Create すると Visible=False でもアクティブになるので WS_EX_NOACTIVATE を使う WS_EX_NOACTIVATE が Windows 2000 以降サポートなのでそれより前の OS には対応できない Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/teraterm/teraterm/ftdlg.cpp trunk/teraterm/teraterm/ttdde.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2012-02-04 09:49:36 UTC (rev 4821) +++ trunk/doc/en/html/about/history.html 2012-02-04 14:20:57 UTC (rev 4822) @@ -69,6 +69,7 @@ <li>Updated the Cyrillic letter translation table(range of KOI8-R, CP866, Windows-1251 and ISO8859-5).</li> <li>"<a href="../macro/command/filerename.html">filerename</a>" macro command: When a file can not be renamed, the error code stores to the result variable.</li> <li>The packet number will not be correct while sending a file by using the XMODEM and YMODEM protocol.</li> + <!--li>\x83\x8D\x83O\x8E擾\x82\xF0\x8AJ\x8En\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83\x8D\x83O\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x88\xEA\x8Fu\x83A\x83N\x83e\x83B\x83u\x82ɂȂ铮\x8D\xEC\x82\xF0\x8FC\x90\xB3(\x91\xF4\x82\xCD Windows 2000 \x88ȍ~\x82ł̂ݗL\x8C\xF8)\x81B</li--> </ul> </li> Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2012-02-04 09:49:36 UTC (rev 4821) +++ trunk/doc/ja/html/about/history.html 2012-02-04 14:20:57 UTC (rev 4822) @@ -69,6 +69,7 @@ <li>\x83L\x83\x8A\x83\x8B\x95\xB6\x8E\x9A\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B(KOI8-R, CP866, Windows-1251, ISO8859-5 \x8A\xD4)\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> <li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h "<a href="../macro/command/filerename.html">filerename</a>" \x82ɂ\xA8\x82\xA2\x82āA\x83\x8A\x83l\x81[\x83\x80\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x81Aresult \x82ɃG\x83\x89\x81[\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> <li>XMODEM, YMODEM \x82ő\x97\x90M\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83p\x83P\x83b\x83g\x94ԍ\x86\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3</li> + <li>\x83\x8D\x83O\x8E擾\x82\xF0\x8AJ\x8En\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83\x8D\x83O\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x88\xEA\x8Fu\x83A\x83N\x83e\x83B\x83u\x82ɂȂ铮\x8D\xEC\x82\xF0\x8FC\x90\xB3(\x91\xF4\x82\xCD Windows 2000 \x88ȍ~\x82ł̂ݗL\x8C\xF8)\x81B</li> </ul> </li> Modified: trunk/teraterm/teraterm/ftdlg.cpp =================================================================== --- trunk/teraterm/teraterm/ftdlg.cpp 2012-02-04 09:49:36 UTC (rev 4821) +++ trunk/teraterm/teraterm/ftdlg.cpp 2012-02-04 14:20:57 UTC (rev 4822) @@ -30,7 +30,7 @@ BOOL Ok; WNDCLASS wc; int fuLoad = LR_DEFAULTCOLOR; - HWND hwnd = GetForegroundWindow()->GetSafeHwnd(); + HWND hwnd; fv = pfv; cv = pcv; @@ -52,6 +52,7 @@ RegisterClass(&wc); Pause = FALSE; + hwnd = GetForegroundWindow()->GetSafeHwnd(); if (fv->OpId == OpLog) { // parent window is desktop Ok = CDialog::Create(CFileTransDlg::IDD, GetDesktopWindow()); } @@ -67,6 +68,8 @@ } } else { + // \x92\xBC\x91O\x82Ƀt\x83H\x83A\x83O\x83\x89\x83E\x83\x93\x83h\x82\xBE\x82\xC1\x82\xBD\x83E\x83B\x83\x93\x83h\x83E\x82Ƀt\x83H\x81[\x83J\x83X\x82\xF0\x96߂\xB7\x81B + // \x83\x81\x83j\x83\x85\x81[\x82\xA9\x82烍\x83O\x82\xF0\x83X\x83^\x81[\x83g\x82\xB5\x82\xBD\x8E\x9E\x82\xC9 VTWin \x82Ƀt\x83H\x81[\x83J\x83X\x82\xAA\x96߂\xE7\x82Ȃ\xA2\x82̂ŕK\x97v\x82\xC1\x82ۂ\xA2\x81B ::SetForegroundWindow(hwnd); } @@ -159,6 +162,15 @@ { int fuLoad = LR_DEFAULTCOLOR; + if (fv->HideDialog) { + // Visible = False \x82ł\xE0\x83t\x83H\x83A\x83O\x83\x89\x83E\x83\x93\x83h\x82ɗ\x88\x82Ă\xB5\x82܂\xA4\x82̂ŁA\x82\xBB\x82\xA4\x82Ȃ\xE7\x82Ȃ\xA2 + // \x82悤\x82Ɋg\x92\xA3\x83X\x83^\x83C\x83\x8B WS_EX_NOACTIVATE \x82\xF0\x8Ew\x92肷\x82\xE9\x81B + // (Windows 2000 \x88ȏ\xE3\x82ŗL\x8C\xF8) + // WS_EX_NOACTIVATE \x82\xF0\x8Ew\x92肷\x82\xE9\x82ƕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82鎞\x82\xE0\x83^\x83X\x83N\x83o\x81[\x82Ɍ\xBB\x82\xEA\x82Ȃ\xA2 + // \x82̂\xC5 WS_EX_APPWINDOW \x82\xE0\x8Ew\x92肷\x82\xE9\x81B + ModifyStyleEx(0, WS_EX_NOACTIVATE | WS_EX_APPWINDOW); + } + SetWindowText(fv->DlgCaption); SetDlgItemText(IDC_TRANSFNAME, &(fv->FullName[fv->DirLen])); Modified: trunk/teraterm/teraterm/ttdde.c =================================================================== --- trunk/teraterm/teraterm/ttdde.c 2012-02-04 09:49:36 UTC (rev 4821) +++ trunk/teraterm/teraterm/ttdde.c 2012-02-04 14:20:57 UTC (rev 4822) @@ -635,8 +635,11 @@ case '8': //steven add if (HWndLog == NULL) break; - else + else { ShowWindow(HWndLog, SW_RESTORE); + // \x8Ag\x92\xA3\x83X\x83^\x83C\x83\x8B WS_EX_NOACTIVATE \x8F\xF3\x91Ԃ\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9 + SetForegroundWindow(HWndLog); + } break; } break;