From b1dfd57502869bcddfb979e7230256a2b3ffffaa Mon Sep 17 00:00:00 2001 From: tomcw Date: Tue, 10 Oct 2017 22:05:03 +0100 Subject: [PATCH] Tidy-up in Frame.cpp: unused prototypes, dead code; consolidate some full-screen constants --- source/Frame.cpp | 35 +++++++++++++---------------------- source/Frame.h | 6 ------ source/Video.cpp | 10 ---------- 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/source/Frame.cpp b/source/Frame.cpp index e67614f2..9202fcab 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -143,14 +143,14 @@ static int viewportx = VIEWPORTX; // Default to Normal (non-FullScreen static int viewporty = VIEWPORTY; // Default to Normal (non-FullScreen) mode // Direct Draw -- For Full Screen - LPDIRECTDRAW g_pDD = (LPDIRECTDRAW)0; +// LPDIRECTDRAW g_pDD = (LPDIRECTDRAW)0; LPDIRECTDRAWSURFACE g_pDDPrimarySurface = (LPDIRECTDRAWSURFACE)0; #if DIRECTX_PAGE_FLIP LPDIRECTDRAWSURFACE g_pDDBackSurface = (LPDIRECTDRAWSURFACE)0; #endif HDC g_hDDdc = 0; - int g_nDDFullScreenW = 640; - int g_nDDFullScreenH = 480; +// int g_nDDFullScreenW = 640; +// int g_nDDFullScreenH = 480; static bool g_bShowingCursor = true; static bool g_bLastCursorInAppleViewport = false; @@ -184,12 +184,9 @@ static int g_win_fullscreen_offsety = 0; // __ Prototypes __________________________________________________________________________________ static void DrawCrosshairs (int x, int y); - static void FrameSetCursorPosByMousePos(int x, int y, int dx, int dy, bool bLeavingAppleScreen); - static void DrawCrosshairsMouse(); static void UpdateMouseInAppleViewport(int iOutOfBoundsX, int iOutOfBoundsY, int x=0, int y=0); static void ScreenWindowResize(const bool bCtrlKey); static void FrameResizeWindow(int nNewScale); - static void GetWidthHeight(int& nWidth, int& nHeight); TCHAR g_pAppleWindowTitle[ 128 ] = ""; @@ -2161,9 +2158,6 @@ void SetFullScreenMode () FULLSCREEN_SCALE_TYPE width, height, scalex, scaley; int top, left; - const int A2_WINDOW_WIDTH = FRAMEBUFFER_BORDERLESS_W; - const int A2_WINDOW_HEIGHT = FRAMEBUFFER_BORDERLESS_H; - buttonover = -1; #if 0 // FS: 640x480 @@ -2188,12 +2182,12 @@ void SetFullScreenMode () width = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.right - monitor_info.rcMonitor.left); height = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top ); - scalex = width / A2_WINDOW_WIDTH; - scaley = height / A2_WINDOW_HEIGHT; + scalex = width / FRAMEBUFFER_BORDERLESS_W; + scaley = height / FRAMEBUFFER_BORDERLESS_H; g_win_fullscreen_scale = (scalex <= scaley) ? scalex : scaley; - g_win_fullscreen_offsetx = ((int)width - (int)(g_win_fullscreen_scale * A2_WINDOW_WIDTH )) / 2; - g_win_fullscreen_offsety = ((int)height - (int)(g_win_fullscreen_scale * A2_WINDOW_HEIGHT)) / 2; + g_win_fullscreen_offsetx = ((int)width - (int)(g_win_fullscreen_scale * FRAMEBUFFER_BORDERLESS_W)) / 2; + g_win_fullscreen_offsety = ((int)height - (int)(g_win_fullscreen_scale * FRAMEBUFFER_BORDERLESS_H)) / 2; SetWindowPos(g_hFrameWindow, NULL, left, top, (int)width, (int)height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); g_bIsFullScreen = true; @@ -2845,9 +2839,6 @@ bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UI } } - const int A2_WINDOW_WIDTH = FRAMEBUFFER_BORDERLESS_W; - const int A2_WINDOW_HEIGHT = FRAMEBUFFER_BORDERLESS_H; - if (userSpecifiedHeight) { if (vecDisplayResolutions.size() == 0) @@ -2859,8 +2850,8 @@ bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UI { if (width > it->first) { - UINT scaleFactor = it->second / A2_WINDOW_HEIGHT; - if (it->first >= (A2_WINDOW_WIDTH * scaleFactor)) + UINT scaleFactor = it->second / FRAMEBUFFER_BORDERLESS_H; + if (it->first >= (FRAMEBUFFER_BORDERLESS_W * scaleFactor)) { width = it->first; } @@ -2875,17 +2866,17 @@ bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UI return true; } - // Pick max height that's an exact multiple of A2_WINDOW_HEIGHT + // Pick max height that's an exact multiple of FRAMEBUFFER_BORDERLESS_H UINT tmpBestWidth = 0; UINT tmpBestHeight = 0; for (VEC_PAIR::iterator it = vecDisplayResolutions.begin(); it!= vecDisplayResolutions.end(); ++it) { - if ((it->second % A2_WINDOW_HEIGHT) == 0) + if ((it->second % FRAMEBUFFER_BORDERLESS_H) == 0) { if (it->second > tmpBestHeight) { - UINT scaleFactor = it->second / A2_WINDOW_HEIGHT; - if (it->first >= (A2_WINDOW_WIDTH * scaleFactor)) + UINT scaleFactor = it->second / FRAMEBUFFER_BORDERLESS_H; + if (it->first >= (FRAMEBUFFER_BORDERLESS_W * scaleFactor)) { tmpBestWidth = it->first; tmpBestHeight = it->second; diff --git a/source/Frame.h b/source/Frame.h index fcae0f26..92da9608 100644 --- a/source/Frame.h +++ b/source/Frame.h @@ -30,12 +30,6 @@ #endif // NTSC_END -// Direct Draw -- For Full Screen - extern LPDIRECTDRAW g_pDD; - extern LPDIRECTDRAWSURFACE g_pDDPrimarySurface; - extern int g_nDDFullScreenW; - extern int g_nDDFullScreenH; - // Win32 extern HWND g_hFrameWindow; extern int g_nViewportCX; diff --git a/source/Video.cpp b/source/Video.cpp index 694c7ae9..501546fe 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -674,16 +674,6 @@ void VideoRefreshScreen ( uint32_t uRedrawWholeScreenVideoMode /* =0*/, bool bRe if (hFrameDC) { { - int xDst = 0; - int yDst = 0; - - if ( IsFullScreen() ) - { - // Why the need to set the mid-position here, but not for (full-screen) LOGO or DEBUG modes? - xDst = (g_nDDFullScreenW-W)/2 - VIEWPORTX*2; - yDst = (g_nDDFullScreenH-H)/2; - } - int xSrc = BORDER_W; int ySrc = BORDER_H; VideoFrameBufferAdjust(xSrc, ySrc); // TC: Hacky-fix for GH#341