Mercurial > hg > openttd
changeset 13482:122917aef385 draft
(svn r18001) -Codechange: [SDL] When the mouse cursor is locked into position when scrolling a viewport, warp the mouse pointer to the centre of the window. This gives maximum freedom of movement. The pointer position is restored when the lock is removed. Visually the mouse cursor stays where it was.
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Sat, 07 Nov 2009 21:41:41 +0000 |
| parents | 7e6ed48b9162 |
| children | 783021d70eb7 |
| files | src/video/sdl_v.cpp |
| diffstat | 1 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -29,6 +29,8 @@ static SDL_Surface *_sdl_screen; static bool _all_modes; +/** Flag used to determine if _cursor.fix_at has changed. */ +static bool _last_fix_at; /** Whether the drawing is/may be done in a separate thread. */ static bool _draw_threaded; @@ -363,17 +365,29 @@ { SDL_Event ev; + if (_cursor.fix_at != _last_fix_at) { + _last_fix_at = _cursor.fix_at; + if (_last_fix_at) { + /* Move to centre of window */ + SDL_CALL SDL_WarpMouse(_screen.width / 2, _screen.height / 2); + + } else { + /* Restore position */ + SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y); + } + } + if (!SDL_CALL SDL_PollEvent(&ev)) return -2; switch (ev.type) { case SDL_MOUSEMOTION: if (_cursor.fix_at) { - int dx = ev.motion.x - _cursor.pos.x; - int dy = ev.motion.y - _cursor.pos.y; + int dx = ev.motion.x - _screen.width / 2; + int dy = ev.motion.y - _screen.height / 2; if (dx != 0 || dy != 0) { _cursor.delta.x += dx; _cursor.delta.y += dy; - SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y); + SDL_CALL SDL_WarpMouse(_screen.width / 2, _screen.height / 2); } } else { _cursor.delta.x = ev.motion.x - _cursor.pos.x;