Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split Frame.cpp to WinFrame.cpp (PR #874)

This commit is contained in:
Andrea 2020-11-23 19:21:20 +00:00 committed by GitHub
parent c79abb45eb
commit c455488b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 3125 additions and 3073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AppleWinExpress2008.vcproj
View File

@ -961,6 +961,14 @@
RelativePath=".\source\Windows\DirectInput.h"
>
</File>
<File
RelativePath=".\source\Windows\WinFrame.cpp"
>
</File>
<File
RelativePath=".\source\Windows\WinFrame.h"
>
</File>
<File
RelativePath=".\source\Windows\WinVideo.cpp"
>

2
AppleWinExpress2019.vcxproj
View File

@ -109,6 +109,7 @@
<ClInclude Include="source\Tfe\Uilib.h" />
<ClInclude Include="source\Video.h" />
<ClInclude Include="source\Windows\DirectInput.h" />
<ClInclude Include="source\Windows\WinFrame.h" />
<ClInclude Include="source\Windows\WinVideo.h" />
<ClInclude Include="source\YamlHelper.h" />
<ClInclude Include="source\z80emu.h" />
@ -215,6 +216,7 @@
</ClCompile>
<ClCompile Include="source\Video.cpp" />
<ClCompile Include="source\Windows\DirectInput.cpp" />
<ClCompile Include="source\Windows\WinFrame.cpp" />
<ClCompile Include="source\Windows\WinVideo.cpp" />
<ClCompile Include="source\YamlHelper.cpp" />
<ClCompile Include="source\z80emu.cpp" />

6
AppleWinExpress2019.vcxproj.filters
View File

@ -208,6 +208,9 @@
<ClCompile Include="source\Windows\WinVideo.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="source\Windows\WinFrame.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="source\AppleWin.h">
@ -501,6 +504,9 @@
<ClInclude Include="source\Windows\WinVideo.h">
<Filter>Source Files\Windows</Filter>
</ClInclude>
<ClInclude Include="source\Windows\WinFrame.h">
<Filter>Source Files\Windows</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="resource\Applewin.bmp">

2
source/AppleWin.cpp
View File

@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Debug.h"
#include "Disk.h"
#include "DiskImage.h"
#include "Frame.h"
#include "Harddisk.h"
#include "Joystick.h"
#include "Keyboard.h"
@ -55,6 +54,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#endif
#include "SynchronousEventManager.h"
#include "Windows/WinVideo.h"
#include "Windows/WinFrame.h"
#include "RGBMonitor.h"
#include "NTSC.h"

2
source/Configuration/About.cpp
View File

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "About.h"
#include "../AppleWin.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../resource/resource.h"
static const TCHAR g_szGPL[] =

2
source/Configuration/PageConfig.cpp
View File

@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "PropertySheetHelper.h"
#include "../AppleWin.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../Registry.h"
#include "../SerialComms.h"
#include "../Windows/WinVideo.h"

2
source/Configuration/PageDisk.cpp
View File

@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../AppleWin.h"
#include "../CardManager.h"
#include "../Disk.h" // Drive_e, Disk_Status_e
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../Registry.h"
#include "../resource/resource.h"

2
source/Configuration/PropertySheet.cpp
View File

@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "PropertySheet.h"
#include "../AppleWin.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../resource/resource.h"
void CPropertySheet::Init(void)

2
source/Configuration/PropertySheetHelper.cpp
View File

@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../AppleWin.h" // g_nAppMode, g_uScrollLockToggle, sg_PropertySheet
#include "../CardManager.h"
#include "../Disk.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../Log.h"
#include "../Registry.h"
#include "../SaveState.h"

2
source/Debugger/Debug.cpp
View File

@ -38,12 +38,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../CardManager.h"
#include "../CPU.h"
#include "../Disk.h"
#include "../Frame.h"
#include "../Keyboard.h"
#include "../Memory.h"
#include "../NTSC.h"
#include "../SoundCore.h" // SoundCore_SetFade()
#include "../Windows/WinVideo.h"
#include "../Windows/WinFrame.h"
#include "../Video.h"
// #define DEBUG_COMMAND_HELP 1

1
source/Debugger/Debugger_Assembler.cpp
View File

@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Debug.h"
#include "../CPU.h"
#include "../Frame.h"
#include "../Memory.h"
#define DEBUG_ASSEMBLER 0

2
source/Debugger/Debugger_Commands.cpp
View File

@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Debug.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
// Commands _______________________________________________________________________________________

1
source/Debugger/Debugger_Display.cpp
View File

@ -35,6 +35,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../AppleWin.h"
#include "../CPU.h"
#include "../Frame.h"
#include "../Windows/WinFrame.h"
#include "../LanguageCard.h"
#include "../Memory.h"
#include "../Mockingboard.h"

2
source/Disk.cpp
View File

@ -37,13 +37,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "AppleWin.h"
#include "CPU.h"
#include "DiskImage.h"
#include "Frame.h"
#include "Log.h"
#include "Memory.h"
#include "Registry.h"
#include "SaveState.h"
#include "Video.h"
#include "Windows/WinVideo.h"
#include "Windows/WinFrame.h"
#include "YamlHelper.h"
#include "../resource/resource.h"

3004
source/Frame.cpp
View File

File diff suppressed because it is too large Load Diff

49
source/Frame.h
View File

@ -3,58 +3,9 @@
// 1.19.0.0 Hard Disk Status/Indicator Light
#define HD_LED 1
// Win32
extern HWND g_hFrameWindow;
extern int g_nViewportCX;
extern int g_nViewportCY;
extern BOOL g_bConfirmReboot; // saved PageConfig REGSAVE
extern BOOL g_bMultiMon;
// Emulator
extern bool g_bFreshReset;
extern std::string PathFilename[2];
extern bool g_bScrollLock_FullSpeed;
// Prototypes
void CtrlReset();
void FrameCreateWindow(void);
HDC FrameGetDC ();
void FrameReleaseDC ();
void FrameRefreshStatus (int, bool bUpdateDiskStatus = true );
void FrameRegisterClass ();
void FrameSetCursorPosByMousePos();
int GetViewportScale(void);
int SetViewportScale(int nNewScale, bool bForce = false);
void GetViewportCXCY(int& nViewportCX, int& nViewportCY);
void FrameUpdateApple2Type(void);
bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedHeight=0);
bool IsFullScreen(void);
bool GetFullScreenShowSubunitStatus(void);
void SetFullScreenShowSubunitStatus(bool bShow);
void FrameDrawDiskLEDS( HDC hdc );
void FrameDrawDiskStatus( HDC hdc );
LRESULT CALLBACK FrameWndProc (
HWND window,
UINT message,
WPARAM wparam,
LPARAM lparam );
int GetFullScreenOffsetX(void);
int GetFullScreenOffsetY(void);
UINT GetFrameBufferBorderlessWidth(void);
UINT GetFrameBufferBorderlessHeight(void);
UINT GetFrameBufferBorderWidth(void);
UINT GetFrameBufferBorderHeight(void);
UINT GetFrameBufferWidth(void);
UINT GetFrameBufferHeight(void);
UINT Get3DBorderWidth(void);
UINT Get3DBorderHeight(void);
void SetAltEnterToggleFullScreen(bool mode);

2
source/Harddisk.cpp
View File

@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "CPU.h"
#include "DiskImage.h" // ImageError_e, Disk_Status_e
#include "DiskImageHelper.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Memory.h"
#include "Registry.h"
#include "SaveState.h"

2
source/Keyboard.cpp
View File

@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Keyboard.h"
#include "AppleWin.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Pravets.h"
#include "Tape.h"
#include "YamlHelper.h"

2
source/Memory.cpp
View File

@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "CardManager.h"
#include "CPU.h"
#include "Disk.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Harddisk.h"
#include "Joystick.h"
#include "Keyboard.h"

2
source/MouseInterface.cpp
View File

@ -49,7 +49,7 @@ Etc.
#include "AppleWin.h" // g_SynchronousEventMgr
#include "CardManager.h"
#include "CPU.h"
#include "Frame.h" // FrameSetCursorPosByMousePos()
#include "Windows/WinFrame.h" // FrameSetCursorPosByMousePos()
#include "Log.h"
#include "Memory.h"
#include "Video.h"

1
source/ParallelPrinter.cpp
View File

@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "ParallelPrinter.h"
#include "AppleWin.h"
#include "Frame.h" // g_hFrameWindow
#include "Memory.h"
#include "Registry.h"
#include "YamlHelper.h"

2
source/Pravets.cpp
View File

@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Pravets.h"
#include "AppleWin.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Keyboard.h"
#include "Tape.h"

2
source/SaveState.cpp
View File

@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "CPU.h"
#include "Debug.h"
#include "Disk.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Joystick.h"
#include "Keyboard.h"
#include "LanguageCard.h"

2
source/SerialComms.cpp
View File

@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SerialComms.h"
#include "AppleWin.h"
#include "CPU.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Log.h"
#include "Memory.h"
#include "YamlHelper.h"

2
source/SoundCore.cpp
View File

@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SoundCore.h"
#include "AppleWin.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Log.h"
#include "Speaker.h"

2
source/Speaker.cpp
View File

@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Speaker.h"
#include "AppleWin.h"
#include "CPU.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Log.h"
#include "Memory.h"
#include "SoundCore.h"

1
source/Video.cpp
View File

@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "AppleWin.h"
#include "CPU.h"
#include "Frame.h"
#include "Windows/WinFrame.h"
#include "Log.h"
#include "Memory.h"
#include "Registry.h"

3034
source/Windows/WinFrame.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

54
source/Windows/WinFrame.h Normal file
View File

@ -0,0 +1,54 @@
#pragma once
// 1.19.0.0 Hard Disk Status/Indicator Light
#define HD_LED 1
// Win32
extern HWND g_hFrameWindow;
extern int g_nViewportCX;
extern int g_nViewportCY;
extern BOOL g_bConfirmReboot; // saved PageConfig REGSAVE
extern BOOL g_bMultiMon;
// Emulator
extern bool g_bFreshReset;
extern std::string PathFilename[2];
extern bool g_bScrollLock_FullSpeed;
// Prototypes
void CtrlReset();
void FrameCreateWindow(void);
HDC FrameGetDC ();
void FrameReleaseDC ();
void FrameRefreshStatus (int, bool bUpdateDiskStatus = true );
void FrameRegisterClass ();
void FrameSetCursorPosByMousePos();
int GetViewportScale(void);
int SetViewportScale(int nNewScale, bool bForce = false);
void GetViewportCXCY(int& nViewportCX, int& nViewportCY);
void FrameUpdateApple2Type(void);
bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedHeight=0);
bool IsFullScreen(void);
bool GetFullScreenShowSubunitStatus(void);
void SetFullScreenShowSubunitStatus(bool bShow);
void FrameDrawDiskLEDS( HDC hdc );
void FrameDrawDiskStatus( HDC hdc );
LRESULT CALLBACK FrameWndProc (
HWND window,
UINT message,
WPARAM wparam,
LPARAM lparam );
int GetFullScreenOffsetX(void);
int GetFullScreenOffsetY(void);
UINT Get3DBorderWidth(void);
UINT Get3DBorderHeight(void);
void SetAltEnterToggleFullScreen(bool mode);

1
source/Windows/WinVideo.cpp
View File

@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "Windows/WinVideo.h"
#include "Windows/WinFrame.h"
#include "AppleWin.h"
#include "Video.h"
#include "CPU.h"