From 2ce421e06c8f4814d63ae807be0cfefe21a69cf8 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 25 Mar 2010 06:35:18 +0000 Subject: [PATCH] - disabled mouse revert in win32 as it doesn't seem to work properly (screen freezes while dragging) - changed the mouse cursor at startup so it always looks like the regular glest mouse (unless we get one of those new glest error message boxes) --- source/glest_game/main/main.cpp | 4 ++-- source/shared_lib/sources/platform/win32/window.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index b8452f8d..fd456884 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -253,8 +253,8 @@ int glestMain(int argc, char** argv){ NetworkInterface::setDisplayMessageFunction(ExceptionHandler::DisplayMessage); - showCursor(config.getBool("Windowed")); - //showCursor(false); + //showCursor(config.getBool("Windowed")); + showCursor(false); program= new Program(); mainWindow= new MainWindow(program); diff --git a/source/shared_lib/sources/platform/win32/window.cpp b/source/shared_lib/sources/platform/win32/window.cpp index 33b5761c..80405624 100644 --- a/source/shared_lib/sources/platform/win32/window.cpp +++ b/source/shared_lib/sources/platform/win32/window.cpp @@ -89,7 +89,7 @@ bool Window::handleEvent(){ } void Window::revertMousePos() { - SetCursorPos(oldX, oldY); + //SetCursorPos(oldX, oldY); } string Window::getText(){ @@ -364,13 +364,18 @@ LRESULT CALLBACK Window::eventRouter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; // not handled, send to DefWindowProc case WM_MOUSEMOVE: + eventWindow->setMouseState(mbLeft, wParam & MK_LBUTTON); eventWindow->setMouseState(mbRight, wParam & MK_RBUTTON); eventWindow->setMouseState(mbCenter, wParam & MK_MBUTTON); eventWindow->setMouseState(mbButtonX1, wParam & MK_XBUTTON1); eventWindow->setMouseState(mbButtonX2, wParam & MK_XBUTTON2); - eventWindow->eventMouseMove(mousePos.x, mousePos.y, &eventWindow->getMouseState()); - return 0; + + const MouseState &ms = eventWindow->getMouseState(); + eventWindow->eventMouseMove(mousePos.x, mousePos.y, &ms); + + //return 0; + break; } break; }