Tera TermRevision: 8948
https://osdn.net/projects/ttssh2/scm/svn/commits/8948
Author: zmatsuo
Date: 2020-10-03 00:46:23 +0900 (Sat, 03 Oct 2020)
Log Message:
-----------
vtwin.cpp から SendVar, FileVar 参照を削除
- IsSendVarNULL(), IsFileVarNULL() を追加
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/filesys.h
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-10-02 15:46:12 UTC (rev 8947)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-10-02 15:46:23 UTC (rev 8948)
@@ -1078,3 +1078,14 @@
if (! OpenProtoDlg(FileVar,PROTO_QV,mode,0,0))
ProtoEnd();
}
+
+
+BOOL IsSendVarNULL()
+{
+ return SendVar == NULL;
+}
+
+BOOL IsFileVarNULL()
+{
+ return FileVar == NULL;
+}
Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h 2020-10-02 15:46:12 UTC (rev 8947)
+++ trunk/teraterm/teraterm/filesys.h 2020-10-02 15:46:23 UTC (rev 8948)
@@ -72,9 +72,10 @@
BOOL LoadTTFILE(void);
BOOL FreeTTFILE(void);
-//void ShowFTDlg(WORD OpId);
BOOL NewFileVar(PFileVar *FV);
void FreeFileVar(PFileVar *FV);
+BOOL IsSendVarNULL();
+BOOL IsFileVarNULL();
void FileSendStart(void);
void FileSend(void);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2020-10-02 15:46:12 UTC (rev 8947)
+++ trunk/teraterm/teraterm/vtwin.cpp 2020-10-02 15:46:23 UTC (rev 8948)
@@ -927,7 +927,7 @@
(ts.PasteFlag & CPF_CONFIRM_RBUTTON) != 0 &&
cv.Ready &&
!mousereport &&
- (SendVar==NULL) && (FileVar==NULL) &&
+ IsSendVarNULL() && IsFileVarNULL() &&
(cv.PortType!=IdFile) &&
(IsClipboardFormatAvailable(CF_TEXT) ||
IsClipboardFormatAvailable(CF_OEMTEXT))) {
@@ -1221,8 +1221,8 @@
}
}
- if ( (! cv.Ready) || (SendVar!=NULL) ||
- (FileVar!=NULL) || (cv.PortType==IdFile) ) {
+ if ( (! cv.Ready) || (!IsSendVarNULL()) ||
+ (!IsFileVarNULL()) || (cv.PortType==IdFile) ) {
EnableMenuItem(FileMenu,ID_FILE_SENDFILE,MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(FileMenu,ID_TRANSFER,MF_BYPOSITION | MF_GRAYED); /* Transfer */
EnableMenuItem(FileMenu,ID_FILE_CHANGEDIR,MF_BYCOMMAND | MF_GRAYED);
@@ -1305,7 +1305,7 @@
EnableMenuItem(EditMenu,ID_EDIT_COPYTABLE,MF_BYCOMMAND | MF_GRAYED);
}
if (cv.Ready &&
- (SendVar==NULL) && (FileVar==NULL) &&
+ IsSendVarNULL() && IsFileVarNULL() &&
(cv.PortType!=IdFile) &&
(IsClipboardFormatAvailable(CF_TEXT) ||
IsClipboardFormatAvailable(CF_OEMTEXT))) {
@@ -1323,7 +1323,7 @@
* (ID_SETUP_SERIALPORT)\x82̃\x81\x83j\x83\x85\x81[\x82\xAA\x91I\x91\xF0\x82ł\xAB\x82Ȃ\xA2\x82悤\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD\x82\xAA\x81A
* \x82\xB1\x82̃K\x81[\x83h\x82\xF0\x8AO\x82\xB5\x81A\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x83_\x83C\x83A\x83\x8D\x83O\x82\xA9\x82\xE7\x90V\x82\xB5\x82\xA2\x90ڑ\xB1\x82\xAA\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
*/
- if ((SendVar!=NULL) || (FileVar!=NULL) || Connecting) {
+ if (!IsSendVarNULL() || !IsFileVarNULL() || Connecting) {
EnableMenuItem(SetupMenu,ID_SETUP_SERIALPORT,MF_BYCOMMAND | MF_GRAYED);
}
else {
@@ -1333,7 +1333,7 @@
else if (SubMenu == ControlMenu)
{
if (cv.Ready &&
- (SendVar==NULL) && (FileVar==NULL)) {
+ IsSendVarNULL() && IsFileVarNULL()) {
if (ts.DisableMenuSendBreak) {
EnableMenuItem(ControlMenu,ID_CONTROL_SENDBREAK,MF_BYCOMMAND | MF_GRAYED);
}
@@ -1352,7 +1352,7 @@
EnableMenuItem(ControlMenu,ID_CONTROL_RESETPORT,MF_BYCOMMAND | MF_GRAYED);
}
- if (cv.Ready && cv.TelFlag && (FileVar==NULL)) {
+ if (cv.Ready && cv.TelFlag && IsFileVarNULL()) {
EnableMenuItem(ControlMenu,ID_CONTROL_AREYOUTHERE,MF_BYCOMMAND | MF_ENABLED);
}
else {
@@ -1366,7 +1366,7 @@
EnableMenuItem(ControlMenu,ID_CONTROL_CLOSETEK,MF_BYCOMMAND | MF_ENABLED);
}
- if (DDELog || (FileVar!=NULL)) {
+ if (DDELog || !IsFileVarNULL()) {
EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(ControlMenu,ID_CONTROL_SHOW_MACRO,MF_BYCOMMAND | MF_ENABLED);
}
@@ -2068,7 +2068,7 @@
void CVTWindow::OnDropFiles(HDROP hDropInfo)
{
::SetForegroundWindow(HVTWin);
- if (cv.Ready && SendVar==NULL)
+ if (cv.Ready && IsSendVarNULL())
{
const UINT ShowDialog =
((GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0) ? 1 : 0;