Tera TermRevision: 8683
https://osdn.net/projects/ttssh2/scm/svn/commits/8683
Author: zmatsuo
Date: 2020-04-12 00:53:09 +0900 (Sun, 12 Apr 2020)
Log Message:
-----------
ttl.cpp から ttl_gui に移動した関数を削除
- 主にダイアログを出す関数を移動した
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ttl.cpp
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp 2020-04-11 15:52:50 UTC (rev 8682)
+++ trunk/teraterm/ttpmacro/ttl.cpp 2020-04-11 15:53:09 UTC (rev 8683)
@@ -450,184 +450,6 @@
return Err;
}
-#if 0
-// add 'clipb2var' (2006.9.17 maya)
-WORD TTLClipb2Var()
-{
- WORD Err;
- TVarId VarId;
- HANDLE hText;
- PTSTR clipbText;
- char buf[MaxStrLen];
- int Num = 0;
- char *newbuff;
- static char *cbbuff;
- static int cbbuffsize, cblen;
- HANDLE wide_hText;
- LPWSTR wide_buf;
- int mb_len;
- UINT Cf;
-
- Err = 0;
- GetStrVar(&VarId, &Err);
- if (Err!=0) return Err;
-
- // get 2nd arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&Num, &Err);
- }
-
- if ((Err==0) && (GetFirstChar()!=0))
- Err = ErrSyntax;
- if (Err!=0) return Err;
-
- if (Num == 0) {
- if (IsClipboardFormatAvailable(CF_UNICODETEXT)) {
- Cf = CF_UNICODETEXT;
- }
- else if (IsClipboardFormatAvailable(CF_TEXT)) {
- Cf = CF_TEXT;
- }
- else {
- cblen = 0;
- SetResult(0);
- return Err;
- }
- if (OpenClipboard(NULL) == 0) {
- cblen = 0;
- SetResult(0);
- return Err;
- }
-
- if (Cf == CF_UNICODETEXT) {
- wide_hText = GetClipboardData(CF_UNICODETEXT);
- if (wide_hText != NULL) {
- wide_buf = GlobalLock(wide_hText);
- mb_len = WideCharToMultiByte(CP_ACP, 0, wide_buf, -1, NULL, 0, NULL, NULL);
- hText = GlobalAlloc(GMEM_MOVEABLE, sizeof(CHAR) * mb_len);
- clipbText = GlobalLock(hText);
- if (hText != NULL) {
- WideCharToMultiByte(CP_ACP, 0, wide_buf, -1, clipbText, mb_len, NULL, NULL);
-
- cblen = strlen(clipbText);
- if (cbbuffsize <= cblen) {
- if ((newbuff = realloc(cbbuff, cblen + 1)) == NULL) {
- // realloc failed. fall back to old mode.
- cblen = 0;
- strncpy_s(buf,sizeof(buf),clipbText,_TRUNCATE);
- GlobalUnlock(hText);
- CloseClipboard();
- SetStrVal(VarId, buf);
- SetResult(3);
- return Err;
- }
- cbbuff = newbuff;
- cbbuffsize = cblen + 1;
- }
- strncpy_s(cbbuff, cbbuffsize, clipbText, _TRUNCATE);
-
- GlobalUnlock(hText);
- GlobalFree(hText);
- }
- GlobalUnlock(wide_hText);
- }
- else {
- cblen = 0;
- }
- }
- else if (Cf == CF_TEXT) {
- hText = GetClipboardData(CF_TEXT);
- if (hText != NULL) {
- clipbText = GlobalLock(hText);
- cblen = strlen(clipbText);
- if (cbbuffsize <= cblen) {
- if ((newbuff = realloc(cbbuff, cblen + 1)) == NULL) {
- // realloc failed. fall back to old mode.
- cblen = 0;
- strncpy_s(buf,sizeof(buf),clipbText,_TRUNCATE);
- GlobalUnlock(hText);
- CloseClipboard();
- SetStrVal(VarId, buf);
- SetResult(3);
- return Err;
- }
- cbbuff = newbuff;
- cbbuffsize = cblen + 1;
- }
- strncpy_s(cbbuff, cbbuffsize, clipbText, _TRUNCATE);
- GlobalUnlock(hText);
- }
- else {
- cblen = 0;
- }
- }
- CloseClipboard();
- }
-
- if (cbbuff != NULL && Num >= 0 && Num * (MaxStrLen - 1) < cblen) {
- if (strncpy_s(buf ,sizeof(buf), cbbuff + Num * (MaxStrLen-1), _TRUNCATE) == STRUNCATE)
- SetResult(2); // Copied string is truncated.
- else {
- SetResult(1);
- }
- SetStrVal(VarId, buf);
- }
- else {
- SetResult(0);
- }
-
- return Err;
-}
-#endif
-
-#if 0
-// add 'var2clipb' (2006.9.17 maya)
-WORD TTLVar2Clipb()
-{
- WORD Err;
- TStrVal Str;
- HGLOBAL hText;
- PTSTR clipbText;
- int wide_len;
- HGLOBAL wide_hText;
- LPWSTR wide_buf;
-
- Err = 0;
- GetStrVal(Str,&Err);
- if (Err!=0) return Err;
-
- hText = GlobalAlloc(GHND, sizeof(Str));
- clipbText = GlobalLock(hText);
- strncpy_s(clipbText, sizeof(Str), Str, _TRUNCATE);
- GlobalUnlock(hText);
-
- wide_len = MultiByteToWideChar(CP_ACP, 0, clipbText, -1, NULL, 0);
- wide_hText = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR) * wide_len);
- if (wide_hText) {
- wide_buf = (LPWSTR)GlobalLock(wide_hText);
- MultiByteToWideChar(CP_ACP, 0, clipbText, -1, wide_buf, wide_len);
- GlobalUnlock(wide_hText);
- }
-
- if (OpenClipboard(NULL) == 0) {
- SetResult(0);
- }
- else {
- EmptyClipboard();
- SetClipboardData(CF_TEXT, hText);
-
- if (wide_buf) {
- SetClipboardData(CF_UNICODETEXT, wide_hText);
- }
-
- CloseClipboard();
- SetResult(1);
- }
-
- return Err;
-}
-#endif
-
WORD TTLCloseSBox()
{
if (GetFirstChar()!=0)
@@ -1546,69 +1368,6 @@
return Err;
}
-#if 0
-// add 'filenamebox' (2007.9.13 maya)
-WORD TTLFilenameBox()
-{
- TStrVal Str1;
- WORD Err, ValType;
- TVarId VarId;
- OPENFILENAME ofn;
- char uimsg[MAX_UIMSG];
- BOOL SaveFlag = FALSE;
- TStrVal InitDir = "";
- BOOL ret;
-
- Err = 0;
- GetStrVal(Str1,&Err);
- if (Err!=0) return Err;
-
- // get 2nd arg(optional) if given
- if (CheckParameterGiven()) { // dialogtype
- GetIntVal(&SaveFlag, &Err);
- if (Err!=0) return Err;
-
- // get 3rd arg(optional) if given
- if (CheckParameterGiven()) { // initdir
- GetStrVal(InitDir, &Err);
- if (Err!=0) return Err;
- }
- }
-
- if ((Err==0) && (GetFirstChar()!=0))
- Err = ErrSyntax;
- if (Err!=0) return Err;
-
- SetInputStr("");
- if (CheckVar("inputstr", &ValType, &VarId) &&
- (ValType==TypString)) {
- memset(&ofn, 0, sizeof(OPENFILENAME));
- ofn.lStructSize = get_OPENFILENAME_SIZE();
- ofn.hwndOwner = HMainWin;
- ofn.lpstrTitle = Str1;
- ofn.lpstrFile = StrVarPtr(VarId);
- ofn.nMaxFile = MaxStrLen;
- get_lang_msg("FILEDLG_ALL_FILTER", uimsg, sizeof(uimsg), "All(*.*)\\0*.*\\0\\0", UILanguageFile);
- ofn.lpstrFilter = uimsg;
- ofn.lpstrInitialDir = NULL;
- if (strlen(InitDir) > 0) {
- ofn.lpstrInitialDir = InitDir;
- }
- BringupWindow(HMainWin);
- if (SaveFlag) {
- ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
- ret = GetSaveFileName(&ofn);
- }
- else {
- ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT;
- ret = GetOpenFileName(&ofn);
- }
- SetResult(ret);
- }
- return Err;
-}
-#endif
-
WORD TTLFileOpen()
{
WORD Err;
@@ -2619,52 +2378,6 @@
return Err;
}
-#if 0
-WORD TTLGetPassword()
-{
- TStrVal Str, Str2, Temp2;
- char Temp[512];
- WORD Err;
- TVarId VarId;
- int result = 0; /* failure */
-
- Err = 0;
- GetStrVal(Str,&Err);
- GetStrVal(Str2,&Err);
- GetStrVar(&VarId,&Err);
- if ((Err==0) && (GetFirstChar()!=0))
- Err = ErrSyntax;
- if (Err!=0) return Err;
- SetStrVal(VarId,"");
- if (Str[0]==0) return Err;
- if (Str2[0]==0) return Err;
-
- GetAbsPath(Str,sizeof(Str));
-
- GetPrivateProfileString("Password",Str2,"",
- Temp,sizeof(Temp), Str);
- if (Temp[0]==0) // password not exist
- {
- OpenInpDlg(Temp2, Str2, "Enter password", "", TRUE);
- if (Temp2[0]!=0) {
- Encrypt(Temp2,Temp);
- if (WritePrivateProfileString("Password",Str2,Temp, Str) != 0) {
- result = 1; /* success */
- }
- }
- }
- else {// password exist
- Decrypt(Temp,Temp2);
- result = 1; /* success */
- }
-
- SetStrVal(VarId,Temp2);
-
- SetResult(result); // \x90\xAC\x8C\xF7\x89ۂ\xF0\x90ݒ肷\x82\xE9\x81B
- return Err;
-}
-#endif
-
// setpassword 'password.dat' 'mypassword' passowrd
WORD TTLSetPassword()
{
@@ -3083,54 +2796,6 @@
return Err;
}
-#if 0
-WORD TTLInputBox(BOOL Paswd)
-{
- TStrVal Str1, Str2, Str3;
- WORD Err, ValType, P;
- TVarId VarId;
- int sp = 0;
-
- Err = 0;
- GetStrVal(Str1,&Err);
- GetStrVal(Str2,&Err);
- if (Err!=0) return Err;
-
- if (!Paswd && CheckParameterGiven()) {
- // get 3rd arg(optional)
- P = LinePtr;
- GetStrVal(Str3,&Err);
- if (Err == ErrTypeMismatch) {
- strncpy_s(Str3,sizeof(Str3),"",_TRUNCATE);
- LinePtr = P;
- Err = 0;
- }
- }
- else {
- strncpy_s(Str3,sizeof(Str3),"",_TRUNCATE);
- }
-
- // get 4th(3rd) arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&sp, &Err);
- }
-
- if ((Err==0) && (GetFirstChar()!=0))
- Err = ErrSyntax;
- if (Err!=0) return Err;
-
- if (sp) {
- RestoreNewLine(Str1);
- }
-
- SetInputStr("");
- if (CheckVar("inputstr",&ValType,&VarId) &&
- (ValType==TypString))
- OpenInpDlg(StrVarPtr(VarId),Str1,Str2,Str3,Paswd);
- return Err;
-}
-#endif
-
WORD TTLInt2Str()
{
TVarId VarId;
@@ -3440,175 +3105,6 @@
return Err;
}
-#if 0
-WORD TTLDirnameBox()
-{
- TStrVal Title;
- WORD Err, ValType;
- TVarId VarId;
- char buf[MAX_PATH];
- TStrVal InitDir = "";
- BOOL ret;
-
- Err = 0;
- GetStrVal(Title, &Err);
- if (Err != 0) return Err;
-
- // get 2nd arg(optional) if given
- if (CheckParameterGiven()) { // initdir
- GetStrVal(InitDir, &Err);
- if (Err != 0) return Err;
- }
-
- if ((Err == 0) && (GetFirstChar() != 0))
- Err = ErrSyntax;
- if (Err != 0) return Err;
-
- SetInputStr("");
- if (CheckVar("inputstr", &ValType, &VarId) &&
- (ValType == TypString)) {
- BringupWindow(HMainWin);
- if (doSelectFolder(HMainWin, buf, sizeof(buf), InitDir, Title)) {
- SetInputStr(buf);
- ret = 1;
- }
- else {
- ret = 0;
- }
- SetResult(ret);
- }
- return Err;
-}
-
-#if 0
-#define IdMsgBox 1
-#define IdYesNoBox 2
-#define IdStatusBox 3
-#define IdListBox 4
-#define LISTBOX_ITEM_NUM 10
-#endif
-
-int MessageCommand(int BoxId, LPWORD Err)
-{
- TStrVal Str1, Str2;
- int sp = 0;
- int ret;
- TCHAR **s;
- int i, ary_size;
- int sel = 0;
- TVarId VarId, VarId2;
-
- *Err = 0;
- GetStrVal2(Str1, Err, TRUE);
- GetStrVal2(Str2, Err, TRUE);
- if (*Err!=0) return 0;
-
- if (BoxId != IdListBox) {
- // get 3rd arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&sp, Err);
- }
- if ((*Err==0) && (GetFirstChar()!=0))
- *Err = ErrSyntax;
- if (*Err!=0) return 0;
- }
-
- if (sp) {
- RestoreNewLine(Str1);
- }
-
- if (BoxId==IdMsgBox) {
- ret = OpenMsgDlg(Str1,Str2,FALSE);
- // \x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB7\x82\xE9\x82ƁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
- // (2008.8.5 yutaka)
- if (ret == IDCANCEL) {
- TTLStatus = IdTTLEnd;
- }
- } else if (BoxId==IdYesNoBox) {
- ret = OpenMsgDlg(Str1,Str2,TRUE);
- // \x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB7\x82\xE9\x82ƁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
- // (2008.8.6 yutaka)
- if (ret == IDCLOSE) {
- TTLStatus = IdTTLEnd;
- }
- return (ret);
- }
- else if (BoxId==IdStatusBox) {
- OpenStatDlg(Str1,Str2);
-
- } else if (BoxId==IdListBox) {
- // \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x82̑I\x91\xF0\x8E\x88\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
- GetStrAryVar(&VarId, Err);
-
- if (CheckParameterGiven()) {
- GetIntVal(&sel, Err);
- }
- if (*Err==0 && GetFirstChar()!=0)
- *Err = ErrSyntax;
- if (*Err!=0) return 0;
-
- ary_size = GetStrAryVarSize(VarId);
- if (sel < 0 || sel >= ary_size) {
- sel = 0;
- }
-
- s = (TCHAR **)calloc(ary_size + 1, sizeof(char *));
- if (s == NULL) {
- *Err = ErrFewMemory;
- return -1;
- }
- for (i = 0 ; i < ary_size ; i++) {
- VarId2 = GetStrVarFromArray(VarId, i, Err);
- if (*Err!=0) return -1;
- s[i] = _strdup(StrVarPtr(VarId2));
- }
- if (s[0] == NULL) {
- *Err = ErrSyntax;
- return -1;
- }
-
- // return
- // 0\x88ȏ\xE3: \x91I\x91\xF0\x8D\x80\x96\xDA
- // -1: \x83L\x83\x83\x83\x93\x83Z\x83\x8B
- // -2: close
- ret = OpenListDlg(Str1, Str2, s, sel);
-
- for (i = 0 ; i < ary_size ; i++) {
- free(s[i]);
- }
- free(s);
-
- // \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x82̕\xB6\x82\xE9\x83{\x83^\x83\x93(&\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O)\x82ŁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
- if (ret == -2) {
- TTLStatus = IdTTLEnd;
- }
- return (ret);
-
- }
- return 0;
-}
-
-// \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X
-// (2013.3.13 yutaka)
-WORD TTLListBox()
-{
- WORD Err;
- int ret;
-
- ret = MessageCommand(IdListBox, &Err);
- SetResult(ret);
- return Err;
-}
-
-WORD TTLMessageBox()
-{
- WORD Err;
-
- MessageCommand(IdMsgBox, &Err);
- return Err;
-}
-#endif
-
WORD TTLNext()
{
if (GetFirstChar()!=0)
@@ -4780,16 +4276,6 @@
return Err;
}
-#if 0
-WORD TTLStatusBox()
-{
- WORD Err;
-
- MessageCommand(IdStatusBox, &Err);
- return Err;
-}
-#endif
-
WORD TTLStr2Code()
{
TVarId VarId;
@@ -5860,23 +5346,6 @@
return SendCmnd(CmdXmodemSend,IdTTLWaitCmndResult);
}
-#if 0
-WORD TTLYesNoBox()
-{
- WORD Err;
- int YesNo;
-
- YesNo = MessageCommand(IdYesNoBox, &Err);
- if (Err!=0) return Err;
- if (YesNo==IDOK)
- YesNo = 1; // Yes
- else
- YesNo = 0; // No
- SetResult(YesNo);
- return Err;
-}
-#endif
-
WORD TTLZmodemSend()
{
TStrVal Str;