Changed: #927 Move OS specific code from client or server to NeL when it's possible

This commit is contained in:
kervala 2010-05-22 22:37:50 +02:00
parent 1c36c03d3c
commit 0a9673f1ae
2 changed files with 58 additions and 0 deletions

View file

@ -77,6 +77,9 @@ public:
/// Get desktop current color depth without using UDriver. /// Get desktop current color depth without using UDriver.
static uint getCurrentColorDepth(); static uint getCurrentColorDepth();
/// Check if mouse cursor is in client area.
static bool isSystemCursorInClientArea();
}; };
} // NLMISC } // NLMISC

View file

@ -339,14 +339,69 @@ uint CSystemUtils::getCurrentColorDepth()
} }
} }
#else #else
depth = 24; // temporary fix for compilation under Linux
/*
Display *display = XOpenDisplay(NULL); Display *display = XOpenDisplay(NULL);
if (display) if (display)
{ {
depth = (uint) DefaultDepth(display, DefaultScreen(display)); depth = (uint) DefaultDepth(display, DefaultScreen(display));
XCloseDisplay(display); XCloseDisplay(display);
} }
*/
#endif #endif
return depth; 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 } // NLMISC