Tera TermRevision: 9998
https://osdn.net/projects/ttssh2/scm/svn/commits/9998
Author: nmaya
Date: 2022-06-15 23:35:24 +0900 (Wed, 15 Jun 2022)
Log Message:
-----------
TTSSH から通知領域のアイコンをセットするタイミングを変更
「SSH 接続時にセット」「TCP 接続断または Tera Term 終了で戻す」
↓
「通知直前にセット」「通知直後に戻す」
これにより、「SSH 接続中」かつ「Tera Term 本体からの通知」は Tera Term 側でセットされたアイコンで通知される
ttssh2-dev 442
ticket #44517, #43907
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/44517
https://osdn.net/projects/ttssh2/tracker/detail/43907
Modified Paths:
--------------
branches/adjust_icon/ttssh2/ttxssh/fwd.c
branches/adjust_icon/ttssh2/ttxssh/ssh.c
branches/adjust_icon/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/adjust_icon/ttssh2/ttxssh/fwd.c
===================================================================
--- branches/adjust_icon/ttssh2/ttxssh/fwd.c 2022-06-13 15:25:28 UTC (rev 9997)
+++ branches/adjust_icon/ttssh2/ttxssh/fwd.c 2022-06-15 14:35:24 UTC (rev 9998)
@@ -1953,7 +1953,10 @@
UTIL_get_lang_msg("MSG_FWD_AGENT_NOTIFY_TITLE", pvar, "Agent Forwarding");
strncpy_s(title, sizeof(title), pvar->ts->UIMsg, _TRUNCATE);
UTIL_get_lang_msg("MSG_FWD_AGENT_NOTIFY", pvar, "Remote host access to agent");
+
+ NotifySetIconID(pvar->cv, hInst, pvar->settings.IconID);
NotifyInfoMessage(pvar->cv, pvar->ts->UIMsg, title);
+ NotifySetIconID(pvar->cv, NULL, 0);
}
if (pvar->session_settings.ForwardAgentConfirm) {
Modified: branches/adjust_icon/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/adjust_icon/ttssh2/ttxssh/ssh.c 2022-06-13 15:25:28 UTC (rev 9997)
+++ branches/adjust_icon/ttssh2/ttxssh/ssh.c 2022-06-15 14:35:24 UTC (rev 9998)
@@ -7229,7 +7229,9 @@
case 3:
msgW = ToWcharU8(msg);
if (msgW) {
+ NotifySetIconID(pvar->cv, hInst, pvar->settings.IconID);
NotifyInfoMessageW(pvar->cv, msgW, L"Authentication Banner");
+ NotifySetIconID(pvar->cv, NULL, 0);
free(msgW);
}
break;
@@ -9492,7 +9494,10 @@
strncpy_s(title, sizeof(title), pvar->ts->UIMsg, _TRUNCATE);
UTIL_get_lang_msg("MSG_SSH_AGENTERROR_TOOLARGE", pvar,
"Agent request size is too large, ignore it.");
+
+ NotifySetIconID(pvar->cv, hInst, pvar->settings.IconID);
NotifyInfoMessage(pvar->cv, pvar->ts->UIMsg, title);
+ NotifySetIconID(pvar->cv, NULL, 0);
}
goto error;
Modified: branches/adjust_icon/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/adjust_icon/ttssh2/ttxssh/ttxssh.c 2022-06-13 15:25:28 UTC (rev 9997)
+++ branches/adjust_icon/ttssh2/ttxssh/ttxssh.c 2022-06-15 14:35:24 UTC (rev 9998)
@@ -185,9 +185,6 @@
// VT \x83E\x83B\x83\x93\x83h\x83E\x82̃A\x83C\x83R\x83\x93
SetVTIconID(pvar->cv, NULL, 0);
- // \x92ʒm\x97̈\xE6\x82̃J\x83X\x83^\x83\x80\x83A\x83C\x83R\x83\x93
- NotifySetIconID(pvar->cv, NULL, 0);
-
ssh_heartbeat_lock_finalize();
cipher_free_SSH2(pvar->cc[MODE_IN]);
@@ -666,9 +663,6 @@
// VT \x83E\x83B\x83\x93\x83h\x83E\x82̃A\x83C\x83R\x83\x93
SetVTIconID(pvar->cv, hInst, pvar->settings.IconID);
- // \x92ʒm\x97̈\xE6\x82̃J\x83X\x83^\x83\x80\x83A\x83C\x83R\x83\x93
- NotifySetIconID(pvar->cv, hInst, pvar->settings.IconID);
-
logputs(LOG_LEVEL_VERBOSE, "Entering secure mode");
}