Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skip duplicate key events sent by IMEs like uim.

Browse Source
This commit is contained in:
Alex Baines 2016-11-01 17:38:05 +00:00
parent d0c8bf7f0b
commit 8eb762769e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/x11/SDL_x11events.c
View File

@ -574,6 +574,9 @@ X11_DispatchEvent(_THIS)
if (orig_keycode) { if (orig_keycode) {
#if defined(HAVE_IBUS_IBUS_H) || defined(HAVE_FCITX_FRONTEND_H) #if defined(HAVE_IBUS_IBUS_H) || defined(HAVE_FCITX_FRONTEND_H)
SDL_Scancode scancode = videodata->key_layout[orig_keycode]; SDL_Scancode scancode = videodata->key_layout[orig_keycode];
videodata->filter_code = orig_keycode;
videodata->filter_time = xevent.xkey.time;
if (orig_event_type == KeyPress) { if (orig_event_type == KeyPress) {
SDL_SendKeyboardKey(SDL_PRESSED, scancode); SDL_SendKeyboardKey(SDL_PRESSED, scancode);
} else { } else {
@ -582,6 +585,9 @@ X11_DispatchEvent(_THIS)
#endif #endif
} }
return; return;
} else if (orig_keycode == videodata->filter_code && xevent.xkey.time == videodata->filter_time) {
/* This is a duplicate event, resent by an IME - skip it. */
return;
} }
/* Send a SDL_SYSWMEVENT if the application wants them */ /* Send a SDL_SYSWMEVENT if the application wants them */

4
src/video/x11/SDL_x11video.h
View File

@ -133,6 +133,10 @@ typedef struct SDL_VideoData
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
XkbDescPtr xkb; XkbDescPtr xkb;
#endif #endif
KeyCode filter_code;
Time filter_time;
} SDL_VideoData; } SDL_VideoData;
extern SDL_bool X11_UseDirectColorVisuals(void); extern SDL_bool X11_UseDirectColorVisuals(void);