svnno****@sourc*****
svnno****@sourc*****
2010年 3月 26日 (金) 19:47:59 JST
Tera TermRevision: 3827
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3827
Author: yutakapon
Date: 2010-03-26 19:47:59 +0900 (Fri, 26 Mar 2010)
Log Message:
-----------
Control - Macro メニューã‹ã‚‰ã®ãƒžã‚¯ãƒå‘¼ã³å‡ºã—後ã€ã•ã‚‰ã«å½“該メニューをé¸æŠžã™ã‚‹ã¨ã€
ã™ã§ã«èµ·å‹•ä¸ã®ãƒžã‚¯ãƒã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ç¾¤ãŒã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ã•ã‚Œã€ã©ã®ttermpro.exeã¨ttpmacro.exeãŒ
関連付ã‘ã•ã‚Œã¦ã„ã‚‹ã®ã‹ã‚’分ã‹ã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
ãŸã ã—ã€ã†ã¾ãå‹•ã„ã¦ã„ãªã„ã®ã§ã€ãƒ•ã‚¿ã‚’ã—ã¦ã‚ã‚Šã¾ã™ã€‚
Modified Paths:
--------------
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2010-03-26 09:09:02 UTC (rev 3826)
+++ trunk/teraterm/teraterm/ttdde.c 2010-03-26 10:47:59 UTC (rev 3827)
@@ -1088,12 +1088,32 @@
// In this case, the connection to the host will
// made after the link to TT(P)MACRO is established.
{
+ static PROCESS_INFORMATION pi;
int i;
char Cmnd[MAXPATHLEN+40];
STARTUPINFO si;
- PROCESS_INFORMATION pi;
DWORD pri = NORMAL_PRIORITY_CLASS;
+ // Control menu‚©‚ç‚̃}ƒNƒŒÄ‚Ño‚µ‚ÅA‚·‚łɃ}ƒNƒ‹N“®’†‚Ìê‡A
+ // ŠY“–‚·‚é"ttpmacro"‚ðƒtƒ‰ƒbƒVƒ…‚·‚éB
+ if (FName == NULL && Startup == FALSE && ConvH != 0) {
+ HWND hwnd;
+ DWORD pid;
+
+ hwnd = GetTopWindow(NULL);
+ while (hwnd) {
+ GetWindowThreadProcessId(hwnd, &pid);
+ if (pid == pi.dwProcessId) {
+ BringWindowToTop(hwnd);
+ SetForegroundWindow(hwnd);
+ break;
+ }
+ hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
+ }
+
+ return;
+ }
+
SetTopic();
if (! InitDDE()) return;
strncpy_s(Cmnd, sizeof(Cmnd),"TTPMACRO /D=", _TRUNCATE);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2010-03-26 09:09:02 UTC (rev 3826)
+++ trunk/teraterm/teraterm/vtwin.cpp 2010-03-26 10:47:59 UTC (rev 3827)
@@ -1367,7 +1367,12 @@
}
if ((ConvH!=0) || (FileVar!=NULL)) {
+ // Control - Macro ƒƒjƒ…[‚Ì‘½dŒÄ‚Ño‚µ‚ð‹–‰Â‚·‚é‚É‚ÍA#if 1 ‚É‚·‚éB
+#if 0
+ EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_ENABLED);
+#else
EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_GRAYED);
+#endif
}
else {
EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_ENABLED);