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

attempting to fix some potential input dialog crashes

This commit is contained in:
StapleButter 2018-12-15 00:22:28 +01:00
parent e6c03619a1
commit 56c2160855
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libui_sdl/libui/unix/area.c
View File

@ -523,16 +523,26 @@ char* uiKeyName(int scancode)
{ {
scancode = scancode_normal2unix(scancode); scancode = scancode_normal2unix(scancode);
char* ret;
guint* keyvals; int num; guint* keyvals; int num;
GdkKeymap* keymap = gdk_keymap_get_default(); GdkKeymap* keymap = gdk_keymap_get_for_display(gdk_display_get_default());
gdk_keymap_get_entries_for_keycode(keymap, scancode, NULL, &keyvals, &num); if (gdk_keymap_get_entries_for_keycode(keymap, scancode, NULL, &keyvals, &num))
{
// TODO: pick smarter??
int keyval = keyvals[0];
g_free(keyvals);
ret = gdk_keyval_name(keyval);
}
else
{
char tmp[16];
sprintf(tmp, "#%03X", scancode);
ret = tmp;
}
// TODO: pick smarter?? return uiUnixStrdupText(ret);
int keyval = keyvals[0];
g_free(keyvals);
return uiUnixStrdupText(gdk_keyval_name(keyval));
} }
enum { enum {