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

Move Windows related functions to Interface.h (PR #882) 

This is not complete as header files from Windows/.. are still included in:

Keyboard.cpp
SerialComms.cpp
Joystick.cpp

But probably these are arch specific and will have to be completely reimplemented elsewhere.
This commit is contained in:
Andrea 2020-11-29 17:30:06 +00:00 committed by GitHub
parent 93346c215f
commit 7ca547479b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AppleWinExpress2008.vcproj
View File

@ -242,6 +242,10 @@
RelativePath=".\source\Core.h"
>
</File>
<File
RelativePath=".\source\Interface.h"
>
</File>
<File
RelativePath=".\source\Utilities.cpp"
>

1
AppleWinExpress2019.vcxproj
View File

@ -72,6 +72,7 @@
<ClInclude Include="source\DiskLog.h" />
<ClInclude Include="source\Frame.h" />
<ClInclude Include="source\Harddisk.h" />
<ClInclude Include="source\Interface.h" />
<ClInclude Include="source\Joystick.h" />
<ClInclude Include="source\Keyboard.h" />
<ClInclude Include="source\LanguageCard.h" />

3
AppleWinExpress2019.vcxproj.filters
View File

@ -525,6 +525,9 @@
<ClInclude Include="source\CmdLine.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="source\Interface.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="resource\Applewin.bmp">

2
source/CmdLine.cpp
View File

@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "ParallelPrinter.h"
#include "CardManager.h"
#include "SerialComms.h"
#include "Windows/WinFrame.h"
#include "Interface.h"
CmdLine g_cmdLine;
std::string g_sConfigFile; // INI file to use instead of Registry

4
source/Disk.cpp
View File

@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SaveState_Structs_v1.h"
#include "Windows/AppleWin.h"
#include "Interface.h"
#include "Core.h"
#include "CPU.h"
#include "DiskImage.h"
@ -43,8 +43,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Registry.h"
#include "SaveState.h"
#include "Video.h"
#include "Windows/WinVideo.h"
#include "Windows/WinFrame.h"
#include "YamlHelper.h"
#include "../resource/resource.h"

3
source/Frame.h
View File

@ -1,8 +1,5 @@
#pragma once
// 1.19.0.0 Hard Disk Status/Indicator Light
#define HD_LED 1
UINT GetFrameBufferBorderlessWidth(void);
UINT GetFrameBufferBorderlessHeight(void);
UINT GetFrameBufferBorderWidth(void);

3
source/Harddisk.cpp
View File

@ -30,12 +30,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Harddisk.h"
#include "Core.h"
#include "Windows/AppleWin.h"
#include "Interface.h"
#include "CardManager.h"
#include "CPU.h"
#include "DiskImage.h" // ImageError_e, Disk_Status_e
#include "DiskImageHelper.h"
#include "Windows/WinFrame.h"
#include "Memory.h"
#include "Registry.h"
#include "SaveState.h"

3
source/Harddisk.h
View File

@ -25,6 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "DiskImage.h"
// 1.19.0.0 Hard Disk Status/Indicator Light
#define HD_LED 1
enum HardDrive_e
{
HARDDISK_1 = 0,

20
source/Interface.h Normal file
View File

@ -0,0 +1,20 @@
#pragma once
extern HINSTANCE g_hInstance;
extern HWND g_hFrameWindow;
extern BOOL g_bConfirmReboot; // saved PageConfig REGSAVE
extern BOOL g_bMultiMon;
void FrameDrawDiskLEDS(HDC hdc);
void FrameDrawDiskStatus(HDC hdc);
void FrameRefreshStatus(int, bool bUpdateDiskStatus = true);
void FrameUpdateApple2Type();
void FrameSetCursorPosByMousePos();
void VideoRedrawScreen();
void SetFullScreenShowSubunitStatus(bool bShow);
bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedHeight = 0);
int SetViewportScale(int nNewScale, bool bForce = false);
void SetAltEnterToggleFullScreen(bool mode);
void SetLoadedSaveStateFlag(const bool bFlag);

2
source/Memory.cpp
View File

@ -31,11 +31,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "Memory.h"
#include "Interface.h"
#include "Core.h"
#include "CardManager.h"
#include "CPU.h"
#include "Disk.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 "Core.h" // g_SynchronousEventMgr
#include "CardManager.h"
#include "CPU.h"
#include "Windows/WinFrame.h" // FrameSetCursorPosByMousePos()
#include "Interface.h" // FrameSetCursorPosByMousePos()
#include "Log.h"
#include "Memory.h"
#include "Video.h"

2
source/NTSC_CharSet.cpp
View File

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "NTSC_CharSet.h"
#include "Windows/AppleWin.h"
#include "Interface.h"
#include "Core.h"
#include "../resource/resource.h"
#include "Video.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 "Core.h"
#include "Windows/WinFrame.h"
#include "Interface.h"
#include "Keyboard.h"
#include "Tape.h"

3
source/SaveState.cpp
View File

@ -31,12 +31,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SaveState.h"
#include "YamlHelper.h"
#include "Windows/AppleWin.h"
#include "Interface.h"
#include "CardManager.h"
#include "CPU.h"
#include "Debug.h"
#include "Disk.h"
#include "Windows/WinFrame.h"
#include "Joystick.h"
#include "Keyboard.h"
#include "LanguageCard.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 "Core.h"
#include "Windows/WinFrame.h"
#include "Interface.h"
#include "Log.h"
#include "Speaker.h"

3
source/Speaker.cpp
View File

@ -31,11 +31,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Speaker.h"
#include "Core.h"
#include "CPU.h"
#include "Windows/WinFrame.h"
#include "Interface.h"
#include "Log.h"
#include "Memory.h"
#include "SoundCore.h"
#include "Windows/WinVideo.h" // VideoRedrawScreen()
#include "YamlHelper.h"
#include "Riff.h"

2
source/Utilities.cpp
View File

@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SerialComms.h"
#include "Speaker.h"
#include "Mockingboard.h"
#include "Windows/WinFrame.h"
#include "Interface.h"
#include "Configuration/IPropertySheet.h"
#include "Tfe/Tfe.h"

2
source/Video.cpp
View File

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

3
source/Windows/WinFrame.h
View File

@ -1,8 +1,5 @@
#pragma once
// 1.19.0.0 Hard Disk Status/Indicator Light
#define HD_LED 1
// Win32
extern HWND g_hFrameWindow;
extern int g_nViewportCX;