svnno****@sourc*****
svnno****@sourc*****
2017年 7月 26日 (水) 12:47:40 JST
Tera TermRevision: 6882
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6882
Author: doda
Date: 2017-07-26 12:47:40 +0900 (Wed, 26 Jul 2017)
Log Message:
-----------
コード整理。処理内容は変化なし。
・コメントの typo fix
・インデント調整
・#if 0 でコメントアウトされたコードブロックを削除
・現状に合わないコメントを削除
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2017-07-25 08:45:35 UTC (rev 6881)
+++ trunk/teraterm/teraterm/vtwin.cpp 2017-07-26 03:47:40 UTC (rev 6882)
@@ -5364,7 +5364,6 @@
return TRUE;
}
-
//
// \x8C\xBB\x8Dݓǂݍ\x9E\x82܂\xEA\x82Ă\xA2\x82\xE9 teraterm.ini \x83t\x83@\x83C\x83\x8B\x82\xAA\x8Ai\x94[\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
// \x83t\x83H\x83\x8B\x83_\x82\xF0\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82ŊJ\x82\xAD\x81B
@@ -5380,7 +5379,6 @@
}
-
void CVTWindow::OnSetupLoadKeyMap()
{
BOOL Ok;
@@ -5480,9 +5478,6 @@
SendDlgItemMessage(Dialog, IDC_COMMAND_EDIT, CB_SETCURSEL,0,0);
}
-
-
-
// \x83h\x83\x8D\x83b\x83v\x83_\x83E\x83\x93\x82̒\x86\x82̃G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xF0
// \x83T\x83u\x83N\x83\x89\x83X\x89\xBB\x82\xB7\x82邽\x82߂̃E\x83C\x83\x93\x83h\x83E\x83v\x83\x8D\x83V\x81[\x83W\x83\x83
static WNDPROC OrigBroadcastEditProc; // Original window procedure
@@ -5526,16 +5521,7 @@
SetWindowText(dlg, "");
SendMessage(dlg, EM_SETSEL, 0, 0);
}
-#if 0
- for (i = 0 ; i < MAXNWIN ; i++) { // 50 = MAXNWIN(@ ttcmn.c)
- hd = GetNthWin(i);
- if (hd == NULL)
- break;
- PostMessage(hd, msg, wParam, lParam);
- //PostMessage(hd, WM_SETFOCUS, NULL, 0);
- }
-#else
count = SendMessage(BroadcastWindowList, LB_GETCOUNT, 0, 0);
for (i = 0 ; i < count ; i++) {
if (SendMessage(BroadcastWindowList, LB_GETSEL, i, 0)) {
@@ -5545,21 +5531,11 @@
}
}
}
-#endif
}
break;
case WM_CHAR:
-#if 0
- switch (wParam) {
- case VK_RETURN:
- case VK_ESCAPE:
- // \x8Cx\x8D\x90\x89\xB9\x82\xAA\x8Fo\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9
- return FALSE;
- }
- // not break;
-#endif
- // \x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x82\xAA\x82\xAAIDC_COMMAND_EDIT\x82Ɏc\x82\xE7\x82Ȃ\xA2\x82悤\x82Ɏ̂Ă\xE9
+ // \x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x82\xAAIDC_COMMAND_EDIT\x82Ɏc\x82\xE7\x82Ȃ\xA2\x82悤\x82Ɏ̂Ă\xE9
return FALSE;
default:
@@ -5575,7 +5551,7 @@
int i;
HWND hd;
- for (i = 0 ; i < MAXNWIN ; i++) { // 50 = MAXNWIN(@ ttcmn.c)
+ for (i = 0 ; i < MAXNWIN ; i++) {
hd = GetNthWin(i);
if (hd == NULL) {
break;
@@ -5584,7 +5560,6 @@
return (i);
}
-
static void UpdateBroadcastWindowList(HWND hWnd)
{
int i;
@@ -5593,7 +5568,7 @@
SendMessage(hWnd, LB_RESETCONTENT, 0, 0);
- for (i = 0 ; i < MAXNWIN ; i++) { // 50 = MAXNWIN(@ ttcmn.c)
+ for (i = 0 ; i < MAXNWIN ; i++) {
hd = GetNthWin(i);
if (hd == NULL) {
break;
@@ -5602,12 +5577,6 @@
GetWindowText(hd, szWindowText, 256);
SendMessage(hWnd, LB_INSERTSTRING, -1, (LPARAM)szWindowText);
}
-
-#if 0
- for (i = 0 ; i < SendMessage(BroadcastWindowList, LB_GETCOUNT, 0, 0) ; i++) {
- SendMessage(hWnd, LB_SETSEL, TRUE, i);
- }
-#endif
}
/*
@@ -5652,10 +5621,8 @@
// (2006.2.7 yutaka)
PostMessage(hd, WM_SETFOCUS, NULL, 0);
}
-
}
-
/*
* \x94C\x88ӂ\xCCTeraTerm\x8CQ\x82փ\x81\x83b\x83Z\x81[\x83W\x82𑗐M\x82\xB7\x82\xE9\x83}\x83\x8B\x83`\x83L\x83\x83\x83X\x83g\x83\x82\x81[\x83h\x81B\x8C\xB5\x96\xA7\x82ɂ́A
* \x83u\x83\x8D\x81[\x83h\x83L\x83\x83\x83X\x83g\x91\x97\x90M\x82\xF0\x8Ds\x82\xA2\x81A\x8E\xF3\x90M\x91\xA4\x82Ń\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8E\xE6\x8ȆI\x91\xF0\x82\xB7\x82\xE9\x81B
@@ -5690,7 +5657,7 @@
memcpy(msg + nlen, buf, buflen);
// \x82\xB7\x82ׂĂ\xCCTera Term\x82Ƀ\x81\x83b\x83Z\x81[\x83W\x82ƃf\x81[\x83^\x82𑗂\xE9
- for (i = 0 ; i < MAXNWIN ; i++) { // 50 = MAXNWIN(@ ttcmn.c)
+ for (i = 0 ; i < MAXNWIN ; i++) {
hd = GetNthWin(i);
if (hd == NULL) {
break;
@@ -5714,7 +5681,6 @@
free(msg);
}
-
extern "C"
void SetMulticastName(char *name)
{
@@ -5841,15 +5807,15 @@
init_height = rc_dlg.bottom - rc_dlg.top;
// \x8C\xBB\x8D݃T\x83C\x83Y\x82\xA9\x82\xE7\x95K\x97v\x82Ȓl\x82\xF0\x8Cv\x8EZ
- GetClientRect(hWnd, &rc_dlg);
+ GetClientRect(hWnd, &rc_dlg);
p.x = rc_dlg.right;
p.y = rc_dlg.bottom;
ClientToScreen(hWnd, &p);
- GetWindowRect(GetDlgItem(hWnd, IDOK), &rc_ok);
+ GetWindowRect(GetDlgItem(hWnd, IDOK), &rc_ok);
ok2right = p.x - rc_ok.left;
- GetWindowRect(GetDlgItem(hWnd, IDCANCEL), &rc);
+ GetWindowRect(GetDlgItem(hWnd, IDCANCEL), &rc);
cancel2right = p.x - rc.left;
GetWindowRect(GetDlgItem(hWnd, IDC_COMMAND_EDIT), &rc);
@@ -5944,7 +5910,7 @@
GetDefaultFName(ts.HomeDir, BROADCAST_LOGFILE, historyfile, sizeof(historyfile));
if (LoadTTSET()) {
(*AddValueToList)(historyfile, buf, "BroadcastCommands", "Command",
- ts.MaxBroadcatHistory);
+ ts.MaxBroadcatHistory);
FreeTTSET();
}
ApplyBroadCastCommandHisotry(hWnd, historyfile);
@@ -6046,7 +6012,7 @@
POINT p;
// \x90V\x82\xB5\x82\xA2\x83_\x83C\x83A\x83\x8D\x83O\x82̃T\x83C\x83Y\x82\xE9
- GetClientRect(hWnd, &rc_dlg);
+ GetClientRect(hWnd, &rc_dlg);
dlg_w = rc_dlg.right;
dlg_h = rc_dlg.bottom;
@@ -6056,8 +6022,8 @@
p.y = rc.top;
ScreenToClient(hWnd, &p);
SetWindowPos(GetDlgItem(hWnd, IDOK), 0,
- dlg_w - ok2right, p.y, 0, 0,
- SWP_NOSIZE | SWP_NOZORDER);
+ dlg_w - ok2right, p.y, 0, 0,
+ SWP_NOSIZE | SWP_NOZORDER);
// Cancel button
GetWindowRect(GetDlgItem(hWnd, IDCANCEL), &rc);
@@ -6065,8 +6031,8 @@
p.y = rc.top;
ScreenToClient(hWnd, &p);
SetWindowPos(GetDlgItem(hWnd, IDCANCEL), 0,
- dlg_w - cancel2right, p.y, 0, 0,
- SWP_NOSIZE | SWP_NOZORDER);
+ dlg_w - cancel2right, p.y, 0, 0,
+ SWP_NOSIZE | SWP_NOZORDER);
// Command Edit box
GetWindowRect(GetDlgItem(hWnd, IDC_COMMAND_EDIT), &rc);
@@ -6074,8 +6040,8 @@
p.y = rc.top;
ScreenToClient(hWnd, &p);
SetWindowPos(GetDlgItem(hWnd, IDC_COMMAND_EDIT), 0,
- 0, 0, dlg_w - p.x - ok2right - cmdlist2ok, p.y,
- SWP_NOMOVE | SWP_NOZORDER);
+ 0, 0, dlg_w - p.x - ok2right - cmdlist2ok, p.y,
+ SWP_NOMOVE | SWP_NOZORDER);
// List Edit box
GetWindowRect(GetDlgItem(hWnd, IDC_LIST), &rc);
@@ -6083,8 +6049,8 @@
p.y = rc.top;
ScreenToClient(hWnd, &p);
SetWindowPos(GetDlgItem(hWnd, IDC_LIST), 0,
- 0, 0, dlg_w - p.x - list2right , dlg_h - p.y - list2bottom,
- SWP_NOMOVE | SWP_NOZORDER);
+ 0, 0, dlg_w - p.x - list2right , dlg_h - p.y - list2bottom,
+ SWP_NOMOVE | SWP_NOZORDER);
// status bar
SendMessage(hStatus , msg , wp , lp);
@@ -6230,8 +6196,6 @@
return 1; // \x91\x97\x90M\x82ł\xAB\x82\xBD\x8Fꍇ\x82\xCD1\x82\xF0\x95Ԃ\xB7
}
-
-
void CVTWindow::OnControlOpenTEK()
{
OpenTEK();