Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-23 00:30:17 +00:00
Code Issues Projects Releases Wiki Activity
e48ea095a3
AppleWin/source/Applewin.h

90 lines
2.2 KiB
C
Raw Normal View History

*** empty log message ***
2006-02-25 20:50:29 +00:00
#pragma once
Support 2nd Disk][ card and improved card management (#726) (PR #741) Support 2nd Disk][ in slot-5, via command line: - -s5 diskii - -s5d1 \<imagefile\> - -s5d2 \<imagefile\> NB. there's currently no Configuration UI support, except the Drive icons' tooltips show what's in slot-5 & slot-6 (for drive-n). So there's no way to eject the disks or insert new disks. The use-case I'm supporting it Wasteland which just has the 4 disks in the 4 drives. Improved card management: - Added `class Card` (in Card.h) which all other cards (that exist as classes) derive from (eg. LC,SSC,Mouse,Disk2). - Added `class CardManager` (in CardManager.cpp\h) which now manages the 8 slots (and aux slot). - Added `class Disk2CardManager` (in Disk2CardManager.cpp\h) which provides methods for operations that act on all Disk2 instances at the same time. - Currently limited to just 1x SSC and 1x Mouse card (why would you need more?). This simplifies things, meaning there's no need to have dedicated SSCManager / MouseCardManager objects. - Currently the 2nd Disk2 card can only be put into slot-5. This limitation is just due to the complexity of the Configuration UI. Having a more general drop-down per slot UI would remove this limitation.
2019-12-19 19:42:30 +00:00
#include "Card.h"
Manual merge from master @ c798157
2016-03-21 23:48:02 +00:00
#include "SaveState_Structs_common.h"
Renamed DiskConsts.h to DiskDefs.h + other header refactoring
2014-08-14 16:48:38 +00:00
#include "Common.h"
PCH refactor: remove non-system headers from stdafx.h
2014-08-13 20:30:35 +00:00
Debug logging: add log message for time from boot until first key read (for AZTEC.DSK). + Remove an unused var.
2016-09-06 20:38:00 +00:00
void LogFileTimeUntilFirstKeyReadReset(void);
void LogFileTimeUntilFirstKeyRead(void);
Next iteration of the string project. Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-09-07 09:16:51 +00:00
bool SetCurrentImageDir(const std::string & pszImageDir);
Merged from cm630 branch Fix for browsing for CiderPress changed curr dir Fix for pressing "OK" on Advanced sheet resulted in resetting savestate file to default
2008-06-21 11:48:15 +00:00
Reinstate support for old AppleWin 1.25 "Color (Standard)" video mode (#357) (PR #614) Renamed this video mode to: "Color (RGB Monitor)" Also renamed "Color (Monitor)" to "Color (NTSC Monitor)". As for the colours: I've changed them from the original 1.25 colours. Instead I runtime-generate the colours from the NTSC code. See NTSC.cpp's GenerateBaseColors(). This shifts the same 4-bit pattern in, combining with NTSC color phase, until the colour stabilises. Then I average the next 4 RGB values to get the final colour. The reason for this is that we now have consistent colours between NTSC and this simplified rendering mode. NB. The 2 greys (in GR,DGR,DHGR) are now the same RGB value.
2019-01-09 21:29:36 +00:00
extern const UINT16* GetOldAppleWinVersion(void);
Prevent uninitialized value bugs and improve string safety. This change does two things: 1. Updates the registry APIs to reduce the likelihood of uninitialized variables. The code wasn't always checking the return value of registry load operations. In some cases, this led to uninitialized memory being used, and crashes could result. For example, LoadConfiguration in Applewin.cpp was using an uninitialized value for the computer type if no registry variable for the "Apple 2 type" was set. New registry reading methods and macros have also been introduced, allowing default value fallbacks for the cases where a registry variable is not found. This makes registry access simpler and safer when a default value is known in advance. The registry code's style has also been updated to conform with the rest of the code base (tabs instead of spaces, naming conventions, etc.) 2. Introduces string safety improvements. A number of code paths have been modified to use safe-string functions instead of their unsafe counterparts (e.g., strcpy, sprintf). In the process, some strings were converted from "char" to "TCHAR". This was done mostly for consistency with the rest of the code-base.
2019-08-09 03:50:29 +00:00
extern TCHAR VERSIONSTRING[]; // Constructed in WinMain()
*** empty log message ***
2006-02-25 20:50:29 +00:00
Next iteration of the string project. Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-09-07 09:16:51 +00:00
extern std::string g_pAppTitle;
added global: g_pAppTitle removed: define TITLE indentation cleanup
2006-06-27 02:34:46 +00:00
Clean-up in PropertySheetPage.cpp Registry: . Added "Slot 4" & "Slot 5" . Removed "Clone Type" . Removed "Mouse in slot 4" . Removed "Z80 in slot 5" . Removed "Soundcard Type"
2012-03-20 23:17:06 +00:00
extern eApple2Type g_Apple2Type;
Manual merge from master @ c798157
2016-03-21 23:48:02 +00:00
eApple2Type GetApple2Type(void);
void SetApple2Type(eApple2Type type);
Fixed BRKOP, BRK # to enter debugger Pressing F7 after triggered break stops on next break Fixed global "mode" to comply with coding convention: g_nAppMode
2006-06-12 22:06:50 +00:00
Support 50Hz(PAL) (#648) (PR #658) - Added Configuration GUI to include checkbox for "50Hz" - Implicitly use PAL or NTSC base 6502 clocks depending on video refresh rate - Added new -50hz and -60hz command line switches - Updated save-state for video refresh rate 1.28.8.0: Updated version & history.txt
2019-06-28 20:34:34 +00:00
double Get6502BaseClock(void);
void SetCurrentCLK6502(void);
Improve ContinueExecution() whilst MODE_STEPPING: . GetKeyState(VK_SCROLL) is slow, so only call periodically . Account for g_nCpuCyclesFeedback before calling SpkrUpdate()
2017-02-26 13:45:06 +00:00
void SingleStep(bool bReinit);
Support for #384: . Debug 'G(o)' cmd now defaults to normal speed (and precise video updates) . New debug 'GG' cmd enables full speed (and periodic video updates) . Single-stepping (normal or full speed) now routed through ContinueExecution() . Removed Cpu6502()/Cpu65C02() check for debug breakpoints . Removed the (undocumented) SHIFT+F7 feature to exit debugger for 'normal speed breakpoints' . Removed the g_bDebugNormalSpeedBreakpoints variable
2017-02-25 22:32:46 +00:00
*** empty log message ***
2006-02-25 20:50:29 +00:00
extern bool g_bFullSpeed;
instance -> g_hInstance
2006-07-02 09:56:50 +00:00
Merged from cm630 branch for "Pravets" clone support
2008-06-20 23:47:25 +00:00
//===========================================
instance -> g_hInstance
2006-07-02 09:56:50 +00:00
// Win32
extern HINSTANCE g_hInstance;
Fixed BRKOP, BRK # to enter debugger Pressing F7 after triggered break stops on next break Fixed global "mode" to comply with coding convention: g_nAppMode
2006-06-12 22:06:50 +00:00
extern AppMode_e g_nAppMode;
1.22.1.5: . Allow debugging of save-state image from start-up "logo" screen. . Fixed inserting of disk images from save-state when drive-2 contained the disk required for drive-1.
2013-04-26 21:55:45 +00:00
bool GetLoadedSaveStateFlag(void);
void SetLoadedSaveStateFlag(const bool bFlag);
Keyboard: . reverted default so that ALT+TAB is not hooked (#556) . reverted default so that ALT GR's fake LCONTROL is not hooked (#558) . added new switches: -hook-alt-tab and -hook-altgr-control to support hooking these key combo's (#556)
2018-07-29 21:34:09 +00:00
bool GetHookAltGrControl(void);
Fixed BRKOP, BRK # to enter debugger Pressing F7 after triggered break stops on next break Fixed global "mode" to comply with coding convention: g_nAppMode
2006-06-12 22:06:50 +00:00
Replace some char * with std::string.
2019-09-06 16:34:25 +00:00
extern std::string g_sProgramDir;
Next iteration of the string project. Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-09-07 09:16:51 +00:00
extern std::string g_sCurrentDir;
Renamed globals to match coding convention: g_bApple2e g_bApple2plus g_sProgramDir
2006-06-25 03:41:52 +00:00
Renamed g_restart to g_bRestart.
2016-09-10 21:58:26 +00:00
extern bool g_bRestart;
Fixed screen update when running at full-speed . Specifically IBIZA.DSK demo which streams data from the disk throughout (ie. so runs at full-speed all the time) . Update the screen every frame, but only if video memory has changed (check AZTEC.DSK loading time) . NB. When running at full-speed, then 6502 emulation doesn't do cycle-accurate video updates Fixed crash that could occur when switch video mode (F9) when running at full-speed . Occured when g_nVideoClockVert was >= 192
2016-07-23 21:53:29 +00:00
extern bool g_bRestartFullScreen;
*** empty log message ***
2006-02-25 20:50:29 +00:00
extern DWORD g_dwSpeed;
extern double g_fCurrentCLK6502;
Added floating bus emulation. Summary of changes: AppleWin.cpp: Made dwCyclesThisFrame global -> g_dwCyclesThisFrame. CPU.cpp: Made InternalCpuExecute()'s nCyclesLeft static -> nInternalCyclesLeft. CPU.cpp: Added CpuGetCyclesThisFrame(). Memory.cpp: Added MemGet80Store(). Memory.cpp: Added MemReadFloatingBus(). Memory.cpp: Added MemReadFloatingBus(BYTE const highbit). Memory.cpp: Changed NullIo() to call MemReadFloatingBus(). Video.cpp: Added video scanner constants and VideoGetScannerAddress(bool* pbVblBar_OUT). Video.cpp: Changed VideoCheckVbl() to call VideoGetScannerAddress(). Various files: Replaced MemReturnRandomData() calls with MemReadFloatingBus().
2006-03-12 09:05:39 +00:00
extern int g_nCpuCyclesFeedback;
extern DWORD g_dwCyclesThisFrame;
1.22.1.3: New cmd line switch: -no-di . Disable DirectInput, ie. for DIMouse
2013-03-23 14:14:48 +00:00
extern bool g_bDisableDirectInput; // Cmd line switch: don't init DI (so no DIMouse support)
Merge from AppleWin-Tom @ 565-614 (Excluded HEAD=615, due to Tree Conflict errors) Fix for SSC (big transfers): use queue instead of single byte buffer New switches: -log, -no-mb, -spkr-max, -spkr-inc Fix for Speaker underflow problem (max=200, inc=20) SSC: Support 112.5K Baud Dynamic 'Serial Port' drop-down menu Save "Serial Port Name" to Registry (instead of drop-down menu index as "Serial Port")
2009-10-07 21:38:42 +00:00
extern bool g_bDisableDirectSound; // Cmd line switch: don't init DS (so no MB/Speaker support)
extern bool g_bDisableDirectSoundMockingboard; // Cmd line switch: don't init MB support
Feature Request #206 Command line switch: -memclear #
2014-07-18 03:18:59 +00:00
extern int g_nMemoryClearType; // Cmd line switch: use specific MIP (Memory Initialization Pattern)
*** empty log message ***
2006-02-25 20:50:29 +00:00
Support 2nd Disk][ card and improved card management (#726) (PR #741) Support 2nd Disk][ in slot-5, via command line: - -s5 diskii - -s5d1 \<imagefile\> - -s5d2 \<imagefile\> NB. there's currently no Configuration UI support, except the Drive icons' tooltips show what's in slot-5 & slot-6 (for drive-n). So there's no way to eject the disks or insert new disks. The use-case I'm supporting it Wasteland which just has the 4 disks in the 4 drives. Improved card management: - Added `class Card` (in Card.h) which all other cards (that exist as classes) derive from (eg. LC,SSC,Mouse,Disk2). - Added `class CardManager` (in CardManager.cpp\h) which now manages the 8 slots (and aux slot). - Added `class Disk2CardManager` (in Disk2CardManager.cpp\h) which provides methods for operations that act on all Disk2 instances at the same time. - Currently limited to just 1x SSC and 1x Mouse card (why would you need more?). This simplifies things, meaning there's no need to have dedicated SSCManager / MouseCardManager objects. - Currently the 2nd Disk2 card can only be put into slot-5. This limitation is just due to the complexity of the Configuration UI. Having a more general drop-down per slot UI would remove this limitation.
2019-12-19 19:42:30 +00:00
extern class CardManager g_CardMgr;
Clock cleanup
2009-02-14 03:54:12 +00:00
Added cmd line arg -rom <file> for 12KB & 16KB roms (#771)
2020-03-25 23:05:02 +00:00
extern HANDLE g_hCustomRomF8; // INVALID_HANDLE_VALUE if no custom F8 rom
extern HANDLE g_hCustomRom; // INVALID_HANDLE_VALUE if no custom rom
Merged from Ken's branch (for CP/M card support)
2008-08-19 21:36:31 +00:00
Merge from Tom: r683 Added Speech API support: . Capture char output to COUT . Enable speech via -speech cmd-line . Ctrl+Reset and FullSpeed mode purge the speech buffers Removed #pragma hdrstop from all .cpp files except AppleWin.cpp (which is the PCH create file)
2010-02-14 21:11:26 +00:00
#ifdef USE_SPEECH_API
class CSpeech;
extern CSpeech g_Speech;
PropertySheet: . allow multiple HW changes, and for them to be cancelled + the old config reinstated. . still 1 "afterclose" msg, but this is OK.
2012-05-06 22:14:03 +00:00
#endif
extern __interface IPropertySheet& sg_PropertySheet;
Added a new PerfMarker class: used to instrument emulation sub-systems and log timings (#788) To enable this uncomment the #define LOG_PERF_TIMINGS in AppleWin.h.
2020-05-23 15:23:06 +00:00
//
//#define LOG_PERF_TIMINGS
#ifdef LOG_PERF_TIMINGS
class PerfMarker
{
public:
PerfMarker(UINT64& globalCounter)
: counter(globalCounter)
{
QueryPerformanceCounter(&timeStart);
}
~PerfMarker()
{
QueryPerformanceCounter(&timeEnd);
counter += (UINT64)timeEnd.QuadPart - (UINT64)timeStart.QuadPart;
}
private:
UINT64& counter;
LARGE_INTEGER timeStart;
LARGE_INTEGER timeEnd;
};
#endif
Reference in New Issue Copy Permalink