Move cursor clipping function to CInput.

OpenXRay · Jan 25, 2016 · 14ef214 · 14ef214
1 parent 7de32ef
commit 14ef214
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/src/xrEngine/Xr_input.cpp b/src/xrEngine/Xr_input.cpp
@@ -352,6 +352,24 @@ BOOL CInput::iGetAsyncBtnState(int btn)
     return !!mouseState[btn];
 }
 
+void CInput::ClipCursor(bool clip)
+{
+    HWND hwnd = Device.m_hWnd;
+    if (hwnd)
+    {
+        if (clip)
+        {
+            RECT clientRect;
+            ::GetClientRect(hwnd, &clientRect);
+            ::ClientToScreen(hwnd, (LPPOINT)&clientRect.left);
+            ::ClientToScreen(hwnd, (LPPOINT)&clientRect.right);
+            ::ClipCursor(&clientRect);
+        }
+        else
+            ::ClipCursor(nullptr);
+    }
+}
+
 void CInput::MouseUpdate()
 {
     HRESULT hr;

diff --git a/src/xrEngine/xr_input.h b/src/xrEngine/xr_input.h
@@ -90,6 +90,7 @@ class ENGINE_API CInput
     BOOL iGetAsyncKeyState(int dik);
     BOOL iGetAsyncBtnState(int btn);
     void iGetLastMouseDelta(Ivector2& p) { p.set(offs[0], offs[1]); }
+    void ClipCursor(bool clip);
 
     CInput(BOOL bExclusive = true, int deviceForInit = default_key);
     ~CInput();

diff --git a/src/xrGame/UICursor.cpp b/src/xrGame/UICursor.cpp
@@ -4,6 +4,7 @@
 #include "ui/UIStatic.h"
 #include "ui/UIBtnHint.h"
 #include "xrEngine/IInputReceiver.h"
+#include "xrEngine/xr_input.h"
 
 #define C_DEFAULT	color_xrgb(0xff,0xff,0xff)
 
@@ -31,34 +32,16 @@ void CUICursor::OnScreenResolutionChanged()
 	InitInternal				();
 }
 
-void CUICursor::Clip(bool clip)
-{
-    HWND hwnd = Device.m_hWnd;
-    if (hwnd)
-    {
-        if (clip)
-        {
-            RECT clientRect;
-            ::GetClientRect(hwnd, &clientRect);
-            ::ClientToScreen(hwnd, (LPPOINT)&clientRect.left);
-            ::ClientToScreen(hwnd, (LPPOINT)&clientRect.right);
-            ::ClipCursor(&clientRect);
-        }
-        else
-            ::ClipCursor(nullptr);
-    }
-}
-
 void CUICursor::Show()
 {
     bVisible = true;
-    Clip(false);
+    pInput->ClipCursor(false);
 }
 
 void CUICursor::Hide()
 {
     bVisible = false;
-    Clip(true);
+    pInput->ClipCursor(true);
 }
 
 void CUICursor::InitInternal()

diff --git a/src/xrGame/UICursor.h b/src/xrGame/UICursor.h
@@ -27,5 +27,4 @@ class CUICursor:	public pureRender,
 	bool			IsVisible					() {return bVisible;}
     void			Show();
     void			Hide();
-    void Clip(bool clip);
 };