touch: Detect touch device, and listen for events on floating devices.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6724025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79148 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 0 deletions

diff --git a/views/touchui/touch_factory.cc b/views/touchui/touch_factory.cc
index 99c2ec5..66cdf6b 100644
--- a/views/touchui/touch_factory.cc
+++ b/views/touchui/touch_factory.cc
@@ -5,7 +5,9 @@
 #include "views/touchui/touch_factory.h"
 
 #include <X11/cursorfont.h>
+#include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
+#include <X11/extensions/XIproto.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -36,6 +38,21 @@ TouchFactory::TouchFactory()
   arrow_cursor_ = XCreateFontCursor(display, XC_arrow);
 
   SetCursorVisible(false, false);
+
+  // Detect touch devices.
+  // NOTE: The new API for retrieving the list of devices (XIQueryDevice) does
+  // not provide enough information to detect a touch device. As a result, the
+  // old version of query function (XListInputDevices) is used instead.
+  int count = 0;
+  XDeviceInfo* devlist = XListInputDevices(display, &count);
+  for (int i = 0; i < count; i++) {
+    const char* devtype = XGetAtomName(display, devlist[i].type);
+    if (devtype && !strcmp(devtype, XI_TOUCHSCREEN)) {
+      touch_device_lookup_[devlist[i].id] = true;
+      touch_device_list_.push_back(devlist[i].id);
+    }
+  }
+  XFreeDeviceList(devlist);
 }
 
 TouchFactory::~TouchFactory() {