Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-15 18:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Tidy-up in Frame.cpp: unused prototypes, dead code; consolidate some full-screen constants

Browse Source
This commit is contained in:
tomcw
2017-10-10 22:05:03 +01:00
parent 3ad68739ee
commit b1dfd57502
3 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/Frame.cpp
View File

@@ -143,14 +143,14 @@ static int viewportx = VIEWPORTX; // Default to Normal (non-FullScreen
static int viewporty = VIEWPORTY; // Default to Normal (non-FullScreen) mode static int viewporty = VIEWPORTY; // Default to Normal (non-FullScreen) mode
// Direct Draw -- For Full Screen // Direct Draw -- For Full Screen
LPDIRECTDRAW g_pDD = (LPDIRECTDRAW)0; // LPDIRECTDRAW g_pDD = (LPDIRECTDRAW)0;
LPDIRECTDRAWSURFACE g_pDDPrimarySurface = (LPDIRECTDRAWSURFACE)0; LPDIRECTDRAWSURFACE g_pDDPrimarySurface = (LPDIRECTDRAWSURFACE)0;
#if DIRECTX_PAGE_FLIP #if DIRECTX_PAGE_FLIP
LPDIRECTDRAWSURFACE g_pDDBackSurface = (LPDIRECTDRAWSURFACE)0; LPDIRECTDRAWSURFACE g_pDDBackSurface = (LPDIRECTDRAWSURFACE)0;
#endif #endif
HDC g_hDDdc = 0; HDC g_hDDdc = 0;
int g_nDDFullScreenW = 640; // int g_nDDFullScreenW = 640;
int g_nDDFullScreenH = 480; // int g_nDDFullScreenH = 480;
static bool g_bShowingCursor = true; static bool g_bShowingCursor = true;
static bool g_bLastCursorInAppleViewport = false; static bool g_bLastCursorInAppleViewport = false;
@@ -184,12 +184,9 @@ static int g_win_fullscreen_offsety = 0;
// __ Prototypes __________________________________________________________________________________ // __ Prototypes __________________________________________________________________________________
static void DrawCrosshairs (int x, int y); 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 UpdateMouseInAppleViewport(int iOutOfBoundsX, int iOutOfBoundsY, int x=0, int y=0);
static void ScreenWindowResize(const bool bCtrlKey); static void ScreenWindowResize(const bool bCtrlKey);
static void FrameResizeWindow(int nNewScale); static void FrameResizeWindow(int nNewScale);
static void GetWidthHeight(int& nWidth, int& nHeight);
TCHAR g_pAppleWindowTitle[ 128 ] = ""; TCHAR g_pAppleWindowTitle[ 128 ] = "";
@@ -2161,9 +2158,6 @@ void SetFullScreenMode ()
FULLSCREEN_SCALE_TYPE width, height, scalex, scaley; FULLSCREEN_SCALE_TYPE width, height, scalex, scaley;
int top, left; int top, left;
const int A2_WINDOW_WIDTH = FRAMEBUFFER_BORDERLESS_W;
const int A2_WINDOW_HEIGHT = FRAMEBUFFER_BORDERLESS_H;
buttonover = -1; buttonover = -1;
#if 0 #if 0
// FS: 640x480 // FS: 640x480
@@ -2188,12 +2182,12 @@ void SetFullScreenMode ()
width = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.right - monitor_info.rcMonitor.left); width = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.right - monitor_info.rcMonitor.left);
height = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top ); height = (FULLSCREEN_SCALE_TYPE)(monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top );
scalex = width / A2_WINDOW_WIDTH; scalex = width / FRAMEBUFFER_BORDERLESS_W;
scaley = height / A2_WINDOW_HEIGHT; scaley = height / FRAMEBUFFER_BORDERLESS_H;
g_win_fullscreen_scale = (scalex <= scaley) ? scalex : scaley; 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_offsetx = ((int)width - (int)(g_win_fullscreen_scale * FRAMEBUFFER_BORDERLESS_W)) / 2;
g_win_fullscreen_offsety = ((int)height - (int)(g_win_fullscreen_scale * A2_WINDOW_HEIGHT)) / 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); SetWindowPos(g_hFrameWindow, NULL, left, top, (int)width, (int)height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
g_bIsFullScreen = true; 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 (userSpecifiedHeight)
{ {
if (vecDisplayResolutions.size() == 0) if (vecDisplayResolutions.size() == 0)
@@ -2859,8 +2850,8 @@ bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UI
{ {
if (width > it->first) if (width > it->first)
{ {
UINT scaleFactor = it->second / A2_WINDOW_HEIGHT; UINT scaleFactor = it->second / FRAMEBUFFER_BORDERLESS_H;
if (it->first >= (A2_WINDOW_WIDTH * scaleFactor)) if (it->first >= (FRAMEBUFFER_BORDERLESS_W * scaleFactor))
{ {
width = it->first; width = it->first;
} }
@@ -2875,17 +2866,17 @@ bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UI
return true; 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 tmpBestWidth = 0;
UINT tmpBestHeight = 0; UINT tmpBestHeight = 0;
for (VEC_PAIR::iterator it = vecDisplayResolutions.begin(); it!= vecDisplayResolutions.end(); ++it) 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) if (it->second > tmpBestHeight)
{ {
UINT scaleFactor = it->second / A2_WINDOW_HEIGHT; UINT scaleFactor = it->second / FRAMEBUFFER_BORDERLESS_H;
if (it->first >= (A2_WINDOW_WIDTH * scaleFactor)) if (it->first >= (FRAMEBUFFER_BORDERLESS_W * scaleFactor))
{ {
tmpBestWidth = it->first; tmpBestWidth = it->first;
tmpBestHeight = it->second; tmpBestHeight = it->second;

6
source/Frame.h
View File

@@ -30,12 +30,6 @@
#endif #endif
// NTSC_END // NTSC_END
// Direct Draw -- For Full Screen
extern LPDIRECTDRAW g_pDD;
extern LPDIRECTDRAWSURFACE g_pDDPrimarySurface;
extern int g_nDDFullScreenW;
extern int g_nDDFullScreenH;
// Win32 // Win32
extern HWND g_hFrameWindow; extern HWND g_hFrameWindow;
extern int g_nViewportCX; extern int g_nViewportCX;

10
source/Video.cpp
View File

@@ -674,16 +674,6 @@ void VideoRefreshScreen ( uint32_t uRedrawWholeScreenVideoMode /* =0*/, bool bRe
if (hFrameDC) 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 xSrc = BORDER_W;
int ySrc = BORDER_H; int ySrc = BORDER_H;
VideoFrameBufferAdjust(xSrc, ySrc); // TC: Hacky-fix for GH#341 VideoFrameBufferAdjust(xSrc, ySrc); // TC: Hacky-fix for GH#341