From 5adb2f1ae6766fb0880aba5a92fff4fa52d1402f Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Mon, 18 Feb 2013 16:37:20 +0900
Subject: [PATCH] don't filter out non-master pointers in xi2.2 support.

---
 ChangeLog                          |  2 ++
 NEWS                               |  1 +
 src/lib/ecore_x/xlib/ecore_x_xi2.c | 11 ++++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13c8e918b9..04815c7760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
         * Fix edje edje_color_class_list() and edje_text_class_list() to
         look at the correct hashes when returning.
+        * UIpdate ecore_x XI2.2 code to not filter out non-master
+        pointers.
 
 2013-02-17  Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index 13bdeedcd6..d89f0e1f87 100644
--- a/NEWS
+++ b/NEWS
@@ -111,6 +111,7 @@ Improvements:
     * eina: Eina_Tiler now take tile size into account.
     * edje: reduce memory consumption of Edje program handler.
     * eina, evas: improved support for 64bits system.
+    * don't filter out non-master pointers in XI2.2 support.
 
 Fixes:
     * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index 8289688f6f..db81f4b504 100644
--- a/src/lib/ecore_x/xlib/ecore_x_xi2.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c
@@ -438,6 +438,9 @@ ecore_x_input_multi_select(Ecore_X_Window win)
           }
         else if (dev->use == XISlavePointer)
           {
+/* disabled as this seems nto to be needed and never was successfully
+ * tested anyway. leave this here commented out for a while to let people
+ * whickly re-enable and see. should go away one day though.
              XIDeviceInfo *atdev = NULL;
              int j;
 
@@ -448,6 +451,7 @@ ecore_x_input_multi_select(Ecore_X_Window win)
                }
              if (((atdev) && (atdev->use != XIMasterPointer)) ||
                  (!atdev))
+ */
                {
                   XIEventMask eventmask;
                   unsigned char mask[4] = { 0 };
@@ -482,11 +486,11 @@ ecore_x_input_multi_select(Ecore_X_Window win)
 # ifdef XI_TouchEnd
                   XISetMask(mask, XI_TouchEnd);
 # endif
-#endif /* #ifdef ECORE_XI2_2 */
-
+#endif
                   XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
                   find = EINA_TRUE;
                }
+/* part of the above commented int - never tested/needed the if...
 #ifdef ECORE_XI2_2
              else if ((atdev) && (atdev->use == XIMasterPointer))
                {
@@ -514,7 +518,8 @@ ecore_x_input_multi_select(Ecore_X_Window win)
                        find = EINA_TRUE;
                     }
                }
-#endif /* #ifdef ECORE_XI2_2 */
+#endif
+ */
           }
      }