mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #13286: Use relative mouse movement when cursor position is fixed. 

This ensures the movement isn't constrained by the window boundary.

As this switches us from automatic to manual mouse capture modes, this also removes the `no_mouse_capture` driver option.
pull/13287/head
Peter Nelson 2025-01-06 17:30:17 +00:00
parent 23ea9f138a
commit f1e310727a
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/video/sdl2_v.cpp
View File

@ -205,6 +205,20 @@ bool VideoDriver_SDL_Base::ClaimMousePointer()
return true; return true;
} }
void VideoDriver_SDL_Base::FixMousePointer(bool fix_at)
{
if (_cursor.fix_at == fix_at) return;
this->VideoDriver::FixMousePointer(fix_at);
SDL_SetRelativeMouseMode(fix_at ? SDL_TRUE : SDL_FALSE);
if (!fix_at) {
/* Move cursor back to where it was before being fixed. */
SDL_WarpMouseInWindow(this->sdl_window, _cursor.pos.x, _cursor.pos.y);
}
}
/** /**
* This is called to indicate that an edit box has gained focus, text input mode should be enabled. * This is called to indicate that an edit box has gained focus, text input mode should be enabled.
*/ */
@ -385,21 +399,23 @@ bool VideoDriver_SDL_Base::PollEvent()
switch (ev.type) { switch (ev.type) {
case SDL_MOUSEMOTION: { case SDL_MOUSEMOTION: {
int32_t x = ev.motion.x;
int32_t y = ev.motion.y;
if (_cursor.fix_at) { if (_cursor.fix_at) {
/* Use relative motion events. */
int32_t x = ev.motion.xrel;
int32_t y = ev.motion.yrel;
/* Get all queued mouse events now in case we have to warp the cursor. In the /* Get all queued mouse events now in case we have to warp the cursor. In the
* end, we only care about the current mouse position and not bygone events. */ * end, we only care about the current mouse position and not bygone events. */
while (SDL_PeepEvents(&ev, 1, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEMOTION)) { while (SDL_PeepEvents(&ev, 1, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEMOTION)) {
x = ev.motion.x; x += ev.motion.xrel;
y = ev.motion.y; y += ev.motion.yrel;
}
} }
if (_cursor.UpdateCursorPosition(x, y)) { _cursor.UpdateCursorPositionRelative(x, y);
SDL_WarpMouseInWindow(this->sdl_window, _cursor.pos.x, _cursor.pos.y); } else {
_cursor.UpdateCursorPosition(ev.motion.x, ev.motion.y);
} }
HandleMouseEvents(); HandleMouseEvents();
break; break;
} }
@ -560,12 +576,10 @@ std::optional<std::string_view> VideoDriver_SDL_Base::Start(const StringList &pa
if (error) return error; if (error) return error;
#ifdef SDL_HINT_MOUSE_AUTO_CAPTURE #ifdef SDL_HINT_MOUSE_AUTO_CAPTURE
if (GetDriverParamBool(param, "no_mouse_capture")) {
/* By default SDL captures the mouse, while a button is pressed. /* By default SDL captures the mouse, while a button is pressed.
* This is annoying during debugging, when OpenTTD is suspended while the button was pressed. * This is annoying during debugging, when OpenTTD is suspended while the button was pressed.
*/ */
if (!SDL_SetHint(SDL_HINT_MOUSE_AUTO_CAPTURE, "0")) return SDL_GetError(); SDL_SetHint(SDL_HINT_MOUSE_AUTO_CAPTURE, "0");
}
#endif #endif
#ifdef SDL_HINT_APP_NAME #ifdef SDL_HINT_APP_NAME

2
src/video/sdl2_v.h
View File

@ -35,6 +35,8 @@ public:
bool ClaimMousePointer() override; bool ClaimMousePointer() override;
void FixMousePointer(bool fix_at) override;
void EditBoxGainedFocus() override; void EditBoxGainedFocus() override;
void EditBoxLostFocus() override; void EditBoxLostFocus() override;