From svnnotify ＠ sourceforge.jp  Tue May  1 00:11:59 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 May 2012 00:11:59 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4916=5D__Additional_settings_-_Visua?=
 =?utf-8?b?bCB0YWLjgafjgIFFdGVybSBsb29rLWZlZWwg44KS44OB44Kn44OD44Kv44Gn?=
 =?utf-8?b?44GN44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1335798719.621463.29894.nullmailer@users.sourceforge.jp>

Revision: 4916
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4916
Author:   yutakapon
Date:     2012-05-01 00:11:59 +0900 (Tue, 01 May 2012)
Log Message:
-----------
Additional settings - Visual tabで、Eterm look-feel をチェックできるようにした。
設定変更後、Tera Termを再起動するかどうか問い合わせるようにした。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-additional.html
    trunk/doc/en/html/usage/transparent.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-additional.html
    trunk/doc/ja/html/usage/transparent.html
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/ttdlg.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/en/html/about/history.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -60,6 +60,7 @@
         <ul>
           <li>Environment variable strings(%variableName%) can be included in the ini file path.</li>
           <li>added an image file specified configuration(theme\ImageFile.INI).</li>
+          <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
         </ul></li>
       <li>Macro
         <ul>

Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/en/html/menu/setup-additional.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -227,7 +227,7 @@
 
       <dt>Eterm lookfeel</dt>
       <dd>
-	Tera Term window looks like Eterm-lookfeel background transparency. Not supported.
+	Tera Term window looks like Eterm-lookfeel background transparency.
       </dd>
     </dl>
 

Modified: trunk/doc/en/html/usage/transparent.html
===================================================================
--- trunk/doc/en/html/usage/transparent.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/en/html/usage/transparent.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -31,7 +31,7 @@
 
 <p>
 In this type Tera Term window looks like Eterm background transparency. If this function is enabled, Tera Term window becomes background transparency and mixes the wallpaper with your specified image file(*.jpg).<br>
-Please edit the "BGEnable=on" in the teraterm.ini file because you can not configure the value in "Visual" tab on <a href="../menu/setup-additional.html">[Setup] Additonal settings</a>.
+Please edit the "BGEnable=on" in the teraterm.ini file, or you can configure the value in "Visual" tab on <a href="../menu/setup-additional.html">[Setup] Additonal settings</a>.
 </p>
 
 <p>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/ja/html/about/history.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -60,6 +60,7 @@
         <ul>
           <li>ini\x83t\x83@\x83C\x83\x8B\x83p\x83X\x82??\xAB\x95?\x94\x95\xB6\x8E\x9A\x97\xF1(%variableName%)\x82\xF0\x8A??\xE7\x82\xEA\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
           <li>\x89摜\x83t\x83@\x83C\x83\x8B\x8Ew\x92\xE8\x90?\xE8(theme\ImageFile.INI)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+          <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li>\x83}\x83N\x83\x8D
         <ul>

Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/ja/html/menu/setup-additional.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -224,7 +224,7 @@
 
       <dt>Eterm lookfeel</dt>
       <dd>
-	Eterm\x95\x97\x82?\xBC\x93\xA7\x96\xBE\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B\x8C\xBB\x8D?A\x93\x96\x8AY\x8D\x80\x96??ύX\x95s\x89?ł\xB7\x81B
+	Eterm\x95\x97\x82?\xBC\x93\xA7\x96\xBE\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
       </dd>
     </dl>
 

Modified: trunk/doc/ja/html/usage/transparent.html
===================================================================
--- trunk/doc/ja/html/usage/transparent.html	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/doc/ja/html/usage/transparent.html	2012-04-30 15:11:59 UTC (rev 4916)
@@ -32,7 +32,7 @@
 
 <p>
 \x82\xB1\x82?@\x94\\x82\xF0\x8Eg\x82\xA4\x82?AEterm\x95\x97\x82?\xBC\x93\xA7\x96\xBE\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B\x82\xB1\x82?@\x94\\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9\x82?ATera Term\x82?E\x83B\x83\x93\x83h\x83E\x82?\xBC\x93\xA7\x96\xBE\x89\xBB\x82\xB3\x82\xEA\x81A\x95ǎ\x86\x82?w\x92?\x82\xBD\x89摜\x83t\x83@\x83C\x83\x8B(*.jpg)\x82?\xAC\x8D\x87\x82\xB3\x82\xEA\x82?`\x89悳\x82\xEA\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B<br>
-\x82\xB1\x82?@\x94\\x82?A<a href="../menu/setup-additional.html">[Setup] Additional settings</a> \x82\xCC Visual \x83^\x83u\x82ŗL\x8C\xF8\x82?ł\xAB\x82?\xA2\x82\xBD\x82?A\x92\xBC\x90\xDA teraterm.ini \x82\xCC"BGEnable=on"\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x82\xB1\x82?@\x94\\x82?A<a href="../menu/setup-additional.html">[Setup] Additional settings</a> \x82\xCC Visual \x83^\x83u\x82ŗL\x8C\xF8\x82?\xB7\x82?\x81A\x92\xBC\x90\xDA teraterm.ini \x82\xCC"BGEnable=on"\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 </p>
 
 <p>

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/teraterm/teraterm/addsetting.cpp	2012-04-30 15:11:59 UTC (rev 4916)
@@ -11,6 +11,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttwinman.h"
+#include "ttcommon.h"
 
 mouse_cursor_t MouseCursor[] = {
 	{"ARROW", IDC_ARROW},
@@ -1003,6 +1004,7 @@
 	int beforeAlphaBlend;
 	char buf[MAXPATHLEN];
 	COLORREF TmpColor;
+	int flag_changed = 0;
 
 	// (1)
 	beforeAlphaBlend = ts.AlphaBlend;
@@ -1017,7 +1019,10 @@
 	// \x83O\x83\x8D\x81[\x83o\x83\x8B\x95?\x94 BGEnable \x82??\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x82?A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x97\x8E\x82\xBF\x82邱\x82?\xAA
 	// \x82\xA0\x82\xE9\x82?ŃR\x83s\x81[\x82\xF0\x8FC\x90\xB3\x82\xB7\x82\xE9\x82???\xB7\x82\xE9\x81B(2005.4.24 yutaka)
 	btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
-	ts.EtermLookfeel.BGEnable = btn->GetCheck();
+	if (ts.EtermLookfeel.BGEnable != btn->GetCheck()) {
+		flag_changed = 1;
+		ts.EtermLookfeel.BGEnable = btn->GetCheck();
+	}
 
 	// (3)
 	listbox = (CListBox *)GetDlgItem(IDC_MOUSE_CURSOR);
@@ -1109,6 +1114,11 @@
 			SetWindowStyle(&ts);
 		}
 	}
+
+	if (flag_changed) {
+		// re-launch
+		RestartTeraTerm(GetSafeHwnd(), &ts);
+	}
 }
 
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/teraterm/teraterm/ttermpro.rc	2012-04-30 15:11:59 UTC (rev 4916)
@@ -114,7 +114,7 @@
 BEGIN
     LTEXT           "&Alpha blend",IDC_ALPHABLEND,10,10,43,8
     EDITTEXT        IDC_ALPHA_BLEND,58,8,28,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,8,72,12
+    CONTROL         "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,8,72,12
     LTEXT           "&Mouse cursor",IDC_MOUSE,10,26,70,8
     LISTBOX         IDC_MOUSE_CURSOR,10,36,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "&Font Quality",IDC_FONT_QUALITY_LABEL,100,26,70,8

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2012-04-30 15:11:59 UTC (rev 4916)
@@ -88,9 +88,20 @@
 	char path[1024];
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
+	char uimsg[MAX_UIMSG];
+	int ret;
 
+	get_lang_msg("MSG_TT_TAKE_EFFECT", uimsg, sizeof(uimsg), 
+		"This option takes effect the next time a session is started.\n"
+		"Are you sure that you want to relaunch Tera Term?"
+		, ts->UILanguageFile);
+	ret = MessageBox(hwnd, uimsg, "Tera Term: Configuration Warning", MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
+	if (ret != IDYES) 
+		return;
+
 	SendMessage(hwnd, WM_COMMAND, ID_SETUP_SAVE, 0);
-	SendMessage(hwnd, WM_COMMAND, ID_FILE_EXIT, 0);
+	// TODO: \x8E\xA9\x93\xAE\x8FI\x97\xB9\x82\xB3\x82\xB9\x82悤\x82?\xB7\x82\xE9\x82?A\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x8F?\x82\xAA\x82\xA0\x82\xE9\x81B
+	//SendMessage(hwnd, WM_COMMAND, ID_FILE_EXIT, 0);
 
 	if (GetModuleFileName(NULL, path, sizeof(path)) == 0) {
 		return;

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2012-04-30 12:58:55 UTC (rev 4915)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2012-04-30 15:11:59 UTC (rev 4916)
@@ -3216,19 +3216,11 @@
 						// \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95ύX\x82\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8F?
 						w = (WORD)GetCurSel(Dialog, IDC_GENLANG_UI);
 						if (w != langui_sel) {
-							int ret;
 							_snprintf_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), _TRUNCATE, 
 								"%s/%s", LANG_PATH, LangUIList[w - 1]);
 
-							get_lang_msg("MSG_TT_TAKE_EFFECT", uimsg, sizeof(uimsg), 
-								"This option takes effect the next time a session is started.\n"
-								"Are you sure that you want to relaunch Tera Term?"
-								, UILanguageFile);
-							ret = MessageBox(Dialog, uimsg, "Tera Term: CONFIGURATION WARNING", MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
-							if (ret == IDYES) {
-								// re-launch
-								RestartTeraTerm(GetParent(Dialog), ts);
-							}
+							// re-launch
+							RestartTeraTerm(GetParent(Dialog), ts);
 						}
 					}
 

From svnnotify ＠ sourceforge.jp  Tue May  1 00:19:43 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 May 2012 00:19:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MTddIGN5Z3Rlcm0uIGNmZyDjga7mm7Q=?=
 =?utf-8?b?5paw44K/44Kk44Of44Oz44Kw44Gr44Gk44GE44Gm6KiY6LyJ44GX44Gf44CC?=
Message-ID: <1335799183.779814.9052.nullmailer@users.sourceforge.jp>

Revision: 4917
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4917
Author:   yutakapon
Date:     2012-05-01 00:19:43 +0900 (Tue, 01 May 2012)
Log Message:
-----------
cygterm.cfg の更新タイミングについて記載した。

Modified Paths:
--------------
    trunk/doc/en/html/menu/setup-additional.html
    trunk/doc/ja/html/menu/setup-additional.html

-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html	2012-04-30 15:11:59 UTC (rev 4916)
+++ trunk/doc/en/html/menu/setup-additional.html	2012-04-30 15:19:43 UTC (rev 4917)
@@ -341,6 +341,7 @@
       <dt>CygTerm</dt>
       <dd>
 	Configure CygTerm settings.
+	The CygTerm configuration file(cygterm.cfg) will be immediately written after your configuration. So, you need not to do the save setup.
       </dd>
     </dl>
   </body>

Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html	2012-04-30 15:11:59 UTC (rev 4916)
+++ trunk/doc/ja/html/menu/setup-additional.html	2012-04-30 15:19:43 UTC (rev 4917)
@@ -339,6 +339,7 @@
       <dt>CygTerm</dt>
       <dd>
 	CygTerm \x82??\xE8\x82\xF0\x82\xB5\x82?\xB7\x81B
+	\x90?\xE8\x8C\xE3\x81A\x91\xA6\x8D\xC0\x82??\xE8\x83t\x83@\x83C\x83\x8B(cygterm.cfg)\x82\xF0\x8DX\x90V\x82\xB5\x82?\xB7\x81BSave setup \x82\xF0\x8Ds\x82\xA4\x95K\x97v\x82?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
       </dd>
     </dl>
   </body>

From svnnotify ＠ sourceforge.jp  Tue May  1 18:45:37 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 May 2012 18:45:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MThdIGN5Z3Rlcm0uIGNmZyDjg5XjgqE=?=
 =?utf-8?b?44Kk44Or44G444Gu5L+d5a2Y44GM5oiQ5Yqf44GX44Gf44KJ44CB44Oh44OD?=
 =?utf-8?b?44K744O844K444OA44Kk44Ki44Ot44Kw44KS6KGo56S644GZ44KL44CC?=
Message-ID: <1335865537.690985.887.nullmailer@users.sourceforge.jp>

Revision: 4918
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4918
Author:   yutakapon
Date:     2012-05-01 18:45:37 +0900 (Tue, 01 May 2012)
Log Message:
-----------
cygterm.cfg ファイルへの保存が成功したら、メッセージダイアログを表示する。
改めて、Save setupを実行する必要はないことを注意喚起する。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/addsetting.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-04-30 15:19:43 UTC (rev 4917)
+++ trunk/doc/en/html/about/history.html	2012-05-01 09:45:37 UTC (rev 4918)
@@ -70,6 +70,7 @@
           <li>added the <a href="../macro/command/fileunlock.html">fileunlock</a> command.</li>
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
+      <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-04-30 15:19:43 UTC (rev 4917)
+++ trunk/doc/ja/html/about/history.html	2012-05-01 09:45:37 UTC (rev 4918)
@@ -70,6 +70,7 @@
           <li><a href="../macro/command/fileunlock.html">fileunlock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2012-04-30 15:19:43 UTC (rev 4917)
+++ trunk/teraterm/teraterm/addsetting.cpp	2012-05-01 09:45:37 UTC (rev 4918)
@@ -1312,10 +1312,11 @@
 END_MESSAGE_MAP()
 
 // CCygwinPropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
+#define CYGTERM_FILE "cygterm.cfg"  // CygTerm configuration file
 
 BOOL CCygwinPropPageDlg::OnInitDialog()
 {
-	char *cfgfile = "cygterm.cfg"; // CygTerm configuration file
+	char *cfgfile = CYGTERM_FILE; // CygTerm configuration file
 	char cfg[MAX_PATH];
 	FILE *fp;
 	char buf[256], *head, *body;
@@ -1471,7 +1472,7 @@
 
 void CCygwinPropPageDlg::OnOK()
 {
-	char *cfgfile = "cygterm.cfg"; // CygTerm configuration file
+	char *cfgfile = CYGTERM_FILE; // CygTerm configuration file
 	char *tmpfile = "cygterm.tmp";
 	char cfg[MAX_PATH];
 	char tmp[MAX_PATH];
@@ -1619,6 +1620,11 @@
 			             "Can't rename CygTerm configuration file (%d).", ts.UILanguageFile);
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, ts.UIMsg, GetLastError());
 			MessageBox(buf, uimsg, MB_ICONEXCLAMATION);
+		} else {
+			// cygterm.cfg \x83t\x83@\x83C\x83\x8B\x82???\xB6\x82\xAA\x90\xAC\x8C\x{1C2D42}\xBD\x82\xE7\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x81B
+			// \x89\xFC\x82?āASave setup\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x95K\x97v\x82??\xA2\x82\xB1\x82???\xAB\x8BN\x82\xB7\x82\xE9\x81B
+			// (2012.5.1 yutaka)
+			MessageBox(CYGTERM_FILE " has been saved. Do not do save setup.", "Tera Term: Notice", MB_OK | MB_ICONINFORMATION);
 		}
 	}
 

From svnnotify ＠ sourceforge.jp  Tue May  1 20:14:14 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 May 2012 20:14:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MTldICDkuIvoqJjjgavjgYrjgYTjgaY=?=
 =?utf-8?b?44CB6Kit5a6a44GM5aSJ5pu044GV44KM44Gf5aC05ZCI44CBVGVyYSBUZXJt?=
 =?utf-8?b?44Gu5YaN6LW35YuV44KS5L+D44GZ44OA44Kk44Ki44Ot44Kw44KS6KGo56S6?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1335870854.929569.27757.nullmailer@users.sourceforge.jp>

Revision: 4919
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4919
Author:   yutakapon
Date:     2012-05-01 20:14:14 +0900 (Tue, 01 May 2012)
Log Message:
-----------
下記において、設定が変更された場合、Tera Termの再起動を促すダイアログを表示するようにした。
- Eterm look-feel 設定変更
- 言語ファイルUI 設定変更

Modified Paths:
--------------
    trunk/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2012-05-01 09:45:37 UTC (rev 4918)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2012-05-01 11:14:14 UTC (rev 4919)
@@ -100,17 +100,17 @@
 		return;
 
 	SendMessage(hwnd, WM_COMMAND, ID_SETUP_SAVE, 0);
-	// TODO: \x8E\xA9\x93\xAE\x8FI\x97\xB9\x82\xB3\x82\xB9\x82悤\x82?\xB7\x82\xE9\x82?A\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x8F?\x82\xAA\x82\xA0\x82\xE9\x81B
-	//SendMessage(hwnd, WM_COMMAND, ID_FILE_EXIT, 0);
+	// ID_FILE_EXIT \x83\x81\x83b\x83Z\x81[\x83W\x82ł?A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82邱\x82?\xAA\x82\xA0\x82邽\x82?AWM_QUIT \x82\xF0\x83|\x83X\x83g\x82\xB7\x82\xE9\x81B
+	//PostMessage(hwnd, WM_COMMAND, ID_FILE_EXIT, 0);
+	PostQuitMessage(0);
 
+	// \x8E\xA9\x83v\x83\x8D\x83Z\x83X\x82?ċN\x93\xAE\x81B
 	if (GetModuleFileName(NULL, path, sizeof(path)) == 0) {
 		return;
 	}
-
 	memset(&si, 0, sizeof(si));
 	GetStartupInfo(&si);
 	memset(&pi, 0, sizeof(pi));
-
 	if (CreateProcess(NULL, path, NULL, NULL, FALSE, 0,
 	                  NULL, NULL, &si, &pi) == 0) {
 	}

From svnnotify ＠ sourceforge.jp  Tue May  1 20:20:15 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 May 2012 20:20:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjBdICDkuIvoqJjjgavjgYrjgYTjgaY=?=
 =?utf-8?b?44CB6Kit5a6a44GM5aSJ5pu044GV44KM44Gf5aC05ZCI44CBVGVyYSBUZXJt?=
 =?utf-8?b?44Gu5YaN6LW35YuV44KS5L+D44GZ44OA44Kk44Ki44Ot44Kw44KS6KGo56S6?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1335871215.498908.2426.nullmailer@users.sourceforge.jp>

Revision: 4920
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4920
Author:   yutakapon
Date:     2012-05-01 20:20:15 +0900 (Tue, 01 May 2012)
Log Message:
-----------
下記において、設定が変更された場合、Tera Termの再起動を促すダイアログを表示するようにした。
- Eterm look-feel 設定変更
- 言語ファイルUI 設定変更

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	2012-05-01 11:14:14 UTC (rev 4919)
+++ trunk/doc/en/html/about/history.html	2012-05-01 11:20:15 UTC (rev 4920)
@@ -60,7 +60,7 @@
         <ul>
           <li>Environment variable strings(%variableName%) can be included in the ini file path.</li>
           <li>added an image file specified configuration(theme\ImageFile.INI).</li>
-          <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
+          <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.  Also, a user will be confirmed whether Tera Term is be relaunched.</li>
         </ul></li>
       <li>Macro
         <ul>
@@ -69,7 +69,7 @@
           <li>added the <a href="../macro/command/filelock.html">filelock</a> command.</li>
           <li>added the <a href="../macro/command/fileunlock.html">fileunlock</a> command.</li>
         </ul></li>
-      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
+      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>. Also, a user will be confirmed whether Tera Term is be relaunched.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-01 11:14:14 UTC (rev 4919)
+++ trunk/doc/ja/html/about/history.html	2012-05-01 11:20:15 UTC (rev 4920)
@@ -60,7 +60,7 @@
         <ul>
           <li>ini\x83t\x83@\x83C\x83\x8B\x83p\x83X\x82??\xAB\x95?\x94\x95\xB6\x8E\x9A\x97\xF1(%variableName%)\x82\xF0\x8A??\xE7\x82\xEA\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
           <li>\x89摜\x83t\x83@\x83C\x83\x8B\x8Ew\x92\xE8\x90?\xE8(theme\ImageFile.INI)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
-          <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+          <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li>\x83}\x83N\x83\x8D
         <ul>
@@ -69,7 +69,7 @@
           <li><a href="../macro/command/filelock.html">filelock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
           <li><a href="../macro/command/fileunlock.html">fileunlock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
-      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
     </ul>
   </li>

From svnnotify ＠ sourceforge.jp  Wed May  2 16:35:33 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 02 May 2012 16:35:33 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4921=5D_gettime=2C__getdate_?=
 =?utf-8?b?44Gr44K/44Kk44Og44K+44O844Oz44KS5oyH5a6a44Gn44GN44KL44KI44GG?=
 =?utf-8?b?44Gr44GX44Gf44CC?=
Message-ID: <1335944133.662061.806.nullmailer@users.sourceforge.jp>

Revision: 4921
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4921
Author:   yutakapon
Date:     2012-05-02 16:35:33 +0900 (Wed, 02 May 2012)
Log Message:
-----------
gettime, getdate にタイムゾーンを指定できるようにした。
cf.
http://logmett.com/forum/viewtopic.php?f=6&t=1996

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/macro/command/getdate.html
    trunk/doc/en/html/macro/command/gettime.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/macro/command/getdate.html
    trunk/doc/ja/html/macro/command/gettime.html
    trunk/teraterm/ttpmacro/ttl.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/en/html/about/history.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -68,6 +68,7 @@
           <li>added a sample code in the <a href="../macro/command/connect.html">connect</a> command.</li>
           <li>added the <a href="../macro/command/filelock.html">filelock</a> command.</li>
           <li>added the <a href="../macro/command/fileunlock.html">fileunlock</a> command.</li>
+          <li>added the third argument _timezone_ at the <a href="../macro/command/gettime.html">gettime</a> and <a href="../macro/command/getdate.html">getdate</a> command.</li>
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>. Also, a user will be confirmed whether Tera Term is be relaunched.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>

Modified: trunk/doc/en/html/macro/command/getdate.html
===================================================================
--- trunk/doc/en/html/macro/command/getdate.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/en/html/macro/command/getdate.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-getdate &lt;strvar&gt; [&lt;format&gt;]
+getdate &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
 </pre>
 
 <h2>Remarks</h2>
@@ -29,8 +29,8 @@
 </p>
 
 <p>
-The behavior of the getdate command specified with the format equals the gettime command specified with the same format.
-</p>
+The behavior of the getdate command specified with the format equals the gettime command specified with the same format.<br>
+When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.</p>
 
 <p>
 This command returns one of the following values in the system variable "result":
@@ -77,6 +77,11 @@
 ;Stores the current date with the user format to "logfile" variable. 
 ;The format is log-YYYYMMDD-HHMMSS.txt.
 getdate logfile "log-%Y%m%d-%H%M%S.txt"
+
+;To generate a GMT/UTC time stamp
+tz="GMT"
+gettime s "%Y/%m/%d %H:%M:%S" tz
+messagebox s tz
 </pre>
 
 <h2>See also</h2>

Modified: trunk/doc/en/html/macro/command/gettime.html
===================================================================
--- trunk/doc/en/html/macro/command/gettime.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/en/html/macro/command/gettime.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-gettime &lt;strvar&gt; [&lt;format&gt;]
+gettime &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
 </pre>
 
 <h2>Remarks</h2>
@@ -29,8 +29,8 @@
 </p>
 
 <p>
-The behavior of the gettime command specified with the format equals the getdate command specified with the same format.
-</p>
+The behavior of the gettime command specified with the format equals the getdate command specified with the same format.<br>
+When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.</p>
 
 <p>
 This command returns one of the following values in the system variable "result":
@@ -81,6 +81,11 @@
 logopen logfile 0 0
 logwrite 'test data'
 logclose
+
+;To generate a GMT/UTC time stamp
+tz="GMT"
+gettime s "%Y/%m/%d %H:%M:%S" tz
+messagebox s tz
 </pre>
 
 <h2>See also</h2>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/ja/html/about/history.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -68,6 +68,7 @@
           <li><a href="../macro/command/connect.html">connect</a>\x83R\x83}\x83\x93\x83h\x82?p\x83\x89\x83\x81\x81[\x83^\x82?p\x82\xB5\x82\xBD\x83T\x83\x93\x83v\x83\x8B\x83R\x81[\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
           <li><a href="../macro/command/filelock.html">filelock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
           <li><a href="../macro/command/fileunlock.html">fileunlock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+          <li><a href="../macro/command/gettime.html">gettime</a>, <a href="../macro/command/getdate.html">getdate</a>\x83R\x83}\x83\x93\x83h\x82?\xE63\x88\xF8\x90\x94\x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>

Modified: trunk/doc/ja/html/macro/command/getdate.html
===================================================================
--- trunk/doc/ja/html/macro/command/getdate.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/ja/html/macro/command/getdate.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-getdate &lt;strvar&gt; [&lt;format&gt;]
+getdate &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
 </pre>
 
 <h2>\x89\xF0\x90\xE0</h2>
@@ -29,7 +29,8 @@
 </p>
 
 <p>
-format\x82\xAA\x8Ew\x92?\x82?getdate\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?gettime\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B
+format\x82\xAA\x8Ew\x92?\x82?getdate\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?gettime\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B<br>
+&lt;timezone&gt \x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x95\\x82\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8Ew\x92?\x82\xE9\x82?A\x83^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x89\xC1\x96\xA1\x82\xB5\x82\xBD\x93\xFA\x95t\x8Cv\x8EZ\x82\xAA\x8Ds\x82\xED\x82\xEA\x82\xE9\x81B
 </p>
 
 <p>
@@ -79,6 +80,11 @@
 ;\x8C\xBB\x8D??\xFA\x8E\x9E\x82\xF0\x8C\xB3\x82?\xB5\x82ă\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82?\xAC\x82\xB5\x81A\x95?\x94logfile\x82?i\x94[\x81B
 ;\x8C`\x8E\xAE\x82\xCDlog-YYYYMMDD-HHMMSS.txt
 getdate logfile "log-%Y%m%d-%H%M%S.txt"
+
+;GMT\x82?\x9E\x8D\x8F\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
+tz="GMT"
+gettime s "%Y/%m/%d %H:%M:%S" tz
+messagebox s tz
 </pre>
 
 <h2>\x8EQ\x8F\xC6</h2>

Modified: trunk/doc/ja/html/macro/command/gettime.html
===================================================================
--- trunk/doc/ja/html/macro/command/gettime.html	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/doc/ja/html/macro/command/gettime.html	2012-05-02 07:35:33 UTC (rev 4921)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-gettime &lt;strvar&gt; [&lt;format&gt;]
+gettime &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
 </pre>
 
 <h2>\x89\xF0\x90\xE0</h2>
@@ -29,7 +29,8 @@
 </p>
 
 <p>
-format\x82\xAA\x8Ew\x92?\x82?gettime\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?getdate\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B
+format\x82\xAA\x8Ew\x92?\x82?gettime\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?getdate\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B<br>
+&lt;timezone&gt; \x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x95\\x82\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8Ew\x92?\x82\xE9\x82?A\x83^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x89\xC1\x96\xA1\x82\xB5\x82\xBD\x93\xFA\x95t\x8Cv\x8EZ\x82\xAA\x8Ds\x82\xED\x82\xEA\x82\xE9\x81B
 </p>
 
 <p>
@@ -83,6 +84,11 @@
 logopen logfile 0 0
 logwrite 'test data'
 logclose
+
+;GMT\x82?\x9E\x8D\x8F\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
+tz="GMT"
+gettime s "%Y/%m/%d %H:%M:%S" tz
+messagebox s tz
 </pre>
 
 <h2>\x8EQ\x8F\xC6</h2>

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2012-05-01 11:20:15 UTC (rev 4920)
+++ trunk/teraterm/ttpmacro/ttl.c	2012-05-02 07:35:33 UTC (rev 4921)
@@ -2168,7 +2168,7 @@
 {
 	WORD Err;
 	TVarId VarId;
-	TStrVal Str1, Str2;
+	TStrVal Str1, Str2, tzStr;
 	time_t time1;
 	struct tm *ptm;
 	char *format;
@@ -2187,6 +2187,15 @@
 //			return ErrSyntax;
 		}
 		set_result = TRUE;
+
+		// \x83^\x83C\x83\x80\x83]\x81[\x83\x93\x82?w\x92肪\x82\xA0\x82\xEA\x82?Alocaltime()\x82?e\x8B\xBF\x82\xB3\x82\xB9\x82\xE9\x81B(2012.5.2 yutaka)
+		if (CheckParameterGiven()) {
+			GetStrVal(tzStr, &Err);
+			if (Err!=0) return Err;
+			_putenv_s("TZ", tzStr);
+			_tzset();
+		}
+
 	}
 	else {
 		switch (mode) {

From svnnotify ＠ sourceforge.jp  Wed May  2 20:41:42 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 02 May 2012 20:41:42 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjJdICBTQ1Ag44Gr6Zai44GZ44KL6Kqs?=
 =?utf-8?b?5piO44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1335958902.785942.13548.nullmailer@users.sourceforge.jp>

Revision: 4922
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4922
Author:   yutakapon
Date:     2012-05-02 20:41:42 +0900 (Wed, 02 May 2012)
Log Message:
-----------
SCP に関する説明を追加した。

Modified Paths:
--------------
    trunk/doc/ja/html/reference/sourcecode.html

-------------- next part --------------
Modified: trunk/doc/ja/html/reference/sourcecode.html
===================================================================
--- trunk/doc/ja/html/reference/sourcecode.html	2012-05-02 07:35:33 UTC (rev 4921)
+++ trunk/doc/ja/html/reference/sourcecode.html	2012-05-02 11:41:42 UTC (rev 4922)
@@ -921,6 +921,63 @@
 \x81@\x82?\xA8\x81A\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93(line discipline: \x89\xF1\x90\xFC\x8BK\x96\xF1)\x82?\xA2\x82\xA4\x82??A\x82\xBD\x82?\xA6\x82?v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA getchar() \x82\xF0\x8CĂяo\x82\xB5\x82\xBD\x82?\xAB\x82?AEnter\x83L\x81[\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82?ŁA\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82?\xA7\x8C?\x93n\x82\xE8\x82?\xB9\x82\xF1\x81B\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93\x82?A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x8E\xC0\x8Ds\x92\x86\x82ł?u\x8Ds\x93\xE0\x95?W\x81v\x82\xF0\x89?\\x82?\xB7\x82邽\x82??\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xB7\x81BLinux\x82ł?A\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93\x82\xCD /proc/tty/ldiscs \x82Ŋm\x94F\x82ł\xAB\x82?\xB7\x81iN_TTY\x82\xAA\x95W\x8F\x80\x93I\x82?\x98\x97p\x82\xB3\x82\xEA\x82\xE9\x81j\x81B
 
 
+  <h3>SCP</h3>
+\x81 ＠ SCP(Secure Copy)\x82\xCD OpenSSH \x83p\x83b\x83P\x81[\x83W\x82???\xEA\x82\xE9\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xCC1\x82?ł\xA0\x82\xE8\x81ASSH\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8Eg\x82\xC1\x82ăt\x83@\x83C\x83\x8B\x82?\x97\x8E\xF3\x90M\x82\xF0\x8Ds\x82\xA4\x82\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x81BSCP\x82?p\x82\xB7\x82邽\x82???A\x83\x8A\x83\x82\x81[\x83g\x83T\x81[\x83o\x82\xC9 sshd \x82\xBE\x82\xAF\x82ł??\xAD\x81A"scp"\x83R\x83}\x83\x93\x83h\x82\xE0\x93\xB1\x93\xFC\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BOpenSSH\x82\xCCSCP\x82?Asshd \x83f\x81[\x83\x82\x83\x93\x82\xA9\x82\xE7"scp"\x83R\x83}\x83\x93\x83h\x82\xAA\x8Eq\x83v\x83\x8D\x83Z\x83X\x82?\xB5\x82ċN\x93\xAE\x82\xB3\x82\xEA\x82邱\x82??\xC0\x8C\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B\x82?\xA8\x81ASCP\x82\xC6SFTP(Secure Feil Transfer Program)\x82??\xC1\x82\xBD\x82\xAD\x95??v\x83\x8D\x83g\x83R\x83\x8B\x82ŁASCP\x82?\x83\x90\x88\x82?t\x8
 3@\x83C\x83\x8B\x82?u\x91\x97\x90M\x81v\x82?u\x8E\xF3\x90M\x81v\x82\xB5\x82\xA9\x82ł\xAB\x82?\xB9\x82\xF1\x81B<br>
+\x81 ＠ SSH\x83Z\x83b\x83V\x83\x87\x83\x93\x8F\xE3\x82Ńt\x83@\x83C\x83\x8B\x93]\x91\x97\x82\xF0\x8Ds\x82\xA4\x82??A\x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7\x83T\x81[\x83o\x82??\xB1\x82\xAA\x90\xAC\x8C\x{1C2D42}\xBD\x82\xA0\x82??A\x83V\x83F\x83\x8B\x83I\x81[\x83v\x83\x93\x82?\xE3\x82\xED\x82\xE8\x82?A\x81u\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\xC0\x8Ds\x81v\x82?\xA2\x82\xA4\x8C`\x8E\xAE\x82ŁASCP\x82\xAA\x97\x98\x97p\x82ł\xAB\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B
+\x81@
+\x81@<h5>SSH2\x82??</h5>
+\x81@\x81 ＠ SSH2_MSG_CHANNEL_REQUEST \x82\xF0\x83T\x81[\x83o\x82?\x97\x82\xE9\x82?\xAB\x82?A"pty-req"\x82?\xE3\x82\xED\x82\xE8\x82\xC9"exec"\x82\xF0\x83T\x81[\x83r\x83X\x96\xBC\x82?\xB5\x82Ďw\x92?\x82\xE9\x82?A\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+<pre>
+\x81@\x81@\x83\x86\x81[\x83U\x94F\x8F?\xAC\x8C\xF7\x8C\xE3
+\x81@\x81@     ----> SSH2_MSG_CHANNEL_OPEN(90)
+\x81@\x81@     <---- SSH2_MSG_CHANNEL_OPEN_CONFIRMATION(91)
+\x81@\x81@     ----> SSH2_MSG_CHANNEL_REQUEST(98)  \x83T\x81[\x83r\x83X\x96\xBC"exec"\x82ŊO\x95\x94\x83R\x83}\x83\x93\x83h\x91\x97\x90M("scp -f")
+\x81@\x81@     <---- SSH2_MSG_CHANNEL_WINDOW_ADJUST  (remote_window+=131072\x83o\x83C\x83g)
+\x81@\x81@     <---- SSH2_MSG_CHANNEL_EXTENDED_DATA  (local_window-=36\x83o\x83C\x83g)
+\x81@\x81@     <---- SSH2_MSG_CHANNEL_DATA(94)
+</pre>
+
+\x81@<h5>SSH1\x82??</h5>
+\x81@\x81@\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x82\xAD\x82?\xAB\x82?ASSH_CMSG_EXEC_CMD \x82\xF0\x83T\x81[\x83o\x82?\x97\x82\xE9\x82?A\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+\x81@
+\x81@<h5>\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\x91\x8E\xAE</h5>
+<pre>
+\x81@\x81\x96"scp [-v] [-r] [-p] [-d] -t \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8D\x81[\x83J\x83\x8B\x82\xA9\x82烊\x83\x82\x81[\x83g\x82??R\x83s\x81[
+\x81@\x81\x96"scp [-v] [-r] [-p] [-d] -f \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8A\x83\x82\x81[\x83g\x82\xA9\x82?\x81[\x83J\x83\x8B\x82??R\x83s\x81[
+\x81@   -v verbose
+\x81@   -r \x83\x8A\x83J\x81[\x83V\x83u
+\x81@   -p \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x95?\x9D
+\x81@   -d \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A
+\x81@   -t Local-to-Remote\x82?R\x83s\x81[
+\x81@   -f Remote-to-Local\x82?R\x83s\x81[
+</pre>
+
+\x81@<h5>\x83f\x81[\x83^\x93]\x91\x97</h5>
+\x81@\x81@\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\x97\x90M\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82\xBD\x82\xA0\x82??A\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82?M\x82\xA8\x82\xE6\x82ю\xF3\x90M\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+\x81@\x81@
+<pre>
+\x81@\x81@\x82P\x81D\x91\x97\x90M\x82?\xAC\x82\xEA
+\x81@  \x81@\x81E"T\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0 \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0"\x82?M\x81i\x83I\x83v\x83V\x83\x87\x83\x93\x81j
+\x81@  \x81@\x81E"C0666 \x83T\x83C\x83Y \x83t\x83@\x83C\x83\x8B\x96\xBC"\x82?M
+\x81@  \x81@\x81E\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82?M
+\x81@  \x81@\x81E\x83Z\x83b\x83V\x83\x87\x83\x93\x83N\x83\x8D\x81[\x83Y
+
+\x81@\x81@\x82Q\x81D\x8E\xF3\x90M\x82?\xAC\x82\xEA
+\x81@  \x81@\x81E"T\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0 \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0"\x82\xF0\x8E\xF3\x90M\x81i\x83I\x83v\x83V\x83\x87\x83\x93\x81j
+\x81@  \x81@\x81E0\x82?M
+\x81@  \x81@\x81E"C0666 \x83T\x83C\x83Y \x83t\x83@\x83C\x83\x8B\x96\xBC"\x82\xF0\x8E\xF3\x90M
+\x81@  \x81@\x81E0\x82?M
+\x81@  \x81@\x81E\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82\xF0\x8E\xF3\x90M
+\x81@  \x81@\x81E\x83t\x83@\x83C\x83\x8B\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x90?\xE8\x81i\x83I\x83v\x83V\x83\x87\x83\x93\x81j
+\x81@  \x81@\x81E0\x82?M
+\x81@  \x81@\x81E\x83Z\x83b\x83V\x83\x87\x83\x93\x83N\x83\x8D\x81[\x83Y
+</pre>
+
+\x81@<h5>\x92\x8D\x88?\x96\x8D\x80</h5>
+\x81@\x81@\x83t\x83@\x83C\x83\x8B\x96\xBC\x82?f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x8A??\xEA\x82\xE9\x82?\xAB\x82?p\x83X\x82?\xE6\x90?\xE8\x82?u/\x81v\x82??\xE8\x82?\xB7\x81B\x82\xA8\x82\xBB\x82炭\x81A\x81u\\x81v\x82??t\x82\xAF\x82?\xA2\x82?v\x82\xA4\x82?ŕϊ\xB7\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+
+
+
 <hr>
 
 

From svnnotify ＠ sourceforge.jp  Wed May  2 22:05:12 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 02 May 2012 22:05:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjNdICDjgqrjg5fjgrfjg6fjg7PlvJU=?=
 =?utf-8?b?5pWw44Gu44Kr44OD44Kz44Gu5YWl44KM5a2Q44KS5L+u5q2j?=
Message-ID: <1335963912.229919.31792.nullmailer@users.sourceforge.jp>

Revision: 4923
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4923
Author:   maya
Date:     2012-05-02 22:05:12 +0900 (Wed, 02 May 2012)
Log Message:
-----------
オプション引数のカッコの入れ子を修正

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/getdate.html
    trunk/doc/en/html/macro/command/gettime.html
    trunk/doc/ja/html/macro/command/getdate.html
    trunk/doc/ja/html/macro/command/gettime.html

-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/getdate.html
===================================================================
--- trunk/doc/en/html/macro/command/getdate.html	2012-05-02 11:41:42 UTC (rev 4922)
+++ trunk/doc/en/html/macro/command/getdate.html	2012-05-02 13:05:12 UTC (rev 4923)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-getdate &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
+getdate &lt;strvar&gt; [&lt;format&gt; [&lt;timezone&gt;]]
 </pre>
 
 <h2>Remarks</h2>

Modified: trunk/doc/en/html/macro/command/gettime.html
===================================================================
--- trunk/doc/en/html/macro/command/gettime.html	2012-05-02 11:41:42 UTC (rev 4922)
+++ trunk/doc/en/html/macro/command/gettime.html	2012-05-02 13:05:12 UTC (rev 4923)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-gettime &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
+gettime &lt;strvar&gt; [&lt;format&gt; [&lt;timezone&gt;]]
 </pre>
 
 <h2>Remarks</h2>

Modified: trunk/doc/ja/html/macro/command/getdate.html
===================================================================
--- trunk/doc/ja/html/macro/command/getdate.html	2012-05-02 11:41:42 UTC (rev 4922)
+++ trunk/doc/ja/html/macro/command/getdate.html	2012-05-02 13:05:12 UTC (rev 4923)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-getdate &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
+getdate &lt;strvar&gt; [&lt;format&gt; [&lt;timezone&gt;]]
 </pre>
 
 <h2>\x89\xF0\x90\xE0</h2>

Modified: trunk/doc/ja/html/macro/command/gettime.html
===================================================================
--- trunk/doc/ja/html/macro/command/gettime.html	2012-05-02 11:41:42 UTC (rev 4922)
+++ trunk/doc/ja/html/macro/command/gettime.html	2012-05-02 13:05:12 UTC (rev 4923)
@@ -18,7 +18,7 @@
 </p>
 
 <pre class="macro-syntax">
-gettime &lt;strvar&gt; [&lt;format&gt;] [&lt;timezone&gt;]
+gettime &lt;strvar&gt; [&lt;format&gt; [&lt;timezone&gt;]]
 </pre>
 
 <h2>\x89\xF0\x90\xE0</h2>

From svnnotify ＠ sourceforge.jp  Wed May  2 22:06:32 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 02 May 2012 22:06:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjRdICDjg6rjg6rjg7zjgrnliY3jgac=?=
 =?utf-8?b?44GC44KL44GT44Go44KS6KiY6L+w?=
Message-ID: <1335963992.913710.665.nullmailer@users.sourceforge.jp>

Revision: 4924
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4924
Author:   maya
Date:     2012-05-02 22:06:32 +0900 (Wed, 02 May 2012)
Log Message:
-----------
リリース前であることを記述

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	2012-05-02 13:05:12 UTC (rev 4923)
+++ trunk/doc/en/html/about/history.html	2012-05-02 13:06:32 UTC (rev 4924)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74)</a></h3>
+<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74 not released yet)</a></h3>
 <ul class="history">
   <li>Changes
     <ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-02 13:05:12 UTC (rev 4923)
+++ trunk/doc/ja/html/about/history.html	2012-05-02 13:06:32 UTC (rev 4924)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74)</a></h3>
+<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74 not released yet)</a></h3>
 <ul class="history">
   <li>\x95ύX
     <ul>

From svnnotify ＠ sourceforge.jp  Thu May  3 19:47:09 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 03 May 2012 19:47:09 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjVdICBTQ1Ag44Gr6Zai44GZ44KL6Kqs?=
 =?utf-8?b?5piO44KS5L+u5q2j44GX44Gf44CC?=
Message-ID: <1336042029.401732.7378.nullmailer@users.sourceforge.jp>

Revision: 4925
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4925
Author:   yutakapon
Date:     2012-05-03 19:47:09 +0900 (Thu, 03 May 2012)
Log Message:
-----------
SCP に関する説明を修正した。

Modified Paths:
--------------
    trunk/doc/ja/html/reference/sourcecode.html

-------------- next part --------------
Modified: trunk/doc/ja/html/reference/sourcecode.html
===================================================================
--- trunk/doc/ja/html/reference/sourcecode.html	2012-05-02 13:06:32 UTC (rev 4924)
+++ trunk/doc/ja/html/reference/sourcecode.html	2012-05-03 10:47:09 UTC (rev 4925)
@@ -921,29 +921,29 @@
 \x81@\x82?\xA8\x81A\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93(line discipline: \x89\xF1\x90\xFC\x8BK\x96\xF1)\x82?\xA2\x82\xA4\x82??A\x82\xBD\x82?\xA6\x82?v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA getchar() \x82\xF0\x8CĂяo\x82\xB5\x82\xBD\x82?\xAB\x82?AEnter\x83L\x81[\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82?ŁA\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82?\xA7\x8C?\x93n\x82\xE8\x82?\xB9\x82\xF1\x81B\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93\x82?A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x8E\xC0\x8Ds\x92\x86\x82ł?u\x8Ds\x93\xE0\x95?W\x81v\x82\xF0\x89?\\x82?\xB7\x82邽\x82??\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xB7\x81BLinux\x82ł?A\x92[\x96\x96\x83\x89\x83C\x83\x93\x83f\x83B\x83V\x83v\x83\x8A\x83\x93\x82\xCD /proc/tty/ldiscs \x82Ŋm\x94F\x82ł\xAB\x82?\xB7\x81iN_TTY\x82\xAA\x95W\x8F\x80\x93I\x82?\x98\x97p\x82\xB3\x82\xEA\x82\xE9\x81j\x81B
 
 
-  <h3>SCP</h3>
-\x81 ＠ SCP(Secure Copy)\x82\xCD OpenSSH \x83p\x83b\x83P\x81[\x83W\x82???\xEA\x82\xE9\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xCC1\x82?ł\xA0\x82\xE8\x81ASSH\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8Eg\x82\xC1\x82ăt\x83@\x83C\x83\x8B\x82?\x97\x8E\xF3\x90M\x82\xF0\x8Ds\x82\xA4\x82\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x81BSCP\x82?p\x82\xB7\x82邽\x82???A\x83\x8A\x83\x82\x81[\x83g\x83T\x81[\x83o\x82\xC9 sshd \x82\xBE\x82\xAF\x82ł??\xAD\x81A"scp"\x83R\x83}\x83\x93\x83h\x82\xE0\x93\xB1\x93\xFC\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BOpenSSH\x82\xCCSCP\x82?Asshd \x83f\x81[\x83\x82\x83\x93\x82\xA9\x82\xE7"scp"\x83R\x83}\x83\x93\x83h\x82\xAA\x8Eq\x83v\x83\x8D\x83Z\x83X\x82?\xB5\x82ċN\x93\xAE\x82\xB3\x82\xEA\x82邱\x82??\xC0\x8C\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B\x82?\xA8\x81ASCP\x82\xC6SFTP(Secure Feil Transfer Program)\x82??\xC1\x82\xBD\x82\xAD\x95??v\x83\x8D\x83g\x83R\x83\x8B\x82ŁASCP\x82?\x83\x90\x88\x82?t\x8
 3@\x83C\x83\x8B\x82?u\x91\x97\x90M\x81v\x82?u\x8E\xF3\x90M\x81v\x82\xB5\x82\xA9\x82ł\xAB\x82?\xB9\x82\xF1\x81B<br>
-\x81 ＠ SSH\x83Z\x83b\x83V\x83\x87\x83\x93\x8F\xE3\x82Ńt\x83@\x83C\x83\x8B\x93]\x91\x97\x82\xF0\x8Ds\x82\xA4\x82??A\x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7\x83T\x81[\x83o\x82??\xB1\x82\xAA\x90\xAC\x8C\x{1C2D42}\xBD\x82\xA0\x82??A\x83V\x83F\x83\x8B\x83I\x81[\x83v\x83\x93\x82?\xE3\x82\xED\x82\xE8\x82?A\x81u\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\xC0\x8Ds\x81v\x82?\xA2\x82\xA4\x8C`\x8E\xAE\x82ŁASCP\x82\xAA\x97\x98\x97p\x82ł\xAB\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B
+  <h3>SCP(Secure Copy)</h3>
+\x81 ＠ SCP\x82\xCD OpenSSH \x83p\x83b\x83P\x81[\x83W\x82???\xEA\x82\xE9\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xCC1\x82?ł\xA0\x82\xE8\x81ASSH\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8Eg\x82\xC1\x82ăt\x83@\x83C\x83\x8B\x82?\x97\x8E\xF3\x90M\x82\xF0\x8Ds\x82\xA4\x82\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x81BSCP\x82?p\x82\xB7\x82邽\x82???A\x83\x8A\x83\x82\x81[\x83g\x83T\x81[\x83o\x82\xC9"sshd"\x82\xBE\x82\xAF\x82ł??\xAD\x81A"scp"\x83R\x83}\x83\x93\x83h\x82\xE0\x93\xB1\x93\xFC\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BOpenSSH\x82\xCCSCP\x82?Asshd \x83f\x81[\x83\x82\x83\x93\x82\xA9\x82\xE7"scp"\x83R\x83}\x83\x93\x83h\x82\xAA\x8Eq\x83v\x83\x8D\x83Z\x83X\x82?\xB5\x82ċN\x93\xAE\x82\xB3\x82\xEA\x82邱\x82??\xC0\x8C\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B\x82?\xA8\x81ASCP\x82\xC6SFTP(Secure File Transfer Program)\x82??\xC1\x82\xBD\x82\xAD\x95??v\x83\x8D\x83g\x83R\x83\x8B\x82ŁA\x8C?\xB7\x90\xAB\x82??\xAD\x81ASCP\x82?
 \x83\x90\x88\x82?t\x83@\x83C\x83\x8B\x82?u\x91\x97\x90M\x81v\x82?u\x8E\xF3\x90M\x81v\x82\xB5\x82\xA9\x82ł\xAB\x82?\xB9\x82\xF1\x81B<br>
+\x81 ＠ SSH\x83Z\x83b\x83V\x83\x87\x83\x93\x8F\xE3\x82Ńt\x83@\x83C\x83\x8B\x93]\x91\x97\x82\xF0\x8Ds\x82\xA4\x82??A\x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7\x83T\x81[\x83o\x82??\xB1\x82\xAA\x90\xAC\x8C\x{1C2D42}\xBD\x82\xA0\x82??A\x83V\x83F\x83\x8B\x83I\x81[\x83v\x83\x93(pty-req)\x82?\xE3\x82\xED\x82\xE8\x82?A\x81u\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\xC0\x8Ds\x81v(exec)\x82?\xA2\x82\xA4\x8C`\x8E\xAE\x82ŁASCP\x82\xAA\x97\x98\x97p\x82ł\xAB\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B
 \x81@
-\x81@<h5>SSH2\x82??</h5>
-\x81@\x81 ＠ SSH2_MSG_CHANNEL_REQUEST \x82\xF0\x83T\x81[\x83o\x82?\x97\x82\xE9\x82?\xAB\x82?A"pty-req"\x82?\xE3\x82\xED\x82\xE8\x82\xC9"exec"\x82\xF0\x83T\x81[\x83r\x83X\x96\xBC\x82?\xB5\x82Ďw\x92?\x82\xE9\x82?A\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+\x81@<p><font size=3>\x81ESSH2\x82??</font></p>
+\x81 ＠ SSH2_MSG_CHANNEL_REQUEST \x82\xF0\x83T\x81[\x83o\x82?\x97\x82\xE9\x82?\xAB\x82?A"pty-req"\x82?\xE3\x82\xED\x82\xE8\x82\xC9"exec"\x82\xF0\x83T\x81[\x83r\x83X\x96\xBC\x82?\xB5\x82Ďw\x92?\x82\xE9\x82?A\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
 <pre>
 \x81@\x81@\x83\x86\x81[\x83U\x94F\x8F?\xAC\x8C\xF7\x8C\xE3
-\x81@\x81@     ----> SSH2_MSG_CHANNEL_OPEN(90)
-\x81@\x81@     <---- SSH2_MSG_CHANNEL_OPEN_CONFIRMATION(91)
-\x81@\x81@     ----> SSH2_MSG_CHANNEL_REQUEST(98)  \x83T\x81[\x83r\x83X\x96\xBC"exec"\x82ŊO\x95\x94\x83R\x83}\x83\x93\x83h\x91\x97\x90M("scp -f")
-\x81@\x81@     <---- SSH2_MSG_CHANNEL_WINDOW_ADJUST  (remote_window+=131072\x83o\x83C\x83g)
-\x81@\x81@     <---- SSH2_MSG_CHANNEL_EXTENDED_DATA  (local_window-=36\x83o\x83C\x83g)
-\x81@\x81@     <---- SSH2_MSG_CHANNEL_DATA(94)
+\x81@\x81@     ----&gt; SSH2_MSG_CHANNEL_OPEN(90)
+\x81@\x81@     &lt;---- SSH2_MSG_CHANNEL_OPEN_CONFIRMATION(91)
+\x81@\x81@     ----&gt; SSH2_MSG_CHANNEL_REQUEST(98)  \x83T\x81[\x83r\x83X\x96\xBC&quot;exec&quot;\x82ŊO\x95\x94\x83R\x83}\x83\x93\x83h\x91\x97\x90M(&quot;scp -f&quot;)
+\x81@\x81@     &lt;---- SSH2_MSG_CHANNEL_WINDOW_ADJUST  (remote_window+=131072\x83o\x83C\x83g)
+\x81@\x81@     &lt;---- SSH2_MSG_CHANNEL_EXTENDED_DATA  (local_window-=36\x83o\x83C\x83g)
+\x81@\x81@     &lt;---- SSH2_MSG_CHANNEL_DATA(94)
 </pre>
 
-\x81@<h5>SSH1\x82??</h5>
+\x81@<p><font size=3>\x81ESSH1\x82??</font></p>
 \x81@\x81@\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x82\xAD\x82?\xAB\x82?ASSH_CMSG_EXEC_CMD \x82\xF0\x83T\x81[\x83o\x82?\x97\x82\xE9\x82?A\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
 \x81@
-\x81@<h5>\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\x91\x8E\xAE</h5>
+\x81@<p><font size=3>\x81E\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\x91\x8E\xAE</font></p>
 <pre>
-\x81@\x81\x96"scp [-v] [-r] [-p] [-d] -t \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8D\x81[\x83J\x83\x8B\x82\xA9\x82烊\x83\x82\x81[\x83g\x82??R\x83s\x81[
-\x81@\x81\x96"scp [-v] [-r] [-p] [-d] -f \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8A\x83\x82\x81[\x83g\x82\xA9\x82?\x81[\x83J\x83\x8B\x82??R\x83s\x81[
+\x81@* "scp [-v] [-r] [-p] [-d] -t \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8D\x81[\x83J\x83\x8B\x82\xA9\x82烊\x83\x82\x81[\x83g\x82??R\x83s\x81[
+\x81@* "scp [-v] [-r] [-p] [-d] -f \x83t\x83@\x83C\x83\x8B\x96\xBC"\x81@\x83\x8A\x83\x82\x81[\x83g\x82\xA9\x82?\x81[\x83J\x83\x8B\x82??R\x83s\x81[
 \x81@   -v verbose
 \x81@   -r \x83\x8A\x83J\x81[\x83V\x83u
 \x81@   -p \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x95?\x9D
@@ -952,9 +952,8 @@
 \x81@   -f Remote-to-Local\x82?R\x83s\x81[
 </pre>
 
-\x81@<h5>\x83f\x81[\x83^\x93]\x91\x97</h5>
+\x81@<p><font size=3>\x81E\x83f\x81[\x83^\x93]\x91\x97</font></p>
 \x81@\x81@\x8AO\x95\x94\x83R\x83}\x83\x93\x83h\x82?\x97\x90M\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82\xBD\x82\xA0\x82??A\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82?M\x82\xA8\x82\xE6\x82ю\xF3\x90M\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
-\x81@\x81@
 <pre>
 \x81@\x81@\x82P\x81D\x91\x97\x90M\x82?\xAC\x82\xEA
 \x81@  \x81@\x81E"T\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0 \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v 0"\x82?M\x81i\x83I\x83v\x83V\x83\x87\x83\x93\x81j
@@ -973,8 +972,8 @@
 \x81@  \x81@\x81E\x83Z\x83b\x83V\x83\x87\x83\x93\x83N\x83\x8D\x81[\x83Y
 </pre>
 
-\x81@<h5>\x92\x8D\x88?\x96\x8D\x80</h5>
-\x81@\x81@\x83t\x83@\x83C\x83\x8B\x96\xBC\x82?f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x8A??\xEA\x82\xE9\x82?\xAB\x82?p\x83X\x82?\xE6\x90?\xE8\x82?u/\x81v\x82??\xE8\x82?\xB7\x81B\x82\xA8\x82\xBB\x82炭\x81A\x81u\\x81v\x82??t\x82\xAF\x82?\xA2\x82?v\x82\xA4\x82?ŕϊ\xB7\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+\x81@<p><font size=3>\x81E\x92\x8D\x88?\x96\x8D\x80</font></p>
+\x81@\x81@\x83t\x83@\x83C\x83\x8B\x96\xBC\x82?f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x8A??\xEA\x82\xE9\x82?\xAB\x82?A\x83p\x83X\x82?\xE6\x90?\xE8\x82?u/\x81v\x82??\xE8\x82?\xB7\x81B\x81u\\x81v\x82??t\x82\xAF\x82?\xA2\x82?ŁA\x95ϊ\xB7\x82\xAA\x95K\x97v\x82ł\xB7\x81B
 
 
 

From svnnotify ＠ sourceforge.jp  Thu May  3 22:09:23 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 03 May 2012 22:09:23 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjZdICBTRlRQ44Gu5a6f6KOF44KSICJz?=
 =?utf-8?b?ZnRwLmMiIOOBq+WIh+OCiuWHuuOBm+OCi+OCiOOBhuOBq+OBmeOCi+OBnw==?=
 =?utf-8?b?44KB44CBICAic3NoLmMiIOOBruOCs+ODvOODieOCkuenu+WLleOBleOBmw==?=
 =?utf-8?b?44Gf44CC?=
Message-ID: <1336050563.241881.8263.nullmailer@users.sourceforge.jp>

Revision: 4926
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4926
Author:   yutakapon
Date:     2012-05-03 22:09:23 +0900 (Thu, 03 May 2012)
Log Message:
-----------
SFTPの実装を"sftp.c"に切り出せるようにするため、"ssh.c"のコードを移動させた。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/sftp.h
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2012-05-03 10:47:09 UTC (rev 4925)
+++ trunk/ttssh2/ttxssh/sftp.c	2012-05-03 13:09:23 UTC (rev 4926)
@@ -1,29 +1,27 @@
 /*
-Copyright (c) 2008 TeraTerm Project
+Copyright (c) 2008-2012 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer.
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products derived
+     from this software without specific prior written permission.
 
-Redistributions in binary form must reproduce the above copyright notice, this list
-of conditions and the following disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-The name of Robert O'Callahan may not be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
 */
 
 #include "ttxssh.h"
@@ -46,12 +44,67 @@
 #include "ssh.h"
 #include "crypt.h"
 #include "fwd.h"
+#include "ssh.h"
 #include "sftp.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
 
+// SFTP\x90\xEA\x97p\x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95?\xB7\x82\xE9\x81BSCP\x82????\xE8\x81A\x90擪\x82??\x82?f\x81[\x83^\x83T\x83C\x83Y\x82??\x9E\x82?B
+static void sftp_buffer_alloc(buffer_t **message)
+{
+	buffer_t *msg;
 
+	msg = buffer_init();
+	if (msg == NULL) {
+		goto error;
+	}
+	// Message length(4byte)
+	buffer_put_int(msg, 0); 
 
+	*message = msg;
 
+error:
+	assert(msg != NULL);
+	return;
+}
+
+static void sftp_buffer_free(buffer_t *message)
+{
+	buffer_free(message);
+}
+
+// \x83T\x81[\x83o\x82\xC9SFTP\x83p\x83P\x83b\x83g\x82?M\x82\xB7\x82\xE9\x81B
+static void sftp_send_msg(PTInstVar pvar, Channel_t *c, buffer_t *msg)
+{
+	char *p;
+	int len;
+
+	len = buffer_len(msg);
+	p = buffer_ptr(msg);
+	// \x8D?\x89\x82?\x81\x83b\x83Z\x81[\x83W\x83T\x83C\x83Y\x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x81B
+	set_uint32(p, len - 4);
+	// \x83y\x83C\x83\x8D\x81[\x83h\x82?\x97\x90M\x81B
+	SSH2_send_channel_data(pvar, c, p, len);
+}
+
+// SFTP\x92?M\x8AJ\x8En\x91O\x82?l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93
+void sftp_do_init(PTInstVar pvar, Channel_t *c)
+{
+	buffer_t *msg;
+
+	c->sftp.state = SFTP_INIT;
+
+	sftp_buffer_alloc(&msg);
+	buffer_put_char(msg, SSH2_FXP_INIT); 
+	buffer_put_int(msg, SSH2_FILEXFER_VERSION);
+	sftp_send_msg(pvar, c, msg);
+	sftp_buffer_free(msg);
+}
+
+void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen)
+{
+	OutputDebugPrintf("len %d\n", buflen);
+
+}

Modified: trunk/ttssh2/ttxssh/sftp.h
===================================================================
--- trunk/ttssh2/ttxssh/sftp.h	2012-05-03 10:47:09 UTC (rev 4925)
+++ trunk/ttssh2/ttxssh/sftp.h	2012-05-03 13:09:23 UTC (rev 4926)
@@ -1,29 +1,27 @@
 /*
-Copyright (c) 2008 TeraTerm Project
+Copyright (c) 2008-2012 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer.
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products derived
+     from this software without specific prior written permission.
 
-Redistributions in binary form must reproduce the above copyright notice, this list
-of conditions and the following disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-The name of Robert O'Callahan may not be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
 */
 
 #ifndef __SFTP_H
@@ -34,5 +32,75 @@
 #define SFTP_DEBUG
 #endif
 
+/* version */
+#define	SSH2_FILEXFER_VERSION		3
 
+/* client to server */
+#define SSH2_FXP_INIT			1
+#define SSH2_FXP_OPEN			3
+#define SSH2_FXP_CLOSE			4
+#define SSH2_FXP_READ			5
+#define SSH2_FXP_WRITE			6
+#define SSH2_FXP_LSTAT			7
+#define SSH2_FXP_STAT_VERSION_0		7
+#define SSH2_FXP_FSTAT			8
+#define SSH2_FXP_SETSTAT		9
+#define SSH2_FXP_FSETSTAT		10
+#define SSH2_FXP_OPENDIR		11
+#define SSH2_FXP_READDIR		12
+#define SSH2_FXP_REMOVE			13
+#define SSH2_FXP_MKDIR			14
+#define SSH2_FXP_RMDIR			15
+#define SSH2_FXP_REALPATH		16
+#define SSH2_FXP_STAT			17
+#define SSH2_FXP_RENAME			18
+#define SSH2_FXP_READLINK		19
+#define SSH2_FXP_SYMLINK		20
+
+/* server to client */
+#define SSH2_FXP_VERSION		2
+#define SSH2_FXP_STATUS			101
+#define SSH2_FXP_HANDLE			102
+#define SSH2_FXP_DATA			103
+#define SSH2_FXP_NAME			104
+#define SSH2_FXP_ATTRS			105
+
+#define SSH2_FXP_EXTENDED		200
+#define SSH2_FXP_EXTENDED_REPLY		201
+
+/* attributes */
+#define SSH2_FILEXFER_ATTR_SIZE		0x00000001
+#define SSH2_FILEXFER_ATTR_UIDGID	0x00000002
+#define SSH2_FILEXFER_ATTR_PERMISSIONS	0x00000004
+#define SSH2_FILEXFER_ATTR_ACMODTIME	0x00000008
+#define SSH2_FILEXFER_ATTR_EXTENDED	0x80000000
+
+/* portable open modes */
+#define SSH2_FXF_READ			0x00000001
+#define SSH2_FXF_WRITE			0x00000002
+#define SSH2_FXF_APPEND			0x00000004
+#define SSH2_FXF_CREAT			0x00000008
+#define SSH2_FXF_TRUNC			0x00000010
+#define SSH2_FXF_EXCL			0x00000020
+
+/* statvfs ＠ openssh.com f_flag flags */
+#define SSH2_FXE_STATVFS_ST_RDONLY	0x00000001
+#define SSH2_FXE_STATVFS_ST_NOSUID	0x00000002
+
+/* status messages */
+#define SSH2_FX_OK			0
+#define SSH2_FX_EOF			1
+#define SSH2_FX_NO_SUCH_FILE		2
+#define SSH2_FX_PERMISSION_DENIED	3
+#define SSH2_FX_FAILURE			4
+#define SSH2_FX_BAD_MESSAGE		5
+#define SSH2_FX_NO_CONNECTION		6
+#define SSH2_FX_CONNECTION_LOST		7
+#define SSH2_FX_OP_UNSUPPORTED		8
+#define SSH2_FX_MAX			8
+
+
+void sftp_do_init(PTInstVar pvar, Channel_t *c);
+void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen);
+
 #endif

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2012-05-03 10:47:09 UTC (rev 4925)
+++ trunk/ttssh2/ttxssh/ssh.c	2012-05-03 13:09:23 UTC (rev 4926)
@@ -76,50 +76,7 @@
 // channel data structure
 #define CHANNEL_MAX 100
 
-enum scp_state {
-	SCP_INIT, SCP_TIMESTAMP, SCP_FILEINFO, SCP_DATA, SCP_CLOSING,
-};
 
-typedef struct bufchain {
-	buffer_t *msg;
-	struct bufchain *next;
-} bufchain_t;
-
-typedef struct scp {
-	enum scp_dir dir;              // transfer direction
-	enum scp_state state;          // SCP state 
-	char localfile[MAX_PATH];      // local filename
-	char localfilefull[MAX_PATH];  // local filename fullpath
-	char remotefile[MAX_PATH];     // remote filename
-	FILE *localfp;                 // file pointer for local file
-	struct __stat64 filestat;      // file status information
-	HWND progress_window;
-	HANDLE thread;
-	unsigned int thread_id;
-	PTInstVar pvar;
-	// for receiving file
-	long long filetotalsize;
-	long long filercvsize;
-} scp_t;
-
-typedef struct channel {
-	int used;
-	int self_id;
-	int remote_id;
-	unsigned int local_window;
-	unsigned int local_window_max;
-	unsigned int local_consumed;
-	unsigned int local_maxpacket;
-	unsigned int remote_window;
-	unsigned int remote_maxpacket;
-	enum channel_type type;
-	int local_num;
-	bufchain_t *bufchain;
-	scp_t scp;
-	buffer_t *agent_msg;
-	int agent_request_len;
-} Channel_t;
-
 static Channel_t channels[CHANNEL_MAX];
 
 static char ssh_ttymodes[] = "\x01\x03\x02\x1c\x03\x08\x04\x15\x05\x04";
@@ -159,7 +116,6 @@
 void SSH2_dispatch_add_range_message(unsigned char begin, unsigned char end);
 int dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
 static void start_ssh_heartbeat_thread(PTInstVar pvar);
-static void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen);
 void ssh2_channel_send_close(PTInstVar pvar, Channel_t *c);
 static BOOL SSH_agent_response(PTInstVar pvar, Channel_t *c, int local_channel_num, unsigned char *data, unsigned int buflen);
 
@@ -709,12 +665,6 @@
 	}
 }
 
-#define get_payload_uint32(pvar, offset) get_uint32_MSBfirst((pvar)->ssh_state.payload + (offset))
-#define get_uint32(buf) get_uint32_MSBfirst((buf))
-#define set_uint32(buf, v) set_uint32_MSBfirst((buf), (v))
-#define get_mpint_len(pvar, offset) ((get_ushort16_MSBfirst((pvar)->ssh_state.payload + (offset)) + 7) >> 3)
-#define get_ushort16(buf) get_ushort16_MSBfirst((buf))
-
 #define do_crc(buf, len) (~(uint32)crc32(0xFFFFFFFF, (buf), (len)))
 
 /* Decrypt the payload, checksum it, eat the padding, get the packet type
@@ -846,7 +796,7 @@
    or for the packet type byte).
    Returns a pointer to the payload data area, a region of length 'len',
    to be filled by the caller. */
-static unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len)
+unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len)
 {
 	unsigned char FAR *buf;
 
@@ -872,7 +822,6 @@
 	return buf + 1;
 }
 
-#define finish_send_packet(pvar) finish_send_packet_special((pvar), 0)
 
 // \x91\x97\x90M\x83\x8A\x83g\x83\x89\x83C\x8A?\x94\x82??\xC1
 //
@@ -973,7 +922,7 @@
 
 /* if skip_compress is true, then the data has already been compressed
    into outbuf + 12 */
-static void finish_send_packet_special(PTInstVar pvar, int skip_compress)
+void finish_send_packet_special(PTInstVar pvar, int skip_compress)
 {
 	unsigned int len = pvar->ssh_state.outgoing_packet_len;
 	unsigned char FAR *data;
@@ -3269,7 +3218,7 @@
 
 }
 
-static void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen)
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen)
 {
 	buffer_t *msg;
 	unsigned char *outmsg;
@@ -7303,6 +7252,12 @@
 			char ch = '\0';
 			SSH2_send_channel_data(pvar, c, &ch, 1);
 		}
+
+	} else if (c->type == TYPE_SFTP) {
+		// SFTP\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x8En\x82\xB7\x82邽\x82??l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93\x82\xF0\x8Ds\x82\xA4\x81B
+		// (2012.5.3 yutaka)
+		sftp_do_init(pvar, c);
+
 	}
 
 	return TRUE;
@@ -8126,6 +8081,7 @@
 		SSH2_scp_response(pvar, c, data, str_len);
 
 	} else if (c->type == TYPE_SFTP) {  // SFTP
+		sftp_response(pvar, c, data, str_len);
 
 	} else if (c->type == TYPE_AGENT) {  // agent forward
 		if (!SSH_agent_response(pvar, c, 0, data, str_len)) {

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2012-05-03 10:47:09 UTC (rev 4925)
+++ trunk/ttssh2/ttxssh/ssh.h	2012-05-03 13:09:23 UTC (rev 4926)
@@ -39,6 +39,8 @@
 
 #include "buffer.h"
 #include "config.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #define DEBUG_PRINT_TO_FILE(base, msg, len) { \
 	static int count = 0; \
@@ -629,4 +631,70 @@
 void SSH2_update_hmac_myproposal(PTInstVar pvar);
 int SSH_notify_break_signal(PTInstVar pvar);
 
+///
+enum scp_state {
+	SCP_INIT, SCP_TIMESTAMP, SCP_FILEINFO, SCP_DATA, SCP_CLOSING,
+};
+
+typedef struct bufchain {
+	buffer_t *msg;
+	struct bufchain *next;
+} bufchain_t;
+
+typedef struct scp {
+	enum scp_dir dir;              // transfer direction
+	enum scp_state state;          // SCP state 
+	char localfile[MAX_PATH];      // local filename
+	char localfilefull[MAX_PATH];  // local filename fullpath
+	char remotefile[MAX_PATH];     // remote filename
+	FILE *localfp;                 // file pointer for local file
+	struct __stat64 filestat;      // file status information
+	HWND progress_window;
+	HANDLE thread;
+	unsigned int thread_id;
+	PTInstVar pvar;
+	// for receiving file
+	long long filetotalsize;
+	long long filercvsize;
+} scp_t;
+
+enum sftp_state {
+	SFTP_INIT, 
+};
+
+typedef struct sftp {
+	enum sftp_state state;
+} sftp_t;
+
+typedef struct channel {
+	int used;
+	int self_id;
+	int remote_id;
+	unsigned int local_window;
+	unsigned int local_window_max;
+	unsigned int local_consumed;
+	unsigned int local_maxpacket;
+	unsigned int remote_window;
+	unsigned int remote_maxpacket;
+	enum channel_type type;
+	int local_num;
+	bufchain_t *bufchain;
+	scp_t scp;
+	buffer_t *agent_msg;
+	int agent_request_len;
+	sftp_t sftp;
+} Channel_t;
+
+unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len);
+void finish_send_packet_special(PTInstVar pvar, int skip_compress);
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen);
+
+#define finish_send_packet(pvar) finish_send_packet_special((pvar), 0)
+#define get_payload_uint32(pvar, offset) get_uint32_MSBfirst((pvar)->ssh_state.payload + (offset))
+#define get_uint32(buf) get_uint32_MSBfirst((buf))
+#define set_uint32(buf, v) set_uint32_MSBfirst((buf), (v))
+#define get_mpint_len(pvar, offset) ((get_ushort16_MSBfirst((pvar)->ssh_state.payload + (offset)) + 7) >> 3)
+#define get_ushort16(buf) get_ushort16_MSBfirst((buf))
+///
+
 #endif

From svnnotify ＠ sourceforge.jp  Thu May  3 22:18:59 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 03 May 2012 22:18:59 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjddIHpsaWIgMS4yLiA3IOOBq+abtA==?=
	=?utf-8?b?5paw?=
Message-ID: <1336051139.957427.20590.nullmailer@users.sourceforge.jp>

Revision: 4927
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4927
Author:   maya
Date:     2012-05-03 22:18:59 +0900 (Thu, 03 May 2012)
Log Message:
-----------
zlib 1.2.7 に更新

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/reference/develop.txt

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-03 13:09:23 UTC (rev 4926)
+++ trunk/doc/en/html/about/history.html	2012-05-03 13:18:59 UTC (rev 4927)
@@ -1901,6 +1901,7 @@
   <li>Misc
     <ul>
       <li>upgraded OpenSSL to 1.0.1b</li>
+      <li>upgraded zlib to 1.2.7</li>
     </ul>
   </li>
 </ul>

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2012-05-03 13:09:23 UTC (rev 4926)
+++ trunk/doc/en/html/reference/develop.txt	2012-05-03 13:18:59 UTC (rev 4927)
@@ -21,7 +21,7 @@
 * Libraries
 - Oniguruma 5.9.2 (http://www.geocities.jp/kosako3/oniguruma/)
 - OpenSSL 1.0.1b (http://www.openssl.org/)
-- zlib 1.2.6 (http://www.zlib.net/)
+- zlib 1.2.7 (http://www.zlib.net/)
 - PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-03 13:09:23 UTC (rev 4926)
+++ trunk/doc/ja/html/about/history.html	2012-05-03 13:18:59 UTC (rev 4927)
@@ -1902,6 +1902,7 @@
   <li>\x82\xBB\x82?\xBC
     <ul>
       <li>OpenSSL 1.0.1b\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
+      <li>zlib 1.2.7\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
     </ul>
   </li>
 </ul>

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2012-05-03 13:09:23 UTC (rev 4926)
+++ trunk/doc/ja/html/reference/develop.txt	2012-05-03 13:18:59 UTC (rev 4927)
@@ -23,7 +23,7 @@
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 5.9.2 (http://www.geocities.jp/kosako3/oniguruma/)
 - OpenSSL 1.0.1b (http://www.openssl.org/)
-- zlib 1.2.6 (http://www.zlib.net/)
+- zlib 1.2.7 (http://www.zlib.net/)
 - PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 

From svnnotify ＠ sourceforge.jp  Thu May  3 23:39:47 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 03 May 2012 23:39:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjhdICAtIFNGVFDlrp/oo4Xjga7jgZ8=?=
 =?utf-8?b?44KB44CB44OQ44OD44OV44Kh5pON5L2c6Zai5pWw44Gu5pW055CG44CC?=
Message-ID: <1336055987.437367.4609.nullmailer@users.sourceforge.jp>

Revision: 4928
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4928
Author:   yutakapon
Date:     2012-05-03 23:39:47 +0900 (Thu, 03 May 2012)
Log Message:
-----------
- SFTP実装のため、バッファ操作関数の整理。
- SFTPバージョン交換まで実装確認。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/buffer.c
    trunk/ttssh2/ttxssh/buffer.h
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/sftp.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/buffer.c
===================================================================
--- trunk/ttssh2/ttxssh/buffer.c	2012-05-03 13:18:59 UTC (rev 4927)
+++ trunk/ttssh2/ttxssh/buffer.c	2012-05-03 14:39:47 UTC (rev 4928)
@@ -11,6 +11,13 @@
 #include <openssl/ec.h>
 #include <zlib.h>
 
+// \x83o\x83b\x83t\x83@\x82?I\x83t\x83Z\x83b\x83g\x82\xF0\x8F\x89\x8A\x{227B0B5}\x81A\x82?\xBE\x93?\xF1\x82ł\xA2\x82?\xA2\x8F\xF3\x91??\xB7\x82\xE9\x81B
+// Tera Term(TTSSH)\x83I\x83\x8A\x83W\x83i\x83\x8B\x8A?\x94\x81B
+void buffer_rewind(buffer_t *buf)
+{
+	buf->offset = 0;
+}
+
 void buffer_clear(buffer_t *buf)
 {
 	buf->offset = 0;
@@ -144,6 +151,59 @@
 	ret = buffer_append(msg, ptr, size);
 }
 
+int buffer_get_ret(buffer_t *msg, void *buf, int len)
+{
+	if (len > msg->len - msg->offset) {
+		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
+		OutputDebugPrintf("buffer_get_ret: trying to get more bytes %d than in buffer %d",
+		    len, msg->len - msg->offset);
+		return (-1);
+	}
+	memcpy(buf, msg->buf + msg->offset, len);
+	msg->offset += len;
+	return (0);
+}
+
+int buffer_get_int_ret(int *ret, buffer_t *msg)
+{
+	unsigned char buf[4];
+
+	if (buffer_get_ret(msg, (char *) buf, 4) == -1)
+		return (-1);
+	if (ret != NULL)
+		*ret = get_uint32(buf);
+	return (0);
+}
+
+int buffer_get_int(buffer_t *msg)
+{
+	int ret = -1;
+
+	if (buffer_get_int_ret(&ret, msg) == -1) {
+		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
+		OutputDebugPrintf("buffer_get_int: buffer error");
+	}
+	return (ret);
+}
+
+int buffer_get_char_ret(char *ret, buffer_t *msg)
+{
+	if (buffer_get_ret(msg, ret, 1) == -1)
+		return (-1);
+	return (0);
+}
+
+int buffer_get_char(buffer_t *msg)
+{
+	char ch;
+
+	if (buffer_get_char_ret(&ch, msg) == -1) {
+		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
+		OutputDebugPrintf("buffer_get_char: buffer error");
+	}
+	return (unsigned char)ch;
+}
+
 // getting string buffer.
 // NOTE: You should free the return pointer if it's unused.
 // (2005.6.26 yutaka)

Modified: trunk/ttssh2/ttxssh/buffer.h
===================================================================
--- trunk/ttssh2/ttxssh/buffer.h	2012-05-03 13:18:59 UTC (rev 4927)
+++ trunk/ttssh2/ttxssh/buffer.h	2012-05-03 14:39:47 UTC (rev 4928)
@@ -6,10 +6,10 @@
 #include <zlib.h>
 
 typedef struct buffer {
-	char *buf;
-	int offset;
-	int maxlen;
-	int len;
+	char *buf;      /* \x83o\x83b\x83t\x83@\x82?擪\x83|\x83C\x83\x93\x83^\x81Brealloc()\x82?\xE6\x82\xE8\x95?\xAE\x82\xB7\x82\xE9\x81B*/
+	int offset;     /* \x8C\xBB\x8D????o\x82\xB5\x88?u */
+	int maxlen;     /* \x83o\x83b\x83t\x83@\x82?ő\xE5\x83T\x83C\x83Y */
+	int len;        /* \x83o\x83b\x83t\x83@\x82???\xEA\x82\xE9\x97L\x8C\xF8\x82?f\x81[\x83^\x83T\x83C\x83Y */
 } buffer_t;
 
 void buffer_clear(buffer_t *buf);
@@ -36,5 +36,11 @@
 void buffer_consume(buffer_t *buf, int shift_byte);
 int buffer_compress(z_stream *zstream, char *payload, int len, buffer_t *compbuf);
 int buffer_decompress(z_stream *zstream, char *payload, int len, buffer_t *compbuf);
+int buffer_get_ret(buffer_t *msg, void *buf, int len);
+int buffer_get_int_ret(int *ret, buffer_t *msg);
+int buffer_get_int(buffer_t *msg);
+int buffer_get_char_ret(char *ret, buffer_t *msg);
+int buffer_get_char(buffer_t *msg);
+void buffer_rewind(buffer_t *buf);
 
 #endif				/* BUFFER_H */

Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2012-05-03 13:18:59 UTC (rev 4927)
+++ trunk/ttssh2/ttxssh/sftp.c	2012-05-03 14:39:47 UTC (rev 4928)
@@ -51,6 +51,30 @@
 #include <sys/stat.h>
 #include <assert.h>
 
+static void sftp_do_syslog(PTInstVar pvar, int level, char *fmt, ...)
+{
+	char tmp[1024];
+	va_list arg;
+
+	va_start(arg, fmt);
+	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	va_end(arg);
+
+	notify_verbose_message(pvar, tmp, level);
+}
+
+static void sftp_syslog(PTInstVar pvar, char *fmt, ...)
+{
+	char tmp[1024];
+	va_list arg;
+
+	va_start(arg, fmt);
+	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	va_end(arg);
+
+	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+}
+
 // SFTP\x90\xEA\x97p\x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95?\xB7\x82\xE9\x81BSCP\x82????\xE8\x81A\x90擪\x82??\x82?f\x81[\x83^\x83T\x83C\x83Y\x82??\x9E\x82?B
 static void sftp_buffer_alloc(buffer_t **message)
 {
@@ -89,7 +113,35 @@
 	SSH2_send_channel_data(pvar, c, p, len);
 }
 
+static void sftp_get_msg(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen, buffer_t **message)
+{
+	buffer_t *msg = *message;
+	int msg_len;
+
+	// \x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95?\xB5\x81A\x83f\x81[\x83^\x82\xF0\x82\xB7\x82??\xFA\x82?\x82?B\x88?~\x82\xCD buffer_t \x8C^\x82\xF0\x92?\xB5\x82đ\x80\x8D?\x82\xE9\x81B
+	// \x82\xBB\x82\xA4\x82\xB5\x82\xBD\x82?\xA4\x82\xAA OpenSSH \x82?R\x81[\x83h\x82??e\x98a\x90\xAB\x82\xAA\x97?\xAD\x82?邽\x82?B
+	buffer_clear(msg);
+	buffer_append(msg, data, buflen);
+	buffer_rewind(msg);
+
+	msg_len = buffer_get_int(msg);
+	if (msg_len > SFTP_MAX_MSG_LENGTH) {
+		// TODO:
+		OutputDebugPrintf("Received message too long %u", msg_len);
+		goto error;
+	}
+	if (msg_len + 4 != buflen) {
+		// TODO:
+		OutputDebugPrintf("Buffer length %u is invalid", buflen);
+		goto error;
+	}
+
+error:
+	return;
+}
+
 // SFTP\x92?M\x8AJ\x8En\x91O\x82?l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93
+// based on do_init()#sftp-client.c
 void sftp_do_init(PTInstVar pvar, Channel_t *c)
 {
 	buffer_t *msg;
@@ -101,10 +153,45 @@
 	buffer_put_int(msg, SSH2_FILEXFER_VERSION);
 	sftp_send_msg(pvar, c, msg);
 	sftp_buffer_free(msg);
+
+	sftp_syslog(pvar, "SFTP client version %u", SSH2_FILEXFER_VERSION);
 }
 
+static void sftp_do_init_recv(PTInstVar pvar, buffer_t *msg)
+{
+	unsigned int type;
+
+	type = buffer_get_char(msg);
+	if (type != SSH2_FXP_VERSION) {
+		goto error;
+	}
+	sftp_syslog(pvar, "SFTP server version %u", type);
+
+error:
+	return;
+}
+
+// SFTP\x8E\xF3\x90M\x8F\x88\x97\x9D -\x83\x81\x83C\x83\x93\x83\x8B\x81[\x83`\x83\x93-
 void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen)
 {
+	buffer_t *msg;
+	int state;
+
 	OutputDebugPrintf("len %d\n", buflen);
 
+	/*
+	 * Allocate buffer
+	 */
+	sftp_buffer_alloc(&msg);
+	sftp_get_msg(pvar, c, data, buflen, &msg);
+
+	state = c->sftp.state;
+	if (state == SFTP_INIT) {
+		sftp_do_init_recv(pvar, msg);
+	}
+
+	/*
+	 * Free buffer
+	 */
+	sftp_buffer_free(msg);
 }

Modified: trunk/ttssh2/ttxssh/sftp.h
===================================================================
--- trunk/ttssh2/ttxssh/sftp.h	2012-05-03 13:18:59 UTC (rev 4927)
+++ trunk/ttssh2/ttxssh/sftp.h	2012-05-03 14:39:47 UTC (rev 4928)
@@ -99,6 +99,8 @@
 #define SSH2_FX_OP_UNSUPPORTED		8
 #define SSH2_FX_MAX			8
 
+/* Maximum packet that we are willing to send/accept */
+#define SFTP_MAX_MSG_LENGTH	(256 * 1024)
 
 void sftp_do_init(PTInstVar pvar, Channel_t *c);
 void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen);

From svnnotify ＠ sourceforge.jp  Fri May  4 01:17:09 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 04 May 2012 01:17:09 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MjldIFNGVFA6ICDmnIDliJ3jga7jg40=?=
 =?utf-8?b?44K044K344Ko44O844K344On44Oz44G+44Gn5a6M5LqG44CC?=
Message-ID: <1336061829.837981.3350.nullmailer@users.sourceforge.jp>

Revision: 4929
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4929
Author:   yutakapon
Date:     2012-05-04 01:17:09 +0900 (Fri, 04 May 2012)
Log Message:
-----------
SFTP: 最初のネゴシエーションまで完了。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/buffer.c
    trunk/ttssh2/ttxssh/buffer.h
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/sftp.h
    trunk/ttssh2/ttxssh/ssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/buffer.c
===================================================================
--- trunk/ttssh2/ttxssh/buffer.c	2012-05-03 14:39:47 UTC (rev 4928)
+++ trunk/ttssh2/ttxssh/buffer.c	2012-05-03 16:17:09 UTC (rev 4929)
@@ -151,28 +151,28 @@
 	ret = buffer_append(msg, ptr, size);
 }
 
-int buffer_get_ret(buffer_t *msg, void *buf, int len)
-{
-	if (len > msg->len - msg->offset) {
-		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
-		OutputDebugPrintf("buffer_get_ret: trying to get more bytes %d than in buffer %d",
-		    len, msg->len - msg->offset);
-		return (-1);
-	}
-	memcpy(buf, msg->buf + msg->offset, len);
-	msg->offset += len;
-	return (0);
+int buffer_get_ret(buffer_t *msg, void *buf, int len)
+{
+	if (len > msg->len - msg->offset) {
+		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
+		OutputDebugPrintf("buffer_get_ret: trying to get more bytes %d than in buffer %d",
+		    len, msg->len - msg->offset);
+		return (-1);
+	}
+	memcpy(buf, msg->buf + msg->offset, len);
+	msg->offset += len;
+	return (0);
 }
 
-int buffer_get_int_ret(int *ret, buffer_t *msg)
-{
-	unsigned char buf[4];
-
-	if (buffer_get_ret(msg, (char *) buf, 4) == -1)
-		return (-1);
-	if (ret != NULL)
-		*ret = get_uint32(buf);
-	return (0);
+int buffer_get_int_ret(int *ret, buffer_t *msg)
+{
+	unsigned char buf[4];
+
+	if (buffer_get_ret(msg, (char *) buf, 4) == -1)
+		return (-1);
+	if (ret != NULL)
+		*ret = get_uint32(buf);
+	return (0);
 }
 
 int buffer_get_int(buffer_t *msg)
@@ -186,11 +186,11 @@
 	return (ret);
 }
 
-int buffer_get_char_ret(char *ret, buffer_t *msg)
-{
-	if (buffer_get_ret(msg, ret, 1) == -1)
-		return (-1);
-	return (0);
+int buffer_get_char_ret(char *ret, buffer_t *msg)
+{
+	if (buffer_get_ret(msg, ret, 1) == -1)
+		return (-1);
+	return (0);
 }
 
 int buffer_get_char(buffer_t *msg)
@@ -236,6 +236,21 @@
 	return(ptr);
 }
 
+// buffer_get_string() \x82\xCC buffer_t \x94ŁB\x96{\x97\x88\x82?\xB1\x82\xBF\x82? OpenSSH \x83X\x83^\x83C\x83\x8B\x81B
+// NOTE: You should free the return pointer if it's unused.
+void *buffer_get_string_msg(buffer_t *msg, int *buflen_ptr)
+{
+	char *data, *olddata;
+	void *ret;
+	int off;
+
+	data = olddata = buffer_tail_ptr(msg);
+	ret = buffer_get_string(&data, buflen_ptr);
+	off = data - olddata;
+	msg->offset += off;
+	return (ret);
+}
+
 void buffer_put_string(buffer_t *msg, char *ptr, int size)
 {
 	char buf[4];
@@ -281,6 +296,12 @@
 	return (msg->len);
 }
 
+// \x82?\xBE\x93??\x9E\x82\xF1\x82ł\xA2\x82?\xA2\x8Ec\x82\xE8\x82?T\x83C\x83Y\x82\xF0\x95?\xB7\x81B\x96{\x97\x88\x82?\xB1\x82\xBF\x82? OpenSSH \x83X\x83^\x83C\x83\x8B\x81B
+int buffer_remain_len(buffer_t *msg)
+{
+	return (msg->len - msg->offset);
+}
+
 // buffer_append() \x82\xE2 buffer_append_space() \x82Ń\x81\x83b\x83Z\x81[\x83W\x83o\x83b\x83t\x83@\x82??\xC1\x82\xF0\x8Ds\x82\xA4\x82?A
 // \x93\xE0\x95\x94\x82\xC5 realloc() \x82?\xE6\x82\xE8\x83o\x83b\x83t\x83@\x83|\x83C\x83\x93\x83^\x82\xAA\x95ς\xED\x82\xC1\x82Ă\xB5\x82?\xA4\x82\xB1\x82?\xAA\x82\xA0\x82\xE9\x81B
 // \x83\x81\x83b\x83Z\x81[\x83W\x83o\x83b\x83t\x83@\x82?|\x83C\x83\x93\x83^\x82\xF0\x8E擾\x82\xB7\x82\xE9\x8D??A\x83o\x83b\x83t\x83@\x92?\xC1\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82\xBD\x8C\xE3\x82\xC9

Modified: trunk/ttssh2/ttxssh/buffer.h
===================================================================
--- trunk/ttssh2/ttxssh/buffer.h	2012-05-03 14:39:47 UTC (rev 4928)
+++ trunk/ttssh2/ttxssh/buffer.h	2012-05-03 16:17:09 UTC (rev 4929)
@@ -36,11 +36,13 @@
 void buffer_consume(buffer_t *buf, int shift_byte);
 int buffer_compress(z_stream *zstream, char *payload, int len, buffer_t *compbuf);
 int buffer_decompress(z_stream *zstream, char *payload, int len, buffer_t *compbuf);
-int buffer_get_ret(buffer_t *msg, void *buf, int len);
-int buffer_get_int_ret(int *ret, buffer_t *msg);
+int buffer_get_ret(buffer_t *msg, void *buf, int len);
+int buffer_get_int_ret(int *ret, buffer_t *msg);
 int buffer_get_int(buffer_t *msg);
-int buffer_get_char_ret(char *ret, buffer_t *msg);
+int buffer_get_char_ret(char *ret, buffer_t *msg);
 int buffer_get_char(buffer_t *msg);
 void buffer_rewind(buffer_t *buf);
+void *buffer_get_string_msg(buffer_t *msg, int *buflen_ptr);
+int buffer_remain_len(buffer_t *msg);
 
 #endif				/* BUFFER_H */

Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2012-05-03 14:39:47 UTC (rev 4928)
+++ trunk/ttssh2/ttxssh/sftp.c	2012-05-03 16:17:09 UTC (rev 4929)
@@ -76,6 +76,13 @@
 }
 
 // SFTP\x90\xEA\x97p\x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95?\xB7\x82\xE9\x81BSCP\x82????\xE8\x81A\x90擪\x82??\x82?f\x81[\x83^\x83T\x83C\x83Y\x82??\x9E\x82?B
+//
+// buffer_t
+//    +---------+------------------------------------+
+//    | msg_len | data                               |  
+//    +---------+------------------------------------+
+//       4byte   <------------- msg_len ------------->
+//
 static void sftp_buffer_alloc(buffer_t **message)
 {
 	buffer_t *msg;
@@ -113,6 +120,7 @@
 	SSH2_send_channel_data(pvar, c, p, len);
 }
 
+// \x83T\x81[\x83o\x82\xA9\x82\xE7\x8E\xF3\x90M\x82\xB5\x82\xBDSFTP\x83p\x83P\x83b\x83g\x82\xF0\x83o\x83b\x83t\x83@\x82?i\x94[\x82\xB7\x82\xE9\x81B
 static void sftp_get_msg(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen, buffer_t **message)
 {
 	buffer_t *msg = *message;
@@ -127,12 +135,12 @@
 	msg_len = buffer_get_int(msg);
 	if (msg_len > SFTP_MAX_MSG_LENGTH) {
 		// TODO:
-		OutputDebugPrintf("Received message too long %u", msg_len);
+		sftp_syslog(pvar, "Received message too long %u", msg_len);
 		goto error;
 	}
 	if (msg_len + 4 != buflen) {
 		// TODO:
-		OutputDebugPrintf("Buffer length %u is invalid", buflen);
+		sftp_syslog(pvar, "Buffer length %u is invalid", buflen);
 		goto error;
 	}
 
@@ -146,8 +154,15 @@
 {
 	buffer_t *msg;
 
+	// SFTP\x8AǗ\x9D\x8D\\x91\xA2\x91??\x89\x8A\xFA\x89\xBB
+	memset(&c->sftp, 0, sizeof(c->sftp));
 	c->sftp.state = SFTP_INIT;
+	c->sftp.transfer_buflen = DEFAULT_COPY_BUFLEN;
+	c->sftp.num_requests = DEFAULT_NUM_REQUESTS;
+	c->sftp.exts = 0;
+	c->sftp.limit_kbps = 0;
 
+	// \x83l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93\x82?J\x8En
 	sftp_buffer_alloc(&msg);
 	buffer_put_char(msg, SSH2_FXP_INIT); 
 	buffer_put_int(msg, SSH2_FILEXFER_VERSION);
@@ -157,7 +172,7 @@
 	sftp_syslog(pvar, "SFTP client version %u", SSH2_FILEXFER_VERSION);
 }
 
-static void sftp_do_init_recv(PTInstVar pvar, buffer_t *msg)
+static void sftp_do_init_recv(PTInstVar pvar, Channel_t *c, buffer_t *msg)
 {
 	unsigned int type;
 
@@ -165,8 +180,50 @@
 	if (type != SSH2_FXP_VERSION) {
 		goto error;
 	}
-	sftp_syslog(pvar, "SFTP server version %u", type);
+	c->sftp.version = buffer_get_int(msg);
+	sftp_syslog(pvar, "SFTP server version %u, remote version %u", type, c->sftp.version);
 
+	while (buffer_remain_len(msg) > 0) {
+		char *name = buffer_get_string_msg(msg, NULL);
+		char *value = buffer_get_string_msg(msg, NULL);
+		int known = 0;
+
+        if (strcmp(name, "posix-rename ＠ openssh.com") == 0 &&
+            strcmp(value, "1") == 0) {
+            c->sftp.exts |= SFTP_EXT_POSIX_RENAME;
+            known = 1;
+        } else if (strcmp(name, "statvfs ＠ openssh.com") == 0 &&
+            strcmp(value, "2") == 0) {
+            c->sftp.exts |= SFTP_EXT_STATVFS;
+            known = 1;
+        } else if (strcmp(name, "fstatvfs ＠ openssh.com") == 0 &&
+            strcmp(value, "2") == 0) {
+            c->sftp.exts |= SFTP_EXT_FSTATVFS;
+            known = 1;
+        } else if (strcmp(name, "hardlink ＠ openssh.com") == 0 &&
+            strcmp(value, "1") == 0) {
+            c->sftp.exts |= SFTP_EXT_HARDLINK;
+            known = 1;
+        }
+        if (known) {
+            sftp_syslog(pvar, "Server supports extension \"%s\" revision %s",
+                name, value);
+        } else {
+            sftp_syslog(pvar, "Unrecognised server extension \"%s\"", name);
+        }
+
+		free(name);
+		free(value);
+	}
+
+	if (c->sftp.version == 0) {
+		c->sftp.transfer_buflen = min(c->sftp.transfer_buflen, 20480);
+	}
+	c->sftp.limit_kbps = 0;
+	if (c->sftp.limit_kbps > 0) {
+		// TODO:
+	}
+
 error:
 	return;
 }
@@ -177,8 +234,6 @@
 	buffer_t *msg;
 	int state;
 
-	OutputDebugPrintf("len %d\n", buflen);
-
 	/*
 	 * Allocate buffer
 	 */
@@ -187,7 +242,8 @@
 
 	state = c->sftp.state;
 	if (state == SFTP_INIT) {
-		sftp_do_init_recv(pvar, msg);
+		sftp_do_init_recv(pvar, c, msg);
+		sftp_syslog(pvar, "Connected to SFTP server.");
 	}
 
 	/*

Modified: trunk/ttssh2/ttxssh/sftp.h
===================================================================
--- trunk/ttssh2/ttxssh/sftp.h	2012-05-03 14:39:47 UTC (rev 4928)
+++ trunk/ttssh2/ttxssh/sftp.h	2012-05-03 16:17:09 UTC (rev 4929)
@@ -99,9 +99,12 @@
 #define SSH2_FX_OP_UNSUPPORTED		8
 #define SSH2_FX_MAX			8
 
-/* Maximum packet that we are willing to send/accept */
-#define SFTP_MAX_MSG_LENGTH	(256 * 1024)
+/* Maximum packet that we are willing to send/accept */
+#define SFTP_MAX_MSG_LENGTH	(256 * 1024)
 
+#define DEFAULT_COPY_BUFLEN 32768   /* Size of buffer for up/download */
+#define DEFAULT_NUM_REQUESTS    64  /* # concurrent outstanding requests */
+
 void sftp_do_init(PTInstVar pvar, Channel_t *c);
 void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen);
 

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2012-05-03 14:39:47 UTC (rev 4928)
+++ trunk/ttssh2/ttxssh/ssh.h	2012-05-03 16:17:09 UTC (rev 4929)
@@ -664,6 +664,17 @@
 
 typedef struct sftp {
 	enum sftp_state state;
+	unsigned int transfer_buflen;
+	unsigned int num_requests;
+	unsigned int version;
+	unsigned int msg_id;
+#define SFTP_EXT_POSIX_RENAME   0x00000001
+#define SFTP_EXT_STATVFS    0x00000002
+#define SFTP_EXT_FSTATVFS   0x00000004
+#define SFTP_EXT_HARDLINK   0x00000008
+	unsigned int exts;
+	unsigned long long limit_kbps;
+	//struct bwlimit bwlimit_in, bwlimit_out;
 } sftp_t;
 
 typedef struct channel {

From svnnotify ＠ sourceforge.jp  Fri May  4 23:39:22 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 04 May 2012 23:39:22 +0900
Subject: [Ttssh2-commit] [4930] SFTP:
Message-ID: <1336142362.489812.15845.nullmailer@users.sourceforge.jp>

Revision: 4930
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4930
Author:   yutakapon
Date:     2012-05-04 23:39:22 +0900 (Fri, 04 May 2012)
Log Message:
-----------
SFTP:
  - コマンドラインコンソール（モードレスダイアログ）を追加した。これが将来的にFFFTPやWinSCPの2ペイン方式になる(予定)。
  - インタラクティブループに入る前のパス送信処理を追加した。

※一人言
SCPを実装したときもそうだったが、WindowsアプリはUNIXプログラムのようにブロックさせないようにしなければならないため、
1つのコマンドを送受信するだけでも、状態遷移管理をしなければならず、ロジックが煩雑になる。
SFTP用の別プロセスを起こして、Tera Term(TTSSH)本体とプロセス間通信するようにしたほうがよいのかも。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/ssh.h
    trunk/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2012-05-03 16:17:09 UTC (rev 4929)
+++ trunk/ttssh2/ttxssh/resource.h	2012-05-04 14:39:22 UTC (rev 4930)
@@ -14,6 +14,7 @@
 #define IDD_SSHAUTH                     106
 #define IDD_SSHSCP_PROGRESS             107
 #define IDD_SSHPASSWD_INPUT             108
+#define IDD_SFTP_DIALOG                 109
 #define IDD_HOSTDLG                     600
 #define IDC_HOSTTCPIP                   601
 #define IDD_SSHDIFFERENTKEY             601
@@ -116,6 +117,7 @@
 #define IDC_SENDFILE_EDIT               1069
 #define IDC_PASSWD                      1069
 #define IDC_ECDSA521_TYPE               1069
+#define IDC_SFTP_EDIT                   1069
 #define IDC_STATIC1                     1070
 #define IDC_COMPRESSLABEL               1070
 #define IDC_SSHVERSIONS                 1070
@@ -194,13 +196,14 @@
 #define IDC_EDIT2                       1208
 #define IDC_NEW_PASSWD                  1208
 #define IDC_SENDFILE_TO                 1208
+#define IDC_SFTP_CONSOLE                1208
 #define IDC_PUTTY_VERSION               1209
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_RESOURCE_VALUE        110
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1210
 #define _APS_NEXT_SYMED_VALUE           101

Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2012-05-03 16:17:09 UTC (rev 4929)
+++ trunk/ttssh2/ttxssh/sftp.c	2012-05-04 14:39:22 UTC (rev 4930)
@@ -51,6 +51,22 @@
 #include <sys/stat.h>
 #include <assert.h>
 
+
+#define WM_USER_CONSOLE (WM_USER + 1)
+
+static void sftp_console_message(PTInstVar pvar, Channel_t *c, char *fmt, ...)
+{
+	char tmp[1024];
+	va_list arg;
+
+	va_start(arg, fmt);
+	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	va_end(arg);
+
+	SendMessage(c->sftp.console_window, WM_USER_CONSOLE, 0, (LPARAM)tmp);
+	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+}
+
 static void sftp_do_syslog(PTInstVar pvar, int level, char *fmt, ...)
 {
 	char tmp[1024];
@@ -148,8 +164,23 @@
 	return;
 }
 
+static void sftp_send_string_request(PTInstVar pvar, Channel_t *c, unsigned int id, unsigned int code,
+									 char *s, unsigned int len)
+{
+	buffer_t *msg;
+
+	sftp_buffer_alloc(&msg);
+	buffer_put_char(msg, code);
+	buffer_put_int(msg, id);
+	buffer_put_string(msg, s, len);
+	sftp_send_msg(pvar, c, msg);
+	sftp_syslog(pvar, "Sent message fd %d T:%u I:%u", c->remote_id, code, id);
+	sftp_buffer_free(msg);
+}
+
+
 // SFTP\x92?M\x8AJ\x8En\x91O\x82?l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93
-// based on do_init()#sftp-client.c
+// based on do_init()#sftp-client.c(OpenSSH 6.0)
 void sftp_do_init(PTInstVar pvar, Channel_t *c)
 {
 	buffer_t *msg;
@@ -224,15 +255,205 @@
 		// TODO:
 	}
 
+	sftp_syslog(pvar, "Connected to SFTP server.");
+
 error:
 	return;
 }
 
-// SFTP\x8E\xF3\x90M\x8F\x88\x97\x9D -\x83\x81\x83C\x83\x93\x83\x8B\x81[\x83`\x83\x93-
+// \x83p\x83X\x82?\x97\x90M
+// based on do_realpath()#sftp-client.c(OpenSSH 6.0)
+static void sftp_do_realpath(PTInstVar pvar, Channel_t *c, char *path)
+{
+	unsigned int id;
+
+	strncpy_s(c->sftp.path, sizeof(c->sftp.path), path, _TRUNCATE);
+	id = c->sftp.msg_id++;
+	sftp_send_string_request(pvar, c, id, SSH2_FXP_REALPATH, path, strlen(path));
+}
+
+/* Convert from SSH2_FX_ status to text error message */
+static const char *fx2txt(int status)
+{       
+    switch (status) {
+    case SSH2_FX_OK:
+        return("No error");
+    case SSH2_FX_EOF:
+        return("End of file");
+    case SSH2_FX_NO_SUCH_FILE:
+        return("No such file or directory");
+    case SSH2_FX_PERMISSION_DENIED:
+        return("Permission denied");
+    case SSH2_FX_FAILURE:
+        return("Failure");
+    case SSH2_FX_BAD_MESSAGE:
+        return("Bad message");
+    case SSH2_FX_NO_CONNECTION:
+        return("No connection");
+    case SSH2_FX_CONNECTION_LOST:
+        return("Connection lost");
+    case SSH2_FX_OP_UNSUPPORTED:
+        return("Operation unsupported");
+    default:
+        return("Unknown status");
+    }
+    /* NOTREACHED */
+}
+
+static char *sftp_do_realpath_recv(PTInstVar pvar, Channel_t *c, buffer_t *msg)
+{
+	unsigned int type, expected_id, count, id;
+	char *filename = NULL, *longname;
+
+	type = buffer_get_char(msg);
+	id = buffer_get_int(msg);
+
+	expected_id = c->sftp.msg_id - 1; 
+	if (id != expected_id) {
+		sftp_syslog(pvar, "ID mismatch (%u != %u)", id, expected_id);
+		goto error;
+	}
+
+	if (type == SSH2_FXP_STATUS) {
+		unsigned int status = buffer_get_int(msg);
+
+		sftp_syslog(pvar, "Couldn't canonicalise: %s", fx2txt(status));
+		goto error;
+	} else if (type != SSH2_FXP_NAME) {
+        sftp_syslog(pvar, "Expected SSH2_FXP_NAME(%u) packet, got %u",
+            SSH2_FXP_NAME, type);
+		goto error;
+	}
+
+	count = buffer_get_int(msg);
+	if (count != 1) {
+		sftp_syslog(pvar, "Got multiple names (%d) from SSH_FXP_REALPATH", count);
+		goto error;
+	}
+
+	filename = buffer_get_string_msg(msg, NULL);
+	longname = buffer_get_string_msg(msg, NULL);
+	//a = decode_attrib(&msg);
+
+	sftp_console_message(pvar, c, "SSH_FXP_REALPATH %s -> %s", c->sftp.path, filename);
+
+	free(longname);
+
+error:
+	return (filename);
+}
+
+
+/*
+ * SFTP \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83R\x83\x93\x83\\x81[\x83\x8B
+ */
+static WNDPROC hEditProc;
+
+static LRESULT CALLBACK EditProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg) {
+		case WM_KEYDOWN:
+		if ((int)wParam == VK_RETURN) {
+			char buf[512];
+
+			GetWindowText(hwnd, buf, sizeof(buf));
+			SetWindowText(hwnd, "");
+			if (buf[0] != '\0') {
+				SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) buf);
+				SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
+								   (LPARAM) (char FAR *) "\r\n");
+			}
+		}
+		break;
+	default:
+		return (CallWindowProc(hEditProc, hwnd, uMsg, wParam, lParam));
+	}
+
+	return 0L;
+}
+
+static LRESULT CALLBACK OnSftpConsoleDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+	static HFONT DlgDragDropFont = NULL;
+	LOGFONT logfont;
+	HFONT font;
+	HWND hEdit;
+
+	switch (msg) {
+		case WM_INITDIALOG:
+			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
+			GetObject(font, sizeof(LOGFONT), &logfont);
+			DlgDragDropFont = NULL;
+
+			hEdit = GetDlgItem(hDlgWnd, IDC_SFTP_EDIT);
+			SetFocus(hEdit);
+
+			// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82?T\x83u\x83N\x83\x89\x83X\x89\xBB
+			hEditProc = (WNDPROC)GetWindowLong(hEdit, GWL_WNDPROC);
+			SetWindowLong(hEdit, GWL_WNDPROC, (LONG)EditProc);
+
+			return TRUE;
+
+		case WM_COMMAND:
+			switch (LOWORD(wp)) {
+				case IDOK:
+					break;
+
+				case IDCANCEL:
+					if (DlgDragDropFont != NULL) {
+						DeleteObject(DlgDragDropFont);
+					}
+					EndDialog(hDlgWnd, IDCANCEL);
+					DestroyWindow(hDlgWnd);
+					break;
+
+				default:
+					return FALSE;
+			}
+
+		case WM_USER_CONSOLE:
+			SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) lp);
+			SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
+							   (LPARAM) (char FAR *) "\r\n");
+			return TRUE;
+
+#if 0
+		case WM_SIZE:
+			{
+				// \x8D?z\x92u
+				int dlg_w, dlg_h;
+				RECT rc_dlg;
+				RECT rc;
+				POINT p;
+
+				// \x90V\x82\xB5\x82\xA2\x83_\x83C\x83A\x83\x8D\x83O\x82?T\x83C\x83Y\x82?\xE9
+				GetClientRect(hDlgWnd, &rc_dlg);
+				dlg_w = rc_dlg.right;
+				dlg_h = rc_dlg.bottom;
+
+				// \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g
+				GetWindowRect(GetDlgItem(hDlgWnd, IDC_SFTP_EDIT), &rc);
+				p.x = rc.left;
+				p.y = rc.top;
+				ScreenToClient(hDlgWnd, &p);
+				SetWindowPos(GetDlgItem(hDlgWnd, IDC_SFTP_EDIT), 0,
+ 							 0, 0, dlg_w, p.y,
+							 SWP_NOSIZE | SWP_NOZORDER);
+			}
+			return TRUE;
+#endif
+
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
+// SFTP\x8E\xF3\x90M\x8F\x88\x97\x9D -\x83X\x83e\x81[\x83g\x83}\x83V\x81[\x83\x93-
 void sftp_response(PTInstVar pvar, Channel_t *c, unsigned char *data, unsigned int buflen)
 {
 	buffer_t *msg;
-	int state;
+	HWND hDlgWnd;
 
 	/*
 	 * Allocate buffer
@@ -240,10 +461,26 @@
 	sftp_buffer_alloc(&msg);
 	sftp_get_msg(pvar, c, data, buflen, &msg);
 
-	state = c->sftp.state;
-	if (state == SFTP_INIT) {
+	if (c->sftp.state == SFTP_INIT) {
 		sftp_do_init_recv(pvar, c, msg);
-		sftp_syslog(pvar, "Connected to SFTP server.");
+
+		// \x83R\x83\x93\x83\\x81[\x83\x8B\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
+		hDlgWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SFTP_DIALOG), 
+				pvar->cv->HWin, (DLGPROC)OnSftpConsoleDlgProc);	
+		if (hDlgWnd != NULL) {
+			c->sftp.console_window = hDlgWnd;
+			ShowWindow(hDlgWnd, SW_SHOW);
+		}
+
+		sftp_do_realpath(pvar, c, ".");
+		c->sftp.state = SFTP_CONNECTED;
+
+	} else if (c->sftp.state == SFTP_CONNECTED) {
+		char *remote_path;
+		remote_path = sftp_do_realpath_recv(pvar, c, msg);
+
+		c->sftp.state = SFTP_REALPATH;
+
 	}
 
 	/*

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2012-05-03 16:17:09 UTC (rev 4929)
+++ trunk/ttssh2/ttxssh/ssh.h	2012-05-04 14:39:22 UTC (rev 4930)
@@ -659,11 +659,12 @@
 } scp_t;
 
 enum sftp_state {
-	SFTP_INIT, 
+	SFTP_INIT, SFTP_CONNECTED, SFTP_REALPATH, 
 };
 
 typedef struct sftp {
 	enum sftp_state state;
+	HWND console_window;
 	unsigned int transfer_buflen;
 	unsigned int num_requests;
 	unsigned int version;
@@ -675,6 +676,7 @@
 	unsigned int exts;
 	unsigned long long limit_kbps;
 	//struct bwlimit bwlimit_in, bwlimit_out;
+	char path[1024];
 } sftp_t;
 
 typedef struct channel {

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2012-05-03 16:17:09 UTC (rev 4929)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2012-05-04 14:39:22 UTC (rev 4930)
@@ -13,6 +13,52 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
+// \x93\xFA\x96{\x8C\xEA resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
+#ifdef _WIN32
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+#pragma code_page(932)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SFTP_DIALOG DIALOGEX 0, 0, 266, 150
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+CAPTION "TTSSH: SFTP console"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    EDITTEXT        IDC_SFTP_EDIT,7,7,252,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_SFTP_CONSOLE,7,33,252,110,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_SFTP_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 259
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 143
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // \x93\xFA\x96{\x8C\xEA resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
 // \x89p\x8C\xEA (\x95č\x91) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

From svnnotify ＠ sourceforge.jp  Sat May  5 21:40:02 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 05 May 2012 21:40:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzFdICDoqIDoqp7jg5XjgqHjgqTjg6s=?=
 =?utf-8?b?44Gu5aSJ5pu044Gn44Oh44OL44Ol44O844KS44Oq44Ot44O844OJ44GZ44KL?=
 =?utf-8?b?44KI44GG44Gr44GX44CB5YaN6LW35YuV44KS5L+D44GV44Gq44GE44KI44GG?=
 =?utf-8?b?44Gr44GX44Gf?=
Message-ID: <1336221602.627997.20970.nullmailer@users.sourceforge.jp>

Revision: 4931
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4931
Author:   maya
Date:     2012-05-05 21:40:02 +0900 (Sat, 05 May 2012)
Log Message:
-----------
言語ファイルの変更でメニューをリロードするようにし、再起動を促さないようにした
# HTEKWin に PostMessage できないので、開いたままの TEK Window のメニューはリロードされない

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/ttpdlg/ttdlg.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-04 14:39:22 UTC (rev 4930)
+++ trunk/doc/en/html/about/history.html	2012-05-05 12:40:02 UTC (rev 4931)
@@ -70,7 +70,7 @@
           <li>added the <a href="../macro/command/fileunlock.html">fileunlock</a> command.</li>
           <li>added the third argument _timezone_ at the <a href="../macro/command/gettime.html">gettime</a> and <a href="../macro/command/getdate.html">getdate</a> command.</li>
         </ul></li>
-      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>. Also, a user will be confirmed whether Tera Term is be relaunched.</li>
+      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-04 14:39:22 UTC (rev 4930)
+++ trunk/doc/ja/html/about/history.html	2012-05-05 12:40:02 UTC (rev 4931)
@@ -70,7 +70,7 @@
           <li><a href="../macro/command/fileunlock.html">fileunlock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
           <li><a href="../macro/command/gettime.html">gettime</a>, <a href="../macro/command/getdate.html">getdate</a>\x83R\x83}\x83\x93\x83h\x82?\xE63\x88\xF8\x90\x94\x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
-      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
     </ul>
   </li>

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2012-05-04 14:39:22 UTC (rev 4930)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2012-05-05 12:40:02 UTC (rev 4931)
@@ -3216,16 +3216,21 @@
 						// \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95ύX\x82\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8F?
 						w = (WORD)GetCurSel(Dialog, IDC_GENLANG_UI);
 						if (w != langui_sel) {
+							char CurDir[MAX_PATH];
+
 							_snprintf_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), _TRUNCATE, 
-								"%s/%s", LANG_PATH, LangUIList[w - 1]);
+								"%s\\%s", LANG_PATH, LangUIList[w - 1]);
 
-							// re-launch
-							RestartTeraTerm(GetParent(Dialog), ts);
+							GetCurrentDirectory(sizeof(CurDir), CurDir);
+							SetCurrentDirectory(ts->HomeDir);
+							_fullpath(ts->UILanguageFile, ts->UILanguageFile_ini, sizeof(ts->UILanguageFile));
+							SetCurrentDirectory(CurDir);
 						}
 					}
 
-					// TTXKanjiMenu \x82?\xBD\x82??AOK \x89\x9F\x89\xBA\x8E\x9E\x82?\x81\x83j\x83\x85\x81[\x8D?`\x89\xE6\x82\xCC
-					// \x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x94\xF2\x82?\xB7\x82悤\x82?\xB5\x82\xBD\x81B (2007.7.14 maya)
+					// TTXKanjiMenu \x82\xCD Language \x82\xF0\x8C\xA9\x82ă\x81\x83j\x83\x85\x81[\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82?ŁA\x95ύX\x82??\\x90\xAB\x82\xAA\x82\xA0\x82\xE9
+					// OK \x89\x9F\x89\xBA\x8E\x9E\x82?\x81\x83j\x83\x85\x81[\x8D?`\x89\xE6\x82?\x81\x83b\x83Z\x81[\x83W\x82\xF0\x94\xF2\x82?\xB7\x82悤\x82?\xB5\x82\xBD\x81B (2007.7.14 maya)
+					// \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82?ύX\x8E\x9E\x82?\x81\x83j\x83\x85\x81[\x82??`\x89悪\x95K\x97v (2012.5.5 maya)
 					PostMessage(GetParent(Dialog),WM_USER_CHANGEMENU,0,0);
 
 					EndDialog(Dialog, 1);

From svnnotify ＠ sourceforge.jp  Wed May  9 01:36:57 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 09 May 2012 01:36:57 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzJdICBJTUXjga7liY3lvozjg5XjgqM=?=
 =?utf-8?b?44O844OJ44OQ44OD44Kv5a++5b+c44KS6KGM44Gj44Gf44CC?=
Message-ID: <1336495017.719504.18509.nullmailer@users.sourceforge.jp>

Revision: 4932
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4932
Author:   yutakapon
Date:     2012-05-09 01:36:57 +0900 (Wed, 09 May 2012)
Log Message:
-----------
IMEの前後フィードバック対応を行った。
ATOK2012で動作確認済み。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/buffer.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/doc/en/html/about/history.html	2012-05-08 16:36:57 UTC (rev 4932)
@@ -72,6 +72,7 @@
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
+      <li>added support for IME feedback back and forth function. </li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/doc/ja/html/about/history.html	2012-05-08 16:36:57 UTC (rev 4932)
@@ -72,6 +72,10 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81B\x8E\x96\x91O\x82\xC9MS-IME/ATOK\x82??肪\x95K\x97v\x81B<br>
+          cf. <a href="http://trendy.nikkeibp.co.jp/article/tec/word/20040317/108107/">\x91O\x8C\xE3\x82?\xB6\x8E\x9A\x82\xF0\x8EQ\x8F?\xB5\x82Č\xF8\x97\xA6\x82?\x95ϊ\xB7</a>,
+              <a href="http://d.hatena.ne.jp/topiyama/20070703">IME\x82?O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB7\x82\xE9\x82?\xCD</a>
+        </li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/teraterm/teraterm/buffer.c	2012-05-08 16:36:57 UTC (rev 4932)
@@ -3508,3 +3508,15 @@
 
 	BuffUpdateRect(0, 0, NumOfColumns-1, NumOfLines-1);
 }
+
+// \x8C\xBB\x8D?s\x82\xF0\x82?邲\x82?o\x83b\x83t\x83@\x82?i\x94[\x82\xB7\x82\xE9\x81B\x95?\xE8\x92l\x82?\xBB\x8D??J\x81[\x83\\x83\x8B\x88?u(X)\x81B
+int BuffGetCurrentLineData(char *buf, int bufsize)
+{
+	LONG Ptr;
+
+	Ptr = GetLinePtr(PageStart + CursorY);
+	memset(buf, 0, bufsize);
+	memcpy(buf, &CodeBuff[Ptr], min(NumOfColumns, bufsize - 1));
+	return (CursorX);
+}
+

Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/teraterm/teraterm/buffer.h	2012-05-08 16:36:57 UTC (rev 4932)
@@ -78,6 +78,7 @@
 void BuffSelectEraseBox(int XStart, int YStart, int XEnd, int YEnd);
 void BuffScrollLeft(int count);
 void BuffScrollRight(int count);
+int BuffGetCurrentLineData(char *buf, int bufsize);
 
 extern int StatusLine;
 extern int CursorTop, CursorBottom;

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/teraterm/teraterm/vtwin.cpp	2012-05-08 16:36:57 UTC (rev 4932)
@@ -124,6 +124,7 @@
 	ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition)
 	ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange)
 	ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify)
+	ON_MESSAGE(WM_IME_REQUEST,OnIMERequest)
 //<!--by AKASI
 	ON_MESSAGE(WM_WINDOWPOSCHANGING,OnWindowPosChanging)
 	ON_MESSAGE(WM_SETTINGCHANGE,OnSettingChange)
@@ -2993,6 +2994,45 @@
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 
+// IME\x82?O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\\x82??Ή\x9E
+// cf. http://d.hatena.ne.jp/topiyama/20070703
+//     http://ice.hotmint.com/putty/#DOWNLOAD
+// (2012.5.9 yutaka)
+LONG CVTWindow::OnIMERequest(UINT wParam, LONG lParam)
+{
+	int size;
+	char buf[512];
+
+	if (wParam == IMR_DOCUMENTFEED) {
+		size = NumOfColumns + 1;
+		if (lParam == 0) {  // 1\x89\xF1\x96??Ăяo\x82\xB5
+			// \x83o\x83b\x83t\x83@\x82?T\x83C\x83Y\x82\xF0\x95?\xB7\x82??B
+
+		} else {  // 2\x89\xF1\x96??Ăяo\x82\xB5
+			//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82?g\x97p\x82\xB7\x82\xE9
+			RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
+			char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
+			int cx;
+
+			cx = BuffGetCurrentLineData(buf, sizeof(buf));
+	        
+			pReconv->dwSize            = sizeof(RECONVERTSTRING);
+			pReconv->dwVersion         = 0;
+			pReconv->dwStrLen          = size;
+			pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
+			pReconv->dwCompStrLen      = 0;
+			pReconv->dwCompStrOffset   = 0;
+			pReconv->dwTargetStrLen    = 0;
+			pReconv->dwTargetStrOffset = cx;
+	        
+			memcpy(pszParagraph, buf, size);
+		}
+		return (sizeof(RECONVERTSTRING) + size);
+	}
+
+	return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
+}
+
 LONG CVTWindow::OnAccelCommand(UINT wParam, LONG lParam)
 {
 	switch (wParam) {

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2012-05-05 12:40:02 UTC (rev 4931)
+++ trunk/teraterm/teraterm/vtwin.h	2012-05-08 16:36:57 UTC (rev 4932)
@@ -99,6 +99,7 @@
 	afx_msg LONG OnIMEComposition(UINT wParam, LONG lParam);
 	afx_msg LONG OnIMEInputChange(UINT wParam, LONG lParam);
 	afx_msg LONG OnIMENotify(UINT wParam, LONG lParam);
+	afx_msg LONG OnIMERequest(UINT wParam, LONG lParam);
 	afx_msg LONG OnAccelCommand(UINT wParam, LONG lParam);
 	afx_msg LONG OnChangeMenu(UINT wParam, LONG lParam);
 	afx_msg LONG OnChangeTBar(UINT wParam, LONG lParam);

From svnnotify ＠ sourceforge.jp  Thu May 10 00:28:47 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 10 May 2012 00:28:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzNdICDli5XkvZznkrDlooPjgpLmmI4=?=
 =?utf-8?b?56K65YyW44GX44Gf44CC?=
Message-ID: <1336577327.558816.24854.nullmailer@users.sourceforge.jp>

Revision: 4933
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4933
Author:   yutakapon
Date:     2012-05-10 00:28:47 +0900 (Thu, 10 May 2012)
Log Message:
-----------
動作環境を明確化した。

Modified Paths:
--------------
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-08 16:36:57 UTC (rev 4932)
+++ trunk/doc/ja/html/about/history.html	2012-05-09 15:28:47 UTC (rev 4933)
@@ -72,9 +72,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81B\x8E\x96\x91O\x82\xC9MS-IME/ATOK\x82??肪\x95K\x97v\x81B<br>
-          cf. <a href="http://trendy.nikkeibp.co.jp/article/tec/word/20040317/108107/">\x91O\x8C\xE3\x82?\xB6\x8E\x9A\x82\xF0\x8EQ\x8F?\xB5\x82Č\xF8\x97\xA6\x82?\x95ϊ\xB7</a>,
-              <a href="http://d.hatena.ne.jp/topiyama/20070703">IME\x82?O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB7\x82\xE9\x82?\xCD</a>
+      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2002/2010\x82ł?\xAE\x8D\xEC\x95s\x89?B<br>
         </li>
     </ul>
   </li>

From svnnotify ＠ sourceforge.jp  Thu May 10 01:14:41 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 10 May 2012 01:14:41 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzRdICBJTUXliY3lvozjg5XjgqPjg7w=?=
 =?utf-8?b?44OJ44OQ44OD44Kv5qmf6IO944GM44CBTVMtSU1FMjAwMuOBp+WLleOBjw==?=
 =?utf-8?b?44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1336580081.757616.22822.nullmailer@users.sourceforge.jp>

Revision: 4934
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4934
Author:   yutakapon
Date:     2012-05-10 01:14:41 +0900 (Thu, 10 May 2012)
Log Message:
-----------
IME前後フィードバック機能が、MS-IME2002で動くようにした。

危機[一髪]
ファイト[一発]

夏は[熱い]
本は[厚い]
お湯は[熱い]
気温は[熱い]
信頼は[厚い]
病は[篤い]

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2012-05-09 15:28:47 UTC (rev 4933)
+++ trunk/teraterm/teraterm/vtwin.cpp	2012-05-09 16:14:41 UTC (rev 4934)
@@ -2995,18 +2995,38 @@
 }
 
 // IME\x82?O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\\x82??Ή\x9E
+// MS\x82\xA9\x82?\x82\xE1\x82\xF1\x82?d\x97l\x82\xAA\x92?\xB3\x82\xEA\x82Ă\xA2\x82?\xA2\x82?ŁA\x83A\x83h\x83z\x83b\x83N\x82?\xE2\x82邵\x82\xA9\x82?\xA2\x82?\x82\xA2\x81B
 // cf. http://d.hatena.ne.jp/topiyama/20070703
 //     http://ice.hotmint.com/putty/#DOWNLOAD
+//     http://27213143.at.webry.info/201202/article_2.html
+//     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
 // (2012.5.9 yutaka)
 LONG CVTWindow::OnIMERequest(UINT wParam, LONG lParam)
 {
-	int size;
-	char buf[512];
+	static int complen, newsize;
+	static char comp[512];
+	int size, ret;
+	char buf[512], newbuf[1024];
+	HIMC hIMC;
 
 	if (wParam == IMR_DOCUMENTFEED) {
-		size = NumOfColumns + 1;
+		size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82?\xB7\x82\xB3+null
+
 		if (lParam == 0) {  // 1\x89\xF1\x96??Ăяo\x82\xB5
 			// \x83o\x83b\x83t\x83@\x82?T\x83C\x83Y\x82\xF0\x95?\xB7\x82??B
+			// ATOK2012\x82ł?\xED\x82\xC9 complen=0 \x82??\xE9\x81B
+			complen = 0;
+			memset(comp, 0, sizeof(comp));
+			hIMC = ImmGetContext(HVTWin);
+			if (hIMC) {
+				ret = ImmGetCompositionString(hIMC, GCS_COMPSTR, comp, sizeof(comp));
+				if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
+					memset(comp, 0, sizeof(comp));
+				}
+				complen = strlen(comp);  // w/o null
+				ImmReleaseContext(HVTWin, hIMC);
+			}
+			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A??\xBD\x91S\x91??\xB7\x82\xB3(including null)
 
 		} else {  // 2\x89\xF1\x96??Ăяo\x82\xB5
 			//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82?g\x97p\x82\xB7\x82\xE9
@@ -3015,19 +3035,27 @@
 			int cx;
 
 			cx = BuffGetCurrentLineData(buf, sizeof(buf));
+
+			// \x83J\x81[\x83\\x83\x8B\x88?u\x82?ϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9\x81B
+			memset(newbuf, 0, sizeof(newbuf));
+			memcpy(newbuf, buf, cx);
+			memcpy(newbuf + cx, comp, complen);
+			memcpy(newbuf + cx + complen, buf + cx, size - cx);
+			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A??\xBD\x91S\x91??\xB7\x82\xB3(including null)
 	        
 			pReconv->dwSize            = sizeof(RECONVERTSTRING);
 			pReconv->dwVersion         = 0;
-			pReconv->dwStrLen          = size;
+			pReconv->dwStrLen          = newsize - 1;
 			pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
-			pReconv->dwCompStrLen      = 0;
-			pReconv->dwCompStrOffset   = 0;
-			pReconv->dwTargetStrLen    = 0;
+			pReconv->dwCompStrLen      = complen;
+			pReconv->dwCompStrOffset   = cx;
+			pReconv->dwTargetStrLen    = complen;
 			pReconv->dwTargetStrOffset = cx;
 	        
-			memcpy(pszParagraph, buf, size);
+			memcpy(pszParagraph, newbuf, newsize);
+			//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
 		}
-		return (sizeof(RECONVERTSTRING) + size);
+		return (sizeof(RECONVERTSTRING) + newsize);
 	}
 
 	return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);

From svnnotify ＠ sourceforge.jp  Thu May 10 01:39:45 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 10 May 2012 01:39:45 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzVdICDli5XkvZznkrDlooPjgpLmmI4=?=
 =?utf-8?b?56K65YyW44GX44Gf44CC?=
Message-ID: <1336581585.762883.5160.nullmailer@users.sourceforge.jp>

Revision: 4935
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4935
Author:   yutakapon
Date:     2012-05-10 01:39:45 +0900 (Thu, 10 May 2012)
Log Message:
-----------
動作環境を明確化した。

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	2012-05-09 16:14:41 UTC (rev 4934)
+++ trunk/doc/en/html/about/history.html	2012-05-09 16:39:45 UTC (rev 4935)
@@ -72,7 +72,7 @@
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
-      <li>added support for IME feedback back and forth function. </li>
+      <li>added support for IME feedback back and forth function. The ATOK2012 and MS-IME2002 work well.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-09 16:14:41 UTC (rev 4934)
+++ trunk/doc/ja/html/about/history.html	2012-05-09 16:39:45 UTC (rev 4935)
@@ -72,8 +72,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2002/2010\x82ł?\xAE\x8D\xEC\x95s\x89?B<br>
-        </li>
+      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012\x82\xC6MS-IME2002\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Thu May 10 22:18:46 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 10 May 2012 22:18:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzZdICBNUy1JTUUyMDAz44KS6L+95Yqg?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1336655926.603173.25435.nullmailer@users.sourceforge.jp>

Revision: 4936
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4936
Author:   yutakapon
Date:     2012-05-10 22:18:46 +0900 (Thu, 10 May 2012)
Log Message:
-----------
MS-IME2003を追加した。

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	2012-05-09 16:39:45 UTC (rev 4935)
+++ trunk/doc/en/html/about/history.html	2012-05-10 13:18:46 UTC (rev 4936)
@@ -72,7 +72,7 @@
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
-      <li>added support for IME feedback back and forth function. The ATOK2012 and MS-IME2002 work well.</li>
+      <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-09 16:39:45 UTC (rev 4935)
+++ trunk/doc/ja/html/about/history.html	2012-05-10 13:18:46 UTC (rev 4936)
@@ -72,7 +72,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012\x82\xC6MS-IME2002\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B</li>
+      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Fri May 11 00:25:50 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 11 May 2012 00:25:50 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzddIHZlciA0LiA2N+OBq+OBiuOBhA==?=
 =?utf-8?b?44Gm44CBSU1FUmVsYXRlZEN1cnNvciDjgqjjg7Pjg4jjg6ogKHRlcmF0ZXJt?=
 =?utf-8?b?LmluaSkg44Gu6KiY6LyJ44GM?=
Message-ID: <1336663550.015455.31680.nullmailer@users.sourceforge.jp>

Revision: 4937
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4937
Author:   yutakapon
Date:     2012-05-11 00:25:41 +0900 (Fri, 11 May 2012)
Log Message:
-----------
ver 4.67において、IMERelatedCursor エントリ(teraterm.ini)の記載が
漏れていたので追加した。

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	2012-05-10 13:18:46 UTC (rev 4936)
+++ trunk/doc/en/html/about/history.html	2012-05-10 15:25:41 UTC (rev 4937)
@@ -395,6 +395,7 @@
       <li>added a user configuration for changing the cursor color depending on the IME open status.
         <ul>
           <li>A user can change the setup value on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
+          <li>added the IMERelatedCursor in the teraterm.ini file. The default is off.</li>
         </ul></li>
       <li>added support for the motion event of xterm style mouse event tracking.</li>
       <li>added support for the DEC Locator Mode style mouse event tracking.</li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-10 13:18:46 UTC (rev 4936)
+++ trunk/doc/ja/html/about/history.html	2012-05-10 15:25:41 UTC (rev 4937)
@@ -394,6 +394,7 @@
       <li>IME\x82\xCCon/off\x8F\xF3\x91?ŃJ\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x95ύX\x82\xB7\x82?\x90?\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
         <ul>
           <li><a href="../menu/setup-additional.html">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ő?\xE8\x82\xF0\x95ύX\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+          <li>teraterm.ini \x82\xC9 IMERelatedCursor \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD off\x81B</li>
         </ul></li>
       <li>vim \x82\xC5 ttymouse \x82\xAA xterm2 \x82?\xA9\x93\xAE\x90??\x82\xEA\x82\xE9\x82悤\x82?ASecondary DA \x82?\x9E\x93\x9A\x82?\xAE\x82\xB5\x82\xBD\x81B</li>
       <li>xterm \x8C`\x8E\xAE\x82?}\x83E\x83X\x83C\x83x\x83\x93\x83g\x92?m\x82ŁA\x83\x82\x81[\x83V\x83\x87\x83\x93\x83C\x83x\x83\x93\x83g\x82?\xB3\x8E\xAE\x91Ή\x9E\x82\xB5\x82\xBD\x81B</li>

From svnnotify ＠ sourceforge.jp  Fri May 11 00:40:39 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 11 May 2012 00:40:39 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzhdICBJTUXliY3lvozjg5XjgqPjg7w=?=
 =?utf-8?b?44OJ44OQ44OD44Kv5qmf6IO944GM44CBICJJTUU9b2ZmIiDjga7loLTlkIg=?=
 =?utf-8?b?44Gv5L2c5YuV44GX44Gq44GE44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1336664439.108307.24408.nullmailer@users.sourceforge.jp>

Revision: 4938
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4938
Author:   yutakapon
Date:     2012-05-11 00:40:38 +0900 (Fri, 11 May 2012)
Log Message:
-----------
IME前後フィードバック機能が、"IME=off"の場合は作動しないようにした。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/doc/en/html/about/history.html	2012-05-10 15:40:38 UTC (rev 4938)
@@ -72,7 +72,7 @@
         </ul></li>
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
-      <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well.</li>
+      <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/doc/ja/html/about/history.html	2012-05-10 15:40:38 UTC (rev 4938)
@@ -72,7 +72,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B</li>
+      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2012-05-10 15:25:41 UTC (rev 4937)
+++ trunk/teraterm/teraterm/vtwin.cpp	2012-05-10 15:40:38 UTC (rev 4938)
@@ -3009,7 +3009,9 @@
 	char buf[512], newbuf[1024];
 	HIMC hIMC;
 
-	if (wParam == IMR_DOCUMENTFEED) {
+	// "IME=off"\x82??\x82?A\x89\xBD\x82\xE0\x82\xB5\x82?\xA2\x81B
+	if (ts.UseIME > 0 &&
+		wParam == IMR_DOCUMENTFEED) {
 		size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82?\xB7\x82\xB3+null
 
 		if (lParam == 0) {  // 1\x89\xF1\x96??Ăяo\x82\xB5

From svnnotify ＠ sourceforge.jp  Fri May 11 01:17:24 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 11 May 2012 01:17:24 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5MzldIHN2bnZlcnNpb24uIGV4ZSDjgas=?=
 =?utf-8?b?6Zai44GZ44KL6KiY6LyJ44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1336666644.932978.9144.nullmailer@users.sourceforge.jp>

Revision: 4939
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4939
Author:   yutakapon
Date:     2012-05-11 01:17:24 +0900 (Fri, 11 May 2012)
Log Message:
-----------
svnversion.exe に関する記載を追加した。

Modified Paths:
--------------
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/reference/develop.txt

-------------- next part --------------
Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2012-05-10 15:40:38 UTC (rev 4938)
+++ trunk/doc/en/html/reference/develop.txt	2012-05-10 16:17:24 UTC (rev 4939)
@@ -16,6 +16,9 @@
   Cygwin 1.5.x (1.7.x doesn't support Windows 9x)
   ActivePerl 5.8 later version
     converts character-code and return-code of documents for building OpenSSL.
+  Subversion for Windows (http://sourceforge.net/projects/win32svn/)
+    Use the compatible version for checkouted svn version.
+    Copy the "svnversion.exe" to the libs\svn\bin directory.
 
 
 * Libraries

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2012-05-10 15:40:38 UTC (rev 4938)
+++ trunk/doc/ja/html/reference/develop.txt	2012-05-10 16:17:24 UTC (rev 4939)
@@ -18,6 +18,7 @@
     OpenSSL \x82?R\x83\x93\x83p\x83C\x83\x8B\x81A\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x83t\x83@\x83C\x83\x8B\x82?\xB6\x8E\x9A\x83R\x81[\x83h\x81E\x89\xFC\x8Ds\x83R\x81[\x83h\x95ϊ\xB7\x82?K\x97v\x82ł\xB7\x81B
   Subversion for Windows (http://sourceforge.net/projects/win32svn/)
     \x83\\x81[\x83X\x82?`\x83F\x83b\x83N\x83A\x83E\x83g\x82?g\x82\xC1\x82\xBD svn \x82??\xB7\x90\xAB\x82?\xA0\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93
+    "svnversion.exe"\x82\xF0 libs\svn\bin \x94z\x89\xBA\x82?R\x83s\x81[\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A

From svnnotify ＠ sourceforge.jp  Sat May 12 00:57:26 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 12 May 2012 00:57:26 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDBdIE9wZW5TU0wgMS4wLiAxYyDjgbg=?=
 =?utf-8?b?44Ki44OD44OX44OH44O844OI?=
Message-ID: <1336751846.424193.16314.nullmailer@users.sourceforge.jp>

Revision: 4940
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4940
Author:   yutakapon
Date:     2012-05-12 00:57:26 +0900 (Sat, 12 May 2012)
Log Message:
-----------
OpenSSL 1.0.1c へアップデート

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/reference/develop.txt

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-10 16:17:24 UTC (rev 4939)
+++ trunk/doc/en/html/about/history.html	2012-05-11 15:57:26 UTC (rev 4940)
@@ -1902,7 +1902,7 @@
 
   <li>Misc
     <ul>
-      <li>upgraded OpenSSL to 1.0.1b</li>
+      <li>upgraded OpenSSL to 1.0.1c</li>
       <li>upgraded zlib to 1.2.7</li>
     </ul>
   </li>

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2012-05-10 16:17:24 UTC (rev 4939)
+++ trunk/doc/en/html/reference/develop.txt	2012-05-11 15:57:26 UTC (rev 4940)
@@ -23,7 +23,7 @@
 
 * Libraries
 - Oniguruma 5.9.2 (http://www.geocities.jp/kosako3/oniguruma/)
-- OpenSSL 1.0.1b (http://www.openssl.org/)
+- OpenSSL 1.0.1c (http://www.openssl.org/)
 - zlib 1.2.7 (http://www.zlib.net/)
 - PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-10 16:17:24 UTC (rev 4939)
+++ trunk/doc/ja/html/about/history.html	2012-05-11 15:57:26 UTC (rev 4940)
@@ -1903,7 +1903,7 @@
 
   <li>\x82\xBB\x82?\xBC
     <ul>
-      <li>OpenSSL 1.0.1b\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
+      <li>OpenSSL 1.0.1c\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
       <li>zlib 1.2.7\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2012-05-10 16:17:24 UTC (rev 4939)
+++ trunk/doc/ja/html/reference/develop.txt	2012-05-11 15:57:26 UTC (rev 4940)
@@ -23,7 +23,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 5.9.2 (http://www.geocities.jp/kosako3/oniguruma/)
-- OpenSSL 1.0.1b (http://www.openssl.org/)
+- OpenSSL 1.0.1c (http://www.openssl.org/)
 - zlib 1.2.7 (http://www.zlib.net/)
 - PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 

From svnnotify ＠ sourceforge.jp  Sun May 13 01:31:18 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 13 May 2012 01:31:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDFdICBJTUXjga7liY3lvozlj4Lnhac=?=
 =?utf-8?b?5qmf6IO944Gr44Gk44GE44Gm44CB44CM44OS44Oz44OI44CN44Gr6Kej6Kqs?=
 =?utf-8?b?44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1336840278.491701.13544.nullmailer@users.sourceforge.jp>

Revision: 4941
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4941
Author:   yutakapon
Date:     2012-05-13 01:31:18 +0900 (Sun, 13 May 2012)
Log Message:
-----------
IMEの前後参照機能について、「ヒント」に解説を追加した。

Modified Paths:
--------------
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/usage/tips/index.html

Added Paths:
-----------
    trunk/doc/ja/html/usage/tips/ime.html

-------------- next part --------------
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-11 15:57:26 UTC (rev 4940)
+++ trunk/doc/ja/html/about/history.html	2012-05-12 16:31:18 UTC (rev 4941)
@@ -72,7 +72,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li>IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
+      <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
     </ul>
   </li>
 

Added: trunk/doc/ja/html/usage/tips/ime.html
===================================================================
--- trunk/doc/ja/html/usage/tips/ime.html	                        (rev 0)
+++ trunk/doc/ja/html/usage/tips/ime.html	2012-05-12 16:31:18 UTC (rev 4941)
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<title>IME\x82?q\x83\x93\x83g</title>
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+<body>
+
+<h1>IME\x82?q\x83\x93\x83g</h1>
+
+<h2><a name="feedback">\x91O\x8C\xE3\x8EQ\x8F?ϊ\xB7</a></h2>
+<p>
+\x82\xB7\x82ł?m\x92\xE8\x8Dς??\xB6\x8E\x9A\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x8F?\x82?\xA8\x82\xA2\x82Ă\xE0\x81A\x83J\x81[\x83\\x83\x8B\x91O\x8C\xE3\x82?\xB6\x8E\x9A\x82\xF0\x8EQ\x8F?\xB5\x82āA\x8DœK\x82?ϊ\xB7\x82\xF0\x8Ds\x82\xA4\x82\xB5\x82\xAD\x82?ł\xB7\x81B
+ATOK\x82ł?u\x83J\x81[\x83\\x83\x8B\x88?u\x91O\x8C\xE3\x82?\xB6\x8F?\xF0\x8EQ\x8F?\xB5\x82?ϊ\xB7\x82\xB7\x82\xE9\x81v\x81AMS-IME\x82ł?u\x91}\x93\xFC\x8E\x9E\x81A\x91O\x82?\xE0\x97e\x82\xF0\x8EQ\x8F?\xB5\x82?ϊ\xB7\x82\xF0\x82\xB7\x82\xE9\x81v\x82?Ă?\xEA\x82Ă\xA2\x82?\xB7\x81B<br>
+\x82\xB1\x82?@\x94\\x82\xCDIME(Input Method Editor)[*1]\x82?A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82?A\x8Cg\x82\xB5\x82Ď\xC0\x8C\xBB\x82\xB7\x82邽\x82?A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x91\xA4\x82?Ή\x9E\x82\xE0\x95K\x97v\x82ł\xB7\x81B\x82?\xBD\x81A\x93\x96\x8AY\x8B@\x94\\x82?\xB5\x96\xA7\x82\xC9Microsoft\x82\xA9\x82\xE7\x8Ed\x97l\x82\xAA\x8AJ\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xA2\x82?ŁA\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93(Tera Term)\x82?\xC0\x91\x95\x82?A\x83h\x83z\x83b\x83N\x82?\xE0\x82???\xE8\x81AIME\x82??g\x82?\x87\x82?\x82?\xE6\x82\xC1\x82Ă?A\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x8D?\x82?\xA2\x8F?\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81B<br>
+<i>[*1] \x82\xA9\x82?Ă\xCDFEP(Front End Processor)\x82?Ă?\xEA\x82Ă\xA2\x82\xBD\x81B</i>
+</p>
+
+<p>
+<b>\x89Ă?\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A\x96{\x82\xF0\x93??B</b>
+</p>
+
+\x97\xE1\x82?\xB5\x82āA\x8F\xE3\x8BL\x82?m\x92?\x82\xBD\x95\xB6\x8F?\xAA\x82\xA0\x82\xE9\x82?\xB5\x82?\xB7\x81B
+
+<p>
+<b>(A)\x89Ă\xC9(B)\x82\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A(C)\x96{\x82\xF0\x93??B</b>
+</p>
+
+\x91O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\\x82\xAA\x97L\x8C\xF8\x82??\xC1\x82Ă\xA2\x82\xE9\x8F?\x81A(A),(B),(C)\x82??u\x82?J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE8\x81A\x81uatui\x81v\x82?\xFC\x97?\xB7\x82\xE9\x82?AIME\x82?\xBB\x82?\x82?\x8BL\x82?悤\x82?K\x90??\xBF\x8E\x9A\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B
+
+<p>
+<b><font color=red>\x8F\x8B\x82\xA2</font>\x89Ă\xC9<font color=red>\x94M\x82\xA2</font>\x82\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A<font color=red>\x8C\xFA\x82\xA2</font>\x96{\x82\xF0\x93??B</b>
+</p>
+
+Tera Term\x82?\xC0\x91\x95\x82?\xB5\x82Ă?AWM_IME_REQUEST\x83\x81\x83b\x83Z\x81[\x83W\x82\xC5IMR_DOCUMENTFEED\x83p\x83\x89\x83\x81\x81[\x83^\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x82\xE7\x81A\x8C\xBB\x8D??J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82?f\x81[\x83^\x82\xF0\x95?p\x82\xB7\x82邱\x82?ŁAIME\x82?ϊ\xB7\x8F\x88\x97\x9D\x82?v\x8C\xA3\x82\xB5\x82?\xB7\x81B<br>
+\x83f\x81[\x83^\x82??p\x95\xFB\x96@\x82?AATOK\x82\xC6IME\x82ň??\xE8\x82?\xB7\x81B
+
+<p>
+<b>\x89Ă\xC9|\x82\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A\x96{\x82\xF0\x93??B</b>
+</p>
+
+ATOK2012\x82??\x81A|\x82??u\x82?J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE8\x81A\x81ua\x81v\x82?\xFC\x97?\xB5\x82\xBD\x8E\x9E\x93_\x82ŁA\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x94\xF2\x82\xF1\x82ł\xAB\x82?\xB7\x81B
+\x82\xB1\x82??\xABTera Term\x82?A\x81u<font color=blue>\x89Ă?\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A\x96{\x82\xF0\x93??B</font>\x81v\x82?\xA2\x82\xA4\x83f\x81[\x83^\x82\xF0\x95?\xB5\x82?\xB7\x81B<br>
+MS-IME2002/2003\x82??\x81A\x81u\x82\xA0\x82\xC2i\x81v\x82?\xFC\x97?\xB5\x82\xBD\x8E\x9E\x93_\x82ŁA\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x94\xF2\x82\xF1\x82ł\xAB\x82?\xB7\x81B
+\x82\xB1\x82??\xABTera Term\x82?A\x81u<font color=blue>\x89Ă\xC9<u>\x82\xA0\x82\xC2</u>\x82\xA8\x92\x83\x82\xF0\x88\xF9\x82??\xAA\x82\xE7\x81A\x96{\x82\xF0\x93??B</font>\x81v\x82?\xA2\x82\xA4\x83f\x81[\x83^\x82\xF0\x95?\xB5\x82?\xB7\x81B<br>
+
+</body>
+</html>

Modified: trunk/doc/ja/html/usage/tips/index.html
===================================================================
--- trunk/doc/ja/html/usage/tips/index.html	2012-05-11 15:57:26 UTC (rev 4940)
+++ trunk/doc/ja/html/usage/tips/index.html	2012-05-12 16:31:18 UTC (rev 4941)
@@ -33,6 +33,7 @@
  <LI><A HREF="telnet_protocol.html">TELNET \x83v\x83\x8D\x83g\x83R\x83\x8B\x82??A\x95t\x82\xAF\x82\xE9</A></LI>
  <LI><A HREF="vim.html">vim \x82\xA9\x82\xE7\x82?\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82?g\x97p\x97\xE1</A></LI>
  <LI><A HREF="namedpipe.html">\x96\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v</A></LI>
+ <LI><A HREF="ime.html">IME\x82?q\x83\x93\x83g</A></LI>
 </UL>
 
 </BODY>

From svnnotify ＠ sourceforge.jp  Sun May 13 21:59:08 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 13 May 2012 21:59:08 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDJdICBFdGVybSBsb29rLWZlZWwg5qmf?=
 =?utf-8?b?6IO944Gu6IOM5pmv55S75YOP5oyH5a6a44KSIEFkZGl0aW9uYWwgc2V0dGlu?=
 =?utf-8?b?Z3Mg44OA44Kk44Ki44Ot44Kw44GL44KJ6KGM44GI44KL44KI44GG44Gr44GX?=
 =?utf-8?b?44Gf44CC?=
Message-ID: <1336913948.030629.10182.nullmailer@users.sourceforge.jp>

Revision: 4942
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4942
Author:   yutakapon
Date:     2012-05-13 21:59:07 +0900 (Sun, 13 May 2012)
Log Message:
-----------
Eterm look-feel 機能の背景画像指定を Additional settings ダイアログから行えるようにした。
ダイアログ上から画像ファイルを指定すると、

  BGThemeFile(teraterm.ini) = theme\ImageFile.INI
  BGDestFile(theme\ImageFile.INI) = 画像ファイル

に更新する。
ダイアログ上から Eterm look-feel を off にすると、

  BGThemeFile(teraterm.ini) = theme\*.INI

に戻す。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-additional.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-additional.html
    trunk/teraterm/common/teraterm.h
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/doc/en/html/about/history.html	2012-05-13 12:59:07 UTC (rev 4942)
@@ -59,7 +59,7 @@
       <li>Eterm look-feel
         <ul>
           <li>Environment variable strings(%variableName%) can be included in the ini file path.</li>
-          <li>added an image file specified configuration(theme\ImageFile.INI).</li>
+          <li>added an image file specified configuration(theme\ImageFile.INI). Also, a background image file can be specified on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
           <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.  Also, a user will be confirmed whether Tera Term is be relaunched.</li>
         </ul></li>
       <li>Macro

Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/doc/en/html/menu/setup-additional.html	2012-05-13 12:59:07 UTC (rev 4942)
@@ -229,11 +229,16 @@
       <dd>
 	Tera Term window looks like Eterm-lookfeel background transparency.
       </dd>
-    </dl>
-
+      
     <p>
       See also <a href="../usage/transparent.html">Background transparency</a>.
     </p>
+      
+      <dt>Background Image</dt>
+      <dd>
+	When the Eterm lookfeel feature is enabled, an image file can be specified as background.
+      </dd>
+    </dl>
 
     <dl>
       <dt>MouseCursor</dt>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/doc/ja/html/about/history.html	2012-05-13 12:59:07 UTC (rev 4942)
@@ -59,7 +59,7 @@
       <li>Eterm look-feel
         <ul>
           <li>ini\x83t\x83@\x83C\x83\x8B\x83p\x83X\x82??\xAB\x95?\x94\x95\xB6\x8E\x9A\x97\xF1(%variableName%)\x82\xF0\x8A??\xE7\x82\xEA\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-          <li>\x89摜\x83t\x83@\x83C\x83\x8B\x8Ew\x92\xE8\x90?\xE8(theme\ImageFile.INI)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+          <li>\x89摜\x83t\x83@\x83C\x83\x8B\x8Ew\x92\xE8\x90?\xE8(theme\ImageFile.INI)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B<a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x94w\x8Ci\x89摜\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
           <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li>\x83}\x83N\x83\x8D

Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/doc/ja/html/menu/setup-additional.html	2012-05-13 12:59:07 UTC (rev 4942)
@@ -226,13 +226,18 @@
       <dd>
 	Eterm\x95\x97\x82?\xBC\x93\xA7\x96\xBE\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
       </dd>
-    </dl>
 
     <p>
       \x8F?\xB5\x82\xAD\x82?u<a href="../usage/transparent.html">\x93\xA7\x89?E\x83C\x83\x93\x83h\x83E</a>\x81v
       \x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
     </p>
 
+      <dt>Background Image</dt>
+      <dd>
+	Eterm lookfeel\x8B@\x94\\x82\xAA\x97L\x8C\xF8\x82??\x81A\x94w\x8Ci\x89摜\x82\xF0\x8Ew\x92?\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+      </dd>
+    </dl>
+
     <dl>
       <dt>MouseCursor</dt>
       <dd>

Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/common/teraterm.h	2012-05-13 12:59:07 UTC (rev 4942)
@@ -13,6 +13,12 @@
 // AKASI\x8E\x81\x82?\xE6\x82\xE9Eterm\x95\x97\x93\xA7\x89?E\x83B\x83\x93\x83h\x83E
 #define ALPHABLEND_TYPE2
 
+// Eterm look-feel
+#define BG_SECTION "BG"
+#define BG_DESTFILE "BGDestFile"
+#define BG_THEME_IMAGEFILE "theme\\ImageFile.INI"
+#define BG_THEME_IMAGEFILE_DEFAULT "theme\\*.INI"
+
 // Added by 337 2006/03/01
 #define USE_NORMAL_BGCOLOR
 

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/common/tt_res.h	2012-05-13 12:59:07 UTC (rev 4942)
@@ -130,6 +130,7 @@
 #define IDC_SCROLL_LINE                 2510
 #define IDC_PASTEDELAY_EDIT             2510
 #define IDC_SCP_PATH                    2510
+#define IDC_BGIMG_EDIT                  2510
 #define IDC_CHECK1                      2512
 #define IDC_CONFIRM_CHANGE_PASTE        2512
 #define IDC_CURSOR_CTRL_SEQ             2512
@@ -153,7 +154,10 @@
 #define IDC_PROTOELAPSEDTIME            2526
 #define IDC_DAD_SENDFILE                2526
 #define IDC_TRANS_ELAPSED               2527
+#define IDC_BGIMG_LABEL                 2527
 #define IDC_TRANS_ETIME                 2528
+#define IDC_BUTTON1                     2528
+#define IDC_BGIMG_BUTTON                2528
 #define IDC_CLIPBOARD_ACCESS_LABEL      2529
 #define IDC_CLIPBOARD_ACCESS            2530
 #define ID_ACC_SENDBREAK                50001
@@ -249,7 +253,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        123
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2527
+#define _APS_NEXT_CONTROL_VALUE         2529
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/common/tttypes.h	2012-05-13 12:59:07 UTC (rev 4942)
@@ -556,6 +556,7 @@
 	WORD KermitOpt;
 	WORD FontQuality;
 	char ScpSendDir[MAXPATHLEN];
+	char BGImageFilePath[MAX_PATH];
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -1014,6 +1015,7 @@
  * - At version 4.74, ttset_memfilemap was replaced with ttset_memfilemap_19.
  *   added tttset.FontQuality
  *   added tttset.ScpSenDir
+ *   added tttset.BGImageFilePath
  *
  * - At version 4.73, ttset_memfilemap was replaced with ttset_memfilemap_18.
  *   added tttset.LogLockExclusive

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/teraterm/addsetting.cpp	2012-05-13 12:59:07 UTC (rev 4942)
@@ -770,6 +770,9 @@
 		SendDlgItemMessage(IDC_ENABLE_URL_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_ENABLE_ANSI_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_URL_UNDERLINE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_BGIMG_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_BGIMG_EDIT, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_BGIMG_BUTTON, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgVisualFont = NULL;
@@ -832,6 +835,18 @@
 	btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
 	btn->SetCheck(ts.EtermLookfeel.BGEnable);
 
+	// Eterm look-feel\x82?w\x8Ci\x89摜\x8Ew\x92\xE8\x81B
+	SetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath);
+	if (ts.EtermLookfeel.BGEnable) {
+		GetDlgItem(IDC_BGIMG_LABEL)->EnableWindow(TRUE);
+		GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
+		GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+	} else {
+		GetDlgItem(IDC_BGIMG_LABEL)->EnableWindow(FALSE);
+		GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
+		GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+	}
+
 	// (3)Mouse cursor type
 	listbox = (CListBox *)GetDlgItem(IDC_MOUSE_CURSOR);
 	for (i = 0 ; MouseCursor[i].name ; i++) {
@@ -904,8 +919,38 @@
 	CListBox *listbox;
 	int sel;
 	char buf[MAXPATHLEN];
+	CButton *btn;
 
 	switch (wParam) {
+		case IDC_ETERM_LOOKFEEL:
+			// \x83`\x83F\x83b\x83N\x82\xB3\x82?\x82\xE7 Enable/Disable \x82\xF0\x83g\x83O\x83\x8B\x82\xB7\x82\xE9\x81B
+			btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
+			if (btn->GetCheck()) {
+				GetDlgItem(IDC_BGIMG_LABEL)->EnableWindow(TRUE);
+				GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
+				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+			} else {
+				GetDlgItem(IDC_BGIMG_LABEL)->EnableWindow(FALSE);
+				GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
+				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+				// \x96\xB3\x8C\x{27B0B3}\x82?\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82??\xB7\x81B
+				strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
+			}
+			return TRUE;
+
+		case IDC_BGIMG_BUTTON | (BN_CLICKED << 16):
+			// \x94w\x8Ci\x89摜\x82\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82?w\x92?\x82\xE9\x81B
+			{
+				CString         filter("Image Files(*.jpg;*.jpeg;*.bmp)|*.jpg;*.jpeg;*.bmp|All Files(*.*)|*.*||");
+				CFileDialog     selDlg(TRUE, NULL, NULL, OFN_HIDEREADONLY, filter);
+				if (selDlg.DoModal() == IDOK) {
+					// \x94w\x8Ci\x89摜\x8Ew\x92肪\x88?}\x93I\x82?s\x82\xED\x82?\x82\xE7\x81ABGThemeFile \x82\xF0\x8CŒ艻\x82\xB7\x82\xE9\x81B
+					SetDlgItemText(IDC_BGIMG_EDIT, selDlg.GetPathName());
+					strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE, sizeof(ts.EtermLookfeel.BGThemeFile));
+				}
+			}
+			return TRUE;
+
 		case IDC_ANSI_COLOR | (LBN_SELCHANGE << 16):
 			listbox = (CListBox *)GetDlgItem(IDC_ANSI_COLOR);
 			sel = listbox->GetCurSel();
@@ -1024,6 +1069,10 @@
 		ts.EtermLookfeel.BGEnable = btn->GetCheck();
 	}
 
+	if (ts.EtermLookfeel.BGEnable) {
+		GetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath, sizeof(ts.BGImageFilePath));
+	}
+
 	// (3)
 	listbox = (CListBox *)GetDlgItem(IDC_MOUSE_CURSOR);
 	sel = listbox->GetCurSel();

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/teraterm/ttermpro.rc	2012-05-13 12:59:07 UTC (rev 4942)
@@ -117,8 +117,8 @@
     CONTROL         "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,8,72,12
     LTEXT           "&Mouse cursor",IDC_MOUSE,10,26,70,8
     LISTBOX         IDC_MOUSE_CURSOR,10,36,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Font Quality",IDC_FONT_QUALITY_LABEL,100,26,70,8
-    COMBOBOX        IDC_FONT_QUALITY,100,36,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "&Font Quality",IDC_FONT_QUALITY_LABEL,100,51,70,8
+    COMBOBOX        IDC_FONT_QUALITY,100,61,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "ANSI color",IDC_ANSICOLOR,10,78,43,8
     LISTBOX         IDC_ANSI_COLOR,10,88,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "&Red",IDC_RED,45,91,22,8
@@ -138,6 +138,9 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,105,12
     CONTROL         "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,105,12
     CONTROL         "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,138,105,12
+    LTEXT           "Background Image",IDC_BGIMG_LABEL,100,22,60,8
+    EDITTEXT        IDC_BGIMG_EDIT,98,31,108,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_BGIMG_BUTTON,213,30,14,14
 END
 
 IDD_TABSHEET_LOG DIALOGEX 0, 0, 242, 158

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/teraterm/vtdisp.c	2012-05-13 12:59:07 UTC (rev 4942)
@@ -112,8 +112,6 @@
 #include <stdio.h>
 #include <time.h>
 
-#define BG_SECTION "BG"
-
 typedef enum _BG_TYPE    {BG_COLOR = 0,BG_PICTURE,BG_WALLPAPER} BG_TYPE;
 typedef enum _BG_PATTERN {BG_STRETCH = 0,BG_TILE,BG_CENTER,BG_FIT_WIDTH,BG_FIT_HEIGHT,BG_AUTOFIT,BG_AUTOFILL} BG_PATTERN;
 
@@ -1388,7 +1386,7 @@
   BGDest.antiAlias = BGGetOnOff("BGDestAntiAlias",BGDest.antiAlias,file);
   BGDest.color     = BGGetColor("BGDestColor",BGDest.color,file);
 
-  GetPrivateProfileString(BG_SECTION,"BGDestFile",BGDest.file,path,MAX_PATH,file);
+  GetPrivateProfileString(BG_SECTION, BG_DESTFILE, BGDest.file,path,MAX_PATH,file);
   RandomFile(path,BGDest.file,sizeof(BGDest.file));
 
   //\x82\xBB\x82?\xBC\x93??o\x82\xB5
@@ -1462,9 +1460,17 @@
   strncpy_s(ts.EtermLookfeel.BGSPIPath, sizeof(ts.EtermLookfeel.BGSPIPath), BGSPIPath, _TRUNCATE);
 
   //\x83R\x83\x93\x83t\x83B\x83O\x83t\x83@\x83C\x83\x8B\x82?\x88\x92\xE8
-  GetPrivateProfileString(BG_SECTION,"BGThemeFile","",path,MAX_PATH,ts.SetupFName);
-  strncpy_s(ts.EtermLookfeel.BGThemeFile, sizeof(ts.EtermLookfeel.BGThemeFile), path, _TRUNCATE);
+  if (ts.EtermLookfeel.BGThemeFile[0] == '\0') {
+	  // \x8B\xF3\x82??\x82??A\x83f\x83B\x83X\x83N\x82\xA9\x82\xE7\x93??BBGInitialize()\x82\xAA Tera Term \x8BN\x93\xAE\x8E\x9E\x88?O\x82?\xE0\x81A
+	  // Additional settings \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82邽\x82?B
+	  GetPrivateProfileString(BG_SECTION,"BGThemeFile","",path,MAX_PATH,ts.SetupFName);
+	  strncpy_s(ts.EtermLookfeel.BGThemeFile, sizeof(ts.EtermLookfeel.BGThemeFile), path, _TRUNCATE);
+  }
 
+  // \x94w\x8Ci\x89摜\x82???\x9E\x82\xDD
+  _snprintf_s(path, sizeof(path), _TRUNCATE, "%s\\%s", ts.HomeDir, BG_THEME_IMAGEFILE);
+  GetPrivateProfileString(BG_SECTION, BG_DESTFILE, "", ts.BGImageFilePath, sizeof(ts.BGImageFilePath), path);
+
   if(!BGEnable)
     return;
 

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2012-05-12 16:31:18 UTC (rev 4941)
+++ trunk/teraterm/ttpset/ttset.c	2012-05-13 12:59:07 UTC (rev 4942)
@@ -2378,7 +2378,7 @@
 	WritePrivateProfileString(NULL, NULL, NULL, FName);
 
 	// Eterm lookfeel alphablend (2005.4.24 yutaka)
-#define ETERM_SECTION "BG"
+#define ETERM_SECTION BG_SECTION
 	WriteOnOff(ETERM_SECTION, "BGEnable", FName,
 	           ts->EtermLookfeel.BGEnable);
 	WriteOnOff(ETERM_SECTION, "BGUseAlphaBlendAPI", FName,
@@ -2393,6 +2393,8 @@
 	           ts->EtermLookfeel.BGNoFrame);
 	WritePrivateProfileString(ETERM_SECTION, "BGThemeFile",
 	                          ts->EtermLookfeel.BGThemeFile, FName);
+	_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s\\%s", ts->HomeDir, BG_THEME_IMAGEFILE);
+	WritePrivateProfileString(BG_SECTION, BG_DESTFILE, ts->BGImageFilePath, Temp);
 
 #ifdef USE_NORMAL_BGCOLOR
 	// UseNormalBGColor

From svnnotify ＠ sourceforge.jp  Sun May 13 23:53:23 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 13 May 2012 23:53:23 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4943=5D__Addtitional_settings_?=
 =?utf-8?b?44OA44Kk44Ki44Ot44Kw44GL44KJ44CBMuWbnuebruS7pemZjeOBruiDjA==?=
 =?utf-8?b?5pmv55S75YOP5oyH5a6a44GM5pyf5b6F6YCa44KK44Gr?=
Message-ID: <1336920803.231392.11446.nullmailer@users.sourceforge.jp>

Revision: 4943
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4943
Author:   yutakapon
Date:     2012-05-13 23:53:23 +0900 (Sun, 13 May 2012)
Log Message:
-----------
Addtitional settings ダイアログから、2回目以降の背景画像指定が期待通りに
動作していなかったバグを修正した。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtdisp.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2012-05-13 12:59:07 UTC (rev 4942)
+++ trunk/teraterm/teraterm/vtdisp.c	2012-05-13 14:53:23 UTC (rev 4943)
@@ -1465,12 +1465,12 @@
 	  // Additional settings \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82邽\x82?B
 	  GetPrivateProfileString(BG_SECTION,"BGThemeFile","",path,MAX_PATH,ts.SetupFName);
 	  strncpy_s(ts.EtermLookfeel.BGThemeFile, sizeof(ts.EtermLookfeel.BGThemeFile), path, _TRUNCATE);
+
+	  // \x94w\x8Ci\x89摜\x82???\x9E\x82\xDD
+	  _snprintf_s(path, sizeof(path), _TRUNCATE, "%s\\%s", ts.HomeDir, BG_THEME_IMAGEFILE);
+	  GetPrivateProfileString(BG_SECTION, BG_DESTFILE, "", ts.BGImageFilePath, sizeof(ts.BGImageFilePath), path);
   }
 
-  // \x94w\x8Ci\x89摜\x82???\x9E\x82\xDD
-  _snprintf_s(path, sizeof(path), _TRUNCATE, "%s\\%s", ts.HomeDir, BG_THEME_IMAGEFILE);
-  GetPrivateProfileString(BG_SECTION, BG_DESTFILE, "", ts.BGImageFilePath, sizeof(ts.BGImageFilePath), path);
-
   if(!BGEnable)
     return;
 

From svnnotify ＠ sourceforge.jp  Mon May 14 00:41:52 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 14 May 2012 00:41:52 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDRdICDlho3otbfli5XjgYzlv4XopoE=?=
 =?utf-8?b?44Gq6Kit5a6a6aCF55uu44Gn44Gu5L+d5a2Y44O75YaN6LW35YuV44KS44GX?=
 =?utf-8?b?44Gq44GE44KI44GG44Gr44GX44Gf?=
Message-ID: <1336923712.573586.23480.nullmailer@users.sourceforge.jp>

Revision: 4944
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4944
Author:   maya
Date:     2012-05-14 00:41:52 +0900 (Mon, 14 May 2012)
Log Message:
-----------
再起動が必要な設定項目での保存・再起動をしないようにした

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/installer/release/lang/English.lng	2012-05-13 15:41:52 UTC (rev 4944)
@@ -196,7 +196,7 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
 DLG_TAB_VISUAL_ALHPA=&Alpha blend
-DLG_TAB_VISUAL_ETERM=&Eterm lookfeel
+DLG_TAB_VISUAL_ETERM=&Eterm lookfeel(*)
 DLG_TAB_VISUAL_MOUSE=&Mouse cursor
 DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
 DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
@@ -212,6 +212,7 @@
 DLG_TAB_VISUAL_URL=Enable &URL attribute color
 DLG_TAB_VISUAL_ANSI=Enable A&NSI color
 DLG_TAB_VISUAL_URLUL=Un&derline URL string
+DLG_TAB_VISUAL_RESTART=(*)Need to Save setup and restart Tera Term
 
 DLG_TAB_LOG_EDITOR=View log &editor
 DLG_TAB_LOG_FILENAME=Default log &file name(strftime format)

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/installer/release/lang/French.lng	2012-05-13 15:41:52 UTC (rev 4944)
@@ -196,7 +196,7 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
 DLG_TAB_VISUAL_ALHPA=M\xE9lange alpha
-DLG_TAB_VISUAL_ETERM=Apparence Eterm
+DLG_TAB_VISUAL_ETERM=Apparence Eterm(*)
 DLG_TAB_VISUAL_MOUSE=Curseur de la souris
 DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
 DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
@@ -212,6 +212,7 @@
 DLG_TAB_VISUAL_URL=Aut. attribut couleur URL
 DLG_TAB_VISUAL_ANSI=Aut. couleur ANSI
 DLG_TAB_VISUAL_URLUL=Souligner les URL
+DLG_TAB_VISUAL_RESTART=(*)Need to Save setup and restart Tera Term
 
 DLG_TAB_LOG_EDITOR=Prog affich journal
 DLG_TAB_LOG_FILENAME=Nom par d\xE9faut du fichier journal (format strftime)

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/installer/release/lang/German.lng	2012-05-13 15:41:52 UTC (rev 4944)
@@ -196,7 +196,7 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
 DLG_TAB_VISUAL_ALHPA=&Transparenz
-DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen
+DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen(*)
 DLG_TAB_VISUAL_MOUSE=&Mauszeiger
 DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
 DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
@@ -212,6 +212,7 @@
 DLG_TAB_VISUAL_URL=Enable &URL attribute color
 DLG_TAB_VISUAL_ANSI=A&NSI-Farben aktivieren
 DLG_TAB_VISUAL_URLUL=&URLs unterstreichen
+DLG_TAB_VISUAL_RESTART=(*)Need to Save setup and restart Tera Term
 
 DLG_TAB_LOG_EDITOR=&Auswahl-Editor
 DLG_TAB_LOG_FILENAME=&Standardprotokoll-Name

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/installer/release/lang/Japanese.lng	2012-05-13 15:41:52 UTC (rev 4944)
@@ -196,7 +196,7 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=\x83~\x83\x8A\x95b
 
 DLG_TAB_VISUAL_ALHPA=\x94\xBC\x93\xA7\x96\xBE\x93x(&A)
-DLG_TAB_VISUAL_ETERM=&Eterm\x95\x97\x82?\xB7\x82\xE9
+DLG_TAB_VISUAL_ETERM=&Eterm\x95\x97\x82?\xB7\x82\xE9(*)
 DLG_TAB_VISUAL_MOUSE=\x83}\x83E\x83X\x83J\x81[\x83\\x83\x8B(&M)
 DLG_TAB_VISUAL_FONT_QUALITY=\x83t\x83H\x83\x93\x83g\x82?i\x8E\xBF(&F)
 DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=\x83f\x83t\x83H\x83\x8B\x83g
@@ -212,6 +212,7 @@
 DLG_TAB_VISUAL_URL=URL\x91\xAE\x90\xAB\x90F\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9(&U)
 DLG_TAB_VISUAL_ANSI=ANSI\x83J\x83\x89\x81[\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9(&N)
 DLG_TAB_VISUAL_URLUL=URL\x95\xB6\x8E\x9A\x97\xF1\x82?\xBA\x90\xFC\x82\xF0\x95t\x89\xC1\x82\xB7\x82\xE9(&D)
+DLG_TAB_VISUAL_RESTART=(*)\x90?\xE8\x82??\xB6\x82\xC6Tera Term\x82?ċN\x93\xAE\x82\xAA\x95K\x97v
 
 DLG_TAB_LOG_EDITOR=\x83\x8D\x83O\x95\\x8E\xA6\x97p\x83G\x83f\x83B\x83^(&E)
 DLG_TAB_LOG_FILENAME=\x95W\x8F\x80\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC(strftime\x83t\x83H\x81[\x83}\x83b\x83g\x89\xC2) (&F)

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/teraterm/common/tt_res.h	2012-05-13 15:41:52 UTC (rev 4944)
@@ -38,6 +38,7 @@
 #define IDC_COLOR_BLUE                  1015
 #define IDC_SAMPLE_COLOR                1016
 #define IDC_COMMAND_EDIT                1017
+#define IDC_RESTART                     1017
 #define IDC_ENTERKEY_CHECK              1018
 #define IDC_RADIO_CRLF                  1019
 #define IDC_RADIO_CR                    1020

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/teraterm/teraterm/addsetting.cpp	2012-05-13 15:41:52 UTC (rev 4944)
@@ -773,6 +773,7 @@
 		SendDlgItemMessage(IDC_BGIMG_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_BGIMG_EDIT, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_BGIMG_BUTTON, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_RESTART, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgVisualFont = NULL;
@@ -817,6 +818,9 @@
 	GetDlgItemText(IDC_URL_UNDERLINE, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_VISUAL_URLUL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_URL_UNDERLINE, ts.UIMsg);
+	GetDlgItemText(IDC_RESTART, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_VISUAL_RESTART", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_RESTART, ts.UIMsg);
 
 	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT", ts.UIMsg, sizeof(ts.UIMsg), "Default", ts.UILanguageFile);
 	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
@@ -1166,7 +1170,7 @@
 
 	if (flag_changed) {
 		// re-launch
-		RestartTeraTerm(GetSafeHwnd(), &ts);
+		// RestartTeraTerm(GetSafeHwnd(), &ts);
 	}
 }
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2012-05-13 14:53:23 UTC (rev 4943)
+++ trunk/teraterm/teraterm/ttermpro.rc	2012-05-13 15:41:52 UTC (rev 4944)
@@ -114,33 +114,34 @@
 BEGIN
     LTEXT           "&Alpha blend",IDC_ALPHABLEND,10,10,43,8
     EDITTEXT        IDC_ALPHA_BLEND,58,8,28,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,8,72,12
-    LTEXT           "&Mouse cursor",IDC_MOUSE,10,26,70,8
-    LISTBOX         IDC_MOUSE_CURSOR,10,36,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Font Quality",IDC_FONT_QUALITY_LABEL,100,51,70,8
-    COMBOBOX        IDC_FONT_QUALITY,100,61,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "ANSI color",IDC_ANSICOLOR,10,78,43,8
-    LISTBOX         IDC_ANSI_COLOR,10,88,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Red",IDC_RED,45,91,22,8
-    EDITTEXT        IDC_COLOR_RED,69,89,15,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "&Green",IDC_GREEN,45,108,22,8
-    EDITTEXT        IDC_COLOR_GREEN,69,106,15,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "&Blue",IDC_BLUE,45,125,22,8
-    EDITTEXT        IDC_COLOR_BLUE,69,123,15,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "SAMPLE",IDC_SAMPLE_COLOR,90,108,25,8
+    CONTROL         "&Eterm lookfeel(*)",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,8,72,12
+    LTEXT           "&Mouse cursor",IDC_MOUSE,10,22,70,8
+    LISTBOX         IDC_MOUSE_CURSOR,10,32,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Background Image",IDC_BGIMG_LABEL,100,22,60,8
+    EDITTEXT        IDC_BGIMG_EDIT,98,31,108,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_BGIMG_BUTTON,213,31,14,14
+    LTEXT           "&Font Quality",IDC_FONT_QUALITY_LABEL,100,47,70,8
+    COMBOBOX        IDC_FONT_QUALITY,100,56,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "ANSI color",IDC_ANSICOLOR,10,74,43,8
+    LISTBOX         IDC_ANSI_COLOR,10,84,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "&Red",IDC_RED,45,87,22,8
+    EDITTEXT        IDC_COLOR_RED,69,85,15,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "&Green",IDC_GREEN,45,104,22,8
+    EDITTEXT        IDC_COLOR_GREEN,69,102,15,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "&Blue",IDC_BLUE,45,121,22,8
+    EDITTEXT        IDC_COLOR_BLUE,69,119,15,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "SAMPLE",IDC_SAMPLE_COLOR,90,104,25,8
     CONTROL         "Enable B&old attribute color",IDC_ENABLE_ATTR_COLOR_BOLD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,105,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,74,105,12
     CONTROL         "Enable B&link attribute color",IDC_ENABLE_ATTR_COLOR_BLINK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,105,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,86,105,12
     CONTROL         "Enable Re&verse attribute color",IDC_ENABLE_ATTR_COLOR_REVERSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,102,105,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,98,105,12
     CONTROL         "Enable &URL attribute color",IDC_ENABLE_URL_COLOR,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,105,12
-    CONTROL         "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,105,12
-    CONTROL         "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,138,105,12
-    LTEXT           "Background Image",IDC_BGIMG_LABEL,100,22,60,8
-    EDITTEXT        IDC_BGIMG_EDIT,98,31,108,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_BGIMG_BUTTON,213,30,14,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,110,105,12
+    CONTROL         "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,122,105,12
+    CONTROL         "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,134,105,12
+    LTEXT           "(*)Need to Save setup and restart Tera Term",IDC_RESTART,5,147,231,8
 END
 
 IDD_TABSHEET_LOG DIALOGEX 0, 0, 242, 158

From svnnotify ＠ sourceforge.jp  Mon May 14 00:47:17 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 14 May 2012 00:47:17 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4945=5D__Eterm_look-feel=E3=82=92_of?=
 =?utf-8?b?ZiDjgavjgZfjgZ/loLTlkIjjgIHog4zmma/nlLvlg4/jga7jg4bjgq3jgrk=?=
 =?utf-8?b?44OI44Oc44OD44Kv44K544KS44Kv44Oq44Ki44GZ44KL44KI44GG44Gr44GX?=
 =?utf-8?b?44Gf44CC?=
Message-ID: <1336924037.585074.1899.nullmailer@users.sourceforge.jp>

Revision: 4945
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4945
Author:   yutakapon
Date:     2012-05-14 00:47:17 +0900 (Mon, 14 May 2012)
Log Message:
-----------
Eterm look-feelを off にした場合、背景画像のテキストボックスをクリアするようにした。
BGDestFile もデフォルトに戻す。
cf. [Ttssh2-devel 2128]

Modified Paths:
--------------
    trunk/teraterm/teraterm/addsetting.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2012-05-13 15:41:52 UTC (rev 4944)
+++ trunk/teraterm/teraterm/addsetting.cpp	2012-05-13 15:47:17 UTC (rev 4945)
@@ -939,6 +939,8 @@
 				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
 				// \x96\xB3\x8C\x{27B0B3}\x82?\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82??\xB7\x81B
 				strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
+				// \x94w\x8Ci\x89摜\x82\xE0\x96\xB3\x8C\x{27B0B7}\x82\xE9\x81B
+				SetDlgItemText(IDC_BGIMG_EDIT, "");
 			}
 			return TRUE;
 
@@ -1075,6 +1077,8 @@
 
 	if (ts.EtermLookfeel.BGEnable) {
 		GetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath, sizeof(ts.BGImageFilePath));
+	} else {
+		strncpy_s(ts.BGImageFilePath, sizeof(ts.BGImageFilePath), "%SystemRoot%\\Web\\Wallpaper\\*.bmp", _TRUNCATE);
 	}
 
 	// (3)

From svnnotify ＠ sourceforge.jp  Mon May 14 01:01:13 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 14 May 2012 01:01:13 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDZdICBFdGVybSBsb29rLWZlZWwg44GM?=
 =?utf-8?b?54Sh5Yq55YyW44Gn44GN44Gq44GE44GT44Go44GM44GC44KL44OQ44Kw44KS?=
 =?utf-8?b?5L+u5q2j44GX44Gf44CC?=
Message-ID: <1336924873.023852.30763.nullmailer@users.sourceforge.jp>

Revision: 4946
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4946
Author:   yutakapon
Date:     2012-05-14 01:01:12 +0900 (Mon, 14 May 2012)
Log Message:
-----------
Eterm look-feel が無効化できないことがあるバグを修正した。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtdisp.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2012-05-13 15:47:17 UTC (rev 4945)
+++ trunk/teraterm/teraterm/vtdisp.c	2012-05-13 16:01:12 UTC (rev 4946)
@@ -1450,19 +1450,19 @@
   BGDestruct();
 
   //BG \x82\xAA\x97L\x8C\xF8\x82\xA9\x83`\x83F\x83b\x83N
-  ts.EtermLookfeel.BGEnable = BGEnable = BGGetOnOff("BGEnable",FALSE,ts.SetupFName);
-  ts.EtermLookfeel.BGUseAlphaBlendAPI = BGGetOnOff("BGUseAlphaBlendAPI",TRUE ,ts.SetupFName);
-  ts.EtermLookfeel.BGNoFrame = BGGetOnOff("BGNoFrame"         ,FALSE,ts.SetupFName);
-  ts.EtermLookfeel.BGFastSizeMove = BGGetOnOff("BGFastSizeMove"    ,TRUE ,ts.SetupFName);
-  ts.EtermLookfeel.BGNoCopyBits = BGGetOnOff("BGFlickerlessMove" ,TRUE ,ts.SetupFName);
+  // \x8B\xF3\x82??\x82??A\x83f\x83B\x83X\x83N\x82\xA9\x82\xE7\x93??BBGInitialize()\x82\xAA Tera Term \x8BN\x93\xAE\x8E\x9E\x88?O\x82?\xE0\x81A
+  // Additional settings \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82邽\x82?B
+  if (ts.EtermLookfeel.BGThemeFile[0] == '\0') {
+	  ts.EtermLookfeel.BGEnable = BGEnable = BGGetOnOff("BGEnable",FALSE,ts.SetupFName);
+	  ts.EtermLookfeel.BGUseAlphaBlendAPI = BGGetOnOff("BGUseAlphaBlendAPI",TRUE ,ts.SetupFName);
+	  ts.EtermLookfeel.BGNoFrame = BGGetOnOff("BGNoFrame"         ,FALSE,ts.SetupFName);
+	  ts.EtermLookfeel.BGFastSizeMove = BGGetOnOff("BGFastSizeMove"    ,TRUE ,ts.SetupFName);
+	  ts.EtermLookfeel.BGNoCopyBits = BGGetOnOff("BGFlickerlessMove" ,TRUE ,ts.SetupFName);
 
-  GetPrivateProfileString(BG_SECTION,"BGSPIPath","plugin",BGSPIPath,MAX_PATH,ts.SetupFName);
-  strncpy_s(ts.EtermLookfeel.BGSPIPath, sizeof(ts.EtermLookfeel.BGSPIPath), BGSPIPath, _TRUNCATE);
+	  GetPrivateProfileString(BG_SECTION,"BGSPIPath","plugin",BGSPIPath,MAX_PATH,ts.SetupFName);
+	  strncpy_s(ts.EtermLookfeel.BGSPIPath, sizeof(ts.EtermLookfeel.BGSPIPath), BGSPIPath, _TRUNCATE);
 
-  //\x83R\x83\x93\x83t\x83B\x83O\x83t\x83@\x83C\x83\x8B\x82?\x88\x92\xE8
-  if (ts.EtermLookfeel.BGThemeFile[0] == '\0') {
-	  // \x8B\xF3\x82??\x82??A\x83f\x83B\x83X\x83N\x82\xA9\x82\xE7\x93??BBGInitialize()\x82\xAA Tera Term \x8BN\x93\xAE\x8E\x9E\x88?O\x82?\xE0\x81A
-	  // Additional settings \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82邽\x82?B
+	  //\x83R\x83\x93\x83t\x83B\x83O\x83t\x83@\x83C\x83\x8B\x82?\x88\x92\xE8
 	  GetPrivateProfileString(BG_SECTION,"BGThemeFile","",path,MAX_PATH,ts.SetupFName);
 	  strncpy_s(ts.EtermLookfeel.BGThemeFile, sizeof(ts.EtermLookfeel.BGThemeFile), path, _TRUNCATE);
 

From svnnotify ＠ sourceforge.jp  Mon May 14 19:33:37 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 14 May 2012 19:33:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDddICDkvZnliIbjgaogOyAg44KS5YmK?=
 =?utf-8?b?6Zmk44CC?=
Message-ID: <1336991617.666323.22518.nullmailer@users.sourceforge.jp>

Revision: 4947
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4947
Author:   doda
Date:     2012-05-14 19:33:37 +0900 (Mon, 14 May 2012)
Log Message:
-----------
余分な ; を削除。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-13 16:01:12 UTC (rev 4946)
+++ trunk/doc/en/html/about/history.html	2012-05-14 10:33:37 UTC (rev 4947)
@@ -73,6 +73,7 @@
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
       <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
+      <!-- li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li -->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-13 16:01:12 UTC (rev 4946)
+++ trunk/doc/ja/html/about/history.html	2012-05-14 10:33:37 UTC (rev 4947)
@@ -73,6 +73,7 @@
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
+      <li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2012-05-13 16:01:12 UTC (rev 4946)
+++ trunk/teraterm/teraterm/vtterm.c	2012-05-14 10:33:37 UTC (rev 4947)
@@ -2107,7 +2107,7 @@
 	break;
       case 18: /* get terminal size */
 	if (ts.WindowFlag & WF_WINDOWREPORT) {
-	  len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "8;%u;%u;t", CLocale,
+	  len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "8;%u;%ut", CLocale,
 	                      NumOfLines-StatusLine, NumOfColumns);
 	  SendCSIstr(Report, len);
 	}

From svnnotify ＠ sourceforge.jp  Tue May 15 22:16:02 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 15 May 2012 22:16:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDhdICDoi7HoqLM=?=
Message-ID: <1337087762.475800.25326.nullmailer@users.sourceforge.jp>

Revision: 4948
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4948
Author:   yutakapon
Date:     2012-05-15 22:16:01 +0900 (Tue, 15 May 2012)
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	2012-05-14 10:33:37 UTC (rev 4947)
+++ trunk/doc/en/html/about/history.html	2012-05-15 13:16:01 UTC (rev 4948)
@@ -73,7 +73,7 @@
       <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
       <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
       <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
-      <!-- li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li -->
+      <li>Removed an extra semicolon(;) included in the window size requesting.</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Wed May 16 23:59:12 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 16 May 2012 23:59:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NDldICDlpInmm7TlsaXmrbTjgpLmlbQ=?=
 =?utf-8?b?55CG?=
Message-ID: <1337180352.414307.873.nullmailer@users.sourceforge.jp>

Revision: 4949
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4949
Author:   maya
Date:     2012-05-16 23:59:12 +0900 (Wed, 16 May 2012)
Log Message:
-----------
変更履歴を整理

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	2012-05-15 13:16:01 UTC (rev 4948)
+++ trunk/doc/en/html/about/history.html	2012-05-16 14:59:12 UTC (rev 4949)
@@ -45,7 +45,7 @@
         <ul>
           <li>added support for the named pipe. Tera Term can <a href="../usage/tips/namedpipe.html">connect the serial port of the VMware and Hyper-V</a>.</li>
           <li>A named pipe can be specified into the TCP/IP:Host entry of <a href="../menu/file-new.html">New connection dialog</a>.</li>
-          <li>added the <a href="../commandline/teraterm.html#NAMEDPIPE">/NAMEDPIPE</a> option by specifying the named pipe.</li>
+          <li>added the <a href="../commandline/teraterm.html#namedpipe">/NAMEDPIPE</a> option by specifying the named pipe.</li>
         </ul></li>
       <li>added the AUTO entry in the <a href="../menu/setup-terminal.html#CRReceive">New-line(receive)</a>. Special thanks to tentner.</li>
       <li>added the selection of the font quality.
@@ -60,8 +60,12 @@
         <ul>
           <li>Environment variable strings(%variableName%) can be included in the ini file path.</li>
           <li>added an image file specified configuration(theme\ImageFile.INI). Also, a background image file can be specified on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
-          <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.  Also, a user will be confirmed whether Tera Term is be relaunched.</li>
+          <li>Enabled the "Eterm lookfeel" checkbox on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
         </ul></li>
+      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
+      <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
+      <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
+      <li>Removed an extra semicolon(;) included in the window size requesting.</li>
       <li>Macro
         <ul>
           <li>added the "paramcnt"(argument count) and "param1"(macro filename) in the <a href="../macro/syntax/variables.html">Variables</a>.</li>
@@ -70,10 +74,6 @@
           <li>added the <a href="../macro/command/fileunlock.html">fileunlock</a> command.</li>
           <li>added the third argument _timezone_ at the <a href="../macro/command/gettime.html">gettime</a> and <a href="../macro/command/getdate.html">getdate</a> command.</li>
         </ul></li>
-      <li>added the LanguageUI entry on the <a href="..\menu\setup-general.html">General setup dialog</a>.</li>
-      <li>A message dialog is shown when the cygterm.cfg has been saved on the Cygwin tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
-      <li>added support for IME feedback back and forth function. The ATOK2012, MS-IME2002 and MS-IME2003 work well. Also, this feature is disabled with "IME=off"(teraterm.ini).</li>
-      <li>Removed an extra semicolon(;) included in the window size requesting.</li>
     </ul>
   </li>
 
@@ -84,8 +84,8 @@
           <li>The initial parameters of the KERMIT server do not be checked well.</li>
         </ul></li>
       <li>The drop down list's items are not shown on Windows 2000 or earlier.</li>
-      <li>A string array can not be recognized as the argument of the macro command. cf.<a href="http://logmett.com/forum/viewtopic.php?f=3&t=1970">Using String Array with sendln</a></li>
-      <li>Fixed a typo of the Cyrillic letter translation table(range of KOI8-R, CP866, Windows-1251 and ISO8859-5).</li>
+      <li>Fixed a typo of the Cyrillic letter translation table(range of CP866 and ISO8859-5).</li>
+      <li>A string array can not be recognized as the argument of the macro command.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-15 13:16:01 UTC (rev 4948)
+++ trunk/doc/ja/html/about/history.html	2012-05-16 14:59:12 UTC (rev 4949)
@@ -45,7 +45,7 @@
         <ul>
           <li>\x96\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82\xBD\x81BTera Term\x82\xA9\x82\xE7<a href="../usage/tips/namedpipe.html">VMware\x82\xE2Hyper-V\x82?V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90?\xB1\x82\xAA\x89?\</a>\x82??\xE9\x81B</li>
           <li><a href="../menu/file-new.html">New connection\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCTCP/IP:Host\x82?\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-          <li><a href="../commandline/teraterm.html#NAMEDPIPE">/NAMEDPIPE</a> \x83I\x83v\x83V\x83\x87\x83\x93\x82Ŗ\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+          <li><a href="../commandline/teraterm.html#namedpipe">/NAMEDPIPE</a> \x83I\x83v\x83V\x83\x87\x83\x93\x82Ŗ\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li><a href="../menu/setup-terminal.html#CRReceive">\x8E\xF3\x90M\x89\xFC\x8Ds\x83\x82\x81[\x83h</a>\x82\xC9AUTO\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81Btentner\x8E\x81\x82?\xB4\x8E?\xB5\x82?\xB7\x81B</li>
       <li>\x95\\x8E\xA6\x83t\x83H\x83\x93\x83g\x82?i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
@@ -60,8 +60,12 @@
         <ul>
           <li>ini\x83t\x83@\x83C\x83\x8B\x83p\x83X\x82??\xAB\x95?\x94\x95\xB6\x8E\x9A\x97\xF1(%variableName%)\x82\xF0\x8A??\xE7\x82\xEA\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
           <li>\x89摜\x83t\x83@\x83C\x83\x8B\x8Ew\x92\xE8\x90?\xE8(theme\ImageFile.INI)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B<a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x94w\x8Ci\x89摜\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-          <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B\x90?\xE8\x95ύX\x8C\xE3\x81A\x8DċN\x93\xAE\x82\xB7\x82?\x82\xF0\x96?\x8D\x87\x82?\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+          <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŁA\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
         </ul></li>
+      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
+      <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
+      <li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li>
       <li>\x83}\x83N\x83\x8D
         <ul>
           <li><a href="../macro/syntax/variables.html">\x95?\x94</a>\x82\xC9"paramcnt"\x81i\x88\xF8\x90\x94\x82??\x94\x81j\x81A"param1"\x81i\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x96\xBC\x81j\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
@@ -70,10 +74,6 @@
           <li><a href="../macro/command/fileunlock.html">fileunlock</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
           <li><a href="../macro/command/gettime.html">gettime</a>, <a href="../macro/command/getdate.html">getdate</a>\x83R\x83}\x83\x93\x83h\x82?\xE63\x88\xF8\x90\x94\x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
-      <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
-      <li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 
@@ -84,8 +84,8 @@
           <li>\x83T\x81[\x83o\x82?\x89\x8A\xFA\x83p\x83\x89\x83\x81\x81[\x83^\x82?\x84\x8D\x86\x83`\x83F\x83b\x83N\x83o\x83O\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
         </ul></li>
       <li>Windows 2000 \x88?O\x82ŁA\x83h\x83\x8D\x83b\x83v\x83_\x83E\x83\x93\x83\x8A\x83X\x83g\x82?I\x91\xF0\x8E\x88\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82?\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
-      <li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82?\xF8\x90\x94\x82?\xB6\x8E\x9A\x8C^\x94z\x97?w\x92\xE8\x82ł\xAB\x82?\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81Bcf.<a href="http://logmett.com/forum/viewtopic.php?f=3&t=1970">Using String Array with sendln</a></li>
-      <li>\x83L\x83\x8A\x83\x8B\x95\xB6\x8E\x9A\x82?ϊ\xB7\x83e\x81[\x83u\x83\x8B(KOI8-R, CP866, Windows-1251, ISO8859-5 \x8A\xD4)\x82\xCCtypo\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83L\x83\x8A\x83\x8B\x95\xB6\x8E\x9A\x82?ϊ\xB7\x83e\x81[\x83u\x83\x8B(CP866, ISO8859-5 \x8A\xD4)\x82\xCCtypo\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82?\xF8\x90\x94\x82?\xB6\x8E\x9A\x8C^\x94z\x97?w\x92\xE8\x82ł\xAB\x82?\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Wed May 16 23:59:41 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 16 May 2012 23:59:41 +0900
Subject: [Ttssh2-commit] [4950]
Message-ID: <1337180381.264486.995.nullmailer@users.sourceforge.jp>

Revision: 4950
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4950
Author:   maya
Date:     2012-05-16 23:59:41 +0900 (Wed, 16 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/ja/html/menu/setup-general.html

-------------- next part --------------
Modified: trunk/doc/ja/html/menu/setup-general.html
===================================================================
--- trunk/doc/ja/html/menu/setup-general.html	2012-05-16 14:59:12 UTC (rev 4949)
+++ trunk/doc/ja/html/menu/setup-general.html	2012-05-16 14:59:41 UTC (rev 4950)
@@ -28,7 +28,7 @@
       <dd>
 	\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B(lang\*.lng)\x82?w\x92\xE8\x82?\xE6\x82\xE8\x81A\x83\x81\x83j\x83\x85\x81[\x82?\x83b\x83Z\x81[\x83W\x82?\xBE\x8C\xEA\x82\xF0\x90?\xE8\x91?\xA6\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
 	<A HREF="../setup/lng.html">\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B</A>\x82\xE0\x8EQ\x8F??\xB1\x82?B
-	\x93\xFA\x96{\x8C\xEA\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邽\x82??\xCD Japanese.lng \x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x93\xFA\x96{\x8C?\x83j\x83\x85\x81[\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邽\x82??\xCD Japanese.lng \x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
       </dd>
     </dl>
   </body>

From svnnotify ＠ sourceforge.jp  Fri May 18 22:45:47 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 18 May 2012 22:45:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NTFdICDjgr/jgqTjg6Djgr7jg7zjg7M=?=
 =?utf-8?b?44KS5oyH5a6a44GX44Gq44GE5aC05ZCI44CB44Ot44O844Kr44Or44K/44Kk?=
 =?utf-8?b?44Og44Gr44Gq44KL44GT44Go44KS5piO6KiY44GX44Gf44CC?=
Message-ID: <1337348747.794853.11903.nullmailer@users.sourceforge.jp>

Revision: 4951
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4951
Author:   yutakapon
Date:     2012-05-18 22:45:47 +0900 (Fri, 18 May 2012)
Log Message:
-----------
タイムゾーンを指定しない場合、ローカルタイムになることを明記した。

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/getdate.html
    trunk/doc/en/html/macro/command/gettime.html
    trunk/doc/ja/html/macro/command/getdate.html
    trunk/doc/ja/html/macro/command/gettime.html

-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/getdate.html
===================================================================
--- trunk/doc/en/html/macro/command/getdate.html	2012-05-16 14:59:41 UTC (rev 4950)
+++ trunk/doc/en/html/macro/command/getdate.html	2012-05-18 13:45:47 UTC (rev 4951)
@@ -30,7 +30,9 @@
 
 <p>
 The behavior of the getdate command specified with the format equals the gettime command specified with the same format.<br>
-When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.</p>
+When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.
+When the &lt;timezone&gt; argument is not specified, the timestamp is treated as the localtime.
+</p>
 
 <p>
 This command returns one of the following values in the system variable "result":

Modified: trunk/doc/en/html/macro/command/gettime.html
===================================================================
--- trunk/doc/en/html/macro/command/gettime.html	2012-05-16 14:59:41 UTC (rev 4950)
+++ trunk/doc/en/html/macro/command/gettime.html	2012-05-18 13:45:47 UTC (rev 4951)
@@ -30,7 +30,9 @@
 
 <p>
 The behavior of the gettime command specified with the format equals the getdate command specified with the same format.<br>
-When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.</p>
+When the &lt;timezone&gt; argument is specified as a timezone string, the timestamp is generated by using the timezone.
+When the &lt;timezone&gt; argument is not specified, the timestamp is treated as the localtime.
+</p>
 
 <p>
 This command returns one of the following values in the system variable "result":

Modified: trunk/doc/ja/html/macro/command/getdate.html
===================================================================
--- trunk/doc/ja/html/macro/command/getdate.html	2012-05-16 14:59:41 UTC (rev 4950)
+++ trunk/doc/ja/html/macro/command/getdate.html	2012-05-18 13:45:47 UTC (rev 4951)
@@ -31,6 +31,7 @@
 <p>
 format\x82\xAA\x8Ew\x92?\x82?getdate\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?gettime\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B<br>
 &lt;timezone&gt \x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x95\\x82\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8Ew\x92?\x82\xE9\x82?A\x83^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x89\xC1\x96\xA1\x82\xB5\x82\xBD\x93\xFA\x95t\x8Cv\x8EZ\x82\xAA\x8Ds\x82\xED\x82\xEA\x82\xE9\x81B
+&lt;timezone&gt; \x82\xF0\x8Ew\x92?\x82?\xA2\x8F?\x82?\x8D\x81[\x83J\x83\x8B\x83^\x83C\x83\x80\x82??\xE9\x81B
 </p>
 
 <p>

Modified: trunk/doc/ja/html/macro/command/gettime.html
===================================================================
--- trunk/doc/ja/html/macro/command/gettime.html	2012-05-16 14:59:41 UTC (rev 4950)
+++ trunk/doc/ja/html/macro/command/gettime.html	2012-05-18 13:45:47 UTC (rev 4951)
@@ -31,6 +31,7 @@
 <p>
 format\x82\xAA\x8Ew\x92?\x82?gettime\x82?A\x93\xAF\x82\xB6format\x82\xAA\x8Ew\x92?\x82?getdate\x82?\xAE\x8D?\x93\x99\x82\xB5\x82\xAD\x82?\xE9\x81B<br>
 &lt;timezone&gt; \x82?^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x95\\x82\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8Ew\x92?\x82\xE9\x82?A\x83^\x83C\x83\x80\x83]\x81[\x83\x93\x82\xF0\x89\xC1\x96\xA1\x82\xB5\x82\xBD\x93\xFA\x95t\x8Cv\x8EZ\x82\xAA\x8Ds\x82\xED\x82\xEA\x82\xE9\x81B
+&lt;timezone&gt; \x82\xF0\x8Ew\x92?\x82?\xA2\x8F?\x82?\x8D\x81[\x83J\x83\x8B\x83^\x83C\x83\x80\x82??\xE9\x81B
 </p>
 
 <p>

From svnnotify ＠ sourceforge.jp  Mon May 21 23:51:28 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 21 May 2012 23:51:28 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NTJdICBzdHJyZXBsYWNlIOOCs+ODng==?=
 =?utf-8?b?44Oz44OJ44Gu6L+U44KK5YCk44Gr6Zai44GZ44KL6KiY6LyJ44GM5ryP44KM?=
 =?utf-8?b?44Gm44GE44Gf44Gu44Gn44CB6L+95Yqg44GX44Gf44CC?=
Message-ID: <1337611888.123090.4987.nullmailer@users.sourceforge.jp>

Revision: 4952
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4952
Author:   yutakapon
Date:     2012-05-21 23:51:27 +0900 (Mon, 21 May 2012)
Log Message:
-----------
strreplace コマンドの返り値に関する記載が漏れていたので、追加した。
ついでに、matchstr 変数のことも。

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/strreplace.html
    trunk/doc/ja/html/macro/command/strreplace.html

-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/strreplace.html
===================================================================
--- trunk/doc/en/html/macro/command/strreplace.html	2012-05-18 13:45:47 UTC (rev 4951)
+++ trunk/doc/en/html/macro/command/strreplace.html	2012-05-21 14:51:27 UTC (rev 4952)
@@ -30,6 +30,11 @@
 If the &lt;newstr&gt; is ''(empty), the &lt;regex&gt; string is removed from &lt;strvar&gt;.
 </p>
 
+<p>
+When the replacing succeeds, the result variable is 1 and the matched string by the &lt;regex&gt; is stored into the matchstr variable. <br>
+When the replacing fails, the result variable is 0.
+</p>
+
 <h2>Example</h2>
 
 <pre class="macro-example">

Modified: trunk/doc/ja/html/macro/command/strreplace.html
===================================================================
--- trunk/doc/ja/html/macro/command/strreplace.html	2012-05-18 13:45:47 UTC (rev 4951)
+++ trunk/doc/ja/html/macro/command/strreplace.html	2012-05-21 14:51:27 UTC (rev 4952)
@@ -30,6 +30,11 @@
 &lt;newstr&gt; \x82\xAA ""(\x8B?\x9A\x97\xF1) \x82??\x81A&lt;strvar&gt; \x92\x86\x82\xCC &lt;regex&gt; \x82??\x82\xB3\x82\xEA\x82\xE9\x81B
 </p>
 
+<p>
+\x92u\x8A\xB7\x82\xAA\x90\xAC\x8C\x{1C2DC2}\xE9\x82?Aresult \x95?\x94\x82\xC9"1"\x82\xAA\x93\xFC\x82\xE8\x81A\x90\xB3\x8BK\x95\\x8C\xBB &lt;regex&gt; \x82Ń}\x83b\x83`\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xCD matchstr \x95?\x94\x82?i\x94[\x82\xB3\x82\xEA\x82\xE9\x81B<br>
+\x92u\x8A\xB7\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8F?\x82?Aresult \x95?\x94\x82\xAA"0"\x82??\xE9\x81B<br>
+</p>
+
 <h2>\x97\xE1</h2>
 
 <pre class="macro-example">

From svnnotify ＠ sourceforge.jp  Wed May 23 00:55:31 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 May 2012 00:55:31 +0900
Subject: [Ttssh2-commit] [4953] Eterm look-feel:
Message-ID: <1337702131.533603.3122.nullmailer@users.sourceforge.jp>

Revision: 4953
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4953
Author:   yutakapon
Date:     2012-05-23 00:55:30 +0900 (Wed, 23 May 2012)
Log Message:
-----------
Eterm look-feel:
未接続から新規接続を行うと、背景画像が真っ黒になってしまう問題を修正した。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtdisp.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2012-05-21 14:51:27 UTC (rev 4952)
+++ trunk/teraterm/teraterm/vtdisp.c	2012-05-22 15:55:30 UTC (rev 4953)
@@ -1454,6 +1454,10 @@
   // Additional settings \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82邽\x82?B
   if (ts.EtermLookfeel.BGThemeFile[0] == '\0') {
 	  ts.EtermLookfeel.BGEnable = BGEnable = BGGetOnOff("BGEnable",FALSE,ts.SetupFName);
+  } else {
+	  BGEnable = BGGetOnOff("BGEnable",FALSE,ts.SetupFName);
+  }
+
 	  ts.EtermLookfeel.BGUseAlphaBlendAPI = BGGetOnOff("BGUseAlphaBlendAPI",TRUE ,ts.SetupFName);
 	  ts.EtermLookfeel.BGNoFrame = BGGetOnOff("BGNoFrame"         ,FALSE,ts.SetupFName);
 	  ts.EtermLookfeel.BGFastSizeMove = BGGetOnOff("BGFastSizeMove"    ,TRUE ,ts.SetupFName);
@@ -1462,6 +1466,7 @@
 	  GetPrivateProfileString(BG_SECTION,"BGSPIPath","plugin",BGSPIPath,MAX_PATH,ts.SetupFName);
 	  strncpy_s(ts.EtermLookfeel.BGSPIPath, sizeof(ts.EtermLookfeel.BGSPIPath), BGSPIPath, _TRUNCATE);
 
+  if (ts.EtermLookfeel.BGThemeFile[0] == '\0') {
 	  //\x83R\x83\x93\x83t\x83B\x83O\x83t\x83@\x83C\x83\x8B\x82?\x88\x92\xE8
 	  GetPrivateProfileString(BG_SECTION,"BGThemeFile","",path,MAX_PATH,ts.SetupFName);
 	  strncpy_s(ts.EtermLookfeel.BGThemeFile, sizeof(ts.EtermLookfeel.BGThemeFile), path, _TRUNCATE);
@@ -1469,7 +1474,7 @@
 	  // \x94w\x8Ci\x89摜\x82???\x9E\x82\xDD
 	  _snprintf_s(path, sizeof(path), _TRUNCATE, "%s\\%s", ts.HomeDir, BG_THEME_IMAGEFILE);
 	  GetPrivateProfileString(BG_SECTION, BG_DESTFILE, "", ts.BGImageFilePath, sizeof(ts.BGImageFilePath), path);
-  }
+  } 
 
   if(!BGEnable)
     return;

From svnnotify ＠ sourceforge.jp  Wed May 23 19:42:34 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 May 2012 19:42:34 +0900
Subject: [Ttssh2-commit] [4954] code freeze
Message-ID: <1337769754.053238.23433.nullmailer@users.sourceforge.jp>

Revision: 4954
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4954
Author:   maya
Date:     2012-05-23 19:42:33 +0900 (Wed, 23 May 2012)
Log Message:
-----------
code freeze
  4.74-RC1

Modified Paths:
--------------
    trunk/installer/teraterm.iss

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2012-05-22 15:55:30 UTC (rev 4953)
+++ trunk/installer/teraterm.iss	2012-05-23 10:42:33 UTC (rev 4954)
@@ -1,27 +1,27 @@
 #define AppName "Tera Term"
-#define AppVer "4.73"
-#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define AppVer "4.74-RC1"
+; #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [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
 
 [PreCompile]
 Name: makechm.bat
-Name: build.bat
-;Name: build.bat; Parameters: rebuild
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
 
 [PostCompile]
 Name: makearchive.bat; Parameters: release
 
 [_ISToolPreCompile]
 Name: makechm.bat
-Name: build.bat
-;Name: build.bat; Parameters: rebuild
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
 
 [_ISToolPostCompile]
 Name: makearchive.bat; Parameters: release

From svnnotify ＠ sourceforge.jp  Wed May 23 22:13:07 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 May 2012 22:13:07 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ5NTVdICDoqqToqJjkv67mraPjgII=?=
Message-ID: <1337778787.560463.1832.nullmailer@users.sourceforge.jp>

Revision: 4955
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4955
Author:   yutakapon
Date:     2012-05-23 22:13:06 +0900 (Wed, 23 May 2012)
Log Message:
-----------
誤記修正。
参考 -> 参照

Modified Paths:
--------------
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-23 10:42:33 UTC (rev 4954)
+++ trunk/doc/ja/html/about/history.html	2012-05-23 13:13:06 UTC (rev 4955)
@@ -64,7 +64,7 @@
         </ul></li>
       <li><a href="..\menu\setup-general.html">General setup\x83_\x83C\x83A\x83\x8D\x83O</a>\x82Ō\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCygwin\x83^\x83u\x82ŁA\x90?\xE8\x95?\xB6\x82ł\xAB\x82\xBD\x8F?\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B</li>
-      <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8Dl\x95ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
+      <li><a href="../usage/tips/ime.html#feedback">IME\x82?O\x8C\xE3\x8EQ\x8F?ϊ\xB7\x8B@\x94\</a>\x82?Ή\x9E\x82\xB5\x82\xBD\x81BATOK2012,MS-IME2002,MS-IME2003\x82œ\xAE\x8D\xEC\x8Am\x94F\x8Dς?BMS-IME2010\x82ł?\xAE\x8D\xEC\x95s\x89?B"IME=off"(teraterm.ini)\x82??\x82?@\x94\\x96\xB3\x8C\xF8\x81B</li>
       <li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x96?\x8D\x87\x82?\x82??\xB7\x82鉞\x93\x9A\x82???\xEA\x82Ă\xA2\x82\xBD\x97]\x95\xAA\x82\xC8 ; \x82\xF0\x8D?\x82\xB5\x82\xBD\x81B</li>
       <li>\x83}\x83N\x83\x8D
         <ul>

From svnnotify ＠ sourceforge.jp  Thu May 31 21:06:41 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 31 May 2012 21:06:41 +0900
Subject: [Ttssh2-commit] [4956] bump up the version.
Message-ID: <1338466001.051891.25093.nullmailer@users.sourceforge.jp>

Revision: 4956
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4956
Author:   maya
Date:     2012-05-31 21:06:40 +0900 (Thu, 31 May 2012)
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/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/doc/en/html/about/history.html	2012-05-31 12:06:40 UTC (rev 4956)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74 not released yet)</a></h3>
+<h3><a name="teraterm_4.74">2012.05.31 (Ver 4.74)</a></h3>
 <ul class="history">
   <li>Changes
     <ul>
@@ -1886,7 +1886,7 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.61">2012.xx.xx (Ver 2.61)</a></h3>
+<h3><a name="ttssh_2.61">2012.05.31 (Ver 2.61)</a></h3>
 <ul class="history">
   <li>Changes
     <ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/doc/ja/html/about/history.html	2012-05-31 12:06:40 UTC (rev 4956)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.74">2012.xx.xx (Ver 4.74 not released yet)</a></h3>
+<h3><a name="teraterm_4.74">2012.05.31 (Ver 4.74)</a></h3>
 <ul class="history">
   <li>\x95ύX
     <ul>
@@ -1887,7 +1887,7 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.61">2012.xx.xx (Ver 2.61)</a></h3>
+<h3><a name="ttssh_2.61">2012.05.31 (Ver 2.61)</a></h3>
 <ul class="history">
   <li>\x95ύX
     <ul>

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/installer/teraterm.iss	2012-05-31 12:06:40 UTC (rev 4956)
@@ -1,5 +1,5 @@
 #define AppName "Tera Term"
-#define AppVer "4.74-RC1"
+#define AppVer "4.74"
 ; #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [InnoIDE_PreCompile]

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/teraterm/teraterm/ttermpro.rc	2012-05-31 12:06:40 UTC (rev 4956)
@@ -403,8 +403,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,73,0,0
- PRODUCTVERSION 4,73,0,0
+ FILEVERSION 4,74,0,0
+ PRODUCTVERSION 4,74,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -421,12 +421,12 @@
         BEGIN
             VALUE "CompanyName", "TeraTerm Project T. Teranishi"
             VALUE "FileDescription", "Tera Term"
-            VALUE "FileVersion", "4, 73, 0, 0"
+            VALUE "FileVersion", "4, 74, 0, 0"
             VALUE "InternalName", "TTERMPRO"
             VALUE "LegalCopyright", "(C)TeraTerm Project 2004-2012, (C)T. Teranishi 1994-1998"
             VALUE "OriginalFilename", "TTERMPRO.EXE"
             VALUE "ProductName", "Tera Term"
-            VALUE "ProductVersion", "4, 73, 0, 0"
+            VALUE "ProductVersion", "4, 74, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc	2012-05-31 12:06:40 UTC (rev 4956)
@@ -104,8 +104,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,73,0,0
- PRODUCTVERSION 4,73,0,0
+ FILEVERSION 4,74,0,0
+ PRODUCTVERSION 4,74,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, 73, 0, 0"
+            VALUE "FileVersion", "4, 74, 0, 0"
             VALUE "InternalName", "TTPMACRO"
             VALUE "LegalCopyright", "Copyright (C) TeraTerm Project 2004-2012, T. Teranishi 1994-1998"
             VALUE "OriginalFilename", "TTPMACRO.EXE"
             VALUE "ProductName", "TTPMACRO"
-            VALUE "ProductVersion", "4, 73, 0, 0"
+            VALUE "ProductVersion", "4, 74, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2012-05-23 13:13:06 UTC (rev 4955)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2012-05-31 12:06:40 UTC (rev 4956)
@@ -67,34 +67,8 @@
 #pragma code_page(1252)
 #endif //_WIN32
 
-#ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog
 //
 
@@ -587,8 +561,34 @@
 #endif    // APSTUDIO_INVOKED
 
 
+#ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
 // Icon
 //
 
@@ -602,8 +602,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,60,0,0
- PRODUCTVERSION 2,60,0,0
+ FILEVERSION 2,61,0,0
+ PRODUCTVERSION 2,61,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -619,12 +619,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "TTXSSH"
-            VALUE "FileVersion", "2, 60, 0, 0"
+            VALUE "FileVersion", "2, 61, 0, 0"
             VALUE "InternalName", "TTXSSH"
             VALUE "LegalCopyright", "(C)2004-2012 TeraTerm Project, (C)1998-1999 Robert O'Callahan"
             VALUE "OriginalFilename", "TTXSSH.dll"
             VALUE "ProductName", "TTSSH"
-            VALUE "ProductVersion", "2, 60, 0, 0"
+            VALUE "ProductVersion", "2, 61, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

From svnnotify ＠ sourceforge.jp  Thu May 31 21:07:56 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 31 May 2012 21:07:56 +0900
Subject: [Ttssh2-commit] [4957] Release 4.74
Message-ID: <1338466076.013875.25763.nullmailer@users.sourceforge.jp>

Revision: 4957
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4957
Author:   maya
Date:     2012-05-31 21:07:55 +0900 (Thu, 31 May 2012)
Log Message:
-----------
Release 4.74

Added Paths:
-----------
    tags/teraterm-4_74/

-------------- next part --------------


From svnnotify ＠ sourceforge.jp  Thu May 31 23:26:45 2012
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 31 May 2012 23:26:45 +0900
Subject: [Ttssh2-commit] [4958] unfrozen
Message-ID: <1338474405.499996.10205.nullmailer@users.sourceforge.jp>

Revision: 4958
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4958
Author:   maya
Date:     2012-05-31 23:26:45 +0900 (Thu, 31 May 2012)
Log Message:
-----------
unfrozen

Modified Paths:
--------------
    trunk/installer/teraterm.iss

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2012-05-31 12:07:55 UTC (rev 4957)
+++ trunk/installer/teraterm.iss	2012-05-31 14:26:45 UTC (rev 4958)
@@ -1,27 +1,27 @@
 #define AppName "Tera Term"
 #define AppVer "4.74"
-; #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [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
 
 [PreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [PostCompile]
 Name: makearchive.bat; Parameters: release
 
 [_ISToolPreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [_ISToolPostCompile]
 Name: makearchive.bat; Parameters: release