ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix for gamepad configuration when using keyboard inputs.

This commit is contained in:
Matthew Budd 2020-05-16 18:50:29 -04:00
parent c7f9a4257a
commit 9dcad0b211
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/sdl/gui.cpp
View File

@ -71,6 +71,8 @@ static unsigned int gtk_win_height = 0;
static int gtk_win_menu_ysize = 30; static int gtk_win_menu_ysize = 30;
static GtkTreeStore *hotkey_store = NULL; static GtkTreeStore *hotkey_store = NULL;
static gint convertKeypress (GtkWidget * grab, GdkEventKey * event, gpointer user_data);
// check to see if a particular GTK version is available // check to see if a particular GTK version is available
// 2.24 is required for most of the dialogs -- ie: checkGTKVersion(2,24); // 2.24 is required for most of the dialogs -- ie: checkGTKVersion(2,24);
bool checkGTKVersion (int major_required, int minor_required) bool checkGTKVersion (int major_required, int minor_required)
@ -860,6 +862,11 @@ void openGamepadConfig (void)
gtk_widget_show_all (win); gtk_widget_show_all (win);
g_signal_connect (G_OBJECT (win), "key-press-event",
G_CALLBACK (convertKeypress), NULL);
g_signal_connect (G_OBJECT (win), "key-release-event",
G_CALLBACK (convertKeypress), NULL);
return; return;
} }
@ -2395,9 +2402,9 @@ static gint convertKeypress (GtkWidget * grab, GdkEventKey * event,
SDL_PushEvent (&sdlev); SDL_PushEvent (&sdlev);
// Only let the emulator handle the key event if this window has the input focus. // Only let the emulator handle the key event if this window has the input focus.
if (keystate == 0 //if (keystate == 0
|| gtk_window_is_active (GTK_WINDOW (MainWindow))) // || gtk_window_is_active (GTK_WINDOW (MainWindow)))
{ //{
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
// Not sure how to do this yet with SDL 2.0 // Not sure how to do this yet with SDL 2.0
// TODO - SDL 2.0 // TODO - SDL 2.0
@ -2405,7 +2412,7 @@ static gint convertKeypress (GtkWidget * grab, GdkEventKey * event,
#else #else
SDL_GetKeyState (NULL)[sdlkey] = keystate; SDL_GetKeyState (NULL)[sdlkey] = keystate;
#endif #endif
} //}
} }
// Allow GTK+ to process this key. // Allow GTK+ to process this key.