ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-31 11:20:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consider key states before startup, patch by Zack Middleton (#4950)

Browse source
This commit is contained in:
Thilo Schulz 2011-04-17 22:09:05 +00:00
parent e5c210236c
commit 6b82f4fd09
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/client/cl_keys.c
View file

@ -1175,7 +1175,7 @@ void CL_KeyDownEvent( int key, unsigned time )
{ {
keys[key].down = qtrue; keys[key].down = qtrue;
keys[key].repeats++; keys[key].repeats++;
if( keys[key].repeats == 1 ) if( keys[key].repeats == 1 && key != K_SCROLLOCK && key != K_KP_NUMLOCK && key != K_CAPSLOCK )
anykeydown++; anykeydown++;
if( keys[K_ALT].down && key == K_ENTER ) if( keys[K_ALT].down && key == K_ENTER )
@ -1268,7 +1268,9 @@ void CL_KeyUpEvent( int key, unsigned time )
{ {
keys[key].repeats = 0; keys[key].repeats = 0;
keys[key].down = qfalse; keys[key].down = qfalse;
if (key != K_SCROLLOCK && key != K_KP_NUMLOCK && key != K_CAPSLOCK)
anykeydown--; anykeydown--;
if (anykeydown < 0) { if (anykeydown < 0) {
anykeydown = 0; anykeydown = 0;
} }
@ -1353,6 +1355,9 @@ void Key_ClearStates (void)
anykeydown = 0; anykeydown = 0;
for ( i=0 ; i < MAX_KEYS ; i++ ) { for ( i=0 ; i < MAX_KEYS ; i++ ) {
if (i == K_SCROLLOCK || i == K_KP_NUMLOCK || i == K_CAPSLOCK)
continue;
if ( keys[i].down ) { if ( keys[i].down ) {
CL_KeyEvent( i, qfalse, 0 ); CL_KeyEvent( i, qfalse, 0 );

16
code/sdl/sdl_input.c
View file

@ -980,6 +980,20 @@ void IN_Frame( void )
} }
} }
/*
===============
IN_InitKeyLockStates
===============
*/
void IN_InitKeyLockStates( void )
{
unsigned char *keystate = SDL_GetKeyState(NULL);
keys[K_SCROLLOCK].down = keystate[SDLK_SCROLLOCK];
keys[K_KP_NUMLOCK].down = keystate[SDLK_NUMLOCK];
keys[K_CAPSLOCK].down = keystate[SDLK_CAPSLOCK];
}
/* /*
=============== ===============
IN_Init IN_Init
@ -1030,6 +1044,8 @@ void IN_Init( void )
Cvar_SetValue( "com_unfocused", !( appState & SDL_APPINPUTFOCUS ) ); Cvar_SetValue( "com_unfocused", !( appState & SDL_APPINPUTFOCUS ) );
Cvar_SetValue( "com_minimized", !( appState & SDL_APPACTIVE ) ); Cvar_SetValue( "com_minimized", !( appState & SDL_APPACTIVE ) );
IN_InitKeyLockStates( );
IN_InitJoystick( ); IN_InitJoystick( );
Com_DPrintf( "------------------------------------\n" ); Com_DPrintf( "------------------------------------\n" );
} }