Andrea Odetti
a3bb062260
Required from upstream.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-17 20:19:12 +00:00
Andrea Odetti
094e09a6d1
Merge remote-tracking branch 'upstream/master'
2021-01-17 20:11:20 +00:00
tomcw
5d46298dcc
Mockingboard: support AY-3-8913 read
2021-01-17 19:51:25 +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
tomcw
fc3a0f57ce
Win32Frame: Fixes for VS2008
2021-01-16 22:13:02 +00:00
Andrea
61db149eab
Move last remaining globals from WinFrame.cpp to class Win32Frame. (PR #913 )
2021-01-16 21:57:28 +00:00
Andrea Odetti
fee6720fb4
Fix qmake project.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-16 19:07:07 +00:00
Andrea Odetti
620fa10454
Remove redundant CPU check and data.h / .cpp.
2021-01-16 16:26:43 +00:00
tomcw
440831179f
Keyboard: improve illegal keycodes handling for II/II+ and clones.
2021-01-16 11:01:18 +00:00
tomcw
7d2ddb3556
Base 64A: support special F2 key via the Delete key (GH#912)
2021-01-14 21:32:59 +00:00
Andrea Odetti
e80fee86c5
Merge remote-tracking branch 'upstream/master'
2021-01-14 14:44:09 +00:00
Andrea Odetti
ad56874b0f
Fix missing call to FrameBase::Destroy().
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-14 14:39:37 +00:00
Andrea Odetti
6ca8aedcf2
Add NFrame.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-14 14:39:18 +00:00
Andrea
816e22524f
VideoReinitialize(): remove default arg & refactor out common code (PR #911 )
2021-01-13 22:02:48 +00:00
Andrea Odetti
54a3bbf773
RetroFrame.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-13 17:48:25 +00:00
Andrea Odetti
59c581b807
Add Qt Frame.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-13 17:45:34 +00:00
Andrea Odetti
8a41ed4d73
Introduce SDL Frame.
2021-01-13 15:28:53 +00:00
Andrea Odetti
4e357b59bd
Updates from AW's master.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-13 13:09:03 +00:00
Andrea Odetti
d06462beb0
Merge remote-tracking branch 'upstream/master'
2021-01-13 13:05:45 +00:00
Andrea Odetti
4fb1d3b75e
Update QHexView for minor changes.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-12 18:52:31 +00:00
Andrea Odetti
8e36c2c7b3
Add header files to cmake project.
...
So they appear in QtCreator.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-12 12:52:26 +00:00
Andrea Odetti
133285ba1c
Update QHexView to fix build.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-12 08:05:50 +00:00
Andrea Odetti
0105e626a3
QHexView: update to HEAD.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-11 20:39:17 +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
9ff3544535
Support F5 = DriveSwap() in applen.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-03 18:50:17 +00:00
Andrea Odetti
0aec7061c3
Incorporate changes from AW's master.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-03 18:44:44 +00:00
Andrea Odetti
e387a8aaac
Merge remote-tracking branch 'upstream/master'
2021-01-03 18:10:23 +00:00
Andrea Odetti
ae33493da7
Merge from AW's master.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-03 18:10:07 +00:00
Andrea
159cde7d64
Video & FrameBase: better split (PR #908 )
...
* Video / FrameBase: move arch specific code to FrameBase.
* Video::Initialize & SetFrameBuffer.
Ensure initialization and SetBuffer can only happen in the right order.
* Video: move virtual functions to FrameBase.
With these changes all the virtual functions are in FrameBase and Video gets closer to be (only) the Apple ][ Video device.
* Move a few more functions from Video to FrameBase (snapshot related)
Now, the inclusion is one way with Video *not* including FrameBase.
* FrameBase::VideoRefreshScreen move Video related code to Video.
And only leave management to FrameBase.
2021-01-03 16:21:24 +00:00
Andrea Odetti
57b2c670ab
Merge remote-tracking branch 'upstream/master'
2021-01-02 21:09:09 +00:00
Andrea Odetti
545c175a76
Add missing include for consistency.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-02 21:08:55 +00:00
Kelvin Lee
0139878dd7
x64 enabling (PR #747 )
...
Here are a few changes to make 64-bit build possible.
The changes are mainly to use windows api in the correct way that works for both 32-bit and 64-bit builds.
2021-01-01 12:57:40 +00:00
Andrea
9d7aa7d309
Move VideoRedrawScreen() to Video. (PR #904 )
2021-01-01 12:42:24 +00:00
Andrea Odetti
ed27650368
Allow users to specify Paddle device for applen.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-31 14:34:00 +00:00
Andrea Odetti
3bf4e5648f
Minor cosmetic changes.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-30 18:48:42 +00:00
Andrea Odetti
faca71ace7
Incorporate changes to FrameBase and Video.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-30 18:28:27 +00:00
Andrea Odetti
b3abd6962e
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# source/Log.cpp
# source/NTSC.h
2020-12-30 18:13:52 +00:00
tomcw
c7d9a780bb
Minor tweaks + comment for GCC needing header file
2020-12-29 21:45:56 +00:00
Andrea
d0cd7ca090
WinVideo: share some generic code (PR #901 )
...
* WinVideo: move some generic functions back to Video.
Introduce a new virtual function (VideoPresentScreen) to draw the video buffer to video memory.
* Move Win32Frame::VideoRedrawScreen() to FrameBase as it is generic.
2020-12-29 21:30:17 +00:00
Andrea
b226bdfd53
Small changes to improve compatibility with GCC. (PR #902 )
...
* Fix GCC build.
1) do not fwd declare enums
2) include only base class header file IPropertySheet.
* DSInit(): make sure sound devices are cleaned before the 2nd call.
And use std::string to avoid need of memory management.
2020-12-29 21:17:03 +00:00
Andrea
6cf907f303
In Linux, save logfile to /tmp. (PR #900 )
2020-12-29 21:13:35 +00:00
Andrea Odetti
cdf8573202
Tidy up linux interface.h.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-29 09:22:10 +00:00
Andrea Odetti
a1ba1d2cd1
Rename Video -> QVideo due to name clash.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 20:00:16 +00:00
Andrea Odetti
247b51b2ab
Integration of GetVideo().
...
Part 1.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 19:42:04 +00:00
Andrea Odetti
577a997003
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# source/Interface.h
2020-12-28 18:47:23 +00:00
Andrea Odetti
32d4c32524
Use macros to avoid duplication.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 18:45:04 +00:00
Andrea Odetti
3a063463ca
For consistency with Registry::instance.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 18:44:47 +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
04fe254521
Fix some access violation (NPE).
...
Due to usage global variables (instances) and the way deleters works, we need to fully delete the old one, before creating the new one.
Otherwise the old's deleter remove instances after the new one has set them.
2020-12-28 15:46:08 +00:00
Andrea Odetti
3d79b7983d
Try to use the image as FD first and HD if this fails.
...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 15:35:19 +00:00