From 017681a97c9a8477fa865bb3fd75a177c42db582 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 1 Jan 2020 12:48:38 -0500 Subject: [PATCH] Now honours permitted mouse range. --- Machines/Atari/ST/IntelligentKeyboard.cpp | 4 ++++ .../xcshareddata/xcschemes/Clock Signal.xcscheme | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Machines/Atari/ST/IntelligentKeyboard.cpp b/Machines/Atari/ST/IntelligentKeyboard.cpp index 532e5edc4..38ee5badd 100644 --- a/Machines/Atari/ST/IntelligentKeyboard.cpp +++ b/Machines/Atari/ST/IntelligentKeyboard.cpp @@ -72,6 +72,10 @@ void IntelligentKeyboard::run_for(HalfCycles duration) { mouse_position_[0] += scaled_movement[0]; mouse_position_[1] += mouse_y_multiplier_ * scaled_movement[1]; + // Clamp to range. + mouse_position_[0] = std::min(std::max(mouse_position_[0], 0), mouse_range_[0]); + mouse_position_[1] = std::min(std::max(mouse_position_[1], 0), mouse_range_[1]); + mouse_movement_[0] -= scaled_movement[0] * mouse_scale_[0]; mouse_movement_[1] -= scaled_movement[1] * mouse_scale_[1]; } break; diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme index 47f9c7286..1465a4f62 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme @@ -67,7 +67,7 @@