Tera TermRevision: 9925
https://osdn.net/projects/ttssh2/scm/svn/commits/9925
Author: nmaya
Date: 2022-05-16 01:22:45 +0900 (Mon, 16 May 2022)
Log Message:
-----------
r9919 で削除した SetVTIcon() の TTTSet * 引数を戻す
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9919
Modified Paths:
--------------
branches/adjust_icon/teraterm/common/tttypes.h
branches/adjust_icon/teraterm/teraterm/vtwin.cpp
branches/adjust_icon/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/adjust_icon/teraterm/common/tttypes.h
===================================================================
--- branches/adjust_icon/teraterm/common/tttypes.h 2022-05-14 15:29:13 UTC (rev 9924)
+++ branches/adjust_icon/teraterm/common/tttypes.h 2022-05-15 16:22:45 UTC (rev 9925)
@@ -348,6 +348,8 @@
} cygterm_t;
/* TTTSet */
+typedef struct tttset TTTSet, *PTTSet;
+
struct tttset {
/*------ VTSet --------*/
/* Tera Term home directory */
@@ -648,11 +650,9 @@
HINSTANCE PluginVTIocnInstance;
WORD PluginVTIocnID;
- void (*SetVTIcon)(HINSTANCE hInstance, WORD IconID);
+ void (*SetVTIcon)(TTTSet *ts, HINSTANCE hInstance, WORD IconID);
};
-typedef struct tttset TTTSet, *PTTSet;
-
/* New Line modes */
#define IdCR 1
#define IdCRLF 2
Modified: branches/adjust_icon/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/adjust_icon/teraterm/teraterm/vtwin.cpp 2022-05-14 15:29:13 UTC (rev 9924)
+++ branches/adjust_icon/teraterm/teraterm/vtwin.cpp 2022-05-15 16:22:45 UTC (rev 9925)
@@ -270,19 +270,19 @@
}
}
-static void SetVTIcon(HINSTANCE hInstance, WORD IconID)
+static void SetVTIcon(TTTSet *ts, HINSTANCE hInstance, WORD IconID)
{
HINSTANCE inst;
WORD icon_id;
const int dpi = GetMonitorDpiFromWindow(HVTWin);
- ts.PluginVTIocnInstance = hInstance;
- ts.PluginVTIocnID = IconID;
+ ts->PluginVTIocnInstance = hInstance;
+ ts->PluginVTIocnID = IconID;
- inst = (ts.PluginVTIocnInstance == NULL) ? hInst : hInstance;
- icon_id = (ts.PluginVTIocnID != 0) ? IconID :
- (ts.VTIcon != IdIconDefault) ? ts.VTIcon
- : IDI_VT;
+ inst = (ts->PluginVTIocnInstance == NULL) ? hInst : hInstance;
+ icon_id = (ts->PluginVTIocnID != 0) ? IconID :
+ (ts->VTIcon != IdIconDefault) ? ts->VTIcon
+ : IDI_VT;
SetIcon(inst, HVTWin, MAKEINTRESOURCEW(icon_id), dpi);
}
Modified: branches/adjust_icon/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/adjust_icon/ttssh2/ttxssh/ttxssh.c 2022-05-14 15:29:13 UTC (rev 9924)
+++ branches/adjust_icon/ttssh2/ttxssh/ttxssh.c 2022-05-15 16:22:45 UTC (rev 9925)
@@ -182,7 +182,7 @@
FWD_end(pvar);
FWDUI_end(pvar);
- pvar->ts->SetVTIcon(NULL, 0);
+ pvar->ts->SetVTIcon(pvar->ts, NULL, 0);
ssh_heartbeat_lock_finalize();
@@ -659,7 +659,7 @@
void notify_established_secure_connection(PTInstVar pvar)
{
- pvar->ts->SetVTIcon(hInst, pvar->settings.IconID);
+ pvar->ts->SetVTIcon(pvar->ts, hInst, pvar->settings.IconID);
logputs(LOG_LEVEL_VERBOSE, "Entering secure mode");
}