Mfc/#1453

doc/en/html/about/history.html

@@ -48,6 +48,11 @@ <h3 id="teraterm_5.6.3">YYYY.MM.DD (Ver 5.6.3 not released yet)</h3>
         Fixed an issue where YMODEM transfers from the local host to a remote system did not stop on the receiver side when the Cancel button was pressed during file transmission.
         (<a href="https://github.com/TeraTermProject/teraterm/issues/1439" target="_blank">issue #1439</a>)
       </li>
+      <li>
+        Fixed an issue where the settings (color, font and menu language) from the setup file specified with the /F= command line option were not applied to the duplicated session.
+        This bug was introduced in 5.6.0.
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/1453" target="_blank">issue #1453</a>)
+      </li>
     </ul>
   </li>
 

doc/ja/html/about/history.html

@@ -48,6 +48,11 @@ <h3 id="teraterm_5.6.3">YYYY.MM.DD (Ver 5.6.3 not released yet)</h3>
         YMODEMを使用したファイル送信中にCancelボタンを押下しても、受信側のYMODEMが停止しない不具合を修正した。
         (<a href="https://github.com/TeraTermProject/teraterm/issues/1439" target="_blank">issue #1439</a>)
       </li>
+      <li>
+        セッションの複製で、コマンドラインの /F= で指定した設定(色,フォント,メニューの言語)が複製先に反映されない不具合を修正した。
+        5.6.0 からの不具合。
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/1453" target="_blank">issue #1453</a>)
+      </li>
     </ul>
   </li>
 

teraterm/teraterm/ttdde.c

@@ -614,11 +614,17 @@ static HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data)
 		if (LoadTTSET()) {
 			char *tmp_u8;
 			wchar_t *commandline;
+			wchar_t *prev_setup = _wcsdup(ts.SetupFNameW);
 			asprintf(&tmp_u8, "a %s", ParamFileName); // "a" = dummy exe name
 			commandline = ToWcharU8(tmp_u8);
 			(*ParseParam)(commandline, &ts, NULL);
 			free(commandline);
 			free(tmp_u8);
+			if (prev_setup != NULL && _wcsicmp(prev_setup, ts.SetupFNameW) != 0) {
+				/* /F= 縺ｧ險ｭ螳壹ヵ繧｡繧､繝ｫ縺悟､画峩縺輔ｌ縺溘りｪｭ縺ｿ逶ｴ縺励※陦ｨ遉ｺ縺ｸ蜀埼←逕ｨ縺吶ｋ */
+				PostMessage(HVTWin, WM_USER_ACCELCOMMAND, IdCmdRestoreSetup, 0);
+			}
+			free(prev_setup);
 		}
 		FreeTTSET();
 		cv.NoMsg = 1; /* suppress error messages */

teraterm/teraterm/vtdisp.c

@@ -2258,6 +2258,34 @@ void DispChangeWinSize(vtdraw_t *vt, int Nx, int Ny)
     InvalidateRect(vt->hVTWin,NULL,FALSE);
 }
 
+/**
+ *	險ｭ螳(濶ｲ,繝輔か繝ｳ繝,繝｡繝九Η繝ｼ)繧定｡ｨ遉ｺ縺ｸ驕ｩ逕ｨ縺吶ｋ
+ *	螳溯｡御ｸｭ縺ｫ /F= 謖�ｮ壹〒險ｭ螳壹ヵ繧｡繧､繝ｫ繧定ｪｭ縺ｿ逶ｴ縺励◆蠕
+ *	(繧ｻ繝�す繝ｧ繝ｳ隍�｣ｽ縺ｮ DDE 邨檎罰謗･邯壹ｄ譁ｰ隕乗磁邯壹ム繧､繧｢繝ｭ繧ｰ)縺ｫ蜻ｼ縺ｶ縲
+ *
+ *	譯∵焚繝ｻ陦梧焚縺ｯ螟峨∴縺壹√ヵ繧ｩ繝ｳ繝医↓蜷医ｏ縺帙※繧ｦ繧｣繝ｳ繝峨え繧ｵ繧､繧ｺ繧貞�險育ｮ励☆繧九
+ *
+ *	@param[in]	vt		蟇ｾ雎｡縺ｮ謠冗判繧ｳ繝ｳ繝�く繧ｹ繝医
+ *						NULL(繧ｦ繧｣繝ｳ繝峨え逕滓�蜑)縺ｮ縺ｨ縺阪�菴輔ｂ縺励↑縺
+ *						(襍ｷ蜍墓凾縺ｯ InitDisp() / ChangeFont() 縺 pts 縺九ｉ驕ｩ逕ｨ縺吶ｋ)
+ *	@param[in]	pts		驕ｩ逕ｨ縺吶ｋ險ｭ螳壹ら樟迥ｶ縺ｯ &ts 繧呈ｸ｡縺吶％縺ｨ
+ *
+ *	@todo ChangeFont() 縺ｮ蠑墓焚縺ｫ pts 繧呈ｸ｡縺帙ｋ繧医≧縺ｫ縺吶ｋ
+ *	@todo ChangeFont() 縺ｯ DispChangeFont() 縺ｮ縺ｻ縺�′螯･蠖薙◎縺
+ */
+void DispApplySetup(vtdraw_t *vt, const TTTSet *pts)
+{
+	if (vt == NULL || pts == NULL) {
+		return;
+	}
+	TColorTheme color_theme;
+	ThemeGetColorDefaultTS(pts, &color_theme);
+	ThemeSetColor(vt, &color_theme);
+	ChangeFont(vt, 0);
+	DispChangeWinSize(vt, WinWidth, WinHeight);
+	PostMessage(vt->hVTWin, WM_USER_CHANGEMENU, 0, 0);
+}
+
 /**
  *	繧ｦ繧｣繝ｳ繝峨え縺ｮ繧ｵ繧､繧ｺ縺悟､牙喧縺吶ｋ譎(WM_SIZE縺檎匱逕溘＠縺滓凾)縺ｫ縲
  *	AdjustSize == TRUE縺ｮ譎ゅ↓繧ｳ繝ｼ繝ｫ縺輔ｌ繧

teraterm/teraterm/vtdisp.h

@@ -98,6 +98,7 @@ void DispEnableCaret(vtdraw_t *vt, BOOL On);
 BOOL IsCaretEnabled(void);
 void DispSetCaretWidth(BOOL DW);
 void DispChangeWinSize(vtdraw_t *vt, int Nx, int Ny);
+void DispApplySetup(vtdraw_t *vt, const TTTSet *pts);
 void ResizeWindow(vtdraw_t *vt, int x, int y, int w, int h, int cw, int ch);
 ttdc_t *PaintWindow(vtdraw_t *vt, HDC PaintDC, RECT PaintRect, BOOL fBkGnd,
 		 int* Xs, int* Ys, int* Xe, int* Ye);

teraterm/teraterm/vtwin.cpp

@@ -556,21 +556,25 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 	WNDCLASSW wc;
 	RECT rect;
 	DWORD Style;
-	BOOL isFirstInstance;
 	m_hInst = hInstance;
 
 	CommInit(&cv);
 	cv.ts = &ts;
-	isFirstInstance = StartTeraTerm(&ts);
+	StartTeraTerm(&ts);
 
 	TTXInit(&ts, &cv); /* TTPLUG */
 
 	MsgDlgHelp = RegisterWindowMessage(HELPMSGSTRING);
 
-	ParseFOption(&ts);
+	/* Parse command line parameters */
+	{
+		// GetCommandLineW() in MSDN remark
+		//  The lifetime of the returned value is managed by the
+		//  system, applications should not free or modify this value.
+		wchar_t *ParamW = _wcsdup(GetCommandLineW());
+		ParseFOption(ParamW, &ts);
+		free(ParamW);
 
-	if (isFirstInstance) {
-		/* first instance */
 		if (LoadTTSET()) {
 			/* read setup info from "teraterm.ini" */
 			(*ReadIniFile)(ts.SetupFNameW, &ts);
@@ -580,29 +584,14 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 			abort();
 		}
 
-	} else {
-		// 2縺､繧∽ｻ･髯阪�繝励Ο繧ｻ繧ｹ縺ｫ縺翫＞縺ｦ繧ゅ√ョ繧｣繧ｹ繧ｯ縺九ｉ TERATERM.INI 繧定ｪｭ繧縲(2004.11.4 yutaka)
 		if (LoadTTSET()) {
-			/* read setup info from "teraterm.ini" */
-			(*ReadIniFile)(ts.SetupFNameW, &ts);
-			FreeTTSET();
-		}
-		else {
-			abort();
+			wchar_t *ParamW = _wcsdup(GetCommandLineW());
+			(*ParseParam)(ParamW, &ts, &(TopicName[0]));
+			free(ParamW);
 		}
+		FreeTTSET();
 	}
 
-	/* Parse command line parameters*/
-	if (LoadTTSET()) {
-		// GetCommandLineW() in MSDN remark
-		//  The lifetime of the returned value is managed by the
-		//  system, applications should not free or modify this value.
-		wchar_t *ParamW = _wcsdup(GetCommandLineW());
-		(*ParseParam)(ParamW, &ts, &(TopicName[0]));
-		free(ParamW);
-	}
-	FreeTTSET();
-
 	// duplicate session縺ｮ謖�ｮ壹′縺ゅｋ縺ｪ繧峨∝�譛峨Γ繝｢繝ｪ縺九ｉ繧ｳ繝斐�縺吶ｋ (2004.12.7 yutaka)
 	if (ts.DuplicateSession == 1) {
 		// 蜈ｱ譛峨Γ繝｢繝ｪ縺ｮ蠎ｧ讓吶�隍�｣ｽ蜈��迴ｾ蝨ｨ縺ｮ繧ｦ繧｣繝ｳ繝峨え蠎ｧ讓吶↓縺ｪ繧九
@@ -3850,9 +3839,15 @@ void CVTWindow::OnFileNewConnection()
 
 			if ((GetHNRec.PortType==IdTCPIP) && LoadTTSET()) {
 				wchar_t *command = NULL;
+				wchar_t *prev_setup = _wcsdup(ts.SetupFNameW);
 				awcscats(&command, ttermpro, L" ", hostname, NULL);
 				(*ParseParam)(command, &ts, NULL);
 				free(command);
+				if (prev_setup != NULL && _wcsicmp(prev_setup, ts.SetupFNameW) != 0) {
+					// /F= 縺ｧ險ｭ螳壹ヵ繧｡繧､繝ｫ縺瑚ｪｭ縺ｿ逶ｴ縺輔ｌ縺溘り牡,繝輔か繝ｳ繝,繝｡繝九Η繝ｼ繧定｡ｨ遉ｺ縺ｸ蜀埼←逕ｨ縺吶ｋ
+					DispApplySetup(vt_src, &ts);
+				}
+				free(prev_setup);
 				FreeTTSET();
 			}
 			SetKeyMap();
@@ -4013,10 +4008,13 @@ void CVTWindow::OnDuplicateSession()
 		wcsncat_s(Command, _countof(Command), ts.KeyCnfFNW, _TRUNCATE);
 	}
 
-	if (ParseFOption(&ts)) {
+	wchar_t *setup_def = GetDefaultSetupFNameW(NULL);
+	if (wcscmp(setup_def, ts.SetupFNameW) != 0) {
+		// INI繝輔ぃ繧､繝ｫ縺後ョ繝輔か繝ｫ繝医→逡ｰ縺ｪ縺｣縺ｦ縺�ｋ縲/F= 縺ｧ謖�ｮ壹☆繧
 		wcsncat_s(Command, _countof(Command), L" /F=", _TRUNCATE);
 		wcsncat_s(Command, _countof(Command), ts.SetupFNameW, _TRUNCATE);
 	}
+	free(setup_def);
 
 	wchar_t *hostnameW = ToWcharA(ts.HostName);
 	const wchar_t *commandline = wcschr(Command, L' ') + 1;	// 螳溯｡後ヵ繧｡繧､繝ｫ蜷堺ｻ･髯

teraterm/ttpset/ttset.c

@@ -3639,17 +3639,28 @@ static wchar_t *GetFilePath(const wchar_t *command_line, const wchar_t *default_
 	return full_path;
 }
 
-BOOL ParseFOption(PTTSet ts) {
-	wchar_t Temp[MaxStrLen]; // ttpmacro縺九ｉ蜻ｼ縺ｰ繧後ｋ縺薙→繧呈Φ螳壹＠MaxStrLen繧ｵ繧､繧ｺ縺ｨ縺吶ｋ
-	wchar_t *Param, *start, *cur, *next;
+/**
+ *	繧ｳ繝槭Φ繝峨Λ繧､繝ｳ縺ｮ /F= 繧定ｧ｣驥医＠縺ｦ ts->SetupFNameW 縺ｫ繧ｻ繝�ヨ縺吶ｋ
+ *	(ANSI迚 ts->SetupFName 縺ｫ繧ゅそ繝�ヨ縺吶ｋ, 蟒�ｭ｢莠亥ｮ)
+ *
+ *	@param[in]	command_line (蜀�ｮｹ縺ｯ遐ｴ螢翫＆繧後ｋ)
+ *				the first term shuld be executable filename of Tera Term
+ *	@param[out]	ts
+ *	@retval		TRUE	/F= 縺悟ｭ伜惠縺励◆
+ *	@retval		FALSE	/F= 縺悟ｭ伜惠縺励↑縺
+ *
+ *	@todo 蛻晄悄蛹匁凾縺ｫ縺励°菴ｿ逕ｨ縺励※縺�↑縺, 蛻晄悄蛹冶ｿ題ｾｺ縺ｫ遘ｻ蜍輔＠縺ｦ static 蛹
+ *	@todo GetParam() 縺ｮ蠑墓焚3 縺ｯ const, 謌ｻ繧雁､ const, 蜍慕噪譁�ｭ励ヰ繝�ヵ繧｡迚医′蠢�ｦ
+ */
+BOOL ParseFOption(const wchar_t *command_line, PTTSet ts)
+{
+	wchar_t Temp[MaxStrLen]; // 繝代Λ繝｡繝ｼ繧ｿ繧貞叙繧雁�縺呎枚蟄励ヰ繝�ヵ繧｡
+	const wchar_t *cur;
+	const wchar_t *next;
 	BOOL isFopt = FALSE;
 
-	/* the first term shuld be executable filename of Tera Term */
-	Param = _wcsdup(GetCommandLineW());
-	start = GetParam(Temp, _countof(Temp), Param);
-
-	cur = start;
-	while ((next = GetParam(Temp, _countof(Temp), cur))) {
+	cur = GetParam(Temp, _countof(Temp), (wchar_t *)command_line);
+	while ((next = GetParam(Temp, _countof(Temp), (wchar_t *)cur))) {
 		DequoteParam(Temp, _countof(Temp), Temp);
 		if (_wcsnicmp(Temp, L"/F=", 3) == 0) {	/* setup filename */
 			isFopt = TRUE;
@@ -3663,7 +3674,6 @@ BOOL ParseFOption(PTTSet ts) {
 		}
 		cur = next;
 	}
-	free(Param);
 	return isFopt;
 }
 

teraterm/ttpset/ttset.h

@@ -35,7 +35,7 @@ extern "C" {
 
 typedef struct TKeyMap_st *PKeyMap;
 
-BOOL ParseFOption(PTTSet ts);
+BOOL ParseFOption(const wchar_t *command_line, PTTSet ts);
 void SaveVTPos(const PTTSet ts);
 
 void PASCAL _ReadIniFile(const wchar_t *FName, PTTSet ts);