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

(svn r27935) -Fix [FS#6629]: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update.

release/1.8
michi_cc 2017-12-09 19:21:45 +00:00
parent e856e3cca8
commit c722cb26b8
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/win32_v.cpp
View File

@ -34,6 +34,10 @@
#define MAPVK_VK_TO_CHAR (2) #define MAPVK_VK_TO_CHAR (2)
#endif #endif
#ifndef PM_QS_INPUT
#define PM_QS_INPUT 0x20000
#endif
static struct { static struct {
HWND main_wnd; HWND main_wnd;
HBITMAP dib_sect; HBITMAP dib_sect;
@ -737,7 +741,6 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
case WM_MOUSEMOVE: { case WM_MOUSEMOVE: {
int x = (int16)LOWORD(lParam); int x = (int16)LOWORD(lParam);
int y = (int16)HIWORD(lParam); int y = (int16)HIWORD(lParam);
POINT pt;
/* If the mouse was not in the window and it has moved it means it has /* If the mouse was not in the window and it has moved it means it has
* come into the window, so start drawing the mouse. Also start * come into the window, so start drawing the mouse. Also start
@ -747,7 +750,18 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, (TIMERPROC)TrackMouseTimerProc); SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, (TIMERPROC)TrackMouseTimerProc);
} }
if (_cursor.UpdateCursorPosition(x, y, true)) { if (_cursor.fix_at) {
/* 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. */
MSG m;
while (PeekMessage(&m, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE | PM_NOYIELD | PM_QS_INPUT)) {
x = (int16)LOWORD(m.lParam);
y = (int16)HIWORD(m.lParam);
}
}
if (_cursor.UpdateCursorPosition(x, y, false)) {
POINT pt;
pt.x = _cursor.pos.x; pt.x = _cursor.pos.x;
pt.y = _cursor.pos.y; pt.y = _cursor.pos.y;
ClientToScreen(hwnd, &pt); ClientToScreen(hwnd, &pt);