From d0f03fc90c71dfa5ed498bc1fa2aec567afa0297 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 9 Dec 2018 10:05:46 +0000 Subject: [PATCH] Removed CTRL+F10 functionality to reveal mouse cursor (fixes #597) --- help/keyboard.html | 9 ++++----- source/Frame.cpp | 6 +----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/help/keyboard.html b/help/keyboard.html index 10314837..26d75449 100644 --- a/help/keyboard.html +++ b/help/keyboard.html @@ -74,6 +74,8 @@ Copy the text screen (auto detect 40/80 columns) to the clipboard.

Alt+Enter:
Default: Toggle between windowed and full screen video modes. (NB. Will conflict with emulation and prevent Open Apple + Enter from being readable. Use the Command Line switch to allow Open Apple + Enter to be readable.)

+

Ctrl+Left Mouse Button:
+ This will show the Windows mouse cursor when emulating an Apple joystick with the PC's mouse or using a Mouse card.

Function Keys F1-F8:
These PC function keys correspond to buttons on the toolbar.

Function Key F2 + Ctrl:
@@ -89,9 +91,6 @@

Function Key F10:
In //e or Enhanced //e emulation mode it will emulate the rocker switch for European video ROM selection. Use the Command Line switch to use an alternate European video ROM file.
In Pravets 8A emulation mode it servers as Caps Lock.

-

Function Key F10 + Ctrl (or Ctrl+left mouse button):
- This PC function key combo will stop emulating an Apple joystick with the PC's mouse.
-

Function Keys F11-F12:
- These PC function keys correspond to saving/loading a save-state - file.

+

Function Keys F11-F12:
+ These PC function keys correspond to saving/loading a save-state file.

\ No newline at end of file diff --git a/source/Frame.cpp b/source/Frame.cpp index de139893..b1312d94 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -1316,11 +1316,7 @@ LRESULT CALLBACK FrameWndProc ( } else if (wparam == VK_F10) { - if (KeybGetCtrlStatus()) - { - SetUsingCursor(FALSE); // Ctrl+F10 - } - else if (g_Apple2Type == A2TYPE_APPLE2E || g_Apple2Type == A2TYPE_APPLE2EENHANCED) + if (g_Apple2Type == A2TYPE_APPLE2E || g_Apple2Type == A2TYPE_APPLE2EENHANCED) { SetVideoRomRockerSwitch( !GetVideoRomRockerSwitch() ); // F10: toggle rocker switch NTSC_VideoInitAppleType();