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

move checks into function + cleanup

Browse Source
This commit is contained in:
FunkyFr3sh 2024-09-07 16:44:35 +02:00
parent 614e340f15
commit 0a65317d96
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/keyboard.c
View File

@ -46,7 +46,7 @@ LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam)
BOOL key_down = !(lParam & (1 << 30)); BOOL key_down = !(lParam & (1 << 30));
BOOL key_up = !!(lParam & (1 << 31)); BOOL key_up = !!(lParam & (1 << 31));
//TRACE("VK_MENU - wParam=%u, key_down=%u, key_up=%u, alt_down=%u\n", wParam, key_down, key_up, alt_down); //TRACE("kbhook wParam=%u, key_down=%u, key_up=%u, alt_down=%u\n", wParam, key_down, key_up, alt_down);
if (wParam == VK_MENU && (key_up || key_down)) /* Fix for alt key being stuck on alt+tab in some games */ if (wParam == VK_MENU && (key_up || key_down)) /* Fix for alt key being stuck on alt+tab in some games */
{ {
@ -61,11 +61,7 @@ LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam)
return 1; return 1;
} }
if (wParam == g_config.hotkeys.toggle_maximize && if (wParam == g_config.hotkeys.toggle_maximize && alt_down)
g_config.resizable &&
g_config.windowed &&
!g_config.fullscreen &&
alt_down)
{ {
if (key_down) if (key_down)
util_toggle_maximize(); util_toggle_maximize();
@ -73,7 +69,7 @@ LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam)
return 1; return 1;
} }
if (g_config.homm_hack && wParam == VK_F4) /* Heroes of Might and Magic 3 and 4 */ if (wParam == VK_F4 && g_config.homm_hack) /* Heroes of Might and Magic 3 and 4 */
{ {
if (key_down) if (key_down)
util_toggle_fullscreen(); util_toggle_fullscreen();
@ -81,6 +77,12 @@ LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam)
return 1; return 1;
} }
if (wParam == g_config.hotkeys.screenshot)
{
if (key_up)
ss_take_screenshot(g_ddraw.primary);
}
if (wParam == VK_CONTROL || wParam == g_config.hotkeys.unlock_cursor1) if (wParam == VK_CONTROL || wParam == g_config.hotkeys.unlock_cursor1)
{ {
if ((real_GetAsyncKeyState(VK_CONTROL) & 0x8000) && if ((real_GetAsyncKeyState(VK_CONTROL) & 0x8000) &&
@ -101,10 +103,5 @@ LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam)
} }
} }
if (key_up && wParam == g_config.hotkeys.screenshot)
{
ss_take_screenshot(g_ddraw.primary);
}
return CallNextHookEx(g_keyboard_hook, code, wParam, lParam); return CallNextHookEx(g_keyboard_hook, code, wParam, lParam);
} }

3
src/utils.c
View File

@ -573,6 +573,9 @@ BOOL util_get_lowest_resolution(
void util_toggle_maximize() void util_toggle_maximize()
{ {
if (!g_config.resizable || !g_config.windowed || g_config.fullscreen)
return;
RECT client_rc; RECT client_rc;
RECT dst_rc; RECT dst_rc;