Tera TermRevision: 9991
https://osdn.net/projects/ttssh2/scm/svn/commits/9991
Author: zmatsuo
Date: 2022-06-11 00:19:33 +0900 (Sat, 11 Jun 2022)
Log Message:
-----------
vtdisp.h,cのプロトタイプ宣言を厳密に行うようにした
- void DispCountScroll() -> void DispCountScroll(int n)
- 引数を省略して宣言されていた
- 呼び出し元と呼び出し先の引数の使い方が同じだったので問題なかった
Modified Paths:
--------------
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtdisp.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2022-06-10 15:19:23 UTC (rev 9990)
+++ trunk/teraterm/teraterm/vtdisp.c 2022-06-10 15:19:33 UTC (rev 9991)
@@ -1667,7 +1667,7 @@
//-->
#endif // ALPHABLEND_TYPE2
-void DispApplyANSIColor() {
+void DispApplyANSIColor(void) {
int i;
for (i = IdBack ; i <= IdFore+8 ; i++)
@@ -1684,7 +1684,7 @@
}
}
-void InitColorTable()
+void InitColorTable(void)
{
int i;
@@ -1714,7 +1714,7 @@
}
}
-void InitDisp()
+void InitDisp(void)
{
HDC TmpDC;
BOOL bMultiDisplaySupport = FALSE;
@@ -1783,7 +1783,7 @@
}
}
-void EndDisp()
+void EndDisp(void)
{
int i, j;
@@ -1812,7 +1812,7 @@
}
-void DispReset()
+void DispReset(void)
{
/* Cursor */
CursorX = 0;
@@ -1879,7 +1879,7 @@
}
}
-void ChangeFont()
+void ChangeFont(void)
{
int i, j;
LOGFONTA VTlf;
@@ -1963,7 +1963,7 @@
}
}
-void ResetIME()
+void ResetIME(void)
{
/* reset language for communication */
cv.Language = ts.Language;
@@ -2002,7 +2002,7 @@
if (IsCaretOn()) CaretOn();
}
-void ChangeCaret()
+void ChangeCaret(void)
{
UINT T;
@@ -2119,7 +2119,7 @@
}
}
-void CaretOn()
+void CaretOn(void)
// Turn on the cursor
{
#if UNICODE_DEBUG_CARET_OFF
@@ -2192,7 +2192,7 @@
}
}
-void CaretOff()
+void CaretOff(void)
{
if (ts.KillFocusCursor == 0 && !Active)
return;
@@ -2207,7 +2207,7 @@
}
}
-void DispDestroyCaret()
+void DispDestroyCaret(void)
{
DestroyCaret();
if (ts.NonblinkingCursor!=0)
@@ -2214,7 +2214,7 @@
KillTimer(HVTWin,IdCaretTimer);
}
-BOOL IsCaretOn()
+BOOL IsCaretOn(void)
// check if caret is on
{
return ((ts.KillFocusCursor || Active) && (CaretStatus==0));
@@ -2229,7 +2229,7 @@
CaretEnabled = On;
}
-BOOL IsCaretEnabled()
+BOOL IsCaretEnabled(void)
{
return CaretEnabled;
}
@@ -2363,7 +2363,7 @@
*Ye = (PaintRect.bottom-1) / FontHeight + WinOrgY;
}
-void DispEndPaint()
+void DispEndPaint(void)
{
if (VTDC==NULL) return;
SelectObject(VTDC,DCPrevFont);
@@ -2370,7 +2370,7 @@
VTDC = NULL;
}
-void DispClearWin()
+void DispClearWin(void)
{
InvalidateRect(HVTWin,NULL,FALSE);
@@ -2392,7 +2392,7 @@
if (IsCaretOn()) CaretOn();
}
-void DispChangeBackground()
+void DispChangeBackground(void)
{
DispReleaseDC();
if (Background != NULL) DeleteObject(Background);
@@ -2414,7 +2414,7 @@
InvalidateRect(HVTWin,NULL,TRUE);
}
-void DispChangeWin()
+void DispChangeWin(void)
{
/* Change window caption */
ChangeTitle();
@@ -2447,7 +2447,7 @@
DispChangeBackground();
}
-void DispInitDC()
+void DispInitDC(void)
{
if (VTDC==NULL)
@@ -2477,7 +2477,7 @@
#endif // ALPHABLEND_TYPE2
}
-void DispReleaseDC()
+void DispReleaseDC(void)
{
if (VTDC==NULL) return;
SelectObject(VTDC, DCPrevFont);
@@ -3077,7 +3077,7 @@
//-------------- scrolling functions --------------------
-void AdjustScrollBar() /* called by ChangeWindowSize() */
+void AdjustScrollBar(void) /* called by ChangeWindowSize() */
{
LONG XRange, YRange;
int ScrollPosX, ScrollPosY;
@@ -3162,7 +3162,7 @@
if (ScrollCount>=ts.ScrollThreshold) DispUpdateScroll();
}
-void DispUpdateScroll()
+void DispUpdateScroll(void)
{
int d;
RECT R;
@@ -3268,7 +3268,7 @@
if (IsCaretOn()) CaretOn();
}
-void DispScrollHomePos()
+void DispScrollHomePos(void)
{
NewOrgX = 0;
NewOrgY = 0;
@@ -3360,7 +3360,7 @@
return CP_ACP;
}
-void DispSetupFontDlg()
+void DispSetupFontDlg(void)
// Popup the Setup Font dialogbox and
// reset window
{
@@ -3387,7 +3387,7 @@
ChangeCaret();
}
-void DispRestoreWinSize()
+void DispRestoreWinSize(void)
// Restore window size by double clik on caption bar
{
if (ts.TermIsWin>0) return;
@@ -3406,7 +3406,7 @@
}
}
-void DispSetWinPos()
+void DispSetWinPos(void)
{
int CaretX, CaretY;
POINT Point;
@@ -3798,7 +3798,7 @@
AdjustSize = FALSE;
}
-BOOL DispWindowIconified() {
+BOOL DispWindowIconified(void) {
return IsIconic(HVTWin);
}
Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h 2022-06-10 15:19:23 UTC (rev 9990)
+++ trunk/teraterm/teraterm/vtdisp.h 2022-06-10 15:19:33 UTC (rev 9991)
@@ -49,36 +49,36 @@
extern BOOL BGEnable;
//-->
-void InitDisp();
-void EndDisp();
-void DispReset();
+void InitDisp(void);
+void EndDisp(void);
+void DispReset(void);
void DispConvWinToScreen
(int Xw, int Yw, int *Xs, int *Ys, PBOOL Right);
void DispConvScreenToWin
(int Xs, int Ys, int *Xw, int *Yw);
-//void SetLogFont();
-void ChangeFont();
-void ResetIME();
-void ChangeCaret();
+//void SetLogFont(void);
+void ChangeFont(void);
+void ResetIME(void);
+void ChangeCaret(void);
void CaretKillFocus(BOOL show);
void UpdateCaretPosition(BOOL enforce);
-void CaretOn();
-void CaretOff();
-void DispDestroyCaret();
-BOOL IsCaretOn();
+void CaretOn(void);
+void CaretOff(void);
+void DispDestroyCaret(void);
+BOOL IsCaretOn(void);
void DispEnableCaret(BOOL On);
-BOOL IsCaretEnabled();
+BOOL IsCaretEnabled(void);
void DispSetCaretWidth(BOOL DW);
void DispChangeWinSize(int Nx, int Ny);
void ResizeWindow(int x, int y, int w, int h, int cw, int ch);
void PaintWindow(HDC PaintDC, RECT PaintRect, BOOL fBkGnd,
int* Xs, int* Ys, int* Xe, int* Ye);
-void DispEndPaint();
-void DispClearWin();
-void DispChangeBackground();
-void DispChangeWin();
-void DispInitDC();
-void DispReleaseDC();
+void DispEndPaint(void);
+void DispClearWin(void);
+void DispChangeBackground(void);
+void DispChangeWin(void);
+void DispInitDC(void);
+void DispReleaseDC(void);
void DispSetupDC(TCharAttr Attr, BOOL Reverse);
void DispStr(const char *Buff, int Count, int Y, int* X);
void DispStrW(const wchar_t *StrW, const char *WidthInfo, int Count, int Y, int* X);
@@ -88,21 +88,21 @@
BOOL DispDeleteLines(int Count, int YEnd);
BOOL DispInsertLines(int Count, int YEnd);
BOOL IsLineVisible(int* X, int* Y);
-void AdjustScrollBar();
+void AdjustScrollBar(void);
void DispScrollToCursor(int CurX, int CurY);
void DispScrollNLines(int Top, int Bottom, int Direction);
-void DispCountScroll();
-void DispUpdateScroll();
-void DispScrollHomePos();
+void DispCountScroll(int n);
+void DispUpdateScroll(void);
+void DispScrollHomePos(void);
void DispAutoScroll(POINT p);
void DispHScroll(int Func, int Pos);
void DispVScroll(int Func, int Pos);
-void DispSetupFontDlg();
-void DispRestoreWinSize();
-void DispSetWinPos();
+void DispSetupFontDlg(void);
+void DispRestoreWinSize(void);
+void DispSetWinPos(void);
void DispSetActive(BOOL ActiveFlag);
-void InitColorTable();
-void DispApplyANSIColor();
+void InitColorTable(void);
+void DispApplyANSIColor(void);
void DispSetNearestColors(int start, int end, HDC DispCtx);
int TCharAttrCmp(TCharAttr a, TCharAttr b);
void DispSetColor(unsigned int num, COLORREF color);
@@ -112,7 +112,7 @@
void DispMoveWindow(int x, int y);
void DispShowWindow(int mode);
void DispResizeWin(int w, int h);
-BOOL DispWindowIconified();
+BOOL DispWindowIconified(void);
void DispGetWindowPos(int *x, int *y, BOOL client);
void DispGetWindowSize(int *width, int *height, BOOL client);
void DispGetRootWinSize(int *x, int *y, BOOL inPixels);