summaryrefslogtreecommitdiff
path: root/src/video
diff options
context:
space:
mode:
authorembeddedt <42941056+embeddedt@users.noreply.github.com>2021-06-28 12:39:09 -0400
committerGitHub <noreply@github.com>2021-06-28 18:39:09 +0200
commit883e4ea325886e5cee88b34c2d9e069f12697c96 (patch)
tree09e46bbda4a0c437bfd58b416a4c3e68940cefc1 /src/video
parent003b6a0c85157059d0339dbfa551db7ec3b40cd9 (diff)
downloadopenttd-883e4ea325886e5cee88b34c2d9e069f12697c96.tar.xz
Change: [Emscripten] set default scrolling mode to non-pointer-locking (#9191)
Diffstat (limited to 'src/video')
-rw-r--r--src/video/sdl2_v.cpp33
1 files changed, 5 insertions, 28 deletions
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index 875491652..8ef00a00c 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -30,11 +30,6 @@
#include "../safeguards.h"
-#ifdef __EMSCRIPTEN__
-/** Whether we just had a window-enter event. */
-static bool _cursor_new_in_window = false;
-#endif
-
void VideoDriver_SDL_Base::MakeDirty(int left, int top, int width, int height)
{
Rect r = {left, top, left + width, top + height};
@@ -203,9 +198,9 @@ bool VideoDriver_SDL_Base::CreateMainSurface(uint w, uint h, bool resize)
bool VideoDriver_SDL_Base::ClaimMousePointer()
{
+ /* Emscripten never claims the pointer, so we do not need to change the cursor visibility. */
+#ifndef __EMSCRIPTEN__
SDL_ShowCursor(0);
-#ifdef __EMSCRIPTEN__
- SDL_SetRelativeMouseMode(SDL_TRUE);
#endif
return true;
}
@@ -377,27 +372,9 @@ bool VideoDriver_SDL_Base::PollEvent()
switch (ev.type) {
case SDL_MOUSEMOTION:
-#ifdef __EMSCRIPTEN__
- if (_cursor_new_in_window) {
- /* The cursor just moved into the window; this means we don't
- * know the absolutely position yet to move relative from.
- * Before this time, SDL didn't know it either, and this is
- * why we postpone it till now. Update the absolute position
- * for this once, and work relative after. */
- _cursor.pos.x = ev.motion.x;
- _cursor.pos.y = ev.motion.y;
- _cursor.dirty = true;
-
- _cursor_new_in_window = false;
- SDL_SetRelativeMouseMode(SDL_TRUE);
- } else {
- _cursor.UpdateCursorPositionRelative(ev.motion.xrel, ev.motion.yrel);
- }
-#else
if (_cursor.UpdateCursorPosition(ev.motion.x, ev.motion.y, true)) {
SDL_WarpMouseInWindow(this->sdl_window, _cursor.pos.x, _cursor.pos.y);
}
-#endif
HandleMouseEvents();
break;
@@ -502,9 +479,7 @@ bool VideoDriver_SDL_Base::PollEvent()
// mouse entered the window, enable cursor
_cursor.in_window = true;
#ifdef __EMSCRIPTEN__
- /* Disable relative mouse mode for the first mouse motion,
- * so we can pick up the absolutely position again. */
- _cursor_new_in_window = true;
+ /* Ensure pointer lock will not occur. */
SDL_SetRelativeMouseMode(SDL_FALSE);
#endif
} else if (ev.window.event == SDL_WINDOWEVENT_LEAVE) {
@@ -525,7 +500,9 @@ static const char *InitializeSDL()
* UpdateWindowSurface() to update the window's texture instead of
* its surface. */
SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "0");
+#ifndef __EMSCRIPTEN__
SDL_SetHint(SDL_HINT_MOUSE_RELATIVE_MODE_WARP, "1");
+#endif
/* Check if the video-driver is already initialized. */
if (SDL_WasInit(SDL_INIT_VIDEO) != 0) return nullptr;