Simply more civilised.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@312 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-10-07 13:04:30 +00:00
parent 42bd1d20de
commit 4c2236c015

View file

@ -94,6 +94,7 @@ int *debug;
HHOOK llkeyboardhook; HHOOK llkeyboardhook;
cvar_t sys_disableWinKeys = {"sys_disableWinKeys", "0"}; cvar_t sys_disableWinKeys = {"sys_disableWinKeys", "0"};
cvar_t sys_disableTaskSwitch = {"sys_disableTaskSwitch", "0", NULL, CVAR_NOTFROMSERVER}; // please don't encourage people to use this...
LRESULT CALLBACK LowLevelKeyboardProc (INT nCode, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK LowLevelKeyboardProc (INT nCode, WPARAM wParam, LPARAM lParam)
{ {
@ -124,14 +125,17 @@ LRESULT CALLBACK LowLevelKeyboardProc (INT nCode, WPARAM wParam, LPARAM lParam)
// Disable CTRL+ESC // Disable CTRL+ESC
//this works, but we've got to give some way to tab out... //this works, but we've got to give some way to tab out...
// if (pkbhs->vkCode == VK_ESCAPE && GetAsyncKeyState (VK_CONTROL) >> ((sizeof(SHORT) * 8) - 1)) if (sys_disableTaskSwitch.value)
// return 1; {
if (pkbhs->vkCode == VK_ESCAPE && GetAsyncKeyState (VK_CONTROL) >> ((sizeof(SHORT) * 8) - 1))
return 1;
// Disable ATL+TAB // Disable ATL+TAB
if (pkbhs->vkCode == VK_TAB && pkbhs->flags & LLKHF_ALTDOWN) if (pkbhs->vkCode == VK_TAB && pkbhs->flags & LLKHF_ALTDOWN)
return 1; return 1;
// Disable ALT+ESC // Disable ALT+ESC
if (pkbhs->vkCode == VK_ESCAPE && pkbhs->flags & LLKHF_ALTDOWN) if (pkbhs->vkCode == VK_ESCAPE && pkbhs->flags & LLKHF_ALTDOWN)
return 1; return 1;
}
break; break;
} }
@ -957,7 +961,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
Sys_Printf ("Host_Init\n"); Sys_Printf ("Host_Init\n");
Host_Init (&parms); Host_Init (&parms);
Cvar_Register(&sys_disableWinKeys, "System vars"); Cvar_Register(&sys_disableWinKeys, "System vars");
Cvar_Register(&sys_disableTaskSwitch, "System vars");
oldtime = Sys_DoubleTime (); oldtime = Sys_DoubleTime ();