Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-10 13:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix #267: allow mousecard move & button in MODE_STEPPING

Browse Source
This commit is contained in:
tomcw 2015-02-13 22:00:56 +00:00
parent d0b067f8d2
commit 779b86b832
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Frame.cpp
View File

@ -1312,7 +1312,7 @@ LRESULT CALLBACK FrameWndProc (
{ {
RevealCursor(); RevealCursor();
} }
else if (g_nAppMode == MODE_RUNNING) else if (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING)
{ {
if (!sg_Mouse.IsEnabled()) if (!sg_Mouse.IsEnabled())
{ {
@ -1389,7 +1389,7 @@ LRESULT CALLBACK FrameWndProc (
DrawCrosshairs(x,y); DrawCrosshairs(x,y);
JoySetPosition(x-viewportx-2, g_nViewportCX-4, y-viewporty-2, g_nViewportCY-4); JoySetPosition(x-viewportx-2, g_nViewportCX-4, y-viewporty-2, g_nViewportCY-4);
} }
else if (sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING)) else if (sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING))
{ {
if (g_bLastCursorInAppleViewport) if (g_bLastCursorInAppleViewport)
break; break;
@ -1420,7 +1420,7 @@ LRESULT CALLBACK FrameWndProc (
if (wparam == IDEVENT_TIMER_MOUSE) if (wparam == IDEVENT_TIMER_MOUSE)
{ {
// NB. Need to check /g_bAppActive/ since WM_TIMER events still occur after AppleWin app has lost focus // NB. Need to check /g_bAppActive/ since WM_TIMER events still occur after AppleWin app has lost focus
if (g_bAppActive && sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING)) if (g_bAppActive && sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING))
{ {
if (!g_bLastCursorInAppleViewport) if (!g_bLastCursorInAppleViewport)
break; break;