From svnnotify @ sourceforge.jp Thu Dec 1 00:03:43 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 01 Dec 2011 00:03:43 +0900
Subject: [Ttssh2-commit] [4757] typo fix.
Message-ID: <1322665423.209195.13457.nullmailer@users.sourceforge.jp>
Revision: 4757
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4757
Author: maya
Date: 2011-12-01 00:03:43 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
typo fix.
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-11-30 14:56:09 UTC (rev 4756)
+++ trunk/doc/en/html/about/history.html 2011-11-30 15:03:43 UTC (rev 4757)
@@ -76,7 +76,7 @@
- Modified Tera Term installer script
- upgraded TTSSH to 2.59
- upgraded TeraTerm Menu to 1.11
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-11-30 14:56:09 UTC (rev 4756)
+++ trunk/doc/ja/html/about/history.html 2011-11-30 15:03:43 UTC (rev 4757)
@@ -76,7 +76,7 @@
- \x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
- - Windows Vista, 7 \x82ŁA\x8AJ\x82\xA2\x82\xBD\x83t\x83H\x83\x8B\x83_\x82?E\x83N\x83\x8A\x83b\x83N\x82\xA9\x82\xE7 CygTerm Here \x82\xF0\x8BN\x93\xAE\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+ - Windows Vista, 7 \x82ŁA\x8AJ\x82\xA2\x82\xBD\x83t\x83H\x83\x8B\x83_\x82?E\x83N\x83\x8A\x83b\x83N\x82\xA9\x82\xE7 Cygterm Here \x82\xF0\x8BN\x93\xAE\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
- TTSSH(2.59)\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B
- TeraTerm Menu(1.11)\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B
From svnnotify @ sourceforge.jp Thu Dec 1 00:42:19 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 01 Dec 2011 00:42:19 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NThdICDmlofoqIDjgpLkv67mraPjgZc=?=
=?utf-8?b?44Gf44CC?=
Message-ID: <1322667739.550042.4282.nullmailer@users.sourceforge.jp>
Revision: 4758
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4758
Author: yutakapon
Date: 2011-12-01 00:42:19 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
文言を修正した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-11-30 15:03:43 UTC (rev 4757)
+++ trunk/doc/en/html/about/history.html 2011-11-30 15:42:19 UTC (rev 4758)
@@ -40,7 +40,7 @@
- - added support for the control seqeuence to modify the tabstop.
+
- added support for configurating the control sequence to change permitted tabstops.
From svnnotify @ sourceforge.jp Thu Dec 1 12:45:38 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 01 Dec 2011 12:45:38 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NTldICBTU0gg6KqN6Ki844Gr5aSx5pWX?=
=?utf-8?b?44GX44GmIFNTSCBBdXRoZW50aWNhdGlvbiDjg4DjgqTjgqLjg63jgrDjgYw=?=
=?utf-8?b?5YaN6KGo56S644GV44KM44Gf44Go44GN44CB5pyA5Yid44Gr6KGo56S644GV?=
=?utf-8?b?44KM44Gf44Go44GN44Gr5YWl5Yqb44GV44KM44Gm44GE44Gf44Om44O844K2?=
=?utf-8?b?5ZCN44Gn44Gv44Gq44GPIFNTSCDoqK3lrprjga7jg4fjg5Xjgqnjg6vjg4g=?=
=?utf-8?b?44Om44O844K25ZCN44GMIFVzZXIgbmFtZSDjgavlhaXlipvjgZXjgozjgos=?=
=?utf-8?b?5ZWP6aGM44KS5L+u5q2j?=
Message-ID: <1322711138.445572.6233.nullmailer@users.sourceforge.jp>
Revision: 4759
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4759
Author: maya
Date: 2011-12-01 12:45:38 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
SSH 認証に失敗して SSH Authentication ダイアログが再表示されたとき、最初に表示されたときに入力されていたユーザ名ではなく SSH 設定のデフォルトユーザ名が User name に入力される問題を修正
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/auth.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/doc/en/html/about/history.html 2011-12-01 03:45:38 UTC (rev 4759)
@@ -1775,6 +1775,7 @@
- Changes
- When the SSH version of the TTSSH does not match the server protocol version, a user can not connect.
+ - The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
- added the SSHFP RR on the Security Warning dialog.
- added the "Verify hostkey fingerprint by DNS" checkbox on the "TTSSH: Setup" dialog box.
@@ -1785,10 +1786,10 @@
- Bug fixes
- - The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
- When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
+ - When the transfering display number is an integer other than zero, the X11 forwaring does not work well.
+
- When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.
- - When the transfering display number is an integer other than zero, the X11 forwaring does not work well.
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/doc/ja/html/about/history.html 2011-12-01 03:45:38 UTC (rev 4759)
@@ -1776,6 +1776,7 @@
- \x95ύX
- \x83T\x81[\x83o\x82?v\x83\x8D\x83g\x83R\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93\x82?w\x92?\x82\xBD SSH \x82?o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x88\xEA\x92v\x82\xB5\x82?\xA2\x8F?\x81A\x90?\xB1\x82\xB5\x82?\xA2\x82悤\x82?\xB5\x82\xBD\x81B
+ - \x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82?\xA7\x8C?\x8E\x9A(^A-^_)\x82\xF0\x93\xFC\x97?ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
- \x83z\x83X\x83g\x8C\xAE\x82?m\x94F(\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8Cx\x8D\x90)\x83_\x83C\x83A\x83\x8D\x83O\x82\xC9DNS\x82\xCCSSHFP RR\x82?\xE6\x82錟\x8F?\x8B\x89?\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x8B@\x94\\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B
- "SSH \x90?\xE8" \x83_\x83C\x83A\x83\x8D\x83O\x82?`\x83F\x83b\x83N\x83{\x83b\x83N\x83X(Verify hostkey fingerprint by DNS)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B
@@ -1786,10 +1787,10 @@
- \x83o\x83O\x8FC\x90\xB3
- - \x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82?\xA7\x8C?\x8E\x9A(^A-^_)\x82\xF0\x93\xFC\x97?ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
- \x83T\x81[\x83o\x82?v\x83\x8D\x83g\x83R\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA 1.99 \x82??\x82?A\x83v\x83\x8D\x83g\x83R\x83\x8B\x82\xC9 SSH1 \x82\xF0\x8Ew\x92?\x82Ă\xE0 SSH2 \x82Ő?\xB1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ - X11\x93]\x91\x97\x82ŁA\x93]\x91\x97\x90\xE6\x82?f\x83B\x83X\x83v\x83\x8C\x83C\x94?\x86\x82\xAA0\x88?O\x82?\x9E\x82?\xB3\x82\xB5\x82\xAD\x93]\x91\x97\x8Fo\x97\x88\x82?\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ - \x94F\x8F??\xB8\x94s\x82\xB5\x82\xBD\x82?\xAB\x82?\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x94F\x8F?_\x83C\x83A\x83\x8D\x83O\x82?\x86\x81[\x83U\x96\xBC\x82?A\x8D?\x89\x82?\xFC\x97?\xB5\x82\xBD\x83\x86\x81[\x83U\x96\xBC\x82ł??\xAD\x83f\x83t\x83H\x83\x8B\x83g\x82?\x86\x81[\x83U\x96\xBC\x82\xAA\x93\xFC\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
- \x83z\x83X\x83g\x8C\xAE\x82\xCCSSHFP\x8C\x9F\x8F?\xF0\x97L\x8C\xF8\x82?\xB5\x82Ă\xA2\x82鎞\x82?ASSHFP RR \x82\xAA\x88\xF8\x82\xAF\x82?\xA2\x82?A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83G\x83\x89\x81[\x82??\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
- - X11\x93]\x91\x97\x82ŁA\x93]\x91\x97\x90\xE6\x82?f\x83B\x83X\x83v\x83\x8C\x83C\x94?\x86\x82\xAA0\x88?O\x82?\x9E\x82?\xB3\x82\xB5\x82\xAD\x93]\x91\x97\x8Fo\x97\x88\x82?\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/ttssh2/ttxssh/auth.c 2011-12-01 03:45:38 UTC (rev 4759)
@@ -267,7 +267,7 @@
EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAMELABEL), FALSE);
}
- if (strlen(pvar->ssh2_username) > 0) {
+ else if (strlen(pvar->ssh2_username) > 0) {
SetDlgItemText(dlg, IDC_SSHUSERNAME, pvar->ssh2_username);
if (pvar->ssh2_autologin == 1) {
EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
From svnnotify @ sourceforge.jp Thu Dec 1 12:47:41 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 01 Dec 2011 12:47:41 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjBdICDkuIrmm7jjgY3jgqTjg7Pjgrk=?=
=?utf-8?b?44OI44O844Or5pmC44GuIEN5Z3Rlcm0gSGVyZSDplqLpgKPjg6zjgrjjgrk=?=
=?utf-8?b?44OI44Oq44Gu5YmK6Zmk5Yem55CG44KS6L+95Yqg?=
Message-ID: <1322711261.640553.8484.nullmailer@users.sourceforge.jp>
Revision: 4760
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4760
Author: maya
Date: 2011-12-01 12:47:41 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
上書きインストール時の Cygterm Here 関連レジストリの削除処理を追加
r4750関連
Modified Paths:
--------------
trunk/installer/teraterm.iss
-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2011-12-01 03:45:38 UTC (rev 4759)
+++ trunk/installer/teraterm.iss 2011-12-01 03:47:41 UTC (rev 4760)
@@ -699,6 +699,8 @@
begin;
RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\Classes\Folder\shell\cygterm');
RegDeleteKeyIncludingSubkeys(HKEY_CLASSES_ROOT, 'Folder\shell\cygterm');
+ RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\Classes\Directory\Background\shell\cygterm');
+ RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\Classes\LibraryFolder\Background\shell\cygterm');
end;
if not IsTaskSelected('macroassoc') then
@@ -717,7 +719,7 @@
RegDeleteValue(HKEY_CLASSES_ROOT, 'telnet\shell', '');
end;
- SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
+ SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
end; // ssDone
end; // case CurStep of
From svnnotify @ sourceforge.jp Thu Dec 1 12:48:08 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 01 Dec 2011 12:48:08 +0900
Subject: [Ttssh2-commit] [4761] 4.72-RC4
Message-ID: <1322711288.826742.10104.nullmailer@users.sourceforge.jp>
Revision: 4761
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4761
Author: maya
Date: 2011-12-01 12:48:08 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
4.72-RC4
Modified Paths:
--------------
trunk/installer/teraterm.iss
-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2011-12-01 03:47:41 UTC (rev 4760)
+++ trunk/installer/teraterm.iss 2011-12-01 03:48:08 UTC (rev 4761)
@@ -1,5 +1,5 @@
#define AppName "Tera Term"
-#define AppVer "4.72-RC3"
+#define AppVer "4.72-RC4"
;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
[Setup]
From svnnotify @ sourceforge.jp Sat Dec 3 14:09:04 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sat, 03 Dec 2011 14:09:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjJdICDjg5Xjg6njg7Pjgrnoqp7jg5U=?=
=?utf-8?b?44Kh44Kk44Or44Gr44K344On44O844OI44Kr44OD44OI44Kt44O844KS6L+9?=
=?utf-8?b?5Yqg?=
Message-ID: <1322888944.634097.12545.nullmailer@users.sourceforge.jp>
Revision: 4762
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4762
Author: maya
Date: 2011-12-03 14:09:04 +0900 (Sat, 03 Dec 2011)
Log Message:
-----------
フランス語ファイルにショートカットキーを追加
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=26872
Modified Paths:
--------------
trunk/installer/release/lang/French.lng
-------------- next part --------------
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2011-12-01 03:48:08 UTC (rev 4761)
+++ trunk/installer/release/lang/French.lng 2011-12-03 05:09:04 UTC (rev 4762)
@@ -39,8 +39,8 @@
MENU_EDIT_COPYTABLE=Copier &tableau
MENU_EDIT_PASTE=&Coller\tAlt+V
MENU_EDIT_PASTECR=Coller\tAlt+R
-MENU_EDIT_CLSCREEN=Effacer l'ecran
-MENU_EDIT_CLBUFFER=Effacer le buffer
+MENU_EDIT_CLSCREEN=Effac&er l'ecran
+MENU_EDIT_CLBUFFER=Effacer le &buffer
MENU_EDIT_CANCELSELECT=Effacer la se&lection
MENU_EDIT_SELECTSCREEN=S\xE9lectionner l'ecran
MENU_EDIT_SELECTALL=Tout selectionner
From svnnotify @ sourceforge.jp Sat Dec 3 19:44:14 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sat, 03 Dec 2011 19:44:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjNdICDoi7HoqLM=?=
Message-ID: <1322909054.689037.8159.nullmailer@users.sourceforge.jp>
Revision: 4763
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4763
Author: yutakapon
Date: 2011-12-03 19:44:14 +0900 (Sat, 03 Dec 2011)
Log Message:
-----------
英訳
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-03 05:09:04 UTC (rev 4762)
+++ trunk/doc/en/html/about/history.html 2011-12-03 10:44:14 UTC (rev 4763)
@@ -76,7 +76,7 @@
- Modified Tera Term installer script
-
+ - Cygterm Here can be launched by the right-click to a opened folder on Windows Vista and 7 later.
- upgraded TTSSH to 2.59
- upgraded TeraTerm Menu to 1.11
@@ -1788,7 +1788,7 @@
- When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
- When the transfering display number is an integer other than zero, the X11 forwaring does not work well.
-
+ - When the user authentication is failure, the user name of the authentication dialog will show the default user name instead of the user input name.
- When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.
From svnnotify @ sourceforge.jp Sun Dec 4 20:54:58 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sun, 04 Dec 2011 20:54:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjRdICBzdm5yZXYg44Gu5a6f6KGM44KS?=
=?utf-8?b?5L+u5q2j?=
Message-ID: <1322999698.778468.27188.nullmailer@users.sourceforge.jp>
Revision: 4764
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4764
Author: maya
Date: 2011-12-04 20:54:58 +0900 (Sun, 04 Dec 2011)
Log Message:
-----------
svnrev の実行を修正
Modified Paths:
--------------
trunk/installer/build.bat
-------------- next part --------------
Modified: trunk/installer/build.bat
===================================================================
--- trunk/installer/build.bat 2011-12-03 10:44:14 UTC (rev 4763)
+++ trunk/installer/build.bat 2011-12-04 11:54:58 UTC (rev 4764)
@@ -13,7 +13,7 @@
devenv /build release ..\teraterm\ttermpro.sln /project svnrev /projectconfig release
:svnrev
-..\teraterm\release\svnrev.exe .. ..\teraterm\ttpdlg\svnversion.h
+..\teraterm\release\svnrev.exe ..\libs\svn\bin\svnversion .. ..\teraterm\ttpdlg\svnversion.h
:build
devenv /%BUILD% release ..\teraterm\ttermpro.sln
From svnnotify @ sourceforge.jp Sun Dec 4 21:13:10 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sun, 04 Dec 2011 21:13:10 +0900
Subject: [Ttssh2-commit] [4765] bump up the version
Message-ID: <1323000790.954679.20705.nullmailer@users.sourceforge.jp>
Revision: 4765
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4765
Author: maya
Date: 2011-12-04 21:13:10 +0900 (Sun, 04 Dec 2011)
Log Message:
-----------
bump up the version
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/installer/teraterm.iss
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/ttpmacro/ttpmacro.rc
trunk/ttpmenu/ttpmenu.rc
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/doc/en/html/about/history.html 2011-12-04 12:13:10 UTC (rev 4765)
@@ -31,7 +31,7 @@
-
+
- Changes
@@ -1770,7 +1770,7 @@
-
+
- Changes
@@ -2776,7 +2776,7 @@
-
+
- added support for inputing the control character(^A-^_) as the password.
@@ -2938,7 +2938,7 @@
-
+
- added the menu id to enable and disable for the macro command.
- added support for the reading the configuration file by using the /F= option.
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/doc/ja/html/about/history.html 2011-12-04 12:13:10 UTC (rev 4765)
@@ -31,7 +31,7 @@
-
+
- \x95ύX
@@ -1771,7 +1771,7 @@
-
+
- \x95ύX
@@ -2779,7 +2779,7 @@
-
+
- \x83p\x83X\x83\x8F\x81[\x83h\x82?\xA7\x8C?\x8E\x9A(^A-^_)\x82\xF0\x93\xFC\x97?ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
@@ -2941,7 +2941,7 @@
-
+
- \x97L\x8C\xF8/\x96\xB3\x8C\xF8\x82?\xB7\x82\xE9\x88??\x81\x83j\x83\x85\x81[ID\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B(\x83}\x83N\x83\x8D\x97p)
- /F= \x83I\x83v\x83V\x83\x87\x83\x93\x82?\xE6\x82\xE9\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82?w\x92\xE8\x82?Ή\x9E\x82\xB5\x82\xBD\x81B
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/installer/teraterm.iss 2011-12-04 12:13:10 UTC (rev 4765)
@@ -1,5 +1,5 @@
#define AppName "Tera Term"
-#define AppVer "4.72-RC4"
+#define AppVer "4.72"
;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
[Setup]
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/teraterm/teraterm/ttermpro.rc 2011-12-04 12:13:10 UTC (rev 4765)
@@ -376,8 +376,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,71,0,0
- PRODUCTVERSION 4,71,0,0
+ FILEVERSION 4,72,0,0
+ PRODUCTVERSION 4,72,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -394,12 +394,12 @@
BEGIN
VALUE "CompanyName", "TeraTerm Project T. Teranishi"
VALUE "FileDescription", "Tera Term"
- VALUE "FileVersion", "4, 71, 0, 0"
+ VALUE "FileVersion", "4, 72, 0, 0"
VALUE "InternalName", "TTERMPRO"
VALUE "LegalCopyright", "(C)TeraTerm Project 2004-2011, (C)T. Teranishi 1994-1998"
VALUE "OriginalFilename", "TTERMPRO.EXE"
VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", "4, 71, 0, 0"
+ VALUE "ProductVersion", "4, 72, 0, 0"
END
END
BLOCK "VarFileInfo"
Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc 2011-12-04 12:13:10 UTC (rev 4765)
@@ -104,8 +104,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,71,0,0
- PRODUCTVERSION 4,71,0,0
+ FILEVERSION 4,72,0,0
+ PRODUCTVERSION 4,72,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -122,12 +122,12 @@
BEGIN
VALUE "CompanyName", "TeraTerm Project T. Teranishi"
VALUE "FileDescription", "TTPMACRO"
- VALUE "FileVersion", "4, 71, 0, 0"
+ VALUE "FileVersion", "4, 72, 0, 0"
VALUE "InternalName", "TTPMACRO"
VALUE "LegalCopyright", "Copyright (C) TeraTerm Project 2004-2011, T. Teranishi 1994-1998"
VALUE "OriginalFilename", "TTPMACRO.EXE"
VALUE "ProductName", "TTPMACRO"
- VALUE "ProductVersion", "4, 71, 0, 0"
+ VALUE "ProductVersion", "4, 72, 0, 0"
END
END
BLOCK "VarFileInfo"
Modified: trunk/ttpmenu/ttpmenu.rc
===================================================================
--- trunk/ttpmenu/ttpmenu.rc 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/ttpmenu/ttpmenu.rc 2011-12-04 12:13:10 UTC (rev 4765)
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// \x89p\x8C\xEA (\x95č\x91) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
@@ -203,8 +203,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,0,0
- PRODUCTVERSION 1,10,0,0
+ FILEVERSION 1,11,0,0
+ PRODUCTVERSION 1,11,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -222,12 +222,12 @@
VALUE "Comments", "Tera Term launch tool"
VALUE "CompanyName", "TeraTerm Project, Shinpei Hayakawa"
VALUE "FileDescription", "TeraTerm Menu"
- VALUE "FileVersion", "1, 10, 0, 0"
+ VALUE "FileVersion", "1, 11, 0, 0"
VALUE "InternalName", "ttpmenu"
VALUE "LegalCopyright", "Copyright (C) 2004-2011 TeraTerm Project, 1997-2003 Shinpei Hayakawa"
VALUE "OriginalFilename", "ttpmenu.exe"
VALUE "ProductName", "TeraTerm Menu"
- VALUE "ProductVersion", "1, 10, 0, 0"
+ VALUE "ProductVersion", "1, 11, 0, 0"
END
END
BLOCK "VarFileInfo"
@@ -236,7 +236,7 @@
END
END
-#endif // English (U.S.) resources
+#endif // \x89p\x8C\xEA (\x95č\x91) resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2011-12-04 11:54:58 UTC (rev 4764)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-12-04 12:13:10 UTC (rev 4765)
@@ -158,7 +158,8 @@
CONTROL "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,195,187,10
CONTROL "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,209,187,10
- CONTROL "&Verify hostkey fingerprint by DNS",IDC_VERIFYHOSTKEYDNS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,223,187,10
+ CONTROL "&Verify hostkey fingerprint by DNS",IDC_VERIFYHOSTKEYDNS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,223,187,10
LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,237,187,12
GROUPBOX "K&EX order (SSH2 only)",IDC_KEX_ORDER,216,8,187,98
LISTBOX IDC_SSHKEX_LIST,230,20,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
@@ -552,8 +553,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,58,0,0
- PRODUCTVERSION 2,58,0,0
+ FILEVERSION 2,59,0,0
+ PRODUCTVERSION 2,59,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -569,12 +570,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "TTXSSH"
- VALUE "FileVersion", "2, 58, 0, 0"
+ VALUE "FileVersion", "2, 59, 0, 0"
VALUE "InternalName", "TTXSSH"
VALUE "LegalCopyright", "(C)2004-2011 TeraTerm Project, (C)1998-1999 Robert O'Callahan"
VALUE "OriginalFilename", "TTXSSH.dll"
VALUE "ProductName", "TTSSH"
- VALUE "ProductVersion", "2, 58, 0, 0"
+ VALUE "ProductVersion", "2, 59, 0, 0"
END
END
BLOCK "VarFileInfo"
From svnnotify @ sourceforge.jp Sun Dec 4 21:13:57 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sun, 04 Dec 2011 21:13:57 +0900
Subject: [Ttssh2-commit] [4766] Release 4.72
Message-ID: <1323000837.354330.21425.nullmailer@users.sourceforge.jp>
Revision: 4766
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4766
Author: maya
Date: 2011-12-04 21:13:57 +0900 (Sun, 04 Dec 2011)
Log Message:
-----------
Release 4.72
Added Paths:
-----------
tags/teraterm-4_72/
-------------- next part --------------
From svnnotify @ sourceforge.jp Sun Dec 4 21:50:16 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Sun, 04 Dec 2011 21:50:16 +0900
Subject: [Ttssh2-commit] [4767] code unfrozen
Message-ID: <1323003016.187343.5142.nullmailer@users.sourceforge.jp>
Revision: 4767
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4767
Author: maya
Date: 2011-12-04 21:50:16 +0900 (Sun, 04 Dec 2011)
Log Message:
-----------
code unfrozen
Modified Paths:
--------------
trunk/installer/teraterm.iss
-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2011-12-04 12:13:57 UTC (rev 4766)
+++ trunk/installer/teraterm.iss 2011-12-04 12:50:16 UTC (rev 4767)
@@ -1,6 +1,6 @@
#define AppName "Tera Term"
#define AppVer "4.72"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
[Setup]
AppCopyright=TeraTerm Project
@@ -805,8 +805,8 @@
[InnoIDE_PreCompile]
Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
[InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
From svnnotify @ sourceforge.jp Tue Dec 6 17:17:56 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 17:17:56 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjhdICDjgrnjg5rjg7zjgrnnrYnjgYw=?=
=?utf-8?b?5ZCr44G+44KM44Gm44GE44KL5aC05ZCI44Gr44K544Kt44OD44OX44GZ44KL?=
=?utf-8?b?44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1323159476.197001.11547.nullmailer@users.sourceforge.jp>
Revision: 4768
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4768
Author: doda
Date: 2011-12-06 17:17:56 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
スペース等が含まれている場合にスキップするようにした。
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2011-12-04 12:50:16 UTC (rev 4767)
+++ trunk/teraterm/common/ttlib.c 2011-12-06 08:17:56 UTC (rev 4768)
@@ -10,6 +10,7 @@
#include
#include "tttypes.h"
#include
+#include
// for _ismbblead
#include
@@ -41,50 +42,50 @@
int b64decode(PCHAR dst, int dsize, PCHAR src)
{
- unsigned int b;
+ unsigned int b = 0;
char c;
- int len = 0;
+ int len = 0, state = 0;
- if (src == NULL || dst == NULL || dsize == 0) {
+ if (src == NULL || dst == NULL || dsize == 0)
return 0;
- }
while (1) {
- if ((c = b64dec_table[*src++]) == -1) {
- break;
+ if (isspace(*src)) {
+ src++;
+ continue;
}
- b = c << 18;
- if ((c = b64dec_table[*src++]) == -1) {
+ if ((c = b64dec_table[*src++]) == -1)
break;
- }
- b |= c << 12;
- dst[len++] = (b >> 16) & 0xff;
- if (len >= dsize) {
- break;
- }
+ b = (b << 6) | c;
+ state++;
- if ((c = b64dec_table[*src++]) == -1) {
- break;
+ if (state == 4) {
+ if (dsize > len)
+ dst[len++] = (b >> 16) & 0xff;
+ if (dsize > len)
+ dst[len++] = (b >> 8) & 0xff;
+ if (dsize > len)
+ dst[len++] = b & 0xff;
+ state = 0;
+ if (dsize <= len)
+ break;
}
- b |= c << 6;
+ }
- dst[len++] = (b >> 8) & 0xff;
- if (len >= dsize) {
- break;
- }
-
- if ((c = b64dec_table[*src++]) == -1) {
- break;
- }
- b |= c;
-
- dst[len++] = b & 0xff;
- if (len >= dsize) {
- break;
- }
+ if (state == 2) {
+ b <<= 4;
+ if (dsize > len)
+ dst[len++] = (b >> 8) & 0xff;
}
+ else if (state == 3) {
+ b <<= 6;
+ if (dsize > len)
+ dst[len++] = (b >> 16) & 0xff;
+ if (dsize > len)
+ dst[len++] = (b >> 8) & 0xff;
+ }
return len;
}
From svnnotify @ sourceforge.jp Tue Dec 6 19:01:20 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 19:01:20 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NjldICBPU0MgNTIg44Gu44Kv44Oq44OD?=
=?utf-8?b?44OX44Oc44O844OJ6Kqt44G/6L6844G/44Gr5a++5b+c?=
Message-ID: <1323165680.625291.24958.nullmailer@users.sourceforge.jp>
Revision: 4769
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4769
Author: doda
Date: 2011-12-06 19:01:20 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
OSC 52 のクリップボード読み込みに対応
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/clipboar.h
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2011-12-06 08:17:56 UTC (rev 4768)
+++ trunk/teraterm/common/ttlib.c 2011-12-06 10:01:20 UTC (rev 4769)
@@ -16,7 +16,7 @@
#include
// for b64encode/b64decode
-// static char *b64enc_table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static char *b64enc_table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static char b64dec_table[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -36,10 +36,60 @@
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
};
-// void b64encode(PCHAR dst, int dsize, PCHAR src, int len)
-// {
-// }
+void b64encode(PCHAR d, int dsize, PCHAR s, int len)
+{
+ unsigned int b = 0;
+ int state = 0;
+ unsigned char *src, *dst;
+ src = (unsigned char *)s;
+ dst = (unsigned char *)d;
+
+ if (dsize == 0 || dst == NULL || src == NULL) {
+ return;
+ }
+ if (dsize < 5) {
+ *dst = 0;
+ return;
+ }
+
+ while (len > 0) {
+ b = (b << 8) | *src++;
+ len--;
+ state++;
+
+ if (state == 3) {
+ *dst++ = b64enc_table[(b>>18) & 0x3f];
+ *dst++ = b64enc_table[(b>>12) & 0x3f];
+ *dst++ = b64enc_table[(b>>6) & 0x3f];
+ *dst++ = b64enc_table[b & 0x3f];
+ dsize -= 4;
+ state = 0;
+ b = 0;
+ if (dsize < 5)
+ break;
+ }
+ }
+
+ if (dsize >= 5) {
+ if (state == 1) {
+ *dst++ = b64enc_table[(b>>2) & 0x3f];
+ *dst++ = b64enc_table[(b<<4) & 0x3f];
+ *dst++ = '=';
+ *dst++ = '=';
+ }
+ else if (state == 2) {
+ *dst++ = b64enc_table[(b>>10) & 0x3f];
+ *dst++ = b64enc_table[(b>>4) & 0x3f];
+ *dst++ = b64enc_table[(b<<2) & 0x3f];
+ *dst++ = '=';
+ }
+ }
+
+ *dst = 0;
+ return;
+}
+
int b64decode(PCHAR dst, int dsize, PCHAR src)
{
unsigned int b = 0;
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2011-12-06 08:17:56 UTC (rev 4768)
+++ trunk/teraterm/common/ttlib.h 2011-12-06 10:01:20 UTC (rev 4769)
@@ -48,7 +48,7 @@
int KanjiCodeTranslate(int lang, int kcode);
char *mctimelocal();
-// void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
+void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
int b64decode(PCHAR dst, int dsize, PCHAR src);
#ifdef __cplusplus
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2011-12-06 08:17:56 UTC (rev 4768)
+++ trunk/teraterm/teraterm/clipboar.c 2011-12-06 10:01:20 UTC (rev 4769)
@@ -13,6 +13,7 @@
#include "ttwinman.h"
#include "ttcommon.h"
+#include "ttlib.h"
#include "clipboar.h"
#include "tt_res.h"
@@ -156,6 +157,70 @@
}
}
+void CBStartPasteB64(HWND HWin, PCHAR header, PCHAR footer)
+{
+ HANDLE tmpHandle = NULL;
+ char *tmpPtr = NULL;
+ int len, hlen, flen, blen;
+
+ if (! cv.Ready) {
+ return;
+ }
+ if (TalkStatus!=IdTalkKeyb) {
+ return;
+ }
+
+ CBEchoOnly = FALSE;
+
+ CBMemHandle = NULL;
+ CBMemPtr = NULL;
+ CBMemPtr2 = 0;
+ CBDDE = TRUE;
+
+ if (IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(HWin)) {
+ if ((tmpHandle = GetClipboardData(CF_TEXT)) == NULL) {
+ CloseClipboard();
+ }
+ }
+ else if (IsClipboardFormatAvailable(CF_OEMTEXT) && OpenClipboard(HWin)) {
+ if ((tmpHandle = GetClipboardData(CF_OEMTEXT)) == NULL) {
+ CloseClipboard();
+ }
+ }
+
+ if (tmpHandle) {
+ if ((tmpPtr = GlobalLock(tmpHandle)) != NULL) {
+ hlen = strlen(header);
+ flen = strlen(footer);
+ len = strlen(tmpPtr);
+ blen = (len + 2) / 3 * 4 + hlen + flen + 1;
+ if ((CBMemHandle = GlobalAlloc(GHND, blen)) != NULL) {
+ if ((CBMemPtr = GlobalLock(CBMemHandle)) != NULL) {
+ if (hlen > 0) {
+ strncpy_s(CBMemPtr, blen, header, _TRUNCATE);
+ }
+ b64encode(CBMemPtr + hlen, blen - hlen, tmpPtr, len);
+ if (flen > 0) {
+ strncat_s(CBMemPtr, blen, footer, _TRUNCATE);
+ }
+ TalkStatus=IdTalkCB;
+ GlobalUnlock(CBMemPtr);
+ CBMemPtr = NULL;
+ }
+ }
+ GlobalUnlock(tmpPtr);
+ }
+ CloseClipboard();
+ }
+
+ CBRetrySend = FALSE;
+ CBRetryEcho = FALSE;
+ CBSendCR = FALSE;
+ if (TalkStatus != IdTalkCB) {
+ CBEndPaste();
+ }
+}
+
void CBStartEcho(PCHAR DataPtr, int DataSize)
{
if (! cv.Ready) {
@@ -170,9 +235,8 @@
CBRetryEcho = FALSE;
CBSendCR = FALSE;
- CBDDE = FALSE;
+ CBDDE = TRUE;
if ((CBMemHandle = GlobalAlloc(GHND, DataSize)) != NULL) {
- CBDDE = TRUE;
if ((CBMemPtr = GlobalLock(CBMemHandle)) != NULL) {
memcpy(CBMemPtr, DataPtr, DataSize);
GlobalUnlock(CBMemHandle);
Modified: trunk/teraterm/teraterm/clipboar.h
===================================================================
--- trunk/teraterm/teraterm/clipboar.h 2011-12-06 08:17:56 UTC (rev 4768)
+++ trunk/teraterm/teraterm/clipboar.h 2011-12-06 10:01:20 UTC (rev 4769)
@@ -13,6 +13,7 @@
void CBClose();
void CBStartPaste(HWND HWin, BOOL AddCR, BOOL Bracketed,
int BuffSize, PCHAR DataPtr, int DataSize);
+void CBStartPasteB64(HWND HWin, PCHAR header, PCHAR footer);
void CBStartEcho(PCHAR DataPtr, int DataSize);
void CBSend();
void CBEcho();
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2011-12-06 08:17:56 UTC (rev 4768)
+++ trunk/teraterm/teraterm/vtterm.c 2011-12-06 10:01:20 UTC (rev 4769)
@@ -24,6 +24,7 @@
#include "teraprn.h"
#include "telnet.h"
#include "ttime.h"
+#include "clipboar.h"
#include "vtterm.h"
@@ -3447,7 +3448,7 @@
void XsProcClipboard(PCHAR buff)
{
int len, blen;
- char *p, *cbbuff;
+ char *p, *cbbuff, hdr[20];
HGLOBAL cbmem;
p = buff;
@@ -3458,7 +3459,10 @@
if (*p++ == ';') {
if (*p == '?' && *(p+1) == 0) { // Read access
if (ts.CtrlFlag & CSF_CBREAD) {
- ; // not supported.
+ strncpy_s(hdr, sizeof(hdr), "\033]52;", _TRUNCATE);
+ if (strncat_s(hdr, sizeof(hdr), buff, p - buff) == 0) {
+ CBStartPasteB64(HVTWin, hdr, "\033\\");
+ }
}
}
else if (ts.CtrlFlag & CSF_CBWRITE) { // Write access
From svnnotify @ sourceforge.jp Tue Dec 6 19:20:49 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 19:20:49 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzBdIE9TQyA1LCAxMDUsIDExMCwgMTEx?=
=?utf-8?b?LCAxMTUsICAxMTYg44Gr5a++5b+c?=
Message-ID: <1323166849.035702.17857.nullmailer@users.sourceforge.jp>
Revision: 4770
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4770
Author: doda
Date: 2011-12-06 19:20:48 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
OSC 5, 105, 110, 111, 115, 116 に対応
#undef APHABLEND_TYPE2 に出来るだけ対応するようにしていたけれど、そろそろ考えないようにしたいな。
ただ、その為には ALPHABLEND_TYPE2 関連のコードを整理しないと。
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtdisp.h
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2011-12-06 10:01:20 UTC (rev 4769)
+++ trunk/teraterm/common/tttypes.h 2011-12-06 10:20:48 UTC (rev 4770)
@@ -90,8 +90,12 @@
#define CS_VT_REVERSEBG 263
#define CS_VT_URLFG 264
#define CS_VT_URLBG 265
-#define CS_TEK_FG 266
-#define CS_TEK_BG 267
+#define CS_VT_UNDERFG 266
+#define CS_VT_UNDERBG 267
+#define CS_TEK_FG 268
+#define CS_TEK_BG 269
+#define CS_UNSPEC 0xffffffff
+#define CS_ALL CS_UNSPEC
/* Kermit function id */
#define IdKmtReceive 1
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2011-12-06 10:01:20 UTC (rev 4769)
+++ trunk/teraterm/teraterm/vtdisp.c 2011-12-06 10:20:48 UTC (rev 4770)
@@ -19,6 +19,41 @@
#define CurWidth 2
+int DefaultColorTable[256][3] = {
+ { 0, 0, 0}, {255, 0, 0}, { 0,255, 0}, {255,255, 0}, { 0, 0,255}, {255, 0,255}, { 0,255,255}, {255,255,255}, // 0 - 7
+ {128,128,128}, {128, 0, 0}, { 0,128, 0}, {128,128, 0}, { 0, 0,128}, {128, 0,128}, { 0,128,128}, {192,192,192}, // 8 - 15
+ { 0, 0, 0}, { 0, 0, 95}, { 0, 0,135}, { 0, 0,175}, { 0, 0,215}, { 0, 0,255}, { 0, 95, 0}, { 0, 95, 95}, // 16 - 23
+ { 0, 95,135}, { 0, 95,175}, { 0, 95,215}, { 0, 95,255}, { 0,135, 0}, { 0,135, 95}, { 0,135,135}, { 0,135,175}, // 24 - 31
+ { 0,135,215}, { 0,135,255}, { 0,175, 0}, { 0,175, 95}, { 0,175,135}, { 0,175,175}, { 0,175,215}, { 0,175,255}, // 32 - 39
+ { 0,215, 0}, { 0,215, 95}, { 0,215,135}, { 0,215,175}, { 0,215,215}, { 0,215,255}, { 0,255, 0}, { 0,255, 95}, // 40 - 47
+ { 0,255,135}, { 0,255,175}, { 0,255,215}, { 0,255,255}, { 95, 0, 0}, { 95, 0, 95}, { 95, 0,135}, { 95, 0,175}, // 48 - 55
+ { 95, 0,215}, { 95, 0,255}, { 95, 95, 0}, { 95, 95, 95}, { 95, 95,135}, { 95, 95,175}, { 95, 95,215}, { 95, 95,255}, // 56 - 63
+ { 95,135, 0}, { 95,135, 95}, { 95,135,135}, { 95,135,175}, { 95,135,215}, { 95,135,255}, { 95,175, 0}, { 95,175, 95}, // 64 - 71
+ { 95,175,135}, { 95,175,175}, { 95,175,215}, { 95,175,255}, { 95,215, 0}, { 95,215, 95}, { 95,215,135}, { 95,215,175}, // 72 - 79
+ { 95,215,215}, { 95,215,255}, { 95,255, 0}, { 95,255, 95}, { 95,255,135}, { 95,255,175}, { 95,255,215}, { 95,255,255}, // 80 - 87
+ {135, 0, 0}, {135, 0, 95}, {135, 0,135}, {135, 0,175}, {135, 0,215}, {135, 0,255}, {135, 95, 0}, {135, 95, 95}, // 88 - 95
+ {135, 95,135}, {135, 95,175}, {135, 95,215}, {135, 95,255}, {135,135, 0}, {135,135, 95}, {135,135,135}, {135,135,175}, // 96 - 103
+ {135,135,215}, {135,135,255}, {135,175, 0}, {135,175, 95}, {135,175,135}, {135,175,175}, {135,175,215}, {135,175,255}, // 104 - 111
+ {135,215, 0}, {135,215, 95}, {135,215,135}, {135,215,175}, {135,215,215}, {135,215,255}, {135,255, 0}, {135,255, 95}, // 112 - 119
+ {135,255,135}, {135,255,175}, {135,255,215}, {135,255,255}, {175, 0, 0}, {175, 0, 95}, {175, 0,135}, {175, 0,175}, // 120 - 127
+ {175, 0,215}, {175, 0,255}, {175, 95, 0}, {175, 95, 95}, {175, 95,135}, {175, 95,175}, {175, 95,215}, {175, 95,255}, // 128 - 135
+ {175,135, 0}, {175,135, 95}, {175,135,135}, {175,135,175}, {175,135,215}, {175,135,255}, {175,175, 0}, {175,175, 95}, // 136 - 143
+ {175,175,135}, {175,175,175}, {175,175,215}, {175,175,255}, {175,215, 0}, {175,215, 95}, {175,215,135}, {175,215,175}, // 144 - 151
+ {175,215,215}, {175,215,255}, {175,255, 0}, {175,255, 95}, {175,255,135}, {175,255,175}, {175,255,215}, {175,255,255}, // 152 - 159
+ {215, 0, 0}, {215, 0, 95}, {215, 0,135}, {215, 0,175}, {215, 0,215}, {215, 0,255}, {215, 95, 0}, {215, 95, 95}, // 160 - 167
+ {215, 95,135}, {215, 95,175}, {215, 95,215}, {215, 95,255}, {215,135, 0}, {215,135, 95}, {215,135,135}, {215,135,175}, // 168 - 175
+ {215,135,215}, {215,135,255}, {215,175, 0}, {215,175, 95}, {215,175,135}, {215,175,175}, {215,175,215}, {215,175,255}, // 176 - 183
+ {215,215, 0}, {215,215, 95}, {215,215,135}, {215,215,175}, {215,215,215}, {215,215,255}, {215,255, 0}, {215,255, 95}, // 184 - 191
+ {215,255,135}, {215,255,175}, {215,255,215}, {215,255,255}, {255, 0, 0}, {255, 0, 95}, {255, 0,135}, {255, 0,175}, // 192 - 199
+ {255, 0,215}, {255, 0,255}, {255, 95, 0}, {255, 95, 95}, {255, 95,135}, {255, 95,175}, {255, 95,215}, {255, 95,255}, // 200 - 207
+ {255,135, 0}, {255,135, 95}, {255,135,135}, {255,135,175}, {255,135,215}, {255,135,255}, {255,175, 0}, {255,175, 95}, // 208 - 215
+ {255,175,135}, {255,175,175}, {255,175,215}, {255,175,255}, {255,215, 0}, {255,215, 95}, {255,215,135}, {255,215,175}, // 216 - 223
+ {255,215,215}, {255,215,255}, {255,255, 0}, {255,255, 95}, {255,255,135}, {255,255,175}, {255,255,215}, {255,255,255}, // 224 - 231
+ { 8, 8, 8}, { 18, 18, 18}, { 28, 28, 28}, { 38, 38, 38}, { 48, 48, 48}, { 58, 58, 58}, { 68, 68, 68}, { 78, 78, 78}, // 232 - 239
+ { 88, 88, 88}, { 98, 98, 98}, {108,108,108}, {118,118,118}, {128,128,128}, {138,138,138}, {148,148,148}, {158,158,158}, // 240 - 247
+ {168,168,168}, {178,178,178}, {188,188,188}, {198,198,198}, {208,208,208}, {218,218,218}, {228,228,228}, {238,238,238} // 248 - 255
+};
+
int WinWidth, WinHeight;
static BOOL Active = FALSE;
static BOOL CompletelyVisible;
@@ -1664,266 +1699,17 @@
void InitColorTable()
{
+ int i;
#ifndef NO_ANSI_COLOR_EXTENSION
DispApplyANSIColor();
#else /* NO_ANSI_COLOR_EXTENSION */
- ANSIColor[IdBack ] = RGB( 0, 0, 0);
- ANSIColor[IdRed ] = RGB(255, 0, 0);
- ANSIColor[IdGreen] = RGB( 0,255, 0);
- ANSIColor[IdYellow] = RGB(255,255, 0);
- ANSIColor[IdBlue] = RGB( 0, 0,255);
- ANSIColor[IdMagenta] = RGB(255, 0,255);
- ANSIColor[IdCyan] = RGB( 0,255,255);
- ANSIColor[IdFore ] = RGB(255,255,255);
- ANSIColor[IdBack+8] = RGB(128,128,128);
- ANSIColor[IdRed+8] = RGB(128, 0, 0);
- ANSIColor[IdGreen+8] = RGB( 0,128, 0);
- ANSIColor[IdYellow+8] = RGB(128,128, 0);
- ANSIColor[IdBlue+8] = RGB( 0, 0,128);
- ANSIColor[IdMagenta+8] = RGB(128, 0,128);
- ANSIColor[IdCyan+8] = RGB( 0,128,128);
- ANSIColor[IdFore+8] = RGB(192,192,192);
+ for (i=0; i<=15; i++) {
+ ANSIColor[i] = RGB(DefaultColorTable[i][0], DefaultColorTable[i][1], DefaultColorTable[i][2]);
+ }
#endif /* NO_ANSI_COLOR_EXTENSION */
- ANSIColor[16] = RGB(0,0,0);
- ANSIColor[17] = RGB(0,0,95);
- ANSIColor[18] = RGB(0,0,135);
- ANSIColor[19] = RGB(0,0,175);
- ANSIColor[20] = RGB(0,0,215);
- ANSIColor[21] = RGB(0,0,255);
- ANSIColor[22] = RGB(0,95,0);
- ANSIColor[23] = RGB(0,95,95);
- ANSIColor[24] = RGB(0,95,135);
- ANSIColor[25] = RGB(0,95,175);
- ANSIColor[26] = RGB(0,95,215);
- ANSIColor[27] = RGB(0,95,255);
- ANSIColor[28] = RGB(0,135,0);
- ANSIColor[29] = RGB(0,135,95);
- ANSIColor[30] = RGB(0,135,135);
- ANSIColor[31] = RGB(0,135,175);
- ANSIColor[32] = RGB(0,135,215);
- ANSIColor[33] = RGB(0,135,255);
- ANSIColor[34] = RGB(0,175,0);
- ANSIColor[35] = RGB(0,175,95);
- ANSIColor[36] = RGB(0,175,135);
- ANSIColor[37] = RGB(0,175,175);
- ANSIColor[38] = RGB(0,175,215);
- ANSIColor[39] = RGB(0,175,255);
- ANSIColor[40] = RGB(0,215,0);
- ANSIColor[41] = RGB(0,215,95);
- ANSIColor[42] = RGB(0,215,135);
- ANSIColor[43] = RGB(0,215,175);
- ANSIColor[44] = RGB(0,215,215);
- ANSIColor[45] = RGB(0,215,255);
- ANSIColor[46] = RGB(0,255,0);
- ANSIColor[47] = RGB(0,255,95);
- ANSIColor[48] = RGB(0,255,135);
- ANSIColor[49] = RGB(0,255,175);
- ANSIColor[50] = RGB(0,255,215);
- ANSIColor[51] = RGB(0,255,255);
- ANSIColor[52] = RGB(95,0,0);
- ANSIColor[53] = RGB(95,0,95);
- ANSIColor[54] = RGB(95,0,135);
- ANSIColor[55] = RGB(95,0,175);
- ANSIColor[56] = RGB(95,0,215);
- ANSIColor[57] = RGB(95,0,255);
- ANSIColor[58] = RGB(95,95,0);
- ANSIColor[59] = RGB(95,95,95);
- ANSIColor[60] = RGB(95,95,135);
- ANSIColor[61] = RGB(95,95,175);
- ANSIColor[62] = RGB(95,95,215);
- ANSIColor[63] = RGB(95,95,255);
- ANSIColor[64] = RGB(95,135,0);
- ANSIColor[65] = RGB(95,135,95);
- ANSIColor[66] = RGB(95,135,135);
- ANSIColor[67] = RGB(95,135,175);
- ANSIColor[68] = RGB(95,135,215);
- ANSIColor[69] = RGB(95,135,255);
- ANSIColor[70] = RGB(95,175,0);
- ANSIColor[71] = RGB(95,175,95);
- ANSIColor[72] = RGB(95,175,135);
- ANSIColor[73] = RGB(95,175,175);
- ANSIColor[74] = RGB(95,175,215);
- ANSIColor[75] = RGB(95,175,255);
- ANSIColor[76] = RGB(95,215,0);
- ANSIColor[77] = RGB(95,215,95);
- ANSIColor[78] = RGB(95,215,135);
- ANSIColor[79] = RGB(95,215,175);
- ANSIColor[80] = RGB(95,215,215);
- ANSIColor[81] = RGB(95,215,255);
- ANSIColor[82] = RGB(95,255,0);
- ANSIColor[83] = RGB(95,255,95);
- ANSIColor[84] = RGB(95,255,135);
- ANSIColor[85] = RGB(95,255,175);
- ANSIColor[86] = RGB(95,255,215);
- ANSIColor[87] = RGB(95,255,255);
- ANSIColor[88] = RGB(135,0,0);
- ANSIColor[89] = RGB(135,0,95);
- ANSIColor[90] = RGB(135,0,135);
- ANSIColor[91] = RGB(135,0,175);
- ANSIColor[92] = RGB(135,0,215);
- ANSIColor[93] = RGB(135,0,255);
- ANSIColor[94] = RGB(135,95,0);
- ANSIColor[95] = RGB(135,95,95);
- ANSIColor[96] = RGB(135,95,135);
- ANSIColor[97] = RGB(135,95,175);
- ANSIColor[98] = RGB(135,95,215);
- ANSIColor[99] = RGB(135,95,255);
- ANSIColor[100] = RGB(135,135,0);
- ANSIColor[101] = RGB(135,135,95);
- ANSIColor[102] = RGB(135,135,135);
- ANSIColor[103] = RGB(135,135,175);
- ANSIColor[104] = RGB(135,135,215);
- ANSIColor[105] = RGB(135,135,255);
- ANSIColor[106] = RGB(135,175,0);
- ANSIColor[107] = RGB(135,175,95);
- ANSIColor[108] = RGB(135,175,135);
- ANSIColor[109] = RGB(135,175,175);
- ANSIColor[110] = RGB(135,175,215);
- ANSIColor[111] = RGB(135,175,255);
- ANSIColor[112] = RGB(135,215,0);
- ANSIColor[113] = RGB(135,215,95);
- ANSIColor[114] = RGB(135,215,135);
- ANSIColor[115] = RGB(135,215,175);
- ANSIColor[116] = RGB(135,215,215);
- ANSIColor[117] = RGB(135,215,255);
- ANSIColor[118] = RGB(135,255,0);
- ANSIColor[119] = RGB(135,255,95);
- ANSIColor[120] = RGB(135,255,135);
- ANSIColor[121] = RGB(135,255,175);
- ANSIColor[122] = RGB(135,255,215);
- ANSIColor[123] = RGB(135,255,255);
- ANSIColor[124] = RGB(175,0,0);
- ANSIColor[125] = RGB(175,0,95);
- ANSIColor[126] = RGB(175,0,135);
- ANSIColor[127] = RGB(175,0,175);
- ANSIColor[128] = RGB(175,0,215);
- ANSIColor[129] = RGB(175,0,255);
- ANSIColor[130] = RGB(175,95,0);
- ANSIColor[131] = RGB(175,95,95);
- ANSIColor[132] = RGB(175,95,135);
- ANSIColor[133] = RGB(175,95,175);
- ANSIColor[134] = RGB(175,95,215);
- ANSIColor[135] = RGB(175,95,255);
- ANSIColor[136] = RGB(175,135,0);
- ANSIColor[137] = RGB(175,135,95);
- ANSIColor[138] = RGB(175,135,135);
- ANSIColor[139] = RGB(175,135,175);
- ANSIColor[140] = RGB(175,135,215);
- ANSIColor[141] = RGB(175,135,255);
- ANSIColor[142] = RGB(175,175,0);
- ANSIColor[143] = RGB(175,175,95);
- ANSIColor[144] = RGB(175,175,135);
- ANSIColor[145] = RGB(175,175,175);
- ANSIColor[146] = RGB(175,175,215);
- ANSIColor[147] = RGB(175,175,255);
- ANSIColor[148] = RGB(175,215,0);
- ANSIColor[149] = RGB(175,215,95);
- ANSIColor[150] = RGB(175,215,135);
- ANSIColor[151] = RGB(175,215,175);
- ANSIColor[152] = RGB(175,215,215);
- ANSIColor[153] = RGB(175,215,255);
- ANSIColor[154] = RGB(175,255,0);
- ANSIColor[155] = RGB(175,255,95);
- ANSIColor[156] = RGB(175,255,135);
- ANSIColor[157] = RGB(175,255,175);
- ANSIColor[158] = RGB(175,255,215);
- ANSIColor[159] = RGB(175,255,255);
- ANSIColor[160] = RGB(215,0,0);
- ANSIColor[161] = RGB(215,0,95);
- ANSIColor[162] = RGB(215,0,135);
- ANSIColor[163] = RGB(215,0,175);
- ANSIColor[164] = RGB(215,0,215);
- ANSIColor[165] = RGB(215,0,255);
- ANSIColor[166] = RGB(215,95,0);
- ANSIColor[167] = RGB(215,95,95);
- ANSIColor[168] = RGB(215,95,135);
- ANSIColor[169] = RGB(215,95,175);
- ANSIColor[170] = RGB(215,95,215);
- ANSIColor[171] = RGB(215,95,255);
- ANSIColor[172] = RGB(215,135,0);
- ANSIColor[173] = RGB(215,135,95);
- ANSIColor[174] = RGB(215,135,135);
- ANSIColor[175] = RGB(215,135,175);
- ANSIColor[176] = RGB(215,135,215);
- ANSIColor[177] = RGB(215,135,255);
- ANSIColor[178] = RGB(215,175,0);
- ANSIColor[179] = RGB(215,175,95);
- ANSIColor[180] = RGB(215,175,135);
- ANSIColor[181] = RGB(215,175,175);
- ANSIColor[182] = RGB(215,175,215);
- ANSIColor[183] = RGB(215,175,255);
- ANSIColor[184] = RGB(215,215,0);
- ANSIColor[185] = RGB(215,215,95);
- ANSIColor[186] = RGB(215,215,135);
- ANSIColor[187] = RGB(215,215,175);
- ANSIColor[188] = RGB(215,215,215);
- ANSIColor[189] = RGB(215,215,255);
- ANSIColor[190] = RGB(215,255,0);
- ANSIColor[191] = RGB(215,255,95);
- ANSIColor[192] = RGB(215,255,135);
- ANSIColor[193] = RGB(215,255,175);
- ANSIColor[194] = RGB(215,255,215);
- ANSIColor[195] = RGB(215,255,255);
- ANSIColor[196] = RGB(255,0,0);
- ANSIColor[197] = RGB(255,0,95);
- ANSIColor[198] = RGB(255,0,135);
- ANSIColor[199] = RGB(255,0,175);
- ANSIColor[200] = RGB(255,0,215);
- ANSIColor[201] = RGB(255,0,255);
- ANSIColor[202] = RGB(255,95,0);
- ANSIColor[203] = RGB(255,95,95);
- ANSIColor[204] = RGB(255,95,135);
- ANSIColor[205] = RGB(255,95,175);
- ANSIColor[206] = RGB(255,95,215);
- ANSIColor[207] = RGB(255,95,255);
- ANSIColor[208] = RGB(255,135,0);
- ANSIColor[209] = RGB(255,135,95);
- ANSIColor[210] = RGB(255,135,135);
- ANSIColor[211] = RGB(255,135,175);
- ANSIColor[212] = RGB(255,135,215);
- ANSIColor[213] = RGB(255,135,255);
- ANSIColor[214] = RGB(255,175,0);
- ANSIColor[215] = RGB(255,175,95);
- ANSIColor[216] = RGB(255,175,135);
- ANSIColor[217] = RGB(255,175,175);
- ANSIColor[218] = RGB(255,175,215);
- ANSIColor[219] = RGB(255,175,255);
- ANSIColor[220] = RGB(255,215,0);
- ANSIColor[221] = RGB(255,215,95);
- ANSIColor[222] = RGB(255,215,135);
- ANSIColor[223] = RGB(255,215,175);
- ANSIColor[224] = RGB(255,215,215);
- ANSIColor[225] = RGB(255,215,255);
- ANSIColor[226] = RGB(255,255,0);
- ANSIColor[227] = RGB(255,255,95);
- ANSIColor[228] = RGB(255,255,135);
- ANSIColor[229] = RGB(255,255,175);
- ANSIColor[230] = RGB(255,255,215);
- ANSIColor[231] = RGB(255,255,255);
- ANSIColor[232] = RGB(8,8,8);
- ANSIColor[233] = RGB(18,18,18);
- ANSIColor[234] = RGB(28,28,28);
- ANSIColor[235] = RGB(38,38,38);
- ANSIColor[236] = RGB(48,48,48);
- ANSIColor[237] = RGB(58,58,58);
- ANSIColor[238] = RGB(68,68,68);
- ANSIColor[239] = RGB(78,78,78);
- ANSIColor[240] = RGB(88,88,88);
- ANSIColor[241] = RGB(98,98,98);
- ANSIColor[242] = RGB(108,108,108);
- ANSIColor[243] = RGB(118,118,118);
- ANSIColor[244] = RGB(128,128,128);
- ANSIColor[245] = RGB(138,138,138);
- ANSIColor[246] = RGB(148,148,148);
- ANSIColor[247] = RGB(158,158,158);
- ANSIColor[248] = RGB(168,168,168);
- ANSIColor[249] = RGB(178,178,178);
- ANSIColor[250] = RGB(188,188,188);
- ANSIColor[251] = RGB(198,198,198);
- ANSIColor[252] = RGB(208,208,208);
- ANSIColor[253] = RGB(218,218,218);
- ANSIColor[254] = RGB(228,228,228);
- ANSIColor[255] = RGB(238,238,238);
+ for (i=16; i<=255; i++) {
+ ANSIColor[i] = RGB(DefaultColorTable[i][0], DefaultColorTable[i][1], DefaultColorTable[i][2]);
+ }
if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
#ifdef ALPHABLEND_TYPE2
@@ -3638,7 +3424,7 @@
}
}
-void DispSetColor(int num, COLORREF color)
+void DispSetColor(unsigned int num, COLORREF color)
{
HDC TmpDC;
@@ -3647,7 +3433,34 @@
ReleaseDC(NULL, TmpDC);
switch (num) {
+#ifdef ALPHABLEND_TYPE2
case CS_VT_NORMALFG:
+ BGVTColor[0] = color;
+ if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
+ ANSIColor[IdFore ] = BGVTColor[0]; // use text color for "white"
+ }
+ break;
+ case CS_VT_NORMALBG:
+ BGVTColor[1] = color;
+ if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
+ ANSIColor[IdBack ] = BGVTColor[1]; // use background color for "Black"
+ }
+ if (ts.UseNormalBGColor) {
+ BGVTBoldColor[1] = BGVTColor[1];
+ BGVTBlinkColor[1] = BGVTColor[1];
+ BGURLColor[1] = BGVTColor[1];
+ }
+ break;
+ case CS_VT_BOLDFG: BGVTBoldColor[0] = color; break;
+ case CS_VT_BOLDBG: BGVTBoldColor[1] = color; break;
+ case CS_VT_BLINKFG: BGVTBlinkColor[0] = color; break;
+ case CS_VT_BLINKBG: BGVTBlinkColor[1] = color; break;
+ case CS_VT_REVERSEFG: BGVTReverseColor[0] = color; break;
+ case CS_VT_REVERSEBG: BGVTReverseColor[1] = color; break;
+ case CS_VT_URLFG: BGURLColor[0] = color; break;
+ case CS_VT_URLBG: BGURLColor[1] = color; break;
+#else
+ case CS_VT_NORMALFG:
ts.VTColor[0] = color;
if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
ANSIColor[IdFore ] = ts.VTColor[0]; // use text color for "white"
@@ -3659,9 +3472,9 @@
ANSIColor[IdBack ] = ts.VTColor[1]; // use background color for "Black"
}
if (ts.UseNormalBGColor) {
- ts.VTBoldColor[1] =color;
- ts.VTBlinkColor[1] =color;
- ts.URLColor[1] = color;
+ ts.VTBoldColor[1] = ts.VTColor[1];
+ ts.VTBlinkColor[1] = ts.VTColor[1];
+ ts.URLColor[1] = ts.VTColor[1];
}
break;
case CS_VT_BOLDFG: ts.VTBoldColor[0] = color; break;
@@ -3672,10 +3485,11 @@
case CS_VT_REVERSEBG: ts.VTReverseColor[1] = color; break;
case CS_VT_URLFG: ts.URLColor[0] = color; break;
case CS_VT_URLBG: ts.URLColor[1] = color; break;
+#endif
case CS_TEK_FG: ts.TEKColor[0] = color; break;
case CS_TEK_BG: ts.TEKColor[1] = color; break;
default:
- if (num >= 0 && num <= 255) {
+ if (num <= 255) {
ANSIColor[num] = color;
}
else {
@@ -3684,11 +3498,108 @@
break;
}
-#ifdef ALPHABLEND_TYPE2
- if (num > 255) {
- BGInitialize();
+ if (num == CS_TEK_FG || num == CS_TEK_BG) {
+ if (HTEKWin)
+ InvalidateRect(HTEKWin, NULL, FALSE);
}
+ else {
+ InvalidateRect(HVTWin,NULL,FALSE);
+ }
+}
+
+void DispResetColor(unsigned int num)
+{
+ HDC TmpDC;
+
+ TmpDC = GetDC(NULL);
+
+ switch(num) {
+#ifdef ALPHABLEND_TYPE2
+ case CS_VT_NORMALFG:
+ BGVTColor[0] = ts.VTColor[0];
+ if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
+ ANSIColor[IdFore ] = ts.VTColor[0]; // use text color for "white"
+ }
+ break;
+ break;
+ case CS_VT_NORMALBG:
+ BGVTColor[1] = ts.VTColor[1];
+ if ((ts.ColorFlag & CF_USETEXTCOLOR)!=0) {
+ ANSIColor[IdBack ] = ts.VTColor[1]; // use background color for "Black"
+ }
+ if (ts.UseNormalBGColor) {
+ ts.VTBoldColor[1] = ts.VTColor[1];
+ ts.VTBlinkColor[1] = ts.VTColor[1];
+ ts.URLColor[1] = ts.VTColor[1];
+ }
+ break;
+ break;
+ case CS_VT_BOLDFG: BGVTBoldColor[0] = ts.VTBoldColor[0]; break;
+ case CS_VT_BOLDBG: BGVTBoldColor[1] = ts.VTBoldColor[1]; break;
+ case CS_VT_BLINKFG: BGVTBlinkColor[0] = ts.VTBlinkColor[0]; break;
+ case CS_VT_BLINKBG: BGVTBlinkColor[1] = ts.VTBlinkColor[1]; break;
+ case CS_VT_REVERSEFG: BGVTReverseColor[0] = ts.VTReverseColor[0]; break;
+ case CS_VT_REVERSEBG: BGVTReverseColor[1] = ts.VTReverseColor[1]; break;
+ case CS_VT_URLFG: BGURLColor[0] = ts.URLColor[0]; break;
+ case CS_VT_URLBG: BGURLColor[1] = ts.URLColor[1]; break;
#endif
+ case CS_TEK_FG:
+ break;
+ case CS_TEK_BG:
+ break;
+ case CS_ALL:
+ InitColorTable();
+ DispSetNearestColors(0, 255, NULL);
+ break;
+ default:
+ if (num == IdBack) {
+ if (ts.ColorFlag & CF_USETEXTCOLOR) {
+#ifdef ALPHABLEND_TYPE2
+ ANSIColor[IdBack] = BGVTColor[1]; // use background color for "Black"
+#else
+ ANSIColor[IdBack] = ts.VTColor[1]; // use background color for "Black"
+#endif
+ }
+ else {
+#ifndef NO_ANSI_COLOR_EXTENSION
+ ANSIColor[IdBack] = ts.ANSIColor[IdBack];
+#else /* NO_ANSI_COLOR_EXTENSION */
+ ANSIColor[IdBack] = RGB(DefaultColorTable[IdBack][0], DefaultColorTable[IdBack][1], DefaultColorTable[IdBack][2]);
+#endif
+ }
+ DispSetNearestColors(num, num, NULL);
+ }
+ else if (num == IdFore) {
+ if (ts.ColorFlag & CF_USETEXTCOLOR) {
+#ifdef ALPHABLEND_TYPE2
+ ANSIColor[IdFore] = BGVTColor[0]; // use text color for "white"
+#else
+ ANSIColor[IdFore] = ts.VTColor[0]; // use text color for "white"
+#endif
+ }
+ else {
+#ifndef NO_ANSI_COLOR_EXTENSION
+ ANSIColor[IdFore] = ts.ANSIColor[IdFore];
+#else /* NO_ANSI_COLOR_EXTENSION */
+ ANSIColor[IdFore] = RGB(DefaultColorTable[IdFore][0], DefaultColorTable[IdFore][1], DefaultColorTable[IdFore][2]);
+#endif
+ }
+ DispSetNearestColors(num, num, NULL);
+ }
+ else if (num <= 15) {
+#ifndef NO_ANSI_COLOR_EXTENSION
+ ANSIColor[num] = ts.ANSIColor[num];
+#else /* NO_ANSI_COLOR_EXTENSION */
+ ANSIColor[num] = RGB(DefaultColorTable[num][0], DefaultColorTable[num][1], DefaultColorTable[num][2]);
+#endif
+ DispSetNearestColors(num, num, NULL);
+ }
+ else if (num <= 255) {
+ ANSIColor[num] = RGB(DefaultColorTable[num][0], DefaultColorTable[num][1], DefaultColorTable[num][2]);
+ DispSetNearestColors(num, num, NULL);
+ }
+ }
+
if (num == CS_TEK_FG || num == CS_TEK_BG) {
if (HTEKWin)
InvalidateRect(HTEKWin, NULL, FALSE);
@@ -3698,7 +3609,7 @@
}
}
-COLORREF DispGetColor(int num)
+COLORREF DispGetColor(unsigned int num)
{
COLORREF color;
@@ -3716,7 +3627,7 @@
case CS_TEK_FG: color = ts.TEKColor[0]; break;
case CS_TEK_BG: color = ts.TEKColor[1]; break;
default:
- if (num >= 0 && num <= 255) {
+ if (num <= 255) {
color = ANSIColor[num];
}
else {
Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h 2011-12-06 10:01:20 UTC (rev 4769)
+++ trunk/teraterm/teraterm/vtdisp.h 2011-12-06 10:20:48 UTC (rev 4770)
@@ -78,8 +78,9 @@
void DispApplyANSIColor();
void DispSetNearestColors(int start, int end, HDC DispCtx);
int TCharAttrCmp(TCharAttr a, TCharAttr b);
-void DispSetColor(int num, COLORREF color);
-COLORREF DispGetColor(int num);
+void DispSetColor(unsigned int num, COLORREF color);
+void DispResetColor(unsigned int num);
+COLORREF DispGetColor(unsigned int num);
void DispSetCurCharAttr(TCharAttr Attr);
void DispMoveWindow(int x, int y);
void DispShowWindow(int mode);
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2011-12-06 10:01:20 UTC (rev 4769)
+++ trunk/teraterm/teraterm/vtterm.c 2011-12-06 10:20:48 UTC (rev 4770)
@@ -3395,53 +3395,104 @@
void XsProcColor(int mode, unsigned int ColorNumber, char *ColorSpec) {
COLORREF color;
char StrBuff[256];
+ unsigned int colornum = CS_UNSPEC;
int len;
switch (mode) {
+ case 4:
+ if (ColorNumber <= 255) {
+ colornum = ColorNumber;
+ }
+ break;
+ case 5:
+ switch (ColorNumber) {
+ case 0:
+ colornum = CS_VT_BOLDFG;
+ break;
+ case 1:
+ // Underline -- not supported.
+ // colornum = CS_VT_UNDERFG;
+ break;
+ case 2:
+ colornum = CS_VT_BLINKFG;
+ break;
+ case 3:
+ colornum = CS_VT_REVERSEBG;
+ break;
+ }
+ break;
case 10:
- ColorNumber = CS_VT_NORMALFG;
+ colornum = CS_VT_NORMALFG;
break;
case 11:
- ColorNumber = CS_VT_NORMALBG;
+ colornum = CS_VT_NORMALBG;
break;
case 15:
- ColorNumber = CS_TEK_FG;
+ colornum = CS_TEK_FG;
break;
case 16:
- ColorNumber = CS_TEK_BG;
+ colornum = CS_TEK_BG;
break;
}
- switch (mode) {
- case 4:
- if ((ts.ColorFlag & CF_XTERM256) && ColorNumber <= 255) {
- if (strcmp(ColorSpec, "?") == 0) {
- color = DispGetColor(ColorNumber);
+ if (colornum != CS_UNSPEC) {
+ if (strcmp(ColorSpec, "?") == 0) {
+ color = DispGetColor(colornum);
+ if (mode == 4 || mode == 5) {
len =_snprintf_s_l(StrBuff, sizeof(StrBuff), _TRUNCATE,
- "4;%d;rgb:%02x/%02x/%02x", CLocale, ColorNumber,
+ "%d;%d;rgb:%02x/%02x/%02x", CLocale, mode, ColorNumber,
GetRValue(color), GetGValue(color), GetBValue(color));
- SendOSCstr(StrBuff, len);
}
- else if (XsParseColor(ColorSpec, &color)) {
- DispSetColor(ColorNumber, color);
+ else {
+ len =_snprintf_s_l(StrBuff, sizeof(StrBuff), _TRUNCATE,
+ "%d;rgb:%02x/%02x/%02x", CLocale, mode,
+ GetRValue(color), GetGValue(color), GetBValue(color));
}
- }
- break;
- case 10:
- case 11:
- case 15:
- case 16:
- if (strcmp(ColorSpec, "?") == 0) {
- color = DispGetColor(ColorNumber);
- len =_snprintf_s_l(StrBuff, sizeof(StrBuff), _TRUNCATE,
- "%d;rgb:%02x/%02x/%02x", CLocale, mode,
- GetRValue(color), GetGValue(color), GetBValue(color));
SendOSCstr(StrBuff, len);
}
else if (XsParseColor(ColorSpec, &color)) {
- DispSetColor(ColorNumber, color);
+ DispSetColor(colornum, color);
}
+ }
+}
+
+void XsResetColor(int mode, unsigned int color)
+{
+ switch (mode) {
+ case 104:
+ if (color < 256) {
+ DispResetColor(color);
+ }
break;
+ case 105:
+ switch (color) {
+ case 0:
+ DispResetColor(CS_VT_BOLDFG);
+ break;
+ case 1:
+ // Underline -- not supported.
+ // DispResetColor(CS_VT_UNDERFG);
+ break;
+ case 2:
+ DispResetColor(CS_VT_BLINKFG);
+ break;
+ case 3:
+ DispResetColor(CS_VT_REVERSEBG);
+ break;
+ }
+ break;
+ case 110:
+ DispResetColor(CS_VT_NORMALFG);
+ break;
+ case 111:
+ DispResetColor(CS_VT_NORMALBG);
+ break;
+ case 115:
+ DispResetColor(CS_TEK_FG);
+ break;
+ case 116:
+ DispResetColor(CS_TEK_FG);
+ break;
}
}
@@ -3514,7 +3565,30 @@
switch (XsParseMode) {
case ModeXsFirst:
- if (isdigit(b)) {
+ if ((b==ST && Accept8BitCtrl && !(ts.Language==IdJapanese && ts.KanjiCode==IdSJIS)) || b==BEL) { /* String Terminator */
+ switch (Param[1]) {
+ case 104:
+ DispResetColor(CS_ALL);
+ break;
+ case 110:
+ case 111:
+ case 115:
+ case 116:
+ XsResetColor(Param[1], 0);
+ break;
+ }
+ ParseMode = ModeFirst;
+ XsParseMode = ModeXsFirst;
+ }
+ else if (b == ESC) { /* Escape */
+ PrevMode = ModeXsFirst;
+ XsParseMode = ModeXsEsc;
+ }
+ else if (b <= US) { /* Other control character -- invalid sequence */
+ ParseMode = ModeFirst;
+ XsParseMode = ModeXsFirst;
+ }
+ else if (isdigit(b)) {
Param[1] = Param[1]*10 + b - '0';
}
else if (b == ';') {
@@ -3522,6 +3596,9 @@
StrLen = 0;
switch (Param[1]) {
case 4:
+ case 5:
+ case 104:
+ case 105:
ColorNumber = 0;
XsParseMode = ModeXsColorNum;
break;
@@ -3547,6 +3624,12 @@
}
XsParseMode = ModeXsString;
break;
+ case 110:
+ case 111:
+ case 115:
+ case 116:
+ XsResetColor(Param[1], 0);
+ break;
default:
XsParseMode = ModeXsString;
}
@@ -3617,11 +3700,33 @@
}
break;
case ModeXsColorNum:
- if (isdigit(b)) {
+ if ((b==ST && Accept8BitCtrl && !(ts.Language==IdJapanese && ts.KanjiCode==IdSJIS)) || b==BEL) { /* String Terminator */
+ if (Param[1] == 104 || Param[1] == 105) {
+ XsResetColor(Param[1], ColorNumber);
+ }
+ ColorNumber = 0;
+ ParseMode = ModeFirst;
+ XsParseMode = ModeXsFirst;
+ }
+ else if (b == ESC) { /* Escape */
+ PrevMode = ModeXsColorNum;
+ XsParseMode = ModeXsEsc;
+ }
+ else if (b <= US) { /* Other control character -- invalid sequence */
+ ParseMode = ModeFirst;
+ XsParseMode = ModeXsFirst;
+ }
+ else if (isdigit(b)) {
ColorNumber = ColorNumber*10 + b - '0';
}
else if (b == ';') {
- XsParseMode = ModeXsColorSpec;
+ if (Param[1] == 104 || Param[1] == 105) {
+ XsResetColor(Param[1], ColorNumber);
+ ColorNumber = 0;
+ }
+ else {
+ XsParseMode = ModeXsColorSpec;
+ }
}
else {
XsParseMode = ModeXsIgnore;
@@ -3653,6 +3758,7 @@
switch (Param[1]) {
case 4:
+ case 5:
XsParseMode = ModeXsColorNum;
break;
case 10:
From svnnotify @ sourceforge.jp Tue Dec 6 20:45:06 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 20:45:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzFdICDlpInmm7TlsaXmrbTmm7TmlrAg?=
=?utf-8?b?KCByNDc2OSwgcjQ3NzAp?=
Message-ID: <1323171906.416007.5788.nullmailer@users.sourceforge.jp>
Revision: 4771
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4771
Author: doda
Date: 2011-12-06 20:45:06 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
変更履歴更新 (r4769, r4770)
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4769
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4770
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-06 10:20:48 UTC (rev 4770)
+++ trunk/doc/en/html/about/history.html 2011-12-06 11:45:06 UTC (rev 4771)
@@ -31,6 +31,37 @@
+
+
+ - Changes
+
+ - added support for following control strings.
+
+ - OSC 5 (Change bold/blink/reverse attribute color)
+ - OSC 104 (Reset color palette)
+ - OSC 105 (Reset bold/blink/reverse attribute color)
+ - OSC 110 (Reset VT window text foreground color)
+ - OSC 111 (Reset VT window text foreground color)
+ - OSC 115 (Reset TEK window text foreground color)
+ - OSC 116 (Reset TEK window text foreground color)
+
+
+
+
+
+
+
+
+
+
- Changes
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-12-06 10:20:48 UTC (rev 4770)
+++ trunk/doc/ja/html/about/history.html 2011-12-06 11:45:06 UTC (rev 4771)
@@ -31,6 +31,37 @@
+
+
+ - \x95ύX
+
+ - \x88?\xBA\x82?\xA7\x8C?\x8E\x9A\x97\xF1\x82?Ή\x9E\x82\xB5\x82\xBD\x81B
+
+ - OSC 5 (\x8D\x82\x8BP\x93x/\x93_\x96\xC5/\x94\xBD\x93]\x91\xAE\x90\xAB\x90F\x95ύX)
+ - OSC 104 (\x83J\x83\x89\x81[\x83p\x83\x8C\x83b\x83g\x83\x8A\x83Z\x83b\x83g)
+ - OSC 105 (\x8D\x82\x8BP\x93x/\x93_\x96\xC5/\x94\xBD\x93]\x91\xAE\x90\xAB\x90F\x83\x8A\x83Z\x83b\x83g)
+ - OSC 110 (VT\x83E\x83B\x83\x93\x83h\x83E\x95\xB6\x8E\x9A\x90F\x83\x8A\x83Z\x83b\x83g)
+ - OSC 111 (VT\x83E\x83B\x83\x93\x83h\x83E\x94w\x8Ci\x90F\x83\x8A\x83Z\x83b\x83g)
+ - OSC 115 (TEK\x83E\x83B\x83\x93\x83h\x83E\x95\xB6\x8E\x9A\x90F\x83\x8A\x83Z\x83b\x83g)
+ - OSC 116 (TEK\x83E\x83B\x83\x93\x83h\x83E\x94w\x8Ci\x90F\x83\x8A\x83Z\x83b\x83g)
+
+ - OSC 52 (\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x83A\x83N\x83Z\x83X) \x90\xA7\x8C?\x8E\x9A\x97\xF1\x82?\xE6\x82\xE9\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82???\xE6\x82\xE8\x82?Ή\x9E\x82\xB5\x82\xBD\x81B
+
+
+
+
+
+
+
+
- \x95ύX
From svnnotify @ sourceforge.jp Tue Dec 6 21:04:15 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 21:04:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzJdIFVDUy0+IENQOTMyIOWkieaPmw==?=
=?utf-8?b?44OG44O844OW44Or44GrIEVNIERBU0gg44KS6L+95Yqg44CCIFtUdHNzaDIt?=
=?utf-8?q?devel_2064=5D?=
Message-ID: <1323173055.084725.2427.nullmailer@users.sourceforge.jp>
Revision: 4772
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4772
Author: doda
Date: 2011-12-06 21:04:14 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
UCS->CP932 変換テーブルに EM DASH を追加。[Ttssh2-devel 2064]
Modified Paths:
--------------
trunk/teraterm/teraterm/uni2sjis.map
-------------- next part --------------
Modified: trunk/teraterm/teraterm/uni2sjis.map
===================================================================
--- trunk/teraterm/teraterm/uni2sjis.map 2011-12-06 11:45:06 UTC (rev 4771)
+++ trunk/teraterm/teraterm/uni2sjis.map 2011-12-06 12:04:14 UTC (rev 4772)
@@ -227,6 +227,7 @@
{ 0x044F, 0x8491 },
{ 0x0451, 0x8476 },
{ 0x2010, 0x815D },
+ { 0x2014, 0x815C },
{ 0x2015, 0x815C },
{ 0x2016, 0x8161 },
{ 0x2018, 0x8165 },
From svnnotify @ sourceforge.jp Tue Dec 6 21:52:29 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 06 Dec 2011 21:52:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzNdICDjg5XjgqHjgqTjg6vlj5fkv6E=?=
=?utf-8?b?5pmC44Gu44OV44Kh44Kk44Or5ZCN44Gu5ZWP6aGM44Gr5a++5Yem44CCaHR0?=
=?utf-8?q?p_=3A//slashdot=2Ejp/comments=2Epl=3Fsid=3D553399=26cid=3D20614?=
=?utf-8?q?94?=
Message-ID: <1323175949.693292.3365.nullmailer@users.sourceforge.jp>
Revision: 4773
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4773
Author: doda
Date: 2011-12-06 21:52:29 +0900 (Tue, 06 Dec 2011)
Log Message:
-----------
ファイル受信時のファイル名の問題に対処。http://slashdot.jp/comments.pl?sid=553399&cid=2061494
・ファイル名に使えない文字があった場合に _ に置き換えるようにした。
・ファイル名が空だった場合、noname というファイル名を使うようにした。
対象: Y/ZMODEM, Kermit, BPlus, QuicVAN
Modified Paths:
--------------
trunk/teraterm/ttpfile/ftlib.c
-------------- next part --------------
Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c 2011-12-06 12:04:14 UTC (rev 4772)
+++ trunk/teraterm/ttpfile/ftlib.c 2011-12-06 12:52:29 UTC (rev 4773)
@@ -158,7 +158,18 @@
{
int i;
char Temp[MAX_PATH];
+ char *p;
+ for (p=&(fv->FullName[fv->DirLen]); *p; p++) {
+ if (strchr("\\/:*?\"<>|", *p)) {
+ *p = '_';
+ }
+ }
+
+ if (fv->FullName[fv->DirLen] == 0) {
+ strncpy_s(&(fv->FullName[fv->DirLen]), sizeof(fv->FullName) - fv->DirLen, "noname", _TRUNCATE);
+ }
+
FitFileName(&(fv->FullName[fv->DirLen]),sizeof(fv->FullName) - fv->DirLen,NULL);
if (! fv->OverWrite)
{
From svnnotify @ sourceforge.jp Wed Dec 7 17:34:05 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 07 Dec 2011 17:34:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzRdICDjgqLjg7zjgqvjgqTjg5bniYg=?=
=?utf-8?b?44Gu6Kqs5piO44KS6L+95Yqg?=
Message-ID: <1323246845.823600.15621.nullmailer@users.sourceforge.jp>
Revision: 4774
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4774
Author: maya
Date: 2011-12-07 17:34:05 +0900 (Wed, 07 Dec 2011)
Log Message:
-----------
アーカイブ版の説明を追加
http://slashdot.jp/journal/543198/Tera-Term-4.72-%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9
Modified Paths:
--------------
trunk/installer/makearchive.bat
trunk/installer/release/README-archive-ja.txt
trunk/installer/release/README-archive.txt
-------------- next part --------------
Modified: trunk/installer/makearchive.bat
===================================================================
--- trunk/installer/makearchive.bat 2011-12-06 12:52:29 UTC (rev 4773)
+++ trunk/installer/makearchive.bat 2011-12-07 08:34:05 UTC (rev 4774)
@@ -90,6 +90,10 @@
perl setini.pl release\TERATERM.INI > %dst%\TERATERM.INI
+if "%release%"=="yes" (
+copy nul %dst%\ttpmenu.ini
+)
+
exit /b
:help
Modified: trunk/installer/release/README-archive-ja.txt
===================================================================
--- trunk/installer/release/README-archive-ja.txt 2011-12-06 12:52:29 UTC (rev 4773)
+++ trunk/installer/release/README-archive-ja.txt 2011-12-07 08:34:05 UTC (rev 4774)
@@ -1,11 +1,22 @@
\x83A\x81[\x83J\x83C\x83u\x94ł?\x8D\x88\xD3
+
- \x92?\xED\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82?\xE6\x82\xE8 Tera Special \x83t\x83H\x83\x93\x83g\x82\xAA\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82?\xB7\x81B
\x95K\x97v\x82??\x82\xCD TSPECIAL1.TTF \x82\xF0\x8E蓮\x82ŃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
- TERATERM.INI \x82??\xA9\x82??A\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82őI\x91\xF0\x82\xB7\x82邱\x82??\xE6\x82\xE8\x82???\x82\xEA\x82\xE9
\x92l\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x82\xAA\x81A\x83A\x81[\x83J\x83C\x83u\x94ł?\xBB\x82\xA4\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B\x95K\x97v\x82??\x82?蓮\x82\xC5
\x90??\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+ \x83\x81\x83j\x83\x85\x81[\x82\xE2\x83_\x83C\x83A\x83\x8D\x83O\x82?\xFA\x96{\x8C\xEA\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9\x82??ATERATERM.INI \x82\xCC
+ UILanguageFile \x82\xF0 lang\Japanese.lng \x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
+- Windows 7 \x82?W\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82\xAA\x97L\x8C\xF8\x82??\xC1\x82Ă\xA2\x82\xE9\x82?\x8C\x83W\x83X\x83g\x83\x8A\x82?\xEE\x95?L\x98^
+ \x82\xB3\x82\xEA\x82?\xB7\x81B\x82\xB1\x82?\xAE\x8D?\x96]\x82?\xB5\x82\xAD\x82?\xA2\x8F?\x82\xCD TERATERM.INI \x82\xCC JumpList \x82\xF0
+ off \x82?ύX\x82\xB5\x82ăW\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82?\xF8\x82?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
- \x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?W\x8F\x80\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82ł???\xEA\x82?\xA2\x91\xBD\x82\xAD\x82??\xC1\x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA
\x93\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B\x95s\x97v\x82?\xE0\x82???\x81E\x83\x8A\x83l\x81[\x83\x80\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
- LogMeTT, TTLEdit \x82???\xEA\x82Ă\xA2\x82?\xB9\x82\xF1\x81B\x95K\x97v\x82??\x82?\xFC\x8E?\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
http://logmett.com/freeware/LogMeTT.php
http://logmett.com/freeware/TTLEdit.php
+
Modified: trunk/installer/release/README-archive.txt
===================================================================
--- trunk/installer/release/README-archive.txt 2011-12-06 12:52:29 UTC (rev 4773)
+++ trunk/installer/release/README-archive.txt 2011-12-07 08:34:05 UTC (rev 4774)
@@ -1,8 +1,11 @@
About Tera Term archive
- Please install the Tera Special manually if necessary.
+
- Please configure your teraterm.ini file if necessary because this archive does not update the teraterm.ini entries.
+
- Many plugins are included. Please remove the plugin unless necessary.
+
- The LogMeTT and TTLEdit are not included. Please download below site.
http://logmett.com/freeware/LogMeTT.php
http://logmett.com/freeware/TTLEdit.php
From svnnotify @ sourceforge.jp Wed Dec 7 20:41:02 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 07 Dec 2011 20:41:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzVdICDoi7HoqLM=?=
Message-ID: <1323258062.235513.11507.nullmailer@users.sourceforge.jp>
Revision: 4775
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4775
Author: yutakapon
Date: 2011-12-07 20:41:02 +0900 (Wed, 07 Dec 2011)
Log Message:
-----------
英訳
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-07 08:34:05 UTC (rev 4774)
+++ trunk/doc/en/html/about/history.html 2011-12-07 11:41:02 UTC (rev 4775)
@@ -45,7 +45,7 @@
- OSC 115 (Reset TEK window text foreground color)
- OSC 116 (Reset TEK window text foreground color)
-
+ - added support for reading the Clipboard by using the OSC 52(clipboard accessing) control sequence.
From svnnotify @ sourceforge.jp Wed Dec 7 20:41:43 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 07 Dec 2011 20:41:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzZdICDoi7HoqLPjgpLov73liqDjgZc=?=
=?utf-8?b?44Gf44CC?=
Message-ID: <1323258103.442247.11734.nullmailer@users.sourceforge.jp>
Revision: 4776
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4776
Author: yutakapon
Date: 2011-12-07 20:41:43 +0900 (Wed, 07 Dec 2011)
Log Message:
-----------
英訳を追加した。
ジャンプリストの保存先レジストリパスが分かるなら、明記してください。
Modified Paths:
--------------
trunk/installer/release/README-archive-ja.txt
trunk/installer/release/README-archive.txt
-------------- next part --------------
Modified: trunk/installer/release/README-archive-ja.txt
===================================================================
--- trunk/installer/release/README-archive-ja.txt 2011-12-07 11:41:02 UTC (rev 4775)
+++ trunk/installer/release/README-archive-ja.txt 2011-12-07 11:41:43 UTC (rev 4776)
@@ -9,6 +9,10 @@
\x83\x81\x83j\x83\x85\x81[\x82\xE2\x83_\x83C\x83A\x83\x8D\x83O\x82?\xFA\x96{\x8C\xEA\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9\x82??ATERATERM.INI \x82\xCC
UILanguageFile \x82\xF0 lang\Japanese.lng \x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+; User interface language file that includes message strings.
+; Tera Term uses English message when the filename is not specified.
+UILanguageFile=lang\Japanese.lng
+
- Windows 7 \x82?W\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82\xAA\x97L\x8C\xF8\x82??\xC1\x82Ă\xA2\x82\xE9\x82?\x8C\x83W\x83X\x83g\x83\x8A\x82?\xEE\x95?L\x98^
\x82\xB3\x82\xEA\x82?\xB7\x81B\x82\xB1\x82?\xAE\x8D?\x96]\x82?\xB5\x82\xAD\x82?\xA2\x8F?\x82\xCD TERATERM.INI \x82\xCC JumpList \x82\xF0
off \x82?ύX\x82\xB5\x82ăW\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82?\xF8\x82?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
Modified: trunk/installer/release/README-archive.txt
===================================================================
--- trunk/installer/release/README-archive.txt 2011-12-07 11:41:02 UTC (rev 4775)
+++ trunk/installer/release/README-archive.txt 2011-12-07 11:41:43 UTC (rev 4776)
@@ -3,7 +3,14 @@
- Please install the Tera Special manually if necessary.
- Please configure your teraterm.ini file if necessary because this archive does not update the teraterm.ini entries.
+ If the menu and dialog locale is changed to other language, please change the UILanguageFile entry in the teraterm.ini file.
+; User interface language file that includes message strings.
+; Tera Term uses English message when the filename is not specified.
+UILanguageFile=lang\Japanese.lng
+
+- When the Windows 7 jump list is enabled, the registry will be recorded on each starting. If this behavior is disabled, please change the JumpList entry to off in the teraterm.ini file.
+
- Many plugins are included. Please remove the plugin unless necessary.
- The LogMeTT and TTLEdit are not included. Please download below site.
From svnnotify @ sourceforge.jp Fri Dec 9 10:01:02 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 09 Dec 2011 10:01:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzddICDjg7vkuI3mraPjgarmloflrZc=?=
=?utf-8?b?44Gu572u44GN5o+b44GI44GoIGRlbGV0ZUludmFsaWRGaWxlTmFtZUNoYXIg?=
=?utf-8?b?44Gu5Yem55CG44KS5YWx6YCa5YyW?=
Message-ID: <1323392462.799864.3442.nullmailer@users.sourceforge.jp>
Revision: 4777
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4777
Author: doda
Date: 2011-12-09 10:01:02 +0900 (Fri, 09 Dec 2011)
Log Message:
-----------
・不正な文字の置き換えと deleteInvalidFileNameChar の処理を共通化
・0x00?0x1f も不正な文字として扱うように変更
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/ttpfile/ftlib.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2011-12-07 11:41:43 UTC (rev 4776)
+++ trunk/teraterm/common/ttlib.c 2011-12-09 01:01:02 UTC (rev 4777)
@@ -15,6 +15,9 @@
// for _ismbblead
#include
+// for isInvalidFileNameChar / replaceInvalidFileNameChar
+static char *invalidFileNameChars = "\\/:*?\"<>|";
+
// for b64encode/b64decode
static char *b64enc_table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static char b64dec_table[] = {
@@ -442,27 +445,23 @@
i++;
continue;
}
- switch (FName[i]) {
- case '\\':
- case '/':
- case ':':
- case '*':
- case '?':
- case '"':
- case '<':
- case '>':
- case '|':
- return 1;
+ if ((FName[i] >= 0 && FName[i] < ' ') || strchr(invalidFileNameChars, FName[i])) {
+ return 1;
}
}
return 0;
}
-// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82?g\x97p\x82ł\xAB\x82?\xA2\x95\xB6\x8E\x9A\x82\xF0\x8D?\x82\xB7\x82\xE9 (2006.8.28 maya)
-void deleteInvalidFileNameChar(PCHAR FName)
+// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82?g\x97p\x82ł\xAB\x82?\xA2\x95\xB6\x8E\x9A\x82\xF0 c \x82?u\x82\xAB\x8A\xB7\x82\xA6\x82\xE9
+// c \x82\xC9 0 \x82\xF0\x8Ew\x92?\x82\xBD\x8F?\x82?\xB6\x8E\x9A\x82\xF0\x8D?\x82\xB7\x82\xE9
+void replaceInvalidFileNameChar(PCHAR FName, unsigned char c)
{
int i, j=0, len;
+ if ((c >= 0 && c < ' ') || strchr(invalidFileNameChars, c)) {
+ c = 0;
+ }
+
len = strlen(FName);
for (i=0; i':
- case '|':
- break;
- default:
- FName[j] = FName[i];
- j++;
+ if ((FName[i] >= 0 && FName[i] < ' ') || strchr(invalidFileNameChars, FName[i])) {
+ if (c) {
+ FName[j++] = c;
+ }
}
+ else {
+ FName[j++] = FName[i];
+ }
}
FName[j] = 0;
}
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2011-12-07 11:41:43 UTC (rev 4776)
+++ trunk/teraterm/common/ttlib.h 2011-12-09 01:01:02 UTC (rev 4777)
@@ -25,7 +25,8 @@
void QuoteFName(PCHAR FName);
#endif
int isInvalidFileNameChar(PCHAR FName);
-void deleteInvalidFileNameChar(PCHAR FName);
+#define deleteInvalidFileNameChar(name) replaceInvalidFileNameChar(name, 0)
+void replaceInvalidFileNameChar(PCHAR FName, unsigned char c);
int isInvalidStrftimeChar(PCHAR FName);
void deleteInvalidStrftimeChar(PCHAR FName);
void ParseStrftimeFileName(PCHAR FName, int destlen);
Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c 2011-12-07 11:41:43 UTC (rev 4776)
+++ trunk/teraterm/ttpfile/ftlib.c 2011-12-09 01:01:02 UTC (rev 4777)
@@ -158,13 +158,8 @@
{
int i;
char Temp[MAX_PATH];
- char *p;
- for (p=&(fv->FullName[fv->DirLen]); *p; p++) {
- if (strchr("\\/:*?\"<>|", *p)) {
- *p = '_';
- }
- }
+ replaceInvalidFileNameChar(&(fv->FullName[fv->DirLen]), '_');
if (fv->FullName[fv->DirLen] == 0) {
strncpy_s(&(fv->FullName[fv->DirLen]), sizeof(fv->FullName) - fv->DirLen, "noname", _TRUNCATE);
From svnnotify @ sourceforge.jp Fri Dec 9 19:26:15 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 09 Dec 2011 19:26:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzhdICDjg5XjgqHjgqTjg6vjg5Hjgrk=?=
=?utf-8?b?44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1323426375.269634.7786.nullmailer@users.sourceforge.jp>
Revision: 4778
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4778
Author: yutakapon
Date: 2011-12-09 19:26:15 +0900 (Fri, 09 Dec 2011)
Log Message:
-----------
ファイルパスを追加した。
Modified Paths:
--------------
trunk/installer/release/README-archive-ja.txt
trunk/installer/release/README-archive.txt
-------------- next part --------------
Modified: trunk/installer/release/README-archive-ja.txt
===================================================================
--- trunk/installer/release/README-archive-ja.txt 2011-12-09 01:01:02 UTC (rev 4777)
+++ trunk/installer/release/README-archive-ja.txt 2011-12-09 10:26:15 UTC (rev 4778)
@@ -13,8 +13,9 @@
; Tera Term uses English message when the filename is not specified.
UILanguageFile=lang\Japanese.lng
-- Windows 7 \x82?W\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82\xAA\x97L\x8C\xF8\x82??\xC1\x82Ă\xA2\x82\xE9\x82?\x8C\x83W\x83X\x83g\x83\x8A\x82?\xEE\x95?L\x98^
- \x82\xB3\x82\xEA\x82?\xB7\x81B\x82\xB1\x82?\xAE\x8D?\x96]\x82?\xB5\x82\xAD\x82?\xA2\x8F?\x82\xCD TERATERM.INI \x82\xCC JumpList \x82\xF0
+- Windows 7 \x82?W\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82\xAA\x97L\x8C\xF8\x82??\xC1\x82Ă\xA2\x82\xE9\x82?t\x83@\x83C\x83\x8B(%AppData%\
+ Microsoft\Windows\Recent\CustomDestinations)\x82?\xEE\x95?L\x98^\x82\xB3\x82\xEA\x82?\xB7\x81B
+ \x82\xB1\x82?\xAE\x8D?\x96]\x82?\xB5\x82\xAD\x82?\xA2\x8F?\x82\xCD TERATERM.INI \x82\xCC JumpList \x82\xF0
off \x82?ύX\x82\xB5\x82ăW\x83\x83\x83\x93\x83v\x83\x8A\x83X\x83g\x82?\xF8\x82?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
- \x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?W\x8F\x80\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82ł???\xEA\x82?\xA2\x91\xBD\x82\xAD\x82??\xC1\x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA
Modified: trunk/installer/release/README-archive.txt
===================================================================
--- trunk/installer/release/README-archive.txt 2011-12-09 01:01:02 UTC (rev 4777)
+++ trunk/installer/release/README-archive.txt 2011-12-09 10:26:15 UTC (rev 4778)
@@ -9,7 +9,10 @@
; Tera Term uses English message when the filename is not specified.
UILanguageFile=lang\Japanese.lng
-- When the Windows 7 jump list is enabled, the registry will be recorded on each starting. If this behavior is disabled, please change the JumpList entry to off in the teraterm.ini file.
+- When the Windows 7 jump list is enabled, a file(%AppData%\Microsoft\
+ Windows\Recent\CustomDestinations) will be recorded on each starting.
+ If this behavior is disabled, please change the JumpList entry to off
+ in the teraterm.ini file.
- Many plugins are included. Please remove the plugin unless necessary.
From svnnotify @ sourceforge.jp Tue Dec 13 08:51:16 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Tue, 13 Dec 2011 08:51:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3NzldICBN44GoVlTjga7jgqLjgqTjgrM=?=
=?utf-8?b?44Oz44Gr5aSn44GN44GE44K144Kk44K644KS6L+95Yqg?=
Message-ID: <1323733876.842400.31849.nullmailer@users.sourceforge.jp>
Revision: 4779
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4779
Author: maya
Date: 2011-12-13 08:51:16 +0900 (Tue, 13 Dec 2011)
Log Message:
-----------
MとVTのアイコンに大きいサイズを追加
32ビットアイコンを全サイズ置き換え
Modified Paths:
--------------
trunk/teraterm/common/vt.ico
trunk/teraterm/ttpmacro/ttmacro.ico
-------------- next part --------------
Modified: trunk/teraterm/common/vt.ico
===================================================================
(Binary files differ)
Modified: trunk/teraterm/ttpmacro/ttmacro.ico
===================================================================
(Binary files differ)
From svnnotify @ sourceforge.jp Fri Dec 23 00:05:34 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 23 Dec 2011 00:05:34 +0900
Subject: [Ttssh2-commit] [4780] typo fix
Message-ID: <1324566334.314993.2007.nullmailer@users.sourceforge.jp>
Revision: 4780
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4780
Author: yutakapon
Date: 2011-12-23 00:05:33 +0900 (Fri, 23 Dec 2011)
Log Message:
-----------
typo fix
http://logmett.com/forum/viewtopic.php?f=8&t=1880
Modified Paths:
--------------
trunk/doc/en/html/macro/syntax/types.html
-------------- next part --------------
Modified: trunk/doc/en/html/macro/syntax/types.html
===================================================================
--- trunk/doc/en/html/macro/syntax/types.html 2011-12-12 23:51:16 UTC (rev 4779)
+++ trunk/doc/en/html/macro/syntax/types.html 2011-12-22 15:05:33 UTC (rev 4780)
@@ -37,7 +37,7 @@
-The string array can be used by using the intdim macro command.
+The string array can be used by using the strdim macro command.
The maximum index is 65536.
The element of the array equals to the string.
The maximum number of the array is 256.
From svnnotify @ sourceforge.jp Fri Dec 23 00:29:31 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 23 Dec 2011 00:29:31 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3ODFdICBmaWxlcmVuYW1lIOOBp+OAgQ==?=
=?utf-8?b?44OV44Kh44Kk44Or44Gu44Oq44ON44O844Og44Gr5aSx5pWX44GX44Gf44KJ?=
=?utf-8?b?44CB5q2j44GX44GP44Ko44Op44O844KS6L+U44GZ44KI44GG44Gr44GX44Gf?=
=?utf-8?b?44CC?=
Message-ID: <1324567771.861669.3868.nullmailer@users.sourceforge.jp>
Revision: 4781
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4781
Author: yutakapon
Date: 2011-12-23 00:29:31 +0900 (Fri, 23 Dec 2011)
Log Message:
-----------
filerename で、ファイルのリネームに失敗したら、正しくエラーを返すようにした。
http://logmett.com/forum/viewtopic.php?f=8&t=1861
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-22 15:05:33 UTC (rev 4780)
+++ trunk/doc/en/html/about/history.html 2011-12-22 15:29:31 UTC (rev 4781)
@@ -49,11 +49,11 @@
-
+
+
- "filerename" macro command: When a file can not be renamed, the error code stores to the result variable.
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-12-25 03:18:55 UTC (rev 4784)
+++ trunk/doc/ja/html/about/history.html 2011-12-28 04:07:33 UTC (rev 4785)
@@ -51,6 +51,7 @@
- \x83o\x83O\x8FC\x90\xB3
+ - \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
- \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h "filerename" \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
Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c 2011-12-25 03:18:55 UTC (rev 4784)
+++ trunk/teraterm/ttpcmn/language.c 2011-12-28 04:07:33 UTC (rev 4785)
@@ -156,8 +156,10 @@
}
/* Russian charset conversion table by Andrey Nikiforov 19971114 */
+/* Updated by NAGATA Shinya 20111228 */
static BYTE cpconv[4][4][128] =
{
+#if 0
// 1251 -> 1251 = dummy
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
@@ -175,8 +177,8 @@
/*192-207*/ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
/*208-223*/ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
/*224-239*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
-/*240-255*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
-// 1251 -> 866 , ,
+/*240-255*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
+// 1251 -> 866
/*128-143*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
/*144-159*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
/*160-175*/ 208,246,247,209,253,210,211,212,240,213,242,214,215,216,217,244,
@@ -185,7 +187,7 @@
/*208-223*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*224-239*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
/*240-255*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-// 1251 -> ISO , ,
+// 1251 -> ISO
/*128-143*/ 162,163,128,243,129,130,131,132,133,134,169,135,170,172,171,175,
/*144-159*/ 242,136,137,138,139,140,141,142,143,144,249,145,250,252,251,255,
/*160-175*/ 146,174,254,168,147,148,149,150,161,151,164,152,153,154,155,167,
@@ -194,7 +196,7 @@
/*208-223*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
/*224-239*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
/*240-255*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-// koi8-r -> 1251 , ,
+// koi8-r -> 1251
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,161,162,184,163,164,165,166,167,169,170,171,172,173,174,175,
@@ -203,7 +205,7 @@
/*208-223*/ 239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250,
/*224-239*/ 222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206,
/*240-255*/ 207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218,
-// koi8-r -> koi8-r = dummy
+// koi8-r -> koi8-r = dummy
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
@@ -221,7 +223,7 @@
/*208-223*/ 175,239,224,225,226,227,166,162,236,235,167,232,237,233,231,234,
/*224-239*/ 158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142,
/*240-255*/ 143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154,
-// koi8-r -> ISO , , , , , , , ,
+// koi8-r -> ISO
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,162,163,241,164,165,166,167,168,169,170,171,172,173,174,175,
@@ -230,7 +232,7 @@
/*208-223*/ 223,239,224,225,226,227,214,210,236,235,215,232,237,233,231,234,
/*224-239*/ 206,176,177,198,180,181,196,179,197,184,185,186,187,188,189,190,
/*240-255*/ 191,207,192,193,194,195,182,178,204,203,183,200,205,201,199,202,
-// 866 -> 1251 , ,
+// 866 -> 1251
/*128-143*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
/*144-159*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
/*160-175*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
@@ -239,7 +241,7 @@
/*208-223*/ 160,163,165,166,167,169,171,172,173,174,177,178,179,180,181,182,
/*224-239*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
/*240-255*/ 168,184,170,186,175,191,161,162,176,183,187,188,185,164,189,190,
-// 866 -> koi8-r , , ,
+// 866 -> koi8-r
/*128-143*/ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
/*144-159*/ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
/*160-175*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
@@ -248,7 +250,7 @@
/*208-223*/ 160,161,162,164,165,166,167,168,169,170,171,172,173,174,175,176,
/*224-239*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
/*240-255*/ 179,163,177,178,180,181,182,183,184,185,186,187,188,189,190,191,
-// 866 -> 866 = dummy , ,
+// 866 -> 866 = dummy
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
@@ -266,7 +268,7 @@
/*208-223*/ 160,162,163,165,166,168,169,170,171,172,173,175,240,242,243,245,
/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
/*240-255*/ 161,241,164,244,167,247,174,254,246,248,249,250,251,252,253,255,
-// ISO -> 1251 , ,
+// ISO -> 1251
/*128-143*/ 130,132,133,134,135,136,137,139,145,146,147,148,149,150,151,152,
/*144-159*/ 153,155,160,164,165,166,167,169,171,172,173,174,176,177,180,181,
/*160-175*/ 182,168,128,129,170,189,178,175,163,138,140,142,141,183,161,143,
@@ -275,7 +277,7 @@
/*208-223*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
/*224-239*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
/*240-255*/ 185,184,144,131,186,190,179,191,188,154,156,158,157,187,162,159,
-// ISO -> koi8-r , , , ,
+// ISO -> koi8-r
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,179,161,162,164,165,166,167,168,169,170,171,172,173,174,175,
@@ -284,7 +286,7 @@
/*208-223*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
/*224-239*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
/*240-255*/ 176,163,177,178,180,181,182,183,184,185,186,187,188,189,190,191,
-// ISO -> 866 , , , ,
+// ISO -> 866
/*128-143*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
/*144-159*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
/*160-175*/ 208,240,209,210,242,211,212,244,213,214,215,216,217,218,246,219,
@@ -293,7 +295,7 @@
/*208-223*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
/*240-255*/ 220,241,221,222,243,223,248,245,249,250,251,252,253,254,247,255,
-// iso -> iso = dummy , , ,
+// iso -> iso = dummy
/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
@@ -302,6 +304,263 @@
/*208-223*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
/*240-255*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+#else
+// NAGATA Shinya 20111228
+// \x95ϊ\xB7\x90\xE6\x82?Ή\x9E\x82\xB7\x82?\x8E\x9A\x81E\x8BL\x8D\x86\x82\xAA\x82?\xA2\x82?\xB1\x82\xEB\x82\xF0\x82\xB7\x82\xAE\x89\xBA\x82?\\x82?\xA6\x82\xB7
+// \x8AY\x93\x96\x95\x94\x95\xAA\x82?d\x95\xA1\x82\xAA\x82?\xA2\x82悤\x82?\x84\x82蓖\x82Ă\xE9(\x83I\x83\x8A\x83W\x83i\x83\x8B\x82\xAA\x82\xBB\x82\xA4\x82?\xC1\x82Ă\xA2\x82\xE9\x82?\xC5)
+// 1251 -> 1251 = dummy
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*192-207*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*208-223*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+// 1251 -> KOI8-R
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,155,157,159,160,161,162,
+/*160-175*/ 154,164,165,166,167,168,169,170,179,191,171,172,173,174,175,176,
+/*176-191*/ 156,177,178,180,181,182,183,158,163,184,185,186,187,188,189,190,
+/*192-207*/ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
+/*208-223*/ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
+/*224-239*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
+/*240-255*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
+// Non mapped character
+//128-143 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//144-159 144,145,146,147,148,149,150,151,152,153,155,157,159,160,161,162,
+//160-175 ,164,165,166,167,168,169,170, , ,171,172,173,174,175,176,
+//176-191 ,177,178,180,181,182,183, , ,184,185,186,187,188,189,190,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// 1251 -> 866
+/*128-143*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*144-159*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*160-175*/ 255,246,247,208,209,210,211,212,240,213,242,214,215,216,217,244,
+/*176-191*/ 248,218,219,220,221,222,223,250,241,252,243,249,251,253,254,245,
+/*192-207*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*208-223*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*224-239*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*240-255*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+// Non mapped character
+//128-143 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+//144-159 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+//160-175 , , ,208,209,210,211,212, ,213, ,214,215,216,217, ,
+//176-191 ,218,219,220,221,222,223, , , , ,249,251,253,254, ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// 1251 -> ISO
+/*128-143*/ 162,163,128,243,129,130,131,132,133,134,169,135,170,172,171,175,
+/*144-159*/ 242,136,137,138,139,140,141,142,143,144,249,145,250,252,251,255,
+/*160-175*/ 160,174,254,168,146,147,148,253,161,149,164,150,151,173,152,167,
+/*176-191*/ 153,154,166,246,155,156,157,158,241,240,244,159,248,165,245,247,
+/*192-207*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*208-223*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*224-239*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*240-255*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+// Non mapped character
+//128-143 , ,128, ,129,130,131,132,133,134, ,135, , , , ,
+//144-159 ,136,137,138,139,140,141,142,143,144, ,145, , , , ,
+//160-175 , , , ,146,147,148, , ,149, ,150,151, ,152, ,
+//176-191 153,154, , ,155,156,157,158, , , ,159, , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// koi8-r -> 1251
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,160,154,176,155,183,156,
+/*160-175*/ 157,158,159,184,161,162,163,164,165,166,167,170,171,172,173,174,
+/*176-191*/ 175,177,178,168,179,180,181,182,185,186,187,188,189,190,191,169,
+/*192-207*/ 254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238,
+/*208-223*/ 239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250,
+/*224-239*/ 222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206,
+/*240-255*/ 207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218,
+// Non mapped character
+//128-143 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//144-159 144,145,146,147,148,149,150,151,152,153, ,154, ,155, ,156,
+//160-175 157,158,159, ,161,162,163,164,165,166,167,170,171,172,173,174,
+//176-191 175,177,178, ,179,180,181,182,185,186,187,188,189,190,191, ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// koi8-r -> koi8-r = dummy
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*192-207*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*208-223*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+// koi8-r -> 866
+/*128-143*/ 196,179,218,191,192,217,195,180,194,193,197,223,220,219,221,222,
+/*144-159*/ 176,177,178,242,254,249,251,243,244,245,255,246,248,247,250,252,
+/*160-175*/ 205,186,213,241,214,201,184,183,187,212,211,200,190,189,188,198,
+/*176-191*/ 199,204,181,240,182,185,209,210,203,207,208,202,216,215,206,255,
+/*192-207*/ 238,160,161,230,164,165,228,163,229,168,169,170,171,172,173,174,
+/*208-223*/ 175,239,224,225,226,227,166,162,236,235,167,232,237,233,231,234,
+/*224-239*/ 158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142,
+/*240-255*/ 143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154,
+// Non mapped character
+//128-143 , , , , , , , , , , , , , , , ,
+//144-159 , , ,242, , , ,243,244,245, ,246, ,247, ,252,
+//160-175 , , , , , , , , , , , , , , , ,
+//176-191 , , , , , , , , , , , , , , ,253,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// koi8-r -> ISO
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,160,154,155,156,157,158,
+/*160-175*/ 159,162,163,241,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 240,242,243,161,244,245,246,247,248,249,250,251,252,253,254,255,
+/*192-207*/ 238,208,209,230,212,213,228,211,229,216,217,218,219,220,221,222,
+/*208-223*/ 223,239,224,225,226,227,214,210,236,235,215,232,237,233,231,234,
+/*224-239*/ 206,176,177,198,180,181,196,179,197,184,185,186,187,188,189,190,
+/*240-255*/ 191,207,192,193,194,195,182,178,204,203,183,200,205,201,199,202,
+// Non mapped character
+//128-143 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//144-159 144,145,146,147,148,149,150,151,152,153, ,154,155,156,157,158,
+//160-175 159,162,163, ,164,165,166,167,168,169,170,171,172,173,174,175,
+//176-191 240,242,243, ,244,245,246,247,248,249,250,251,252,253,254,255,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// 866 -> 1251
+/*128-143*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*144-159*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*160-175*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*176-191*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*192-207*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*208-223*/ 160,163,165,166,167,169,171,172,173,174,177,178,179,180,181,182,
+/*224-239*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+/*240-255*/ 168,184,170,186,175,191,161,162,176,187,183,188,185,189,190,160,
+// Non mapped character
+//128-143 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//144-159 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+//160-175 163,164,165,166,167,169,171,172,173,174,177,178,179,180,181,182,
+//176-191 , , , , , , , , , , , , , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , ,187, ,188, ,189,190, ,
+// 866 -> koi8-r
+/*128-143*/ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
+/*144-159*/ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
+/*160-175*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
+/*176-191*/ 144,145,146,129,135,178,180,167,166,181,161,168,174,173,172,131,
+/*192-207*/ 132,137,136,134,128,138,175,176,171,165,187,184,177,160,190,185,
+/*208-223*/ 186,182,183,170,169,162,164,189,188,133,130,141,140,142,143,139,
+/*224-239*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
+/*240-255*/ 179,163,147,151,152,153,155,157,156,149,158,150,159,191,148,154,
+// Non mapped character
+//128-143 , , , , , , , , , , , , , , , ,
+//144-159 , , , , , , , , , , , , , , , ,
+//160-175 , , , , , , , , , , , , , , , ,
+//176-191 , , , , , , , , , , , , , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , ,147,151,152,153,155,157, , , , ,159,191, , ,
+// 866 -> 866 = dummy
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*192-207*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*208-223*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+// 866 -> ISO
+/*128-143*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*144-159*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*160-175*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*176-191*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*192-207*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*208-223*/ 162,163,165,166,168,169,170,171,172,173,175,240,242,243,245,256,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 161,241,164,244,167,247,174,254,248,249,250,251,252,253,255,160,
+// Non mapped character
+//128-143 , , , , , , , , , , , , , , , ,
+//144-159 , , , , , , , , , , , , , , , ,
+//160-175 , , , , , , , , , , , , , , , ,
+//176-191 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//192-207 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+//208-223 162,163,165,166,168,169,170,171,172,173,175,240,242,243,245,256,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , ,248,249,250,251,252,253,255, ,
+// ISO -> 1251
+/*128-143*/ 130,132,133,134,135,136,137,139,145,146,147,148,149,150,151,152,
+/*144-159*/ 153,155,164,165,166,169,171,172,174,176,177,180,181,182,183,187,
+/*160-175*/ 160,168,128,129,170,189,178,175,163,138,140,142,141,173,161,143,
+/*176-191*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*192-207*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*208-223*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*224-239*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+/*240-255*/ 185,184,144,131,186,190,179,191,188,154,156,158,157,167,162,159,
+// Non mapped character
+//128-143 130,132,133,134,135,136,137,139,145,146,147,148,149,150,151,152,
+//144-159 153,155,164,165,166,169,171,172,174,176,177,180,181,182,183,187,
+//160-175 , , , , , , , , , , , , , , , ,
+//176-191 , , , , , , , , , , , , , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 , , , , , , , , , , , , , , , ,
+// ISO -> koi8-r
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,155,156,157,158,159,160,
+/*160-175*/ 154,179,161,162,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
+/*192-207*/ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
+/*208-223*/ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
+/*224-239*/ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209,
+/*240-255*/ 176,163,177,178,180,181,182,183,184,185,186,187,188,189,190,191,
+// Non mapped character
+//128-143 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+//144-159 144,145,146,147,148,149,150,151,152,153,155,156,157,158,159,160,
+//160-175 , ,161,162,164,165,166,167,168,169,170,171,172,173,174,175,
+//176-191 , , , , , , , , , , , , , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 176, ,177,178,180,181,182,183,184,185,186,187,188,189,190,191,
+// ISO -> 866
+/*128-143*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*144-159*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*160-175*/ 255,240,208,209,242,210,211,244,212,213,214,215,216,217,246,218,
+/*176-191*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*192-207*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*208-223*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 219,241,220,221,243,222,223,245,248,249,250,251,252,253,247,254,
+// Non mapped character
+//128-143 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+//144-159 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+//160-175 , ,208,209, ,210,211, ,212,213,214,215,216,217, ,218,
+//176-191 , , , , , , , , , , , , , , , ,
+//192-207 , , , , , , , , , , , , , , , ,
+//208-223 , , , , , , , , , , , , , , , ,
+//224-239 , , , , , , , , , , , , , , , ,
+//240-255 219, ,220,221, ,222,223, ,248,249,250,251,252,253, ,254,
+// iso -> iso = dummy
+/*128-143*/ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+/*144-159*/ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+/*160-175*/ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+/*176-191*/ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+/*192-207*/ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+/*208-223*/ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+/*224-239*/ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+/*240-255*/ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+#endif
};
// Russian character set conversion
From svnnotify @ sourceforge.jp Thu Dec 29 21:29:38 2011
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 29 Dec 2011 21:29:38 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ3ODZdICBMb2dTdGFydCDjgafjg63jgrA=?=
=?utf-8?b?44OV44Kh44Kk44Or44KS6ZaL44GP44Go44GN44Gr5o6S5LuW44Ot44OD44Kv?=
=?utf-8?b?44GZ44KL44GL44Gp44GG44GL44Gu44Kq44OX44K344On44Oz44KS5L2c5oiQ?=
Message-ID: <1325161778.500452.4057.nullmailer@users.sourceforge.jp>
Revision: 4786
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4786
Author: maya
Date: 2011-12-29 21:29:38 +0900 (Thu, 29 Dec 2011)
Log Message:
-----------
LogStart でログファイルを開くときに排他ロックするかどうかのオプションを作成
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=27016
http://logmett.com/forum/viewtopic.php?f=8&t=1829
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/setup/teraterm-misc.html
trunk/doc/en/html/setup/teraterm.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/setup/teraterm-misc.html
trunk/doc/ja/html/setup/teraterm.html
trunk/installer/release/TERATERM.INI
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-12-28 04:07:33 UTC (rev 4785)
+++ trunk/doc/en/html/about/history.html 2011-12-29 12:29:38 UTC (rev 4786)
@@ -46,6 +46,10 @@
- OSC 116 (Reset TEK window text foreground color)
- added support for reading the Clipboard by using the OSC 52(clipboard accessing) control sequence.
+
Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html 2011-12-28 04:07:33 UTC (rev 4785)
+++ trunk/doc/en/html/setup/teraterm-misc.html 2011-12-29 12:29:38 UTC (rev 4786)
@@ -244,5 +244,22 @@
+
+
+