Tera TermRevision: 10336
https://osdn.net/projects/ttssh2/scm/svn/commits/10336
Author: zmatsuo
Date: 2022-10-24 00:16:58 +0900 (Mon, 24 Oct 2022)
Log Message:
-----------
コンパイラの警告対応
- vtdisp.c:780:10: warning: enumeration value 'BG_NONE' not handled in switch
- vtdisp.c:927:10: warning: 4 enumeration values not handled in switch: 'BG_FIT_WIDTH', 'BG_FIT_HEIGHT', 'BG_AUTOFIT'...
- vtdisp.c:1003:10: warning: enumeration value 'BG_NONE' not handled in switch
- vtdisp.c:2880:30: warning: '&&' within '||'
Modified Paths:
--------------
trunk/teraterm/teraterm/vtdisp.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2022-10-23 15:16:47 UTC (rev 10335)
+++ trunk/teraterm/teraterm/vtdisp.c 2022-10-23 15:16:58 UTC (rev 10336)
@@ -775,21 +775,23 @@
static void BGPreloadSrc(BGSrc *src)
{
- DeleteBitmapDC(&(src->hdc));
+ DeleteBitmapDC(&(src->hdc));
- switch(src->type)
- {
- case BG_COLOR :
- break;
+ switch (src->type) {
+ case BG_COLOR:
+ break;
- case BG_WALLPAPER :
- BGPreloadWallpaper(src);
- break;
+ case BG_WALLPAPER:
+ BGPreloadWallpaper(src);
+ break;
- case BG_PICTURE :
- BGPreloadPicture(src);
- break;
- }
+ case BG_PICTURE:
+ BGPreloadPicture(src);
+ break;
+
+ default:
+ break;
+ }
}
static void BGStretchPicture(HDC hdcDest,BGSrc *src,int x,int y,int width,int height,BOOL bAntiAlias)
@@ -946,6 +948,8 @@
y < rectDest.bottom;y += lws->src->height)
BitBlt(lws->hdcDest,x,y,lws->src->width,lws->src->height,lws->src->hdc,0,0,SRCCOPY);
break;
+ default:
+ break;
}
//\x83\x8A\x81[\x83W\x83\x87\x83\x93\x82\xF0\x94j\x8A\xFC
@@ -998,22 +1002,23 @@
SetWindowOrgEx(hdcDest,0,0,NULL);
}
-static void BGLoadSrc(HDC hdcDest,BGSrc *src)
+static void BGLoadSrc(HDC hdcDest, BGSrc *src)
{
- switch(src->type)
- {
- case BG_COLOR :
- FillBitmapDC(hdcDest,src->color);
- break;
+ switch (src->type) {
+ case BG_COLOR:
+ FillBitmapDC(hdcDest, src->color);
+ break;
- case BG_WALLPAPER :
- BGLoadWallpaper(hdcDest,src);
- break;
+ case BG_WALLPAPER:
+ BGLoadWallpaper(hdcDest, src);
+ break;
- case BG_PICTURE :
- BGLoadPicture(hdcDest,src);
- break;
- }
+ case BG_PICTURE:
+ BGLoadPicture(hdcDest, src);
+ break;
+ default:
+ break;
+ }
}
void BGSetupPrimary(BOOL forceSetup)
@@ -2876,18 +2881,17 @@
// Bottom: bottom line
// Direction: +: forward, -: backward
{
- if ((dScroll*Direction <0) ||
- (dScroll*Direction >0) &&
- ((SRegionTop!=Top) ||
- (SRegionBottom!=Bottom)))
- DispUpdateScroll();
- SRegionTop = Top;
- SRegionBottom = Bottom;
- dScroll = dScroll + Direction;
- if (Direction>0)
- DispCountScroll(Direction);
- else
- DispCountScroll(-Direction);
+ if (((dScroll * Direction < 0) || (dScroll * Direction > 0)) &&
+ (((SRegionTop != Top) || (SRegionBottom != Bottom)))) {
+ DispUpdateScroll();
+ }
+ SRegionTop = Top;
+ SRegionBottom = Bottom;
+ dScroll = dScroll + Direction;
+ if (Direction > 0)
+ DispCountScroll(Direction);
+ else
+ DispCountScroll(-Direction);
}
void DispCountScroll(int n)