svnno****@sourc*****
svnno****@sourc*****
2011年 11月 8日 (火) 11:23:38 JST
Tera TermRevision: 4710
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4710
Author: doda
Date: 2011-11-08 11:23:38 +0900 (Tue, 08 Nov 2011)
Log Message:
-----------
xterm の Back Tab (Shift+Tab) をサポート。
Modified Paths:
--------------
trunk/installer/release/EDITOR.CNF
trunk/installer/release/FUNCTION.CNF
trunk/installer/release/IBMKEYB.CNF
trunk/installer/release/NT98KEYB.CNF
trunk/installer/release/PC98KEYB.CNF
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/installer/release/EDITOR.CNF
===================================================================
--- trunk/installer/release/EDITOR.CNF 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/installer/release/EDITOR.CNF 2011-11-08 02:23:38 UTC (rev 4710)
@@ -140,6 +140,8 @@
XF4=62
; F5 key
XF5=63
+; Shift + Tab key
+XBackTab=527
[Shortcut keys]
; Ctrl + Insert
Modified: trunk/installer/release/FUNCTION.CNF
===================================================================
--- trunk/installer/release/FUNCTION.CNF 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/installer/release/FUNCTION.CNF 2011-11-08 02:23:38 UTC (rev 4710)
@@ -139,6 +139,8 @@
XF4=off
; F5 key
XF5=off
+; Shift + Tab key
+XBackTab=527
[Shortcut keys]
; Ctrl + Insert
Modified: trunk/installer/release/IBMKEYB.CNF
===================================================================
--- trunk/installer/release/IBMKEYB.CNF 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/installer/release/IBMKEYB.CNF 2011-11-08 02:23:38 UTC (rev 4710)
@@ -137,6 +137,8 @@
XF4=62
; F5 key
XF5=63
+; Shit + Tab key
+XBackTab=527
[Shortcut keys]
; Ctrl + Insert
Modified: trunk/installer/release/NT98KEYB.CNF
===================================================================
--- trunk/installer/release/NT98KEYB.CNF 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/installer/release/NT98KEYB.CNF 2011-11-08 02:23:38 UTC (rev 4710)
@@ -137,6 +137,8 @@
XF4=62
; F5 key
XF5=63
+; Shift + Tab key
+XBackTab=527
[Shortcut keys]
;Ctrl + INS
Modified: trunk/installer/release/PC98KEYB.CNF
===================================================================
--- trunk/installer/release/PC98KEYB.CNF 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/installer/release/PC98KEYB.CNF 2011-11-08 02:23:38 UTC (rev 4710)
@@ -137,6 +137,8 @@
XF4=101
; F5 key
XF5=102
+; Shift + Tab key
+XBackTab=527
[Shortcut keys]
;Ctrl + INS
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/teraterm/common/tttypes.h 2011-11-08 02:23:38 UTC (rev 4710)
@@ -742,26 +742,27 @@
#define IdHold 67
#define IdPrint 68
#define IdBreak 69
-#define IdCmdEditCopy 70
-#define IdCmdEditPaste 71
-#define IdCmdEditPasteCR 72
-#define IdCmdEditCLS 73
-#define IdCmdEditCLB 74
-#define IdCmdCtrlOpenTEK 75
-#define IdCmdCtrlCloseTEK 76
-#define IdCmdLineUp 77
-#define IdCmdLineDown 78
-#define IdCmdPageUp 79
-#define IdCmdPageDown 80
-#define IdCmdBuffTop 81
-#define IdCmdBuffBottom 82
-#define IdCmdNextWin 83
-#define IdCmdPrevWin 84
-#define IdCmdNextSWin 85
-#define IdCmdPrevSWin 86
-#define IdCmdLocalEcho 87
-#define IdScrollLock 88
-#define IdUser1 89
+#define IdXBackTab 70
+#define IdCmdEditCopy 71
+#define IdCmdEditPaste 72
+#define IdCmdEditPasteCR 73
+#define IdCmdEditCLS 74
+#define IdCmdEditCLB 75
+#define IdCmdCtrlOpenTEK 76
+#define IdCmdCtrlCloseTEK 77
+#define IdCmdLineUp 78
+#define IdCmdLineDown 79
+#define IdCmdPageUp 80
+#define IdCmdPageDown 81
+#define IdCmdBuffTop 82
+#define IdCmdBuffBottom 83
+#define IdCmdNextWin 84
+#define IdCmdPrevWin 85
+#define IdCmdNextSWin 86
+#define IdCmdPrevSWin 87
+#define IdCmdLocalEcho 88
+#define IdCmdScrollLock 89
+#define IdUser1 90
#define NumOfUDK IdUDK20-IdUDK6+1
#define NumOfUserKey 99
#define IdKeyMax IdUser1+NumOfUserKey-1
@@ -991,6 +992,8 @@
* added tttset.CtrlFlag.
* added tttset.ClickableUrlBrowser.
* added tttset.ClickableUrlBrowserArg.
+ * added XBackTab Key ID.
+ * Key ID renumbered.
*
* - At version 4.70, ttset_memfilemap was replaced with ttset_memfilemap_16.
* added tttset.JumpList.
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/teraterm/teraterm/vtwin.cpp 2011-11-08 02:23:38 UTC (rev 4710)
@@ -2943,10 +2943,6 @@
LONG CVTWindow::OnAccelCommand(UINT wParam, LONG lParam)
{
switch (wParam) {
- case IdScrollLock:
- ScrollLock = ! ScrollLock;
- break;
-
case IdHold:
if (TalkStatus==IdTalkKeyb) {
Hold = ! Hold;
@@ -3030,6 +3026,9 @@
case IdCmdRestoreSetup: // called by TTMACRO
RestoreSetup();
break;
+ case IdCmdScrollLock:
+ ScrollLock = ! ScrollLock;
+ break;
}
return 0;
}
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2011-11-08 02:23:38 UTC (rev 4710)
@@ -713,6 +713,15 @@
strncpy_s(KeyStr,destlen,"\033[15~",_TRUNCATE);
}
break;
+ case IdXBackTab: /* XTERM Back Tab */
+ if (Send8BitMode) {
+ *Len = 2;
+ strncpy_s(KeyStr,destlen,"\233Z",_TRUNCATE);
+ } else {
+ *Len = 3;
+ strncpy_s(KeyStr,destlen,"\033[Z",_TRUNCATE);
+ }
+ break;
case IdHold:
case IdPrint:
case IdBreak:
@@ -734,7 +743,7 @@
case IdCmdNextSWin:
case IdCmdPrevSWin:
case IdCmdLocalEcho:
- case IdScrollLock:
+ case IdCmdScrollLock:
PostMessage(HWin,WM_USER_ACCELCOMMAND,KeyCode,0);
break;
default:
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2011-11-05 11:03:34 UTC (rev 4709)
+++ trunk/teraterm/ttpset/ttset.c 2011-11-08 02:23:38 UTC (rev 4710)
@@ -2732,7 +2732,7 @@
GetInt(KeyMap, IdUDK20, VTFunction, "UDK20", FName);
- // XTERM function keys
+ // XTERM function / extended keys
GetInt(KeyMap, IdXF1, XFunction, "XF1", FName);
GetInt(KeyMap, IdXF2, XFunction, "XF2", FName);
@@ -2743,6 +2743,8 @@
GetInt(KeyMap, IdXF5, XFunction, "XF5", FName);
+ GetInt(KeyMap, IdXBackTab, XFunction, "XBackTab", FName);
+
// accelerator keys
GetInt(KeyMap, IdCmdEditCopy, ShortCut, "EditCopy", FName);
@@ -2780,7 +2782,7 @@
GetInt(KeyMap, IdCmdLocalEcho, ShortCut, "LocalEcho", FName);
- GetInt(KeyMap, IdScrollLock, ShortCut, "ScrollLock", FName);
+ GetInt(KeyMap, IdCmdScrollLock, ShortCut, "ScrollLock", FName);
/* user keys */