Merge pull request #7 from idietmoran/dev-win32

fixed issue when clicking title bar
Stateford · Apr 5, 2018 · d75e0ae · d75e0ae
2 parents 5532c90 + c419424
commit d75e0ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/bin/win.c b/src/bin/win.c
@@ -71,6 +71,8 @@ void cursorLock(void* arguments)
     HANDLE hMessageEmpty = CreateEvent(NULL, FALSE, TRUE, _T("EMPTY"));
     winArgs *args = (winArgs*)arguments;
 
+	POINT cursorPos;
+
     while(args->active)
     {
         //DWORD waiting = WaitForSingleObject(hMessageStop, INFINITE);
@@ -85,6 +87,8 @@ void cursorLock(void* arguments)
         ClientToScreen(args->window->hWnd, &args->window->size.left);
         ClientToScreen(args->window->hWnd, &args->window->size.right);
 
+		getCurrentMousePos(&cursorPos);
+
         HWND active = GetForegroundWindow();
 
         if(args->window->hWnd == active)
@@ -98,13 +102,21 @@ void cursorLock(void* arguments)
     _endthread();
 }
 
+BOOL checkClientArea(POINT* cursorPos, RECT* rect)
+{
+	return cursorPos->y <= rect->bottom && cursorPos->y >= rect->top;
+}
+
+
 int __stdcall cursorLockEx(void* arguments)
 {
     HANDLE hMessageStop = CreateEvent(NULL, FALSE, FALSE, _T("STOP"));
     HANDLE hMessageEmpty = CreateEvent(NULL, FALSE, TRUE, _T("EMPTY"));
     winArgs *args = (winArgs*)arguments;
     WINDOW activeWindow = *args->window;
 
+	POINT cursorPos;
+
     while (*args->active)
     {
         //DWORD waiting = WaitForSingleObject(hMessageStop, INFINITE);
@@ -118,7 +130,9 @@ int __stdcall cursorLockEx(void* arguments)
 
         HWND active = GetForegroundWindow();
 
-        if (activeWindow.hWnd == active)
+		getCurrentMousePos(&cursorPos);
+
+        if (activeWindow.hWnd == active && checkClientArea(&cursorPos, &activeWindow.size))
         {
             ClipCursor(&activeWindow.size);
         }

diff --git a/src/bin/win.h b/src/bin/win.h
@@ -63,6 +63,8 @@ void lockFocused(WINDOW*);
 
 void cursorLock(void*);
 
+BOOL checkClientArea(POINT*, RECT*);
+
 int __stdcall cursorLockEx(void* arguments);
 
 #endif