Ignore all emulated button events (i.e. those from touchscreens)

* src/xterm.c (handle_one_xevent): Ignore all XIPointerEmulated
events if the display supports XI 2.2 or later.

diff --git a/src/xterm.c b/src/xterm.c
index 7456b3b6beb5545f2ceee3b70040054ef2bef4f6..47539fdef5d9a77b83249984c7ca6594d3319d15 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10329,9 +10329,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #ifdef XIPointerEmulated
              /* Ignore emulated scroll events when XI2 native
                 scroll events are present.  */
-             if (dpyinfo->xi2_version >= 1
-                 && xev->detail >= 4
-                 && xev->detail <= 8
+             if (((dpyinfo->xi2_version == 1
+                  && xev->detail >= 4
+                  && xev->detail <= 8)
+                  || (dpyinfo->xi2_version >= 2))
                  && xev->flags & XIPointerEmulated)
                {
                  *finish = X_EVENT_DROP;