From eda7280f641b09d3f0780ca523a36a67a96197b7 Mon Sep 17 00:00:00 2001 From: zmatsuo <6488847+zmatsuo@users.noreply.github.com> Date: Sun, 2 Aug 2026 20:59:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E8=A4=87=E8=A3=BD=E6=99=82=E3=81=AE=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=82=B0=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=20#1453?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - セッションの複製で、複製先が DDE経由で受け取った コマンドラインの /F= を処理するため、 複製元の設定ファイルの色,フォントが複製先に反映されなかった。 - DispApplySetup() をvtdisp.cに追加 - 色(ThemeSetColor)とフォント(ChangeFont)を pts から再設定 - 桁数,行数は変えずにウィンドウサイズを再計算する - ウィンドウ生成前(vt == NULL)は何もしない - ParseParam() の後で SetupFNameW が変わっていたら DispApplySetup() を呼ぶ - 起動時の ParseParam() は ParseFOption() が先に同じファイル名を 設定しているため対象外(従来どおり後段の初期化で適用される) (cherry picked from commit e5cd99b142deff90a21c3fb1d472b3c6569f502a) --- doc/en/html/about/history.html | 4 ++++ doc/ja/html/about/history.html | 4 ++++ teraterm/teraterm/ttdde.c | 6 ++++++ teraterm/teraterm/vtdisp.c | 28 ++++++++++++++++++++++++++++ teraterm/teraterm/vtdisp.h | 1 + teraterm/teraterm/vtwin.cpp | 6 ++++++ 6 files changed, 49 insertions(+) diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html index 1531b4c5a4..b4140bf869 100644 --- a/doc/en/html/about/history.html +++ b/doc/en/html/about/history.html @@ -48,6 +48,10 @@

YYYY.MM.DD (Ver 5.6.3 not released yet)

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. (issue #1439) +
  • + Fixed an issue where the color and font settings from the setup file specified with the /F= command line option were not applied to the duplicated session. + (issue #1453) +
    • diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html index e48e40db4e..afa0cbcd5b 100644 --- a/doc/ja/html/about/history.html +++ b/doc/ja/html/about/history.html @@ -48,6 +48,10 @@

    YYYY.MM.DD (Ver 5.6.3 not released yet)

    YMODEMgpt@CMCancel{^ĂAMYMODEM~ȂsCB (issue #1439) +
  • + ZbV̕ŁAR}hC /F= Ŏw肵ݒt@C̐FƃtHg̐ݒ肪ɔfȂsCB + (issue #1453) +
    • diff --git a/teraterm/teraterm/ttdde.c b/teraterm/teraterm/ttdde.c index 6ba27f918e..ee557fc2bd 100644 --- a/teraterm/teraterm/ttdde.c +++ b/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= で設定ファイルが読み直された。色とフォントを表示へ再適用する */ + DispApplySetup(vt_src, &ts); + } + free(prev_setup); } FreeTTSET(); cv.NoMsg = 1; /* suppress error messages */ diff --git a/teraterm/teraterm/vtdisp.c b/teraterm/teraterm/vtdisp.c index d18d97fdcc..72a69a3347 100644 --- a/teraterm/teraterm/vtdisp.c +++ b/teraterm/teraterm/vtdisp.c @@ -2258,6 +2258,34 @@ void DispChangeWinSize(vtdraw_t *vt, int Nx, int Ny) InvalidateRect(vt->hVTWin,NULL,FALSE); } +/** + * pts の色・フォント設定を表示へ再適用する + * + * 実行中に /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) +{ + TColorTheme color_theme; + + if (vt == NULL || pts == NULL) { + return; + } + ThemeGetColorDefaultTS(pts, &color_theme); + ThemeSetColor(vt, &color_theme); + ChangeFont(vt, 0); + DispChangeWinSize(vt, WinWidth, WinHeight); +} + /** * ウィンドウのサイズが変化する時(WM_SIZEが発生した時)に、 * AdjustSize == TRUEの時にコールされる diff --git a/teraterm/teraterm/vtdisp.h b/teraterm/teraterm/vtdisp.h index f163692bcc..d0382454f1 100644 --- a/teraterm/teraterm/vtdisp.h +++ b/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); diff --git a/teraterm/teraterm/vtwin.cpp b/teraterm/teraterm/vtwin.cpp index d3f1cbcb76..a30569facc 100644 --- a/teraterm/teraterm/vtwin.cpp +++ b/teraterm/teraterm/vtwin.cpp @@ -3850,9 +3850,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(); From a9e68287e4815e43c90c5e5fe43209bd50106c23 Mon Sep 17 00:00:00 2001 From: zmatsuo <6488847+zmatsuo@users.noreply.github.com> Date: Tue, 4 Aug 2026 00:48:25 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=8C=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=20#1453?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3c828992567970431ad46ba0432fddb74250043b) --- doc/en/html/about/history.html | 2 +- doc/ja/html/about/history.html | 2 +- teraterm/teraterm/ttdde.c | 2 +- teraterm/teraterm/vtdisp.c | 8 ++++---- teraterm/teraterm/vtwin.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html index b4140bf869..f6366ecdab 100644 --- a/doc/en/html/about/history.html +++ b/doc/en/html/about/history.html @@ -49,7 +49,7 @@

    YYYY.MM.DD (Ver 5.6.3 not released yet)

    (issue #1439)
  • - Fixed an issue where the color and font settings from the setup file specified with the /F= command line option were not applied to the duplicated session. + 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. (issue #1453)
    • diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html index afa0cbcd5b..d159e4f182 100644 --- a/doc/ja/html/about/history.html +++ b/doc/ja/html/about/history.html @@ -49,7 +49,7 @@

    YYYY.MM.DD (Ver 5.6.3 not released yet)

    (issue #1439)
  • - ZbV̕ŁAR}hC /F= Ŏw肵ݒt@C̐FƃtHg̐ݒ肪ɔfȂsCB + ZbV̕ŁAR}hC /F= Ŏw肵ݒ(F,tHg,j[̌)ɔfȂsCB (issue #1453)
    • diff --git a/teraterm/teraterm/ttdde.c b/teraterm/teraterm/ttdde.c index ee557fc2bd..56cc950a29 100644 --- a/teraterm/teraterm/ttdde.c +++ b/teraterm/teraterm/ttdde.c @@ -621,7 +621,7 @@ static HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data) free(commandline); free(tmp_u8); if (prev_setup != NULL && _wcsicmp(prev_setup, ts.SetupFNameW) != 0) { - /* /F= で設定ファイルが読み直された。色とフォントを表示へ再適用する */ + /* /F= で設定ファイルが読み直された。色,フォント,メニューを表示へ再適用する */ DispApplySetup(vt_src, &ts); } free(prev_setup); diff --git a/teraterm/teraterm/vtdisp.c b/teraterm/teraterm/vtdisp.c index 72a69a3347..aa8e2b7dce 100644 --- a/teraterm/teraterm/vtdisp.c +++ b/teraterm/teraterm/vtdisp.c @@ -2259,10 +2259,10 @@ void DispChangeWinSize(vtdraw_t *vt, int Nx, int Ny) } /** - * pts の色・フォント設定を表示へ再適用する - * + * 設定(色,フォント,メニュー)を表示へ適用する * 実行中に /F= 指定で設定ファイルを読み直した後 * (セッション複製の DDE 経由接続や新規接続ダイアログ)に呼ぶ。 + * * 桁数・行数は変えず、フォントに合わせてウィンドウサイズを再計算する。 * * @param[in] vt 対象の描画コンテキスト。 @@ -2275,15 +2275,15 @@ void DispChangeWinSize(vtdraw_t *vt, int Nx, int Ny) */ void DispApplySetup(vtdraw_t *vt, const TTTSet *pts) { - TColorTheme color_theme; - 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); } /** diff --git a/teraterm/teraterm/vtwin.cpp b/teraterm/teraterm/vtwin.cpp index a30569facc..011bf19836 100644 --- a/teraterm/teraterm/vtwin.cpp +++ b/teraterm/teraterm/vtwin.cpp @@ -3855,7 +3855,7 @@ void CVTWindow::OnFileNewConnection() (*ParseParam)(command, &ts, NULL); free(command); if (prev_setup != NULL && _wcsicmp(prev_setup, ts.SetupFNameW) != 0) { - // /F= で設定ファイルが読み直された。色とフォントを表示へ再適用する + // /F= で設定ファイルが読み直された。色,フォント,メニューを表示へ再適用する DispApplySetup(vt_src, &ts); } free(prev_setup); From 8831ec7b6e12bfd9d9896ba77f70aa5a4da97511 Mon Sep 17 00:00:00 2001 From: zmatsuo <6488847+zmatsuo@users.noreply.github.com> Date: Thu, 6 Aug 2026 00:37:57 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E8=A4=87=E8=A3=BD=E6=99=82=E3=81=A8=20DDE=20=E6=8E=A5?= =?UTF-8?q?=E7=B6=9A=E6=99=82=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E6=89=B1=E3=81=84=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20#1453?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 複製元コマンドラインの /F= の有無ではなく、設定ファイルが デフォルトと異なるかどうかで複製先に /F= を付加するようにした - DDE の connect で設定ファイルが変更されたときは、表示への再適用 (DispApplySetup)ではなく IdCmdRestoreSetup をポストして INI ファイルの読み直しから行うようにした - ParseFOption() はコマンドライン文字列を引数で受け取るように変更 - CVTWindow コンストラクタの TERATERM.INI 読み込みの重複コードを整理 (cherry picked from commit 82c5c318b3a8ecec72fa81f9cfd1f850c46b0d7e) --- teraterm/teraterm/ttdde.c | 4 ++-- teraterm/teraterm/vtwin.cpp | 42 +++++++++++++++---------------------- teraterm/ttpset/ttset.c | 30 +++++++++++++++++--------- teraterm/ttpset/ttset.h | 2 +- 4 files changed, 40 insertions(+), 38 deletions(-) diff --git a/teraterm/teraterm/ttdde.c b/teraterm/teraterm/ttdde.c index 56cc950a29..275c0ac8ef 100644 --- a/teraterm/teraterm/ttdde.c +++ b/teraterm/teraterm/ttdde.c @@ -621,8 +621,8 @@ static HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data) free(commandline); free(tmp_u8); if (prev_setup != NULL && _wcsicmp(prev_setup, ts.SetupFNameW) != 0) { - /* /F= で設定ファイルが読み直された。色,フォント,メニューを表示へ再適用する */ - DispApplySetup(vt_src, &ts); + /* /F= で設定ファイルが変更された。読み直して表示へ再適用する */ + PostMessage(HVTWin, WM_USER_ACCELCOMMAND, IdCmdRestoreSetup, 0); } free(prev_setup); } diff --git a/teraterm/teraterm/vtwin.cpp b/teraterm/teraterm/vtwin.cpp index 011bf19836..89a8a1b66e 100644 --- a/teraterm/teraterm/vtwin.cpp +++ b/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,28 +584,13 @@ 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(); + wchar_t *ParamW = _wcsdup(GetCommandLineW()); + (*ParseParam)(ParamW, &ts, &(TopicName[0])); + free(ParamW); } - else { - abort(); - } - } - - /* 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(); } - FreeTTSET(); // duplicate sessionの指定があるなら、共有メモリからコピーする (2004.12.7 yutaka) if (ts.DuplicateSession == 1) { @@ -4019,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; // 実行ファイル名以降 diff --git a/teraterm/ttpset/ttset.c b/teraterm/ttpset/ttset.c index 54728e4b07..e992c3b661 100644 --- a/teraterm/ttpset/ttset.c +++ b/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; } diff --git a/teraterm/ttpset/ttset.h b/teraterm/ttpset/ttset.h index 3c15369286..c37de52f00 100644 --- a/teraterm/ttpset/ttset.h +++ b/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); From 7686584a80ac75660f5fbbf7938e7ce010f779ef Mon Sep 17 00:00:00 2001 From: zmatsuo <6488847+zmatsuo@users.noreply.github.com> Date: Wed, 12 Aug 2026 00:36:53 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=81=AB=E4=B8=8D=E5=85=B7=E5=90=88=E7=99=BA=E7=94=9F=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E8=A8=98?= =?UTF-8?q?=20#1453?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cb7a4be14d58a4b46629e29a33cfa0d4e95ad0f9) --- doc/en/html/about/history.html | 1 + doc/ja/html/about/history.html | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html index f6366ecdab..e9040a9d12 100644 --- a/doc/en/html/about/history.html +++ b/doc/en/html/about/history.html @@ -50,6 +50,7 @@

    YYYY.MM.DD (Ver 5.6.3 not released yet)

  • 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. (issue #1453)
    • diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html index d159e4f182..735c9d7aa2 100644 --- a/doc/ja/html/about/history.html +++ b/doc/ja/html/about/history.html @@ -50,6 +50,7 @@

    YYYY.MM.DD (Ver 5.6.3 not released yet)

  • ZbV̕ŁAR}hC /F= Ŏw肵ݒ(F,tHg,j[̌)ɔfȂsCB + 5.6.0 ̕sB (issue #1453)