lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove "handlemouse" setting

Browse source
This commit is contained in:
FunkyFr3sh 2021-06-16 05:57:19 +02:00
parent 2dc684c9f7
commit f1bcff220d
10 changed files with 175 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/wndproc.c
View file

@ -374,7 +374,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
}
}
if (!g_ddraw->handlemouse)
if (g_ddraw->got_child_windows)
{
redraw_count = 2;
RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
@ -404,7 +404,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
}
}
if (!g_ddraw->handlemouse)
if (g_ddraw->got_child_windows)
RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */
@ -483,7 +483,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{
if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE)
{
if (!g_ddraw->handlemouse)
if (g_ddraw->got_child_windows)
RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
}
@ -530,7 +530,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
/* let it pass through once (tiberian sun) */
static BOOL one_time;
if (wParam && !one_time && !g_ddraw->handlemouse && g_ddraw->noactivateapp)
if (wParam && !one_time && g_ddraw->noactivateapp)
{
one_time = TRUE;
break;
@ -664,6 +664,17 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
case WM_MBUTTONDOWN:
case WM_MOUSEMOVE:
{
int x = GET_X_LPARAM(lParam) - g_ddraw->render.viewport.x;
int y = GET_Y_LPARAM(lParam) - g_ddraw->render.viewport.y;
if (x < 0)
x = 0;
if (y < 0)
y = 0;
lParam = MAKELPARAM(x, y);
if (!g_ddraw->devmode)
{
if (!g_ddraw->locked)
@ -737,7 +748,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
}
case WM_PAINT:
{
if (!g_ddraw->handlemouse && redraw_count > 0)
if (redraw_count > 0)
{
redraw_count--;
RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);