Commit graph

29 commits

Author SHA1 Message Date
Andrea Odetti
4683883c2b Merge remote-tracking branch 'origin/uthernet' 2021-04-17 18:47:50 +01:00
Andrea Odetti
6b6a238bcf Make tfe easier to compile in linux. 2021-04-17 18:44:40 +01:00
Andrea Odetti
cb166dc47f Merge remote-tracking branch 'upstream/master' 2021-02-18 16:34:31 +00:00
tomcw
4e88163430 MB/6522: better reset support - only ACR,IFR,IER affected 2021-02-13 16:56:29 +00:00
Andrea Odetti
217e9ab2cc Merge remote-tracking branch 'upstream/master' 2021-01-20 11:02:08 +00:00
Andrea
cdf1cb9106
Remove usages of g_hFrameWindow and g_hInstance from core emulator files. And Resource related Win32 functions. (PR #915)
. Win32Frame: remove WM_USER_RESTART.
2021-01-19 20:37:43 +00:00
Andrea Odetti
094e09a6d1 Merge remote-tracking branch 'upstream/master' 2021-01-17 20:11:20 +00:00
TomCh
daa0675694
Pravets refactor: move all specialisations into new Pravets class. (PR #914)
Mainly for keyboard & printer specialisations.
2021-01-17 10:48:06 +00:00
Andrea Odetti
d06462beb0 Merge remote-tracking branch 'upstream/master' 2021-01-13 13:05:45 +00:00
Andrea
6cffb30330
FrameBase: some changes to ease implementations (PR #910)
. simplify the interface FrameBase to make it easier to implement it for different cases (remove HDC and make parameters more explicit)
. remove functions which are only called on a Win32Frame (in which case a cast is guaranteed to succeed)
. otherwise there is the risk that every FrameBase implementation wants to add its own variants.
. FrameBase::FrameRefreshStatus() simplify implementation: pass all flags explicitly
2021-01-10 16:33:06 +00:00
Andrea Odetti
577a997003 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/Interface.h
2020-12-28 18:47:23 +00:00
TomCh
3aa5750dcf
Make Video.cpp and WinVideo.cpp into a dependent class hierarchy (PR #898)
. class hierarchy: WinVideo IS_A Video (ie. WinVideo is a subclass of Video)
. GetVideo() singleton instance of WinVideo in AppleWin.cpp, exposed via Interface.h
2020-12-28 16:25:29 +00:00
Andrea Odetti
c4f3296336 Merge remote-tracking branch 'upstream/master' 2020-12-27 19:43:53 +00:00
Andrea
e27879ac99
Move interface into a class FrameBase. (PR #893)
. Move the Win32  implementation into Win32Frame.
2020-12-24 15:08:50 +00:00
Andrea Odetti
eae49b3f41 Integrate AW changes about IPropertySheet. 2020-12-20 16:35:44 +00:00
Andrea Odetti
2b46f136fc Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/Core.cpp
#	source/Utilities.cpp
2020-12-20 16:32:09 +00:00
Andrea
2d2ba86f4f
IPropertySheet: make it a standard C++ class with pure virtual functions (PR #892)
* Interface.h: ensure that functions in the interface are not exported by other header files.

This is generally harmless, except for the presence of default arguments, in which case the version with default arguments must come first.
To avoid the issue, these functions are only ever exported in the Interface.h header file.
2020-12-20 15:32:51 +00:00
Andrea Odetti
3d10369044 Merge remote-tracking branch 'upstream/master' 2020-12-13 17:59:52 +00:00
tomcw
469f9ba807 Support disconnecting drives from DiskII Interface card: -d1-disconnected, -d2-disconnected 2020-12-12 20:49:46 +00:00
Andrea Odetti
e43a08c5a1 Merge remote-tracking branch 'origin/reset' 2020-11-30 09:25:19 +00:00
Andrea
59294d9d72
Move CtrlReset() and ResetMachineState() to Utilities.cpp (PR #883) 2020-11-29 21:11:05 +00:00
Andrea Odetti
59772cda6b Move CtrlReset() and ResetMachineState() to Utilities.cpp. 2020-11-29 19:26:47 +00:00
Andrea Odetti
ab08dd7de7 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/CommonVICE/types.h
2020-11-29 18:00:16 +00:00
Andrea
7ca547479b
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.
2020-11-29 17:30:06 +00:00
Andrea Odetti
1b6127dbb6 Merge remote-tracking branch 'upstream/master' 2020-11-29 16:36:05 +00:00
Andrea Odetti
ed178d8b1c Move GetAppleWindowTitle() to Utilities.cpp as it is generic and useful to other archs. 2020-11-28 15:49:19 +00:00
Andrea
3d70a9dd35
Some small changes to ensure code compiles with GCC. (PR #877) 2020-11-27 20:57:35 +00:00
Andrea Odetti
8e6fc89384 From AW's master, AppleWin.cpp split.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-27 13:48:53 +00:00
Andrea
bbe88da787
AppleWin.cpp split (PR #875)
. Split AppleWin -> Core with the functionality really needed by the emulator.
. Split AppleWin -> Utilities for generic code not called by other emulator components.
. Split AppleWin -> CmdLine for the command line option parsing.
2020-11-26 21:50:06 +00:00