svnno****@sourc*****
svnno****@sourc*****
2016年 7月 11日 (月) 17:53:03 JST
Tera TermRevision: 6435
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6435
Author: doda
Date: 2016-07-11 17:53:02 +0900 (Mon, 11 Jul 2016)
Log Message:
-----------
・行末の空白/タブを削除
・インデント調整
Modified Paths:
--------------
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/buffer.c
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/ftdlg.cpp
trunk/teraterm/teraterm/hfs_plus.map
trunk/teraterm/teraterm/keyboard.c
trunk/teraterm/teraterm/prnabort.cpp
trunk/teraterm/teraterm/protodlg.cpp
trunk/teraterm/teraterm/teklib.c
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/telnet.c
trunk/teraterm/teraterm/telnet.h
trunk/teraterm/teraterm/teraprn.cpp
trunk/teraterm/teraterm/teraterm.cpp
trunk/teraterm/teraterm/teraterm.manifest
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/teraterm/ttdde.h
trunk/teraterm/teraterm/ttdialog.c
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/teraterm/ttime.c
trunk/teraterm/teraterm/ttwinman.c
trunk/teraterm/teraterm/ttwsk.c
trunk/teraterm/teraterm/uni2sjis.map
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpfile/ttfile.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/addsetting.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -173,7 +173,7 @@
// (4)IDC_MOUSEWHEEL_SCROLL_LINE
GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));
val = atoi(buf);
- if (val > 0)
+ if (val > 0)
ts.MouseWheelScrollLine = val;
// (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
@@ -567,7 +567,7 @@
btn = (CButton *)GetDlgItem(IDC_TRIMNLCHAR);
btn->SetCheck(ts.TrimTrailingNLonPaste);
- // (7)ConfirmChangePaste
+ // (7)ConfirmChangePaste
btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
btn->SetCheck(ts.ConfirmChangePaste);
@@ -931,7 +931,7 @@
btn = (CButton *)GetDlgItem(IDC_URL_UNDERLINE);
btn->SetCheck((ts.FontFlag&FF_URLUNDERLINE) != 0);
- // \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82Ă\xE9
+ // \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82Ă\xE9
::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_ALPHA_BLEND));
return FALSE;
@@ -1497,7 +1497,7 @@
GetDlgItem(IDC_ROTATE_SIZE_TYPE)->EnableWindow(FALSE);
GetDlgItem(IDC_ROTATE_STEP_TEXT)->EnableWindow(FALSE);
GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(FALSE);
- }
+ }
}
return TRUE;
@@ -1644,7 +1644,7 @@
((CComboBox*)GetDlgItem(IDC_ROTATE_SIZE_TYPE))->GetWindowText(str);
for (i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
- if (strcmp(str, LogRotateSizeType[i]) == 0)
+ if (strcmp(str, LogRotateSizeType[i]) == 0)
break;
}
if (i >= LOG_ROTATE_SIZETYPE_NUM)
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/buffer.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -29,7 +29,7 @@
#define BuffSizeMax (BuffYMax * 80)
// status line
-int StatusLine; //0: none 1: shown
+int StatusLine; //0: none 1: shown
/* top, bottom, left & right margin */
int CursorTop, CursorBottom, CursorLeftM, CursorRightM;
BOOL Selected;
@@ -1593,7 +1593,7 @@
};
unsigned char ch = CodeLine[x];
- if (ts.EnableClickableUrl == FALSE &&
+ if (ts.EnableClickableUrl == FALSE &&
(ts.ColorFlag & CF_URLCOLOR) == 0)
return;
@@ -1605,7 +1605,7 @@
if ((PrevCharAttr & AttrURL) && !(AttrLine[0]&(AttrKanji|AttrSpecial)) && !(ch & 0x80) && url_char[ch]) {
if ((AttrLine[0] & AttrLineContinued) || (ts.JoinSplitURL &&
(PrevCharCode == ts.JoinSplitURLIgnoreEOLChar || ts.JoinSplitURLIgnoreEOLChar == '\0' ))) {
- AttrLine[0] |= AttrURL;
+ AttrLine[0] |= AttrURL;
}
}
return;
@@ -1614,7 +1614,7 @@
if ((x-1>=0) && (AttrLine[x-1] & AttrURL) &&
!(AttrLine[x] & (AttrKanji|AttrSpecial)) &&
((!(ch & 0x80) && url_char[ch]) || (x == NumOfColumns - 1 && ch == ts.JoinSplitURLIgnoreEOLChar))) {
- AttrLine[x] |= AttrURL;
+ AttrLine[x] |= AttrURL;
return;
}
@@ -1628,7 +1628,7 @@
len = strlen(*p) - 1;
if ((x-len>=0) && !strncmp(&CodeLine[x-len], *p, len)) {
for (i = 0; i <= len; i++) {
- AttrLine[x-i] |= AttrURL;
+ AttrLine[x-i] |= AttrURL;
}
break;
}
@@ -2399,7 +2399,7 @@
uptr = url;
for (i = 0; i < end - start + 1; i++) {
ch = CodeBuff[start + i];
- if ((start + i) % NumOfColumns == NumOfColumns - 1
+ if ((start + i) % NumOfColumns == NumOfColumns - 1
&& ch == ts.JoinSplitURLIgnoreEOLChar) {
// \x8Ds\x96\x96\x82\xAA\x8Ds\x8Cp\x91\xB1\x83}\x81[\x83N\x97p\x82̕\xB6\x8E\x9A\x82̏ꍇ\x82̓X\x83L\x83b\x83v\x82\xB7\x82\xE9
} else {
@@ -2696,7 +2696,7 @@
MoveCharPtr(TmpPtr,&IStart,1);
}
}
-
+
// \x8Ds\x82\xAA\x88ړ\xAE\x82\xB5\x82Ă\xA2\x82邩\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x82̂ŁA\x83N\x83\x8A\x83b\x83N\x82\xB5\x82\xBD\x8Ds\x82\xF0\x8E\xE6\x82蒼\x82\xB7
TmpPtr = GetLinePtr(YEnd);
i = 1;
@@ -2972,7 +2972,7 @@
ChangeSelectRegion();
SelectStart = DblClkEnd;
SelectEnd.x = X;
- SelectEnd.y = Y;
+ SelectEnd.y = Y;
}
if (IsDelimiter(TmpPtr,SelectEnd.x)) {
b = CodeBuff[TmpPtr+SelectEnd.x];
@@ -2995,7 +2995,7 @@
MoveCharPtr(TmpPtr,(int *)&SelectEnd.x,-1); // move left
}
if (IsDelimiter(TmpPtr,SelectEnd.x)) {
- MoveCharPtr(TmpPtr,(int *)&SelectEnd.x,1);
+ MoveCharPtr(TmpPtr,(int *)&SelectEnd.x,1);
}
}
}
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/clipboar.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -859,7 +859,7 @@
FILE *fp = NULL;
char buf[256];
int len;
-
+
if (filename == NULL || filename[0] == '\0')
goto error;
@@ -870,7 +870,7 @@
// TODO: \x88\xEA\x8Ds\x82\xAA256byte\x82\xA6\x82Ă\xA2\x82\xE9\x8Fꍇ\x82̍l\x97\xB6
while (fgets(buf, sizeof(buf), fp) != NULL) {
len = strlen(buf);
- if (buf[len - 1] == '\n')
+ if (buf[len - 1] == '\n')
buf[len - 1] = '\0';
if (buf[0] == '\0')
continue;
@@ -912,7 +912,7 @@
if (!ts.ConfirmChangePaste && !ts.TrimTrailingNLonPaste)
return 1;
- if (! cv.Ready)
+ if (! cv.Ready)
goto error;
if (TalkStatus!=IdTalkKeyb)
goto error;
@@ -923,10 +923,10 @@
Cf = CF_TEXT;
else if (IsClipboardFormatAvailable(CF_OEMTEXT))
Cf = CF_OEMTEXT;
- else
+ else
goto error;
- if (!OpenClipboard(HWin))
+ if (!OpenClipboard(HWin))
goto error;
if (Cf == CF_UNICODETEXT) {
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/commlib.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -586,7 +586,7 @@
case IdNamedPipe:
InitFileIO(IdNamedPipe); /* TTPLUG */
TTXOpenFile(); /* TTPLUG */
-
+
memset(P, 0, sizeof(P));
strncpy_s(P, sizeof(P), ts->HostName, _TRUNCATE);
@@ -594,10 +594,10 @@
if (CheckNamedPipeFormat(P, strlen(P)) < 0) {
InvalidHost = TRUE;
- _snprintf_s(ErrMsg, sizeof(ErrMsg), _TRUNCATE,
+ _snprintf_s(ErrMsg, sizeof(ErrMsg), _TRUNCATE,
"Invalid pipe name (%d)\n\n"
"A valid pipe name has the form\n"
- "\"\\\\<ServerName>\\pipe\\<PipeName>\"",
+ "\"\\\\<ServerName>\\pipe\\<PipeName>\"",
GetLastError());
get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg), "Tera Term: Error", ts->UILanguageFile);
MessageBox(cv->HWin,ErrMsg,uimsg,MB_TASKMODAL | MB_ICONEXCLAMATION);
@@ -675,7 +675,7 @@
WaitForSingleObject(REnd,INFINITE);
}
else {
- DErr = GetLastError();
+ DErr = GetLastError();
// [VMware] this returns 109 (broken pipe) if a named pipe is removed.
// [Virtual Box] this returns 233 (pipe not connected) if a named pipe is removed.
if (! cv->Ready || ERROR_BROKEN_PIPE == DErr || ERROR_PIPE_NOT_CONNECTED == DErr) {
@@ -1089,7 +1089,7 @@
DWORD DErr;
if ((! cv->Open) || (! cv->Ready)) {
- cv->OutBuffCount = 0;
+ cv->OutBuffCount = 0;
return;
}
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/filesys.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -60,7 +60,7 @@
static BOOL FSend = FALSE;
-HWND HWndLog = NULL; //steven add
+HWND HWndLog = NULL; //steven add
static HMODULE HTTFILE = NULL;
static int TTFILECount = 0;
@@ -181,7 +181,7 @@
{
FreeLibrary(HTTFILE);
HTTFILE = NULL;
- return FALSE;
+ return FALSE;
}
else {
TTFILECount = 1;
@@ -228,7 +228,7 @@
FTDlg->Create(fv, &cv, &ts);
FTDlg->RefreshNum();
if (fv->OpId == OpLog) {
- HWndLog = FTDlg->m_hWnd; // steven add
+ HWndLog = FTDlg->m_hWnd; // steven add
}
}
@@ -408,7 +408,7 @@
}
// \x92x\x89\x84\x8F\x91\x82\xAB\x8D\x9E\x82ݗp\x83X\x83\x8C\x83b\x83h
-static unsigned _stdcall DeferredLogWriteThread(void *arg)
+static unsigned _stdcall DeferredLogWriteThread(void *arg)
{
MSG msg;
PFileVar fv = (PFileVar)arg;
@@ -490,8 +490,8 @@
(0x1000 * ts.LogTypePlainText) |
(0x2000 * ts.LogTimestamp) |
(0x4000 * ts.LogHideDialog) |
- (0x8000 * ts.LogAllBuffIncludedInFirst)
- );
+ (0x8000 * ts.LogAllBuffIncludedInFirst)
+ );
// \x83\x8D\x83O\x82̃f\x83t\x83H\x83\x8B\x83g\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x90ݒ\xE8 (2006.8.28 maya)
strncat_s(LogVar->FullName, sizeof(LogVar->FullName), ts.LogDefaultName, _TRUNCATE);
@@ -813,7 +813,7 @@
return;
if (LogVar->RotateMode == ROTATE_SIZE) {
- if (LogVar->ByteCount <= LogVar->RotateSize)
+ if (LogVar->ByteCount <= LogVar->RotateSize)
return;
//OutputDebugPrintf("%s: mode %d size %ld\n", __FUNCTION__, LogVar->RotateMode, LogVar->ByteCount);
} else {
@@ -921,7 +921,7 @@
strncat_s(tmp, sizeof(tmp), strtime, _TRUNCATE);
strncat_s(tmp, sizeof(tmp), "] ", _TRUNCATE);
}
-
+
/* 2007.05.24 Gentaro */
if( b == 0x0a ){
eLineEnd = Line_LineHead; /* set endmark*/
@@ -971,7 +971,7 @@
#endif
#else
time_t tick = time(NULL);
- char *strtime = ctime(&tick);
+ char *strtime = ctime(&tick);
#endif
/* 2007.05.24 Gentaro */
if( eLineEnd == Line_FileHead ){
@@ -991,7 +991,7 @@
WriteFile((HANDLE)LogVar->FileHandle, "] ", 2, &wrote, NULL);
#endif
}
-
+
/* 2007.05.24 Gentaro */
if( b == 0x0a ){
eLineEnd = Line_LineHead; /* set endmark*/
@@ -1101,7 +1101,7 @@
return;
}
- if (! LoadTTFILE())
+ if (! LoadTTFILE())
return;
if (! NewFileVar(&SendVar))
{
@@ -1178,7 +1178,7 @@
{
FLogDlg->DestroyWindow();
FLogDlg = NULL;
- HWndLog = NULL; // steven add
+ HWndLog = NULL; // steven add
}
FreeFileVar(&LogVar);
FreeLogBuf();
@@ -1226,7 +1226,7 @@
// - FileBracketMode == false
// - cv.TelFlag == false
// - ts.LocalEcho == 0
-void FileSendBinayBoost()
+void FileSendBinayBoost()
{
WORD c, fc;
LONG BCOld;
@@ -1459,7 +1459,7 @@
((PXVar)ProtoVar)->XOpt = Opt1;
((PXVar)ProtoVar)->TextFlag = 1 - (Opt2 & 1);
break;
- case PROTO_YM:
+ case PROTO_YM:
((PYVar)ProtoVar)->YMode = Mode;
((PYVar)ProtoVar)->YOpt = Opt1;
break;
@@ -1524,7 +1524,7 @@
(((PQVVar)ProtoVar)->QVMode==IdQVSend))
CommTextOut(&cv,"\015",1);
if (FileVar->LogFlag)
- _lclose(FileVar->LogFile);
+ _lclose(FileVar->LogFile);
FileVar->LogFile = 0;
if (ProtoVar!=NULL)
{
@@ -1645,7 +1645,7 @@
FileVar->OpId = OpKmtSend;
if (strlen(&(FileVar->FullName[FileVar->DirLen]))==0)
{
- if (! (*GetGetFname)(FileVar->HMainWin,FileVar) ||
+ if (! (*GetGetFname)(FileVar->HMainWin,FileVar) ||
(strlen(FileVar->FullName)==0))
{
ProtoEnd();
Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ftdlg.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -197,7 +197,7 @@
::PostMessage(fv->HMainWin,WM_USER_FTCANCEL,fv->OpId,0);
}
-BOOL CFileTransDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+BOOL CFileTransDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
switch (LOWORD(wParam)) {
case IDCANCEL:
Modified: trunk/teraterm/teraterm/hfs_plus.map
===================================================================
--- trunk/teraterm/teraterm/hfs_plus.map 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/hfs_plus.map 2016-07-11 08:53:02 UTC (rev 6435)
@@ -5,7 +5,7 @@
} hfsplus_codemap_t;
/*
- * cf. http://developer.apple.com/technotes/tn/tn1150table.html
+ * cf. http://developer.apple.com/technotes/tn/tn1150table.html
*
*/
static hfsplus_codemap_t mapHFSPlusUnicode[] = {
Modified: trunk/teraterm/teraterm/keyboard.c
===================================================================
--- trunk/teraterm/teraterm/keyboard.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/keyboard.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -790,7 +790,7 @@
{ /* shift */
State = State | 2; /* bit 1 */
}
-
+
if ((KCode & 1024) != 0)
{ /* control */
State = State | 4; /* bit 2 */
Modified: trunk/teraterm/teraterm/prnabort.cpp
===================================================================
--- trunk/teraterm/teraterm/prnabort.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/prnabort.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -60,7 +60,7 @@
DestroyWindow();
}
-BOOL CPrnAbortDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+BOOL CPrnAbortDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
*Abort = TRUE;
DestroyWindow();
@@ -68,12 +68,12 @@
return CDialog::OnCommand(wParam, lParam);
}
-void CPrnAbortDlg::PostNcDestroy()
+void CPrnAbortDlg::PostNcDestroy()
{
delete this;
}
-BOOL CPrnAbortDlg::DestroyWindow()
+BOOL CPrnAbortDlg::DestroyWindow()
{
HWND HParent;
Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/protodlg.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -64,7 +64,7 @@
::PostMessage(fv->HMainWin,WM_USER_PROTOCANCEL,0,0);
}
-BOOL CProtoDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+BOOL CProtoDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
switch (LOWORD(wParam)) {
case IDCANCEL:
Modified: trunk/teraterm/teraterm/teklib.c
===================================================================
--- trunk/teraterm/teraterm/teklib.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/teklib.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -65,7 +65,7 @@
TEKInit = (PTEKInit)GetProcAddress(HTTTEK,
MAKEINTRESOURCE(IdTEKInit));
if (TEKInit==NULL) Err = TRUE;
-
+
TEKResizeWindow = (PTEKResizeWindow)GetProcAddress(HTTTEK,
MAKEINTRESOURCE(IdTEKResizeWindow));
if (TEKResizeWindow==NULL) Err = TRUE;
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/tekwin.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -491,7 +491,7 @@
void CTEKWindow::OnSetFocus(CWnd* pOldWnd)
{
TEKChangeCaret(&tk,&ts);
- CFrameWnd::OnSetFocus(pOldWnd);
+ CFrameWnd::OnSetFocus(pOldWnd);
}
void CTEKWindow::OnSize(UINT nType, int cx, int cy)
Modified: trunk/teraterm/teraterm/telnet.c
===================================================================
--- trunk/teraterm/teraterm/telnet.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/telnet.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -44,7 +44,7 @@
static TelRec tr;
static HANDLE keepalive_thread = (HANDLE)-1L;
-static HWND keepalive_dialog = NULL;
+static HWND keepalive_dialog = NULL;
int nop_interval = 0;
void DefaultTelRec()
@@ -323,7 +323,7 @@
else
SendBack(DONTTEL,b);
break;
-
+
case WantNo:
switch (tr.HisOpt[b].Que) {
case Empty:
Modified: trunk/teraterm/teraterm/telnet.h
===================================================================
--- trunk/teraterm/teraterm/telnet.h 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/telnet.h 2016-07-11 08:53:02 UTC (rev 6435)
@@ -28,7 +28,7 @@
#define BINARY 0
#define ECHO 1
#define RECONNECT 2
-#define SGA 3
+#define SGA 3
#define AMSN 4
#define STATUS 5
#define TIMING 6
Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/teraprn.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -181,7 +181,7 @@
// = IdPrnSelectedText (user selects "print selection")
// = IdPrnScrollRegion (always when PrnFlag=IdPrnScrollRegion)
// = IdPrnFile (always when PrnFlag=IdPrnFile)
-{
+{
BOOL Sel;
TEXTMETRIC Metrics;
POINT PPI, PPI2;
Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/teraterm.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -98,8 +98,8 @@
if (cv.ProtoFlag) Change = ProtoDlgParse();
else {
switch (ActiveWin) {
- case IdVT:
- Change = ((CVTWindow*)pVTWin)->Parse();
+ case IdVT:
+ Change = ((CVTWindow*)pVTWin)->Parse();
// TEK window\x82̃A\x83N\x83e\x83B\x83u\x92\x86\x82\xC9 pause \x82\xF0\x8Eg\x82\xA4\x82ƁACPU\x8Eg\x97p\x97\xA6100%\x82ƂȂ\xE9
// \x8C\xBB\x8Fۂւ̎b\x92\xE8\x91Ώ\x88\x81B(2006.2.6 yutaka)
// \x91҂\xBF\x8E\x9E\x8AԂ\xF0\x82Ȃ\xAD\x82\xB5\x81A\x83R\x83\x93\x83e\x83L\x83X\x83g\x83X\x83C\x83b\x83`\x82\xBE\x82\xAF\x82ɂ\xB7\x82\xE9\x81B(2006.3.20 yutaka)
Modified: trunk/teraterm/teraterm/teraterm.manifest
===================================================================
--- trunk/teraterm/teraterm/teraterm.manifest 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/teraterm.manifest 2016-07-11 08:53:02 UTC (rev 6435)
@@ -13,8 +13,8 @@
publicKeyToken="6595b64144ccf1df"
language="*"
/>
- <!--assemblyIdentity
- type="win32"
+ <!--assemblyIdentity
+ type="win32"
name=SXS_ASSEMBLY_NAME
version=SXS_ASSEMBLY_VERSION
processorArchitecture=SXS_PROCESSOR_ARCHITECTURE
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttdde.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -865,7 +865,7 @@
func(ParamFileName, ParamSecondFileName);
EndDdeCmnd(1); // \x83}\x83N\x83\x8D\x8E\xC0\x8Ds\x82\xF0\x8FI\x97\xB9\x82\xB3\x82\xB9\x82\xE9\x81B\x96{\x97\x88\x82Ȃ\xE7\x81ASCP\x93]\x91\x97\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA9\x82\xE7\x8CĂяo\x82\xB5\x82\xBD\x82ق\xA4\x82\xAA\x96]\x82܂\xB5\x82\xA2\x81B
break;
- }
+ }
scp_send_error:
MessageBox(NULL, msg, "Tera Term: scpsend command error", MB_OK | MB_ICONERROR);
@@ -901,7 +901,7 @@
func(ParamFileName, ParamSecondFileName);
EndDdeCmnd(1); // \x83}\x83N\x83\x8D\x8E\xC0\x8Ds\x82\xF0\x8FI\x97\xB9\x82\xB3\x82\xB9\x82\xE9\x81B\x96{\x97\x88\x82Ȃ\xE7\x81ASCP\x93]\x91\x97\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA9\x82\xE7\x8CĂяo\x82\xB5\x82\xBD\x82ق\xA4\x82\xAA\x96]\x82܂\xB5\x82\xA2\x81B
break;
- }
+ }
scp_rcv_error:
MessageBox(NULL, msg, "Tera Term: scpsend command error", MB_OK | MB_ICONERROR);
@@ -1139,7 +1139,7 @@
else
Ok = FALSE;
- SyncMode = FALSE;
+ SyncMode = FALSE;
CloseTT = FALSE;
StartupFlag = FALSE;
DDELog = FALSE;
@@ -1166,7 +1166,7 @@
if (ConvH != 0)
DdeDisconnect(ConvH);
- ConvH = 0;
+ ConvH = 0;
SyncMode = FALSE;
StartupFlag = FALSE;
@@ -1296,8 +1296,8 @@
if (CreateProcess(
NULL,
Cmnd,
- NULL,
NULL,
+ NULL,
FALSE,
pri,
NULL, NULL,
Modified: trunk/teraterm/teraterm/ttdde.h
===================================================================
--- trunk/teraterm/teraterm/ttdde.h 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttdde.h 2016-07-11 08:53:02 UTC (rev 6435)
@@ -22,7 +22,7 @@
extern HCONV ConvH;
extern BOOL AdvFlag;
extern BOOL CloseTT;
-extern HWND HWndLog; //steven add
+extern HWND HWndLog; //steven add
#ifdef __cplusplus
}
Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttdialog.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -131,7 +131,7 @@
BOOL FreeTTDLG()
{
if (TTDLGUseCount==0) {
- return FALSE;
+ return FALSE;
}
TTDLGUseCount--;
if (TTDLGUseCount>0) {
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttermpro.rc 2016-07-11 08:53:02 UTC (rev 6435)
@@ -319,7 +319,7 @@
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_DAD_DIALOG, DIALOG
BEGIN
@@ -421,18 +421,18 @@
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"..\\common\\tt_res.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -501,7 +501,7 @@
// Menu
//
-IDR_MENU MENU
+IDR_MENU MENU
BEGIN
POPUP "&File"
BEGIN
@@ -615,7 +615,7 @@
END
END
-IDR_TEKMENU MENU
+IDR_TEKMENU MENU
BEGIN
POPUP "&File"
BEGIN
@@ -646,7 +646,7 @@
END
END
-IDR_PASTEMENU MENU
+IDR_PASTEMENU MENU
BEGIN
MENUITEM "&Paste", ID_EDIT_PASTE2
MENUITEM "Paste<C&R>", ID_EDIT_PASTECR
@@ -658,7 +658,7 @@
// Accelerator
//
-IDR_ACC ACCELERATORS
+IDR_ACC ACCELERATORS
BEGIN
"T", ID_ACC_AREYOUTHERE, VIRTKEY, ALT, NOINVERT
"C", ID_ACC_COPY, VIRTKEY, ALT, NOINVERT
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttime.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -181,7 +181,7 @@
hIMC = (*PImmGetContext)(HVTWin);
if (hIMC==0) return NULL;
- if ((lParam & GCS_RESULTSTR)==0)
+ if ((lParam & GCS_RESULTSTR)==0)
goto skip;
// Get the size of the result string.
Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttwinman.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -177,7 +177,7 @@
if (ts.TitleFormat & 8) {
_snprintf_s(TempTitle, sizeof(TempTitle), _TRUNCATE, "%s - %s", str, TempTitleWithRemote);
} else {
- strncat_s(TempTitle, sizeof(TempTitle), str, _TRUNCATE);
+ strncat_s(TempTitle, sizeof(TempTitle), str, _TRUNCATE);
}
}
else if (cv.PortType == IdNamedPipe)
Modified: trunk/teraterm/teraterm/ttwsk.c
===================================================================
--- trunk/teraterm/teraterm/ttwsk.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/ttwsk.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -65,8 +65,8 @@
#define IdCLOSESOCKET 3
#define IdCONNECT 4
-#define IdHTONL 8
-#define IdHTONS 9
+#define IdHTONL 8
+#define IdHTONS 9
#define IdINET_ADDR 10
#define IdIOCTLSOCKET 12
#define IdRECV 16
Modified: trunk/teraterm/teraterm/uni2sjis.map
===================================================================
--- trunk/teraterm/teraterm/uni2sjis.map 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/uni2sjis.map 2016-07-11 08:53:02 UTC (rev 6435)
@@ -1,7 +1,7 @@
#include "codemap.h"
/*
- * cf. ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT
+ * cf. ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT
*
*/
static codemap_t mapUnicodeToSJIS[] = {
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/vtdisp.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -355,17 +355,17 @@
//\x83t\x83@\x83C\x83\x8B\x82𐔂\xA6\x82\xE9
hFind = FindFirstFile(fullpath,&fd);
-
+
file_num = 0;
if(hFind != INVALID_HANDLE_VALUE && filePart)
{
do{
-
+
if(!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
file_num ++;
-
+
}while(FindNextFile(hFind,&fd));
}
@@ -385,10 +385,10 @@
i = 0;
do{
-
+
if(!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
i ++;
-
+
}while(i < file_num && FindNextFile(hFind,&fd));
}else{
@@ -470,13 +470,13 @@
return FALSE;
bmiSize = pbmi->bmiHeader.biSize;
-
+
switch(pbmi->bmiHeader.biBitCount)
{
case 1:
bmiSize += pbmi->bmiHeader.biClrUsed ? sizeof(RGBQUAD) * 2 : 0;
break;
-
+
case 2 :
bmiSize += sizeof(RGBQUAD) * 4;
break;
@@ -485,7 +485,7 @@
bmiSize += sizeof(RGBQUAD) * 16;
break;
- case 8 :
+ case 8 :
bmiSize += sizeof(RGBQUAD) * 256;
break;
}
@@ -563,7 +563,7 @@
if(hPictureFile == INVALID_HANDLE_VALUE)
return;
-
+
fileSize = GetFileSize(hPictureFile,0);
//\x8DŒ\xE1 2kb \x82͊m\x95\xDB (Susie plugin \x82̎d\x97l\x82\xE6\x82\xE8)
@@ -613,7 +613,7 @@
LocalFree(hbmi);
LocalFree(hbuf);
-
+
strncpy_s(src->file, sizeof(src->file),src->fileTmp, _TRUNCATE);
break;
@@ -791,7 +791,7 @@
bi.bmiHeader.biPlanes = 1;
bi.bmiHeader.biBitCount = 32;
fAlpha = (bm.bmBitsPixel == 32);
- pbBits = (BYTE *)HeapAlloc(GetProcessHeap(), 0,
+ pbBits = (BYTE *)HeapAlloc(GetProcessHeap(), 0,
nWidthBytes * bm.bmHeight);
if (pbBits == NULL)
return NULL;
@@ -829,17 +829,17 @@
c10 = ((LPDWORD)pbLine0)[x1];
c11 = ((LPDWORD)pbLine1)[x1];
- b0 = ((ex0 * (c00 & 0xFF)) +
+ b0 = ((ex0 * (c00 & 0xFF)) +
(ex1 * (c10 & 0xFF))) >> 8;
- b1 = ((ex0 * (c01 & 0xFF)) +
+ b1 = ((ex0 * (c01 & 0xFF)) +
(ex1 * (c11 & 0xFF))) >> 8;
- g0 = ((ex0 * ((c00 >> 8) & 0xFF)) +
+ g0 = ((ex0 * ((c00 >> 8) & 0xFF)) +
(ex1 * ((c10 >> 8) & 0xFF))) >> 8;
- g1 = ((ex0 * ((c01 >> 8) & 0xFF)) +
+ g1 = ((ex0 * ((c01 >> 8) & 0xFF)) +
(ex1 * ((c11 >> 8) & 0xFF))) >> 8;
- r0 = ((ex0 * ((c00 >> 16) & 0xFF)) +
+ r0 = ((ex0 * ((c00 >> 16) & 0xFF)) +
(ex1 * ((c10 >> 16) & 0xFF))) >> 8;
- r1 = ((ex0 * ((c01 >> 16) & 0xFF)) +
+ r1 = ((ex0 * ((c01 >> 16) & 0xFF)) +
(ex1 * ((c11 >> 16) & 0xFF))) >> 8;
b0 = (ey0 * b0 + ey1 * b1) >> 8;
g0 = (ey0 * g0 + ey1 * g1) >> 8;
@@ -847,13 +847,13 @@
if (fAlpha)
{
- a0 = ((ex0 * ((c00 >> 24) & 0xFF)) +
+ a0 = ((ex0 * ((c00 >> 24) & 0xFF)) +
(ex1 * ((c10 >> 24) & 0xFF))) >> 8;
- a1 = ((ex0 * ((c01 >> 24) & 0xFF)) +
+ a1 = ((ex0 * ((c01 >> 24) & 0xFF)) +
(ex1 * ((c11 >> 24) & 0xFF))) >> 8;
a0 = (ey0 * a0 + ey1 * a1) >> 8;
}
- ((LPDWORD)pbNewLine)[ix] =
+ ((LPDWORD)pbNewLine)[ix] =
MAKELONG(MAKEWORD(b0, g0), MAKEWORD(r0, a0));
}
}
@@ -896,9 +896,9 @@
}
#ifdef DEBUG_XP
- //wi.pattern = BG_STRETCH;
- //wi.pattern = BG_FIT_WIDTH;
- //wi.pattern = BG_FIT_HEIGHT;
+ //wi.pattern = BG_STRETCH;
+ //wi.pattern = BG_FIT_WIDTH;
+ //wi.pattern = BG_FIT_HEIGHT;
#endif
GetObject(hbm,sizeof(bm),&bm);
@@ -944,7 +944,7 @@
DeleteObject(hbm);
hbm = newhbm;
- wi.pattern = BG_STRETCH;
+ wi.pattern = BG_STRETCH;
}
}
@@ -1053,7 +1053,7 @@
height = (src->height * ScreenWidth) / src->width;
y = (ScreenHeight - height) / 2;
-
+
BGStretchPicture(hdcDest,src,0,y,ScreenWidth,height,src->antiAlias);
break;
@@ -1131,7 +1131,7 @@
break;
case BG_TILE :
-
+
SetWindowOrgEx(lws->src->hdc,0,0,NULL);
for(x = rectDest.left - (rectDest.left % lws->src->width ) - lws->src->width ;
@@ -1183,7 +1183,7 @@
(*BGEnumDisplayMonitors)(NULL,NULL,BGLoadWallpaperEnumFunc,(LPARAM)&lws);
}else{
RECT rectMonitor;
-
+
SetRect(&rectMonitor,0,0,CRTWidth,CRTHeight);
BGLoadWallpaperEnumFunc(NULL,NULL,&rectMonitor,(LPARAM)&lws);
}
@@ -1222,7 +1222,7 @@
point.x = 0;
point.y = 0;
ClientToScreen(HVTWin,&point);
-
+
GetClientRect(HVTWin,&rect);
OffsetRect(&rect,point.x,point.y);
@@ -1401,7 +1401,7 @@
GetPrivateProfileString(BG_SECTION,"BGSrc1File",BGSrc1.file,path,MAX_PATH,file);
RandomFile(path,BGSrc1.file,sizeof(BGSrc1.file));
-
+
//Src2 \x82̓ǂݏo\x82\xB5
BGSrc2.type = BGGetType("BGSrc2Type",BGSrc2.type,file);
BGSrc2.pattern = BGGetPattern("BGSrc2Pattern",BGSrc2.pattern,file);
@@ -1510,7 +1510,7 @@
// \x94w\x8Ci\x89摜\x82̖\xBE\x82邳\x82̓ǂݍ\x9E\x82݁B
// BGSrc1Alpha \x82\xC6 BGSrc2Alpha\x82͓\xAF\x92l\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x81B
ts.BGImgBrightness = GetPrivateProfileInt(BG_SECTION, BG_THEME_IMAGE_BRIGHTNESS1, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT, path);
- }
+ }
if(!BGEnable)
return;
@@ -1524,7 +1524,7 @@
BGNoFrame = ts.EtermLookfeel.BGNoFrame;
BGFastSizeMove = ts.EtermLookfeel.BGFastSizeMove;
BGNoCopyBits = ts.EtermLookfeel.BGNoCopyBits;
-
+
#if 0
GetPrivateProfileString(BG_SECTION,"BGSPIPath","plugin",BGSPIPath,MAX_PATH,ts.SetupFName);
strncpy_s(ts.EtermLookfeel.BGSPIPath, sizeof(ts.EtermLookfeel.BGSPIPath), BGSPIPath, _TRUNCATE);
@@ -1535,7 +1535,7 @@
GetTempFileName(tempPath,"ttAK",0,BGDest.fileTmp);
GetTempFileName(tempPath,"ttAK",0,BGSrc1.fileTmp);
GetTempFileName(tempPath,"ttAK",0,BGSrc2.fileTmp);
-
+
//\x83f\x83t\x83H\x83\x8B\x83g\x92l
BGDest.type = BG_PICTURE;
BGDest.pattern = BG_STRETCH;
@@ -1570,7 +1570,7 @@
if(strcmp(config_file,""))
{
char dir[MAX_PATH],prevDir[MAX_PATH];
-
+
//INI\x83t\x83@\x83C\x83\x8B\x82̂\xA0\x82\xE9\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉꎞ\x93I\x82Ɉړ\xAE
GetCurrentDirectory(MAX_PATH,prevDir);
@@ -1962,7 +1962,7 @@
TmpDC = GetDC(HVTWin);
SelectObject(TmpDC, VTFont[0]);
- GetTextMetrics(TmpDC, &Metrics);
+ GetTextMetrics(TmpDC, &Metrics);
FontWidth = Metrics.tmAveCharWidth + ts.FontDW;
FontHeight = Metrics.tmHeight + ts.FontDH;
@@ -2058,11 +2058,11 @@
DestroyCaret();
switch (ts.CursorShape) {
case IdVCur:
- CreateCaret(HVTWin, 0, CurWidth, FontHeight);
- break;
+ CreateCaret(HVTWin, 0, CurWidth, FontHeight);
+ break;
case IdHCur:
- CreateCaret(HVTWin, 0, FontWidth, CurWidth);
- break;
+ CreateCaret(HVTWin, 0, FontWidth, CurWidth);
+ break;
}
if (CaretEnabled) {
CaretStatus = 1;
@@ -2312,7 +2312,7 @@
GetClientRect(HVTWin,&R);
dW = ScreenWidth - R.right + R.left;
dH = ScreenHeight - R.bottom + R.top;
-
+
if ((dW!=0) || (dH!=0))
{
AdjustSize = TRUE;
@@ -2425,7 +2425,7 @@
{
SetScrollRange(HVTWin,SB_VERT,0,1,FALSE);
}
- else
+ else
SetScrollRange(HVTWin,SB_VERT,0,NumOfLines-WinHeight,FALSE);
SetScrollPos(HVTWin,SB_HORZ,0,TRUE);
@@ -2550,7 +2550,7 @@
}
DCAttr = Attr;
DCReverse = Reverse;
-
+
SelectObject(VTDC, VTFont[(Attr.Attr & AttrFontMask) | (isURLUnderlined(Attr)?AttrUnder:0)]);
if ((ts.ColorFlag & CF_FULLCOLOR) == 0) {
@@ -2796,7 +2796,7 @@
eto_options |= ETO_OPAQUE;
}
}
-
+
ExtTextOut(hdcBGBuffer,ts.FontDX,ts.FontDY,eto_options,&rect,Buff,Count,&Dx[0]);
BitBlt(VTDC,*X,Y,width,height,hdcBGBuffer,0,0,SRCCOPY);
@@ -2860,7 +2860,7 @@
RText.top = Y;
RText.bottom = Y+FontHeight;
RText.left = *X;
- RText.right = *X + Count*FontWidth; //
+ RText.right = *X + Count*FontWidth; //
// Unicode\x82ŏo\x97͂\xB7\x82\xE9\x81B
#if 1
@@ -3105,7 +3105,7 @@
SetScrollPos(HVTWin,SB_HORZ,ScrollPosX,TRUE);
SetScrollPos(HVTWin,SB_VERT,ScrollPosY,TRUE);
- DontChangeSize = FALSE;
+ DontChangeSize = FALSE;
}
void DispScrollToCursor(int CurX, int CurY)
@@ -3390,7 +3390,7 @@
#ifdef ALPHABLEND_TYPE2
if(BGEnable)
- InvalidateRect(HVTWin, NULL, FALSE);
+ InvalidateRect(HVTWin, NULL, FALSE);
#endif
}
@@ -3529,9 +3529,9 @@
if (num == CS_UNSPEC) {
return;
}
-
+
TmpDC = GetDC(NULL);
-
+
switch(num) {
#ifdef ALPHABLEND_TYPE2
case CS_VT_NORMALFG:
@@ -3626,7 +3626,7 @@
}
DispSetNearestColors(num, num, NULL);
}
- else if (num <= 15) {
+ else if (num <= 15) {
ANSIColor[num] = ts.ANSIColor[num];
DispSetNearestColors(num, num, NULL);
}
@@ -3718,7 +3718,7 @@
SetWindowPos(HVTWin, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
break;
case WINDOW_REFRESH:
- InvalidateRect(HVTWin, NULL, FALSE);
+ InvalidateRect(HVTWin, NULL, FALSE);
break;
}
}
@@ -3755,7 +3755,7 @@
*y = wndpl.ptMaxPosition.y;
break;
default:
- *x = wndpl.rcNormalPosition.left;
+ *x = wndpl.rcNormalPosition.left;
*y = wndpl.rcNormalPosition.top;
}
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/vtterm.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -1053,7 +1053,7 @@
if (isCursorOnStatusLine)
Buff = &SBuff2; // for status line
- else if (AltScr)
+ else if (AltScr)
Buff = &SBuff3; // for alternate screen
else
Buff = &SBuff1; // for main screen
@@ -1077,7 +1077,7 @@
if (isCursorOnStatusLine)
Buff = &SBuff2; // for status line
- else if (AltScr)
+ else if (AltScr)
Buff = &SBuff3; // for alternate screen
else
Buff = &SBuff1; // for main screen
@@ -1545,7 +1545,7 @@
// <ESC>[J\x82\xCD<ESC>[2J\x82Ɠ\xAF\x82\xB6\x82\xB1\x82ƂȂ̂ŁA\x8F\x88\x97\x9D\x82\xAF\x81A\x8C\xBB\x8Ds\x83o\x83b\x83t\x83@\x82\xF0\x83X\x83N\x83\x8D\x81[\x83\x8B\x83A\x83E\x83g
// \x82\xB3\x82\xB9\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B(2005.5.29 yutaka)
// \x83R\x83\x93\x83t\x83B\x83O\x83\x8C\x81[\x83V\x83\x87\x83\x93\x82Ő\xE8\x91ւ\xA6\x82\xE7\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B(2008.5.3 yutaka)
- if (ts.ScrollWindowClearScreen &&
+ if (ts.ScrollWindowClearScreen &&
(CursorX == 0 && CursorY == 0)) {
// Erase screen (scroll out)
BuffClearScreen();
@@ -2692,7 +2692,7 @@
if (ts.MouseEventTracking)
MouseReportMode = IdMouseTrackX10;
break;
- case 12: /* att610 cursor blinking */
+ case 12: /* att610 cursor blinking */
if (ts.WindowFlag & WF_CURSORCHANGE) {
ts.NonblinkingCursor = FALSE;
ChangeCaret();
@@ -2859,7 +2859,7 @@
case 7: AutoWrapMode = FALSE; break; // DECAWM
case 8: AutoRepeatMode = FALSE; break; // DECARM
case 9: MouseReportMode = IdMouseTrackNone; break; /* X10 Mouse Tracking */
- case 12: /* att610 cursor blinking */
+ case 12: /* att610 cursor blinking */
if (ts.WindowFlag & WF_CURSORCHANGE) {
ts.NonblinkingCursor = TRUE;
ChangeCaret();
@@ -3443,7 +3443,7 @@
break;
case 'x': // DECFRA
- RequiredParams(5);
+ RequiredParams(5);
if (Param[1] < 32 || (Param[1] > 127 && Param[1] < 160) || Param[1] > 255) {
return;
}
@@ -3474,7 +3474,7 @@
case 'z': // DECERA
case '{': // DECSERA
- RequiredParams(4);
+ RequiredParams(4);
CheckParamVal(Param[1], NumOfLines-StatusLine);
CheckParamVal(Param[2], NumOfColumns);
CheckParamValMax(Param[3], NumOfLines-StatusLine);
@@ -5449,18 +5449,18 @@
{
switch (ts.Language) {
case IdUtf8:
- ParseFirstUTF8(b, ts.KanjiCode == IdUTF8m);
+ ParseFirstUTF8(b, ts.KanjiCode == IdUTF8m);
return;
case IdJapanese:
- switch (ts.KanjiCode) {
+ switch (ts.KanjiCode) {
case IdUTF8:
- if (ParseFirstUTF8(b, 0)) {
+ if (ParseFirstUTF8(b, 0)) {
return;
}
break;
case IdUTF8m:
- if (ParseFirstUTF8(b, 1)) {
+ if (ParseFirstUTF8(b, 1)) {
return;
}
break;
@@ -5472,14 +5472,14 @@
break;
case IdKorean:
- switch (ts.KanjiCode) {
+ switch (ts.KanjiCode) {
case IdUTF8:
- if (ParseFirstUTF8(b, 0)) {
+ if (ParseFirstUTF8(b, 0)) {
return;
}
break;
case IdUTF8m:
- if (ParseFirstUTF8(b, 1)) {
+ if (ParseFirstUTF8(b, 1)) {
return;
}
break;
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/teraterm/vtwin.cpp 2016-07-11 08:53:02 UTC (rev 6435)
@@ -260,7 +260,7 @@
return FALSE;
}
- return g_pSetLayeredWindowAttributes(hwnd, crKey,
+ return g_pSetLayeredWindowAttributes(hwnd, crKey,
bAlpha, dwFlags);
}
@@ -450,20 +450,20 @@
/* \x83V\x83\x93\x83{\x83\x8B\x83n\x83\x93\x83h\x83\x89\x82̏\x89\x8A\xFA\x89\xBB */
SymInitialize(hProcess, NULL, TRUE);
-
+
// \x83\x8C\x83W\x83X\x83^\x83_\x83\x93\x83v
msg[0] = '\0';
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "eax=%08X ebx=%08X ecx=%08X edx=%08X esi=%08X edi=%08X\r\n"
"ebp=%08X esp=%08X eip=%08X efl=%08X\r\n"
"cs=%04X ss=%04X ds=%04X es=%04X fs=%04X gs=%04X\r\n",
- ExInfo->ContextRecord->Eax,
- ExInfo->ContextRecord->Ebx,
- ExInfo->ContextRecord->Ecx,
- ExInfo->ContextRecord->Edx,
- ExInfo->ContextRecord->Esi,
- ExInfo->ContextRecord->Edi,
- ExInfo->ContextRecord->Ebp,
- ExInfo->ContextRecord->Esp,
+ ExInfo->ContextRecord->Eax,
+ ExInfo->ContextRecord->Ebx,
+ ExInfo->ContextRecord->Ecx,
+ ExInfo->ContextRecord->Edx,
+ ExInfo->ContextRecord->Esi,
+ ExInfo->ContextRecord->Edi,
+ ExInfo->ContextRecord->Ebp,
+ ExInfo->ContextRecord->Esp,
ExInfo->ContextRecord->Eip,
ExInfo->ContextRecord->EFlags,
ExInfo->ContextRecord->SegCs,
@@ -489,21 +489,21 @@
hProcess,
hThread,
&sf,
- NULL,
NULL,
+ NULL,
SymFunctionTableAccess,
SymGetModuleBase,
NULL);
/* \x8E\xB8\x94s\x82Ȃ\xE7\x82A\x83\x8B\x81[\x83v\x82\xAF\x82\xE9 */
- if (!bResult || sf.AddrFrame.Offset == 0)
+ if (!bResult || sf.AddrFrame.Offset == 0)
break;
-
+
frame++;
/* \x83v\x83\x8D\x83O\x83\x89\x83\x80\x83J\x83E\x83\x93\x83^\x81i\x89\xBC\x91z\x83A\x83h\x83\x8C\x83X\x81j\x82\xA9\x82\xE7\x8A\x94\x96\xBC\x82ƃI\x83t\x83Z\x83b\x83g\x82\xF0\x8E擾 */
bResult = SymGetSymFromAddr(hProcess, sf.AddrPC.Offset, &Disp, pSym);
-
+
/* \x8E擾\x8C\x8B\x89ʂ\xF0\x95\\x8E\xA6 */
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "#%d 0x%08x in ", frame, sf.AddrPC.Offset);
strncat_s(msg, sizeof(msg), buf, _TRUNCATE);
@@ -514,7 +514,7 @@
_snprintf_s(buf, sizeof(buf), _TRUNCATE, " --- ");
strncat_s(msg, sizeof(msg), buf, _TRUNCATE);
}
-
+
// \x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̎擾
ZeroMemory( &(ih_module), sizeof(ih_module) );
ih_module.SizeOfStruct = sizeof(ih_module);
@@ -527,7 +527,7 @@
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s ", "<Unknown Module>" );
strncat_s(msg, sizeof(msg), buf, _TRUNCATE);
}
-
+
// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82ƍs\x94ԍ\x86\x82̎擾
ZeroMemory( &(ih_line), sizeof(ih_line) );
ih_line.SizeOfStruct = sizeof(ih_line);
@@ -537,7 +537,7 @@
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s:%lu", ih_line.FileName, ih_line.LineNumber );
strncat_s(msg, sizeof(msg), buf, _TRUNCATE);
}
-
+
strncat_s(msg, sizeof(msg), "\n", _TRUNCATE);
}
@@ -1921,7 +1921,7 @@
get_lang_msg("MSG_ALL_TERMINATE_CONF", ts.UIMsg, sizeof(ts.UIMsg),
"Terminate ALL Tera Term(s)?", ts.UILanguageFile);
if (::MessageBox(HVTWin, ts.UIMsg, "Tera Term",
- MB_OKCANCEL | MB_ICONERROR | MB_DEFBUTTON2)==IDCANCEL)
+ MB_OKCANCEL | MB_ICONERROR | MB_DEFBUTTON2)==IDCANCEL)
return;
BroadcastClosingMessage(HVTWin);
@@ -2151,7 +2151,7 @@
if (func != NULL) {
func(SendVar->FullName, ts.ScpSendDir);
goto send_success;
- }
+ }
scp_send_error:
::MessageBox(NULL, msg, "Tera Term: scpsend command error", MB_OK | MB_ICONERROR);
@@ -2206,7 +2206,7 @@
case SB_PAGEDOWN:
Func = SCROLL_PAGEDOWN;
break;
- case SB_PAGEUP:
+ case SB_PAGEUP:
Func = SCROLL_PAGEUP;
break;
case SB_THUMBPOSITION:
@@ -2555,7 +2555,7 @@
//
// \x83\x8A\x83T\x83C\x83Y\x83c\x81[\x83\x8B\x83`\x83b\x83v(based on PuTTY sizetip.c)
-//
+//
static ATOM tip_class = 0;
static HFONT tip_font;
static COLORREF tip_bg;
@@ -3339,7 +3339,7 @@
memcpy(newbuf + cx, comp, complen);
memcpy(newbuf + cx + complen, buf + cx, size - cx);
newsize = size + complen; // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
-
+
pReconv->dwSize = sizeof(RECONVERTSTRING);
pReconv->dwVersion = 0;
pReconv->dwStrLen = newsize - 1;
@@ -3348,7 +3348,7 @@
pReconv->dwCompStrOffset = cx;
pReconv->dwTargetStrLen = complen;
pReconv->dwTargetStrOffset = cx;
-
+
memcpy(pszParagraph, newbuf, newsize);
//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
}
@@ -3897,7 +3897,7 @@
int cygterm_PORT_START = 20000;
int cygterm_PORT_RANGE = 40;
int is_cygwin_port = 0;
-
+
// \x8C\xBB\x8D݂̐ݒ\xE8\x93\xE0\x97e\x82\xF0\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82փR\x83s\x81[\x82\xB5\x82Ă\xA8\x82\xAD
CopyTTSetToShmem(&ts);
@@ -3938,14 +3938,14 @@
return;
} else if (cv.TelFlag) { // telnet
_snprintf_s(Command, sizeof(Command), _TRUNCATE,
- "%s %s:%d /DUPLICATE /nossh",
+ "%s %s:%d /DUPLICATE /nossh",
exec, ts.HostName, ts.TCPPort);
} else if (cv.isSSH) { // SSH
// \x82\xB1\x82\xB1\x82̏\x88\x97\x9D\x82\xCD TTSSH \x91\xA4\x82ɂ\xE2\x82点\x82\xE9\x82ׂ\xAB (2004.12.7 yutaka)
// TTSSH\x91\xA4\x82ł̃I\x83v\x83V\x83\x87\x83\x93\x90\xB6\x90\xAC\x82\xF0\x92lj\xC1\x81B(2005.4.8 yutaka)
_snprintf_s(Command, sizeof(Command), _TRUNCATE,
- "%s %s:%d /DUPLICATE",
+ "%s %s:%d /DUPLICATE",
exec, ts.HostName, ts.TCPPort);
TTXSetCommandLine(Command, sizeof(Command), NULL); /* TTPLUG */
@@ -4269,7 +4269,7 @@
get_lang_msg("FILEDLG_OPEN_LOGFILE_TITLE", uimsg, sizeof(uimsg),
"Select replay log file with binary mode", ts.UILanguageFile);
ofn.lpstrTitle = uimsg;
- if(GetOpenFileName(&ofn) == 0)
+ if(GetOpenFileName(&ofn) == 0)
return;
@@ -4358,7 +4358,7 @@
void CVTWindow::OnFileBPRcv()
{
- BPStart(IdBPReceive);
+ BPStart(IdBPReceive);
}
void CVTWindow::OnFileBPSend()
@@ -4369,7 +4369,7 @@
void CVTWindow::OnFileQVRcv()
{
- QVStart(IdQVReceive);
+ QVStart(IdQVReceive);
}
void CVTWindow::OnFileQVSend()
@@ -4772,7 +4772,7 @@
//
static BOOL openFileWithApplication(char *pathname, char *filename, char *editor)
{
- char command[1024];
+ char command[1024];
char fullpath[1024];
STARTUPINFO si;
PROCESS_INFORMATION pi;
@@ -5354,7 +5354,7 @@
if (TTXProcessCommand(HVTWin, ID_CONTROL_SENDBREAK)) {
break;
}
- }
+ }
TelSendBreak();
break;
@@ -5537,7 +5537,7 @@
// \x82\xB7\x82ׂĂ\xCCTera Term\x82Ƀ\x81\x83b\x83Z\x81[\x83W\x82ƃf\x81[\x83^\x82𑗂\xE9
count = SendMessage(BroadcastWindowList, LB_GETCOUNT, 0, 0);
- for (i = 0 ; i < count ; i++) {
+ for (i = 0 ; i < count ; i++) {
hd = NULL;
if (parent_only) {
hd = GetParent(hWnd);
@@ -6024,7 +6024,7 @@
n = GetApplicationInstanceCount();
if (n != prev_instances) {
prev_instances = n;
- UpdateBroadcastWindowList(BroadcastWindowList);
+ UpdateBroadcastWindowList(BroadcastWindowList);
}
}
return TRUE;
@@ -6122,7 +6122,7 @@
name = msg;
nlen = strlen(name) + 1;
buf = msg + nlen;
- buflen = msglen - nlen;
+ buflen = msglen - nlen;
// \x83}\x83\x8B\x83`\x83L\x83\x83\x83X\x83g\x96\xBC\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
if (CompareMulticastName(name) == 0) { // \x93\xAF\x82\xB6
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -103,12 +103,12 @@
char uimsg[MAX_UIMSG];
int ret;
- get_lang_msg("MSG_TT_TAKE_EFFECT", uimsg, sizeof(uimsg),
+ get_lang_msg("MSG_TT_TAKE_EFFECT", uimsg, sizeof(uimsg),
"This option takes effect the next time a session is started.\n"
"Are you sure that you want to relaunch Tera Term?"
, ts->UILanguageFile);
ret = MessageBox(hwnd, uimsg, "Tera Term: Configuration Warning", MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
- if (ret != IDYES)
+ if (ret != IDYES)
return;
SendMessage(hwnd, WM_COMMAND, ID_SETUP_SAVE, 0);
@@ -880,7 +880,7 @@
}
}
-char GetWindowTypeChar(HWND Hw, HWND HWin)
+char GetWindowTypeChar(HWND Hw, HWND HWin)
{
#if 0
if (HWin == Hw)
@@ -1103,10 +1103,10 @@
// \x83E\x83B\x83\x93\x83h\x83E\x88ʒu\x95\x9C\x8C\xB3
SetWindowPos(
- pm->WinList[i], NULL,
- rc.left,
+ pm->WinList[i], NULL,
+ rc.left,
rc.top,
- rc.right - rc.left,
+ rc.right - rc.left,
rc.bottom - rc.top,
SWP_NOZORDER);
@@ -1133,7 +1133,7 @@
return;
}
ExtractDirName(Temp, HomeDir);
-
+
// GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
get_lang_msg("HELPFILE", uimsg, sizeof(uimsg), "teraterm.chm", UILanguageFile);
@@ -1208,7 +1208,7 @@
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
-void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
+void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
{
int n;
HWND hwnd[MAXNWIN];
@@ -1218,7 +1218,7 @@
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82˂ĕ\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
-void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
+void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
{
int n;
HWND hwnd[MAXNWIN];
@@ -1228,7 +1228,7 @@
}
// \x91STera Term\x82ɏI\x97\xB9\x8Ew\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
-void FAR PASCAL BroadcastClosingMessage(HWND myhwnd)
+void FAR PASCAL BroadcastClosingMessage(HWND myhwnd)
{
int i, max;
HWND hwnd[MAXNWIN];
@@ -1242,7 +1242,7 @@
for (i = 0 ; i < max ; i++) {
// \x8E\xA9\x95\xAA\x8E\xA9\x90g\x82͍Ō\xE3\x82ɂ\xB7\x82\xE9\x81B
- if (hwnd[i] == myhwnd)
+ if (hwnd[i] == myhwnd)
continue;
PostMessage(hwnd[i], WM_USER_NONCONFIRM_CLOSE, 0, 0);
@@ -1530,7 +1530,7 @@
return TempLen;
}
-//
+//
// MBCS\x82\xA9\x82\xE7\x8Ae\x8E튿\x8E\x9A\x83R\x81[\x83h\x82֕ϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9\x81B
//
int TextOutMBCS(PComVar cv, PCHAR B, int C)
@@ -1562,7 +1562,7 @@
else {
switch (cv->Language) {
case IdJapanese:
- switch (cv->KanjiCodeSend) {
+ switch (cv->KanjiCodeSend) {
case IdEUC:
K = SJIS2EUC(K);
break;
@@ -1579,7 +1579,7 @@
}
break;
case IdKorean:
- break;
+ break;
}
TempStr[TempLen++] = HIBYTE(K);
TempStr[TempLen++] = LOBYTE(K);
@@ -1771,7 +1771,7 @@
while (! Full && (i < C)) {
TempLen = 0;
d = (BYTE)B[i];
-
+
switch (d) {
case CR:
TempStr[TempLen] = 0x0d;
@@ -1796,7 +1796,7 @@
cv->LineModeBuffCount--;
}
}
- else {
+ else {
TempStr[TempLen++] = d;
}
break;
@@ -2113,7 +2113,7 @@
TempStr[TempLen-1] = 0x0a;
}
break;
-
+
case 0x15: // Ctrl-U
if (cv->TelLineMode) {
// Move to top of line (CHA "\033[G") and erase line (EL "\033[K")
@@ -2146,7 +2146,7 @@
return i;
}
-// listup serial port driver
+// listup serial port driver
// cf. http://www.codeproject.com/system/setupdi.asp?df=100&forumid=4368&exp=0&select=479661
// (2007.8.17 yutaka)
static void ListupSerialPort(LPWORD ComPortTable, int comports, char **ComPortDesc, int ComPortMax)
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -1878,7 +1878,7 @@
str[select] = '\0';
}
- }
+ }
if (wParam == 0x55) { // \x83J\x81[\x83\\x83\x8B\x82\xE6\x82荶\x91\xA4\x82\xF0\x82\xB7\x82ׂď\xC1\x82\xB7
if (select >= len) {
@@ -1991,7 +1991,7 @@
// \x83t\x83@\x83C\x83\x8B\x82\xA8\x82\xE6\x82і\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82̏ꍇ\x81ATCP/IP\x88\xB5\x82\xA2\x82Ƃ\xB7\x82\xE9\x81B
if ( GetHNRec->PortType==IdFile ||
- GetHNRec->PortType==IdNamedPipe
+ GetHNRec->PortType==IdNamedPipe
) {
GetHNRec->PortType = IdTCPIP;
}
@@ -2283,7 +2283,7 @@
D.x = R.left;
D.y = R.top;
ScreenToClient(Dialog,&D);
- DH = R.bottom-R.top;
+ DH = R.bottom-R.top;
TmpDC = GetDC(Dialog);
GetTextExtentPoint32(TmpDC,CurDir,strlen(CurDir),&s);
ReleaseDC(Dialog,TmpDC);
@@ -2422,7 +2422,7 @@
goto error;
}
- ret = VerQueryValue(buf, "\\VarFileInfo\\Translation",
+ ret = VerQueryValue(buf, "\\VarFileInfo\\Translation",
(LPVOID *)&lplgcode, &unLen);
if (ret == FALSE) {
goto error;
@@ -2561,7 +2561,7 @@
}
break;
- case WM_PAINT:
+ case WM_PAINT:
{
// \x83E\x83B\x83\x93\x83h\x83E\x82̕`\x89\xE6
PAINTSTRUCT ps;
@@ -2762,7 +2762,7 @@
#endif
SendMessage(GetDlgItem(Dialog, IDC_TT_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
- // Oniguruma\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9
+ // Oniguruma\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9
// \x83o\x81[\x83W\x83\x87\x83\x93\x82̎擾\x82\xCD onig_version() \x82\xF0\x8CĂяo\x82\xB7\x82̂\xAA\x93K\x90\xBE\x82\xAA\x81A\x82\xBB\x82̂\xBD\x82߂\xBE\x82\xAF\x82Ƀ\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0
// \x83\x8A\x83\x93\x83N\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA9\x82\xC1\x82\xBD\x82̂ŁA\x88ȉ\xBA\x82̂悤\x82ɂ\xB5\x82\xBD\x81BOniguruma\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xC1\x82\xBD\x8Fꍇ\x81A
// \x83r\x83\x8B\x83h\x83G\x83\x89\x81[\x82ƂȂ邩\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
@@ -2952,11 +2952,11 @@
hdc = BeginPaint(Dialog, &ps);
if (fullcolor) {
- BitBlt(hdc,
- ps.rcPaint.left, ps.rcPaint.top,
+ BitBlt(hdc,
+ ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.bottom - ps.rcPaint.top,
- dlgdc,
- ps.rcPaint.left, ps.rcPaint.top,
+ dlgdc,
+ ps.rcPaint.left, ps.rcPaint.top,
SRCCOPY);
}
@@ -2972,7 +2972,7 @@
static int idx = 0;
short amplitudes[4] = {250, 425, 350, 650};
- xpos = LOWORD(lParam);
+ xpos = LOWORD(lParam);
ypos = HIWORD(lParam);
wavemap[POS(xpos,ypos)] = amplitudes[idx++];
@@ -2981,7 +2981,7 @@
break;
case WM_TIMER:
- if (wParam == ID_EFFECT_TIMER)
+ if (wParam == ID_EFFECT_TIMER)
{
int x, y;
short height, xdiff;
@@ -3001,7 +3001,7 @@
// cf. http://freespace.virgin.net/hugo.elias/graphics/x_water.htm
for (y = 1; y < dlgh - 1 ; y++) {
for (x = 1; x < dlgw - 1 ; x++) {
- height = (p_new[POS(x,y-1)] +
+ height = (p_new[POS(x,y-1)] +
p_new[POS(x-1,y)] +
p_new[POS(x+1,y)] +
p_new[POS(x,y+1)]) / 2 - p_old[POS(x,y)];
@@ -3020,9 +3020,9 @@
#if 0
hdc = GetDC(Dialog);
- BitBlt(hdc,
+ BitBlt(hdc,
0, 0, dlgw, dlgh,
- dlgdc,
+ dlgdc,
0, 0,
SRCCOPY);
ReleaseDC(Dialog, hdc);
@@ -3233,7 +3233,7 @@
if (w != langui_sel) {
char CurDir[MAX_PATH];
- _snprintf_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), _TRUNCATE,
+ _snprintf_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), _TRUNCATE,
"%s\\%s", LANG_PATH, LangUIList[w - 1]);
GetCurrentDirectory(sizeof(CurDir), CurDir);
Modified: trunk/teraterm/ttpfile/ttfile.c
===================================================================
--- trunk/teraterm/ttpfile/ttfile.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/ttpfile/ttfile.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -609,7 +609,7 @@
ofn.lCustData = (DWORD)Option;
ofn.lpfnHook = (LPOFNHOOKPROC)(&TFn2Hook);
ofn.lpTemplateName = MAKEINTRESOURCE(IDD_FOPT);
- } else if (FuncId==GMF_Y) {
+ } else if (FuncId==GMF_Y) {
// TODO: YMODEM
}
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2016-07-07 11:46:02 UTC (rev 6434)
+++ trunk/teraterm/ttpset/ttset.c 2016-07-11 08:53:02 UTC (rev 6435)
@@ -542,8 +542,8 @@
ts->Language = IdRussian;
break;
case LANG_KOREAN: // HKS
- ts->Language = IdKorean;
- break;
+ ts->Language = IdKorean;
+ break;
default:
ts->Language = IdEnglish;
}
@@ -1508,7 +1508,7 @@
ts->ConnectingTimeout =
GetPrivateProfileInt(Section, "ConnectingTimeout", 0, FName);
- // mouse cursor
+ // mouse cursor
GetPrivateProfileString(Section, "MouseCursor", "IBEAM",
Temp, sizeof(Temp), FName);
strncpy_s(ts->MouseCursorName, sizeof(ts->MouseCursorName), Temp,
@@ -1767,7 +1767,7 @@
// Lock Terminal UID
if (GetOnOff(Section, "LockTUID", FName, TRUE))
ts->TermFlag |= TF_LOCKTUID;
-
+
// Confirm PasteCR
ts->ConfirmChangePasteCR = GetOnOff(Section, "ConfirmChangePasteCR", FName, TRUE);
@@ -1957,16 +1957,16 @@
strncpy_s(Temp, sizeof(Temp), "Japanese", _TRUNCATE);
break;
case IdKorean:
- strncpy_s(Temp, sizeof(Temp), "Korean", _TRUNCATE);
+ strncpy_s(Temp, sizeof(Temp), "Korean", _TRUNCATE);
break;
case IdRussian:
- strncpy_s(Temp, sizeof(Temp), "Russian", _TRUNCATE);
+ strncpy_s(Temp, sizeof(Temp), "Russian", _TRUNCATE);
break;
case IdUtf8:
- strncpy_s(Temp, sizeof(Temp), "UTF-8", _TRUNCATE);
+ strncpy_s(Temp, sizeof(Temp), "UTF-8", _TRUNCATE);
break;
default:
- strncpy_s(Temp, sizeof(Temp), "English", _TRUNCATE);
+ strncpy_s(Temp, sizeof(Temp), "English", _TRUNCATE);
}
WritePrivateProfileString(Section, "Language", Temp, FName);
@@ -4022,8 +4022,8 @@
ts->PortType = IdSerial;
if (ParamCom > 0) {
ts->ComPort = ParamCom;
- /* Don't display new connection dialog if COM port is specified explicitly (2006.9.15 maya) */
- ts->ComAutoConnect = TRUE;
+ /* Don't display new connection dialog if COM port is specified explicitly (2006.9.15 maya) */
+ ts->ComAutoConnect = TRUE;
}
if (ParamBaud != BaudNone)
ts->Baud = ParamBaud;