From 0a9673f1ae9b1b271bc0de7252a3938c6665cbb9 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 22 May 2010 22:37:50 +0200 Subject: [PATCH] Changed: #927 Move OS specific code from client or server to NeL when it's possible --- code/nel/include/nel/misc/system_utils.h | 3 ++ code/nel/src/misc/system_utils.cpp | 55 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/code/nel/include/nel/misc/system_utils.h b/code/nel/include/nel/misc/system_utils.h index c8e5b578f..4c4dcfe6d 100644 --- a/code/nel/include/nel/misc/system_utils.h +++ b/code/nel/include/nel/misc/system_utils.h @@ -77,6 +77,9 @@ public: /// Get desktop current color depth without using UDriver. static uint getCurrentColorDepth(); + + /// Check if mouse cursor is in client area. + static bool isSystemCursorInClientArea(); }; } // NLMISC diff --git a/code/nel/src/misc/system_utils.cpp b/code/nel/src/misc/system_utils.cpp index f06f345f8..d1e426a7a 100644 --- a/code/nel/src/misc/system_utils.cpp +++ b/code/nel/src/misc/system_utils.cpp @@ -339,14 +339,69 @@ uint CSystemUtils::getCurrentColorDepth() } } #else + depth = 24; // temporary fix for compilation under Linux +/* Display *display = XOpenDisplay(NULL); if (display) { depth = (uint) DefaultDepth(display, DefaultScreen(display)); XCloseDisplay(display); } +*/ #endif return depth; } +bool CSystemUtils::isSystemCursorInClientArea() +{ +#ifdef NL_OS_WINDOWS + if (s_window == NULL) + { + nlwarning("No window has be set with CSystemUtils::setWindow()"); + return false; + } + + POINT cursPos; + // the mouse should be in the client area of the window + if (!GetCursorPos(&cursPos)) + { + return false; + } + HWND wnd = WindowFromPoint(cursPos); + if (wnd != (HWND)s_window) + { + return false; // not the same window + } + // want that the mouse be in the client area + RECT clientRect; + if (!GetClientRect((HWND)s_window, &clientRect)) + { + return false; + } + POINT tl, br; + tl.x = clientRect.left; + tl.y = clientRect.top; + br.x = clientRect.right; + br.y = clientRect.bottom; + if (!ClientToScreen((HWND)s_window, &tl)) + { + return false; + } + if (!ClientToScreen((HWND)s_window, &br)) + { + return false; + } + if (cursPos.x < tl.x || + cursPos.x >= br.x || + cursPos.y < tl.y || + cursPos.y >= br.y) + { + return false; + } +#else + // TODO for Linux and Mac OS +#endif + return true; +} + } // NLMISC