svnno****@sourc*****
svnno****@sourc*****
2014年 10月 11日 (土) 10:16:14 JST
Tera TermRevision: 5684
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5684
Author: maya
Date: 2014-10-11 10:16:12 +0900 (Sat, 11 Oct 2014)
Log Message:
-----------
アクセスキー Alt+D と Alt+G を無効にできるスイッチを追加
https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=34396
Modified Paths:
--------------
trunk/installer/release/TERATERM.INI
trunk/teraterm/common/tt_res.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/installer/release/TERATERM.INI 2014-10-11 01:16:12 UTC (rev 5684)
@@ -62,18 +62,24 @@
; Starting the selection only by a left button.
SelectOnlyByLButton=on
+; New connection by Alt-N Accelerator key
+AcceleratorNewConnection=on
+
; Duplicate session by Alt-D Accelerator key disabled
DisableAcceleratorDuplicateSession=off
+; Cygwin connection by Alt-G Accelerator key
+AcceleratorCygwinConnection=on
+
; Send break by Alt-B Accelerator key disabled
DisableAcceleratorSendBreak=off
+; New connection Menu disabled
+DisableMenuNewConnection=off
+
; Duplicate session Menu disabled
DisableMenuDuplicateSession=off
-; New connection Menu disabled
-DisableMenuNewConnection=off
-
; Send break Menu disabled
DisableMenuSendBreak=off
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/common/tt_res.h 2014-10-11 01:16:12 UTC (rev 5684)
@@ -186,6 +186,8 @@
#define ID_ACC_AREYOUTHERE 50007
#define ID_ACC_PASTE 50008
#define ID_ACC_DISCONNECT 50009
+#define ID_ACC_DUPLICATESESSION 50010
+#define ID_ACC_CYGWINCONNECTION 50011
#define ID_FILE_NEWCONNECTION 50110
#define ID_FILE_DUPLICATESESSION 50111
#define ID_FILE_CYGWINCONNECTION 50112
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/common/tttypes.h 2014-10-11 01:16:12 UTC (rev 5684)
@@ -582,6 +582,8 @@
char JoinSplitURLIgnoreEOLChar;
char MulticastName[MAX_PATH];
WORD DebugModes;
+ WORD AcceleratorNewConnection;
+ WORD AcceleratorCygwinConnection;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1045,6 +1047,10 @@
* Increment the number of this macro value
* when you change TMap or member of TMap.
*
+ * - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
+ * added tttset.AcceleratorNewConnection
+ * added tttset.AcceleratorCygwinConnection
+ *
* - At version 4.83, ttset_memfilemap was replaced with ttset_memfilemap_24.
* added tttset.DebugModes
*
@@ -1187,4 +1193,4 @@
* added tttset.VTCompatTab.
*/
-#define TT_FILEMAPNAME "ttset_memfilemap_24"
+#define TT_FILEMAPNAME "ttset_memfilemap_25"
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/teraterm/ttermpro.rc 2014-10-11 01:16:12 UTC (rev 5684)
@@ -621,8 +621,8 @@
"R", ID_ACC_PASTECR, VIRTKEY, ALT, NOINVERT
"P", ID_ACC_PRINT, VIRTKEY, ALT, NOINVERT
"B", ID_ACC_SENDBREAK, VIRTKEY, ALT, NOINVERT
- "G", ID_FILE_CYGWINCONNECTION, VIRTKEY, ALT, NOINVERT
- "D", ID_FILE_DUPLICATESESSION, VIRTKEY, ALT, NOINVERT
+ "G", ID_ACC_CYGWINCONNECTION, VIRTKEY, ALT, NOINVERT
+ "D", ID_ACC_DUPLICATESESSION, VIRTKEY, ALT, NOINVERT
"I", ID_ACC_DISCONNECT, VIRTKEY, ALT, NOINVERT
END
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/teraterm/vtwin.cpp 2014-10-11 01:16:12 UTC (rev 5684)
@@ -1637,7 +1637,7 @@
case ID_ACC_DISCONNECT:
Disconnect(TRUE);
return TRUE;
- case ID_FILE_DUPLICATESESSION:
+ case ID_ACC_DUPLICATESESSION:
// added DisableAcceleratorDuplicateSession (2009.4.6 maya)
if (!ts.DisableAcceleratorDuplicateSession)
OnDuplicateSession();
@@ -1646,8 +1646,13 @@
if (ActiveWin==IdVT) {
switch (wID) {
case ID_ACC_NEWCONNECTION:
- OnFileNewConnection();
+ if (ts.AcceleratorNewConnection)
+ OnFileNewConnection();
return TRUE;
+ case ID_ACC_CYGWINCONNECTION:
+ if (ts.AcceleratorCygwinConnection)
+ OnCygwinConnection();
+ return TRUE;
case ID_ACC_COPY:
OnEditCopy();
return TRUE;
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/ttpset/ttset.c 2014-10-11 01:16:12 UTC (rev 5684)
@@ -1364,6 +1364,12 @@
ts->DisableAcceleratorDuplicateSession =
GetOnOff(Section, "DisableAcceleratorDuplicateSession", FName, FALSE);
+ ts->AcceleratorNewConnection =
+ GetOnOff(Section, "AcceleratorNewConnection", FName, TRUE);
+
+ ts->AcceleratorCygwinConnection =
+ GetOnOff(Section, "AcceleratorCygwinConnection", FName, TRUE);
+
// added DisableMenuDuplicateSession (2010.8.3 maya)
ts->DisableMenuDuplicateSession =
GetOnOff(Section, "DisableMenuDuplicateSession", FName, FALSE);
@@ -2566,6 +2572,12 @@
WriteOnOff(Section, "DisableAcceleratorDuplicateSession", FName,
ts->DisableAcceleratorDuplicateSession);
+ WriteOnOff(Section, "AcceleratorNewConnection", FName,
+ ts->AcceleratorNewConnection);
+
+ WriteOnOff(Section, "AcceleratorCygwinConnection", FName,
+ ts->AcceleratorCygwinConnection);
+
// DisableMenuDuplicateSession
WriteOnOff(Section, "DisableMenuDuplicateSession", FName,
ts->DisableMenuDuplicateSession);