backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

simplify mouse functions

Browse Source
This commit is contained in:
FunkyFr3sh 2021-06-17 08:17:50 +02:00
parent 801d677af1
commit f74d2fa1ba
1 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/mouse.c
View File

@ -6,39 +6,25 @@
void mouse_lock() void mouse_lock()
{ {
RECT rc; if (g_ddraw->devmode || g_ddraw->bnet_active)
if (g_ddraw->bnet_active)
return;
if (g_ddraw->devmode)
return; return;
if (g_hook_active && !g_ddraw->locked) if (g_hook_active && !g_ddraw->locked)
{ {
RECT rc = {
g_ddraw->render.viewport.x,
g_ddraw->render.viewport.y,
g_ddraw->width + g_ddraw->render.viewport.x,
g_ddraw->height + g_ddraw->render.viewport.y,
};
if (g_ddraw->adjmouse) if (g_ddraw->adjmouse)
{ {
rc.top = g_ddraw->render.viewport.y;
rc.left = g_ddraw->render.viewport.x;
rc.right = g_ddraw->render.viewport.width + g_ddraw->render.viewport.x; rc.right = g_ddraw->render.viewport.width + g_ddraw->render.viewport.x;
rc.bottom = g_ddraw->render.viewport.height + g_ddraw->render.viewport.y; rc.bottom = g_ddraw->render.viewport.height + g_ddraw->render.viewport.y;
} }
else
{
rc.top = g_ddraw->render.viewport.y;
rc.left = g_ddraw->render.viewport.x;
rc.right = g_ddraw->width + g_ddraw->render.viewport.x;
rc.bottom = g_ddraw->height + g_ddraw->render.viewport.y;
}
/* Convert the client area to screen coordinates */ real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2);
POINT pt = { rc.left, rc.top };
POINT pt2 = { rc.right, rc.bottom };
real_ClientToScreen(g_ddraw->hwnd, &pt);
real_ClientToScreen(g_ddraw->hwnd, &pt2);
SetRect(&rc, pt.x, pt.y, pt2.x, pt2.y);
rc.bottom -= (LONG)((g_ddraw->mouse_y_adjust * 2) * g_ddraw->render.scale_h); rc.bottom -= (LONG)((g_ddraw->mouse_y_adjust * 2) * g_ddraw->render.scale_h);
@ -58,17 +44,15 @@ void mouse_lock()
real_SetCursor(g_ddraw->old_cursor); real_SetCursor(g_ddraw->old_cursor);
int game_count = (int)InterlockedExchangeAdd((LONG*)&g_ddraw->show_cursor_count, 0);
int cur_count = real_ShowCursor(TRUE) - 1; int cur_count = real_ShowCursor(TRUE) - 1;
real_ShowCursor(FALSE); real_ShowCursor(FALSE);
int game_count = (int)InterlockedExchangeAdd((LONG*)&g_ddraw->show_cursor_count, 0);
if (cur_count > game_count) if (cur_count > game_count)
{ {
while (real_ShowCursor(FALSE) > game_count); while (real_ShowCursor(FALSE) > game_count);
} }
else if (cur_count < game_count)
if (cur_count < game_count)
{ {
while (real_ShowCursor(TRUE) < game_count); while (real_ShowCursor(TRUE) < game_count);
} }
@ -81,29 +65,16 @@ void mouse_lock()
void mouse_unlock() void mouse_unlock()
{ {
RECT rc; if (g_ddraw->devmode || !g_hook_active)
if (g_ddraw->devmode)
return;
if (!g_hook_active)
return; return;
if (g_ddraw->locked) if (g_ddraw->locked)
{ {
g_ddraw->locked = FALSE; g_ddraw->locked = FALSE;
/* Get the window client area */ RECT rc;
real_GetClientRect(g_ddraw->hwnd, &rc); real_GetClientRect(g_ddraw->hwnd, &rc);
real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2);
/* Convert the client area to screen coordinates */
POINT pt = { rc.left, rc.top };
POINT pt2 = { rc.right, rc.bottom };
real_ClientToScreen(g_ddraw->hwnd, &pt);
real_ClientToScreen(g_ddraw->hwnd, &pt2);
SetRect(&rc, pt.x, pt.y, pt2.x, pt2.y);
CURSORINFO ci = { .cbSize = sizeof(CURSORINFO) }; CURSORINFO ci = { .cbSize = sizeof(CURSORINFO) };
if (real_GetCursorInfo(&ci) && ci.flags == 0) if (real_GetCursorInfo(&ci) && ci.flags == 0)
@ -112,7 +83,6 @@ void mouse_unlock()
} }
real_SetCursor(LoadCursor(NULL, IDC_ARROW)); real_SetCursor(LoadCursor(NULL, IDC_ARROW));
real_ClipCursor(NULL); real_ClipCursor(NULL);
int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0); int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0);