From 30cd103a143b0b0bbc725a4388fda75b7b59d7de Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 7 Nov 2013 14:04:36 -0800
Subject: [PATCH] VIDEO: When using libSDL2, make sure we use the key scan code
 to index the vid_key_state array.  Also, make sure we stick to getting bare
 key events instead of TextInput events.

---
 sim_video.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sim_video.c b/sim_video.c
index 2bb8fe88..e9d4d203 100644
--- a/sim_video.c
+++ b/sim_video.c
@@ -553,8 +553,8 @@ if (vid_mouse_captured) {
 if (!sim_is_running)
     return;
 if (SDL_SemWait (vid_key_events.sem) == 0) {
-    sim_debug (SIM_VID_DBG_KEY, vid_dev, "Keyboard Event: State: %d, Keysym: %d\n", event->state, event->keysym);
     if (vid_key_events.count < MAX_EVENTS) {
+        sim_debug (SIM_VID_DBG_KEY, vid_dev, "Keyboard Event: State: %d, Keysym: %d\n", event->state, event->keysym);
         if (event->state == SDL_PRESSED) {
             if (!vid_key_state[event->keysym.sym]) {    /* Key was not down before */
                 vid_key_state[event->keysym.sym] = TRUE;
@@ -576,6 +576,9 @@ if (SDL_SemWait (vid_key_events.sem) == 0) {
         if (vid_key_events.tail == MAX_EVENTS)
             vid_key_events.tail = 0;
         }
+    else {
+        sim_debug (SIM_VID_DBG_KEY, vid_dev, "Keyboard Event DISCARDED: State: %d, Keysym: %d\n", event->state, event->keysym);
+        }
     SDL_SemPost (vid_key_events.sem);
     }
 }
@@ -1266,11 +1269,11 @@ if (vid_mouse_captured) {
 if (!sim_is_running)
     return;
 if (SDL_SemWait (vid_key_events.sem) == 0) {
-    sim_debug (SIM_VID_DBG_KEY, vid_dev, "Keyboard Event: State: %d, Keysym: %d\n", event->state, event->keysym);
+    sim_debug (SIM_VID_DBG_KEY, vid_dev, "Keyboard Event: State: %d, Keysym(scancode,sym): (%d,%d)\n", event->state, event->keysym.scancode, event->keysym.sym);
     if (vid_key_events.count < MAX_EVENTS) {
         if (event->state == SDL_PRESSED) {
-            if (!vid_key_state[event->keysym.sym]) {    /* Key was not down before */
-                vid_key_state[event->keysym.sym] = TRUE;
+            if (!vid_key_state[event->keysym.scancode]) {    /* Key was not down before */
+                vid_key_state[event->keysym.scancode] = TRUE;
                 ev.key = vid_map_key (event->keysym.sym);
                 ev.state = SIM_KEYPRESS_DOWN;
                 }
@@ -1280,7 +1283,7 @@ if (SDL_SemWait (vid_key_events.sem) == 0) {
                 }
             }
         else {
-            vid_key_state[event->keysym.sym] = FALSE;
+            vid_key_state[event->keysym.scancode] = FALSE;
             ev.key = vid_map_key (event->keysym.sym);
             ev.state = SIM_KEYPRESS_UP;
             }
@@ -1534,6 +1537,8 @@ if (!vid_texture) {
     return 0;
     }
 
+SDL_StopTextInput ();
+
 sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_KEY|SIM_VID_DBG_MOUSE, vid_dev, "vid_thread() - Started\n");
 
 while (vid_active) {