# HG changeset patch
# User Alex Baines <alex@abaines.me.uk>
# Date 1478060100 0
#      Wed Nov 02 04:15:00 2016 +0000
# Node ID 8685540aeb6f12499f4301bbc68d7ccf006faa94
# Parent  251691cfeaa02fcf31aad277d4af828a76a1831d
Fix for missing input text with last uim patch, sorry.

diff -r 251691cfeaa0 -r 8685540aeb6f src/video/x11/SDL_x11events.c
--- a/src/video/x11/SDL_x11events.c	Tue Nov 01 17:38:05 2016 +0000
+++ b/src/video/x11/SDL_x11events.c	Wed Nov 02 04:15:00 2016 +0000
@@ -585,9 +585,6 @@
 #endif
         }
         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 */
@@ -802,7 +799,10 @@
             }
 #endif
             if (!handled_by_ime) {
-                SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
+                /* Don't send the key if it looks like a duplicate of a filtered key sent by an IME */
+                if (xevent.xkey.keycode != videodata->filter_code || xevent.xkey.time != videodata->filter_time) {
+                    SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
+                }
                 if(*text) {
                     SDL_SendKeyboardText(text);
                 }