master bdd7cd0d2e: * src/xterm.c (handle_one_event): Make event attribution more accurate.

[Po Lu]

branch: master
commit bdd7cd0d2ee006e95b10ef12151a5ff1bb4f8abd
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    * src/xterm.c (handle_one_event): Make event attribution more accurate.
---
 src/xterm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xterm.c b/src/xterm.c
index 88122416e2..94cfe63ba0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14818,7 +14818,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                    Qcoding, coding, inev.ie.arg);
 
 #ifdef HAVE_XINPUT2
-               if (event->xkey.time == pending_keystroke_time)
+               if (event->xkey.time == pending_keystroke_time
+                   /* I-Bus sometimes sends events generated from
+                      multiple filtered keystrokes with a time of 0,
+                      so just use the recorded source device if it
+                      exists.  */
+                   || (pending_keystroke_time && !event->xkey.time))
                  {
                    source = xi_device_from_id (dpyinfo,
                                                
dpyinfo->pending_keystroke_source);