mirror of
https://github.com/InstanceBrick/nightcap.git
synced 2026-10-24 21:01:02 +02:00
glook9001andglook9001
b236c59b57
* fix(input): fix mouse aiming, shooting refusal, key drops, and clean up test suite - Remove spurious Wayland RMB release heuristic in window event loop that falsely synthesized releases during mouse drag - Remove mouse motion lockout in WindowPointerCaptureOwner after releasing right-click - Accumulate relative pointer coordinates and clamp discrete clicks to viewport bounds so shooting clicks land on crosshairs in pointer lock mode - Implement mouse motion coalescing in PumpEvents to prevent high-polling rate mice from starving the event queue - Add ASCII and fallback scancode mapping in MapSdlKeyToAndroid to avoid dropping unmapped keys - Clean up obsolete static script-based regex tests and fix system install multi-arch test * fix(input): prevent focus loss lockout from dropping WASD and auto-release text focus on click - Automatically recover router focus when receiving active hardware input events so WASD/movement keys are never permanently dropped after Wayland/SDL focus loss transitions - Release stale Roblox text-input session when clicking anywhere in the game viewport so Roblox Lua movement scripts don't remain in TextBox-focused state - Allow mouse pointer capture when native lock is requested without gating on fragile focused_ flag --------- Co-authored-by: glook9001 <310372091+glook9001@users.noreply.github.com>
247 lines
7.5 KiB
C++
247 lines
7.5 KiB
C++
#include "window/window_pointer_capture_owner.h"
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <cstddef>
|
|
#include <vector>
|
|
|
|
namespace mocktail {
|
|
namespace window {
|
|
namespace {
|
|
|
|
class FakeBackend final : public PointerCaptureBackend {
|
|
public:
|
|
bool Apply(bool relative_mode, bool cursor_visible) override {
|
|
calls.push_back({relative_mode, cursor_visible});
|
|
return succeeds;
|
|
}
|
|
|
|
struct Call {
|
|
bool relative_mode;
|
|
bool cursor_visible;
|
|
};
|
|
std::vector<Call> calls;
|
|
bool succeeds = true;
|
|
};
|
|
|
|
struct QueryState {
|
|
bool succeeds = true;
|
|
bool locked_center = false;
|
|
};
|
|
|
|
bool Query(void* context, bool* locked_center) {
|
|
auto* state = static_cast<QueryState*>(context);
|
|
if (state == nullptr || locked_center == nullptr || !state->succeeds) {
|
|
return false;
|
|
}
|
|
*locked_center = state->locked_center;
|
|
return true;
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, FollowsNativeMouseLockState) {
|
|
FakeBackend backend;
|
|
QueryState query;
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
query.locked_center = true;
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
query.locked_center = false;
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, TextAndFocusAlwaysReleaseCapture) {
|
|
FakeBackend backend;
|
|
QueryState query{true, true};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
EXPECT_TRUE(owner.Pump(true));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_TRUE(owner.OnFocusLost());
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.OnFocusGained(false));
|
|
EXPECT_TRUE(owner.captured());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, QueryOrCaptureFailureStaysReleased) {
|
|
FakeBackend backend;
|
|
backend.succeeds = false;
|
|
QueryState query{true, true};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
|
|
EXPECT_FALSE(owner.Pump(false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
EXPECT_EQ(backend.calls.size(), 2U);
|
|
query.succeeds = false;
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_FALSE(owner.captured());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, RightDragCapturesUntilButtonRelease) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
EXPECT_TRUE(owner.OnRightButton(true, false));
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_TRUE(owner.captured());
|
|
|
|
EXPECT_TRUE(owner.OnRightButton(false, false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest,
|
|
RightReleaseRestoresUnlockedStateWhenNoNativeLock) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
query.locked_center = true;
|
|
ASSERT_TRUE(owner.OnRightButton(true, false));
|
|
constexpr int kTenSecondsAt240Hz = 2400;
|
|
for (int pump = 0; pump < kTenSecondsAt240Hz; ++pump) {
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
}
|
|
ASSERT_TRUE(owner.captured());
|
|
|
|
query.locked_center = false;
|
|
ASSERT_TRUE(owner.OnRightButton(false, false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.ShouldDispatchMouseMotion());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest,
|
|
RightReleasePreservesNativeLockThatPredatedDrag) {
|
|
FakeBackend backend;
|
|
QueryState query{true, true};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
ASSERT_TRUE(owner.OnRightButton(true, false));
|
|
ASSERT_TRUE(owner.OnRightButton(false, false));
|
|
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.ShouldDispatchMouseMotion());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest,
|
|
ShiftLockActivatedDuringRightDragSurvivesButtonRelease) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
ASSERT_TRUE(owner.OnRightButton(true, false));
|
|
query.locked_center = true;
|
|
ASSERT_TRUE(owner.OnShiftKeyPressed(false));
|
|
ASSERT_TRUE(owner.OnRightButton(false, false));
|
|
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.ShouldDispatchMouseMotion());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest,
|
|
ShiftDuringRightDragDoesNotInventNativeMouseLock) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
|
|
ASSERT_TRUE(owner.OnRightButton(true, false));
|
|
ASSERT_TRUE(owner.OnShiftKeyPressed(false));
|
|
ASSERT_TRUE(owner.OnRightButton(false, false));
|
|
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.ShouldDispatchMouseMotion());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, RightDragDoesNotDependOnNativeLockQuery) {
|
|
FakeBackend backend;
|
|
QueryState query{false, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
|
|
EXPECT_TRUE(owner.OnRightButton(true, false));
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.OnRightButton(false, false));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
}
|
|
|
|
TEST(WindowPointerCaptureOwnerTest, TextAndFocusCancelRightDragCapture) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
|
|
EXPECT_TRUE(owner.OnRightButton(true, true));
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.Pump(false));
|
|
EXPECT_TRUE(owner.captured());
|
|
EXPECT_TRUE(owner.OnFocusLost());
|
|
EXPECT_FALSE(owner.captured());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
EXPECT_TRUE(owner.OnFocusGained(false));
|
|
EXPECT_FALSE(owner.captured());
|
|
}
|
|
|
|
// Roblox draws its own cursor while it owns the pointer. Focus loss reveals the
|
|
// system cursor; regaining focus has to hide it again in the same call, because
|
|
// Pump() runs before SDL_PollEvent delivers the focus event and would otherwise
|
|
// leave the desktop arrow on screen for a whole frame.
|
|
TEST(WindowPointerCaptureOwnerTest, FocusGainHidesTheSystemCursorImmediately) {
|
|
FakeBackend backend;
|
|
QueryState query{true, false};
|
|
WindowPointerCaptureOwner owner(&backend);
|
|
ASSERT_TRUE(owner.RegisterQuery(Query, &query));
|
|
|
|
ASSERT_TRUE(owner.Pump(false));
|
|
ASSERT_FALSE(owner.cursor_visible());
|
|
|
|
EXPECT_TRUE(owner.OnFocusLost());
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
|
|
const std::size_t calls_before = backend.calls.size();
|
|
EXPECT_TRUE(owner.OnFocusGained(false));
|
|
EXPECT_FALSE(owner.cursor_visible());
|
|
ASSERT_GT(backend.calls.size(), calls_before);
|
|
EXPECT_FALSE(backend.calls.back().cursor_visible);
|
|
|
|
// An active text field keeps the system cursor, focus or not.
|
|
EXPECT_TRUE(owner.OnFocusLost());
|
|
EXPECT_TRUE(owner.OnFocusGained(true));
|
|
EXPECT_TRUE(owner.cursor_visible());
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace window
|
|
} // namespace mocktail
|