folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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.

Browse source
This commit is contained in:
Mark Pizzolato 2013-11-07 14:04:36 -08:00
parent 593c7f45c2
commit 30cd103a14
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sim_video.c
View file

@ -553,8 +553,8 @@ if (vid_mouse_captured) {
if (!sim_is_running) if (!sim_is_running)
return; return;
if (SDL_SemWait (vid_key_events.sem) == 0) { 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) { 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 (event->state == SDL_PRESSED) {
if (!vid_key_state[event->keysym.sym]) { /* Key was not down before */ if (!vid_key_state[event->keysym.sym]) { /* Key was not down before */
vid_key_state[event->keysym.sym] = TRUE; 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) if (vid_key_events.tail == MAX_EVENTS)
vid_key_events.tail = 0; 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); SDL_SemPost (vid_key_events.sem);
} }
} }
@ -1266,11 +1269,11 @@ if (vid_mouse_captured) {
if (!sim_is_running) if (!sim_is_running)
return; return;
if (SDL_SemWait (vid_key_events.sem) == 0) { 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 (vid_key_events.count < MAX_EVENTS) {
if (event->state == SDL_PRESSED) { if (event->state == SDL_PRESSED) {
if (!vid_key_state[event->keysym.sym]) { /* Key was not down before */ if (!vid_key_state[event->keysym.scancode]) { /* Key was not down before */
vid_key_state[event->keysym.sym] = TRUE; vid_key_state[event->keysym.scancode] = TRUE;
ev.key = vid_map_key (event->keysym.sym); ev.key = vid_map_key (event->keysym.sym);
ev.state = SIM_KEYPRESS_DOWN; ev.state = SIM_KEYPRESS_DOWN;
} }
@ -1280,7 +1283,7 @@ if (SDL_SemWait (vid_key_events.sem) == 0) {
} }
} }
else { else {
vid_key_state[event->keysym.sym] = FALSE; vid_key_state[event->keysym.scancode] = FALSE;
ev.key = vid_map_key (event->keysym.sym); ev.key = vid_map_key (event->keysym.sym);
ev.state = SIM_KEYPRESS_UP; ev.state = SIM_KEYPRESS_UP;
} }
@ -1534,6 +1537,8 @@ if (!vid_texture) {
return 0; return 0;
} }
SDL_StopTextInput ();
sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_KEY|SIM_VID_DBG_MOUSE, vid_dev, "vid_thread() - Started\n"); sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_KEY|SIM_VID_DBG_MOUSE, vid_dev, "vid_thread() - Started\n");
while (vid_active) { while (vid_active) {