Commit 153d8a05 authored by Sam Lantinga's avatar Sam Lantinga

Fix uninitialized variable warning

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40413
parent 4587a893
...@@ -835,7 +835,7 @@ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) ...@@ -835,7 +835,7 @@ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
void X11_SetKeyboardState(Display *display, const char *key_vec) void X11_SetKeyboardState(Display *display, const char *key_vec)
{ {
char keys_return[32]; char keys_return[32];
int i, gen_event; int i;
KeyCode xcode[SDLK_LAST]; KeyCode xcode[SDLK_LAST];
Uint8 new_kstate[SDLK_LAST]; Uint8 new_kstate[SDLK_LAST];
Uint8 *kstate = SDL_GetKeyState(NULL); Uint8 *kstate = SDL_GetKeyState(NULL);
...@@ -846,15 +846,8 @@ void X11_SetKeyboardState(Display *display, const char *key_vec) ...@@ -846,15 +846,8 @@ void X11_SetKeyboardState(Display *display, const char *key_vec)
/* The first time the window is mapped, we initialize key state */ /* The first time the window is mapped, we initialize key state */
if ( ! key_vec ) { if ( ! key_vec ) {
key_vec = keys_return;
XQueryKeymap(display, keys_return); XQueryKeymap(display, keys_return);
gen_event = 0; key_vec = keys_return;
} else {
#if 1 /* We no longer generate key down events, just update state */
gen_event = 0;
#else
gen_event = 1;
#endif
} }
/* Get the keyboard modifier state */ /* Get the keyboard modifier state */
...@@ -927,23 +920,7 @@ void X11_SetKeyboardState(Display *display, const char *key_vec) ...@@ -927,23 +920,7 @@ void X11_SetKeyboardState(Display *display, const char *key_vec)
break; break;
} }
} }
if ( kstate[i] == state ) if ( kstate[i] != state ) {
continue;
/*
* Send a fake keyboard event correcting the difference between
* SDL's keyboard state and the actual. Note that there is no
* way to find out the scancode for key releases, but since all
* keys are released when focus is lost only keypresses should
* be sent here
*/
if ( gen_event ) {
SDL_keysym sk;
memset(&sk, 0, sizeof(sk));
sk.sym = i;
sk.scancode = xcode[i]; /* only valid for key press */
SDL_PrivateKeyboard(state, &sk);
} else {
kstate[i] = state; kstate[i] = state;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment