touchui: support XInput2 MT

views/focus/accelerator_handler_touch.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/focus/accelerator_handler.h"
 
 #include <bitset>
 #include <gtk/gtk.h>
 #include <X11/extensions/XInput2.h>
 
@@ skipping 29 matching lines @@
 }  // namespace
 
 bool DispatchX2Event(Widget* widget, XEvent* xev) {
   XGenericEventCookie* cookie = &xev->xcookie;
   switch (cookie->evtype) {
     case XI_KeyPress:
     case XI_KeyRelease: {
       // TODO(sad): We don't capture XInput2 events from keyboard yet.
       break;
     }
+#if defined(USE_XI2_MT)
+    case XI_TouchBegin:
+    case XI_TouchEnd:
+    case XI_TouchUpdate: {
+      Event::FromNativeEvent2 from_native;
+
+      // Hide the cursor when a touch event comes in.
+      TouchFactory::GetInstance()->SetCursorVisible(false, false);
+
+      // If the TouchEvent is processed by |widget|, then return.
+      TouchEvent touch(xev, from_native);
+      if (widget->OnTouchEvent(touch) != ui::TOUCH_STATUS_UNKNOWN)
+        return true;
+
+      // We do not want to generate a mouse event for an unprocessed touch
+      // event here. That is already done by the gesture manager in
+      // RootView::OnTouchEvent.
+      return false;
+    }
+#endif
     case XI_ButtonPress:
     case XI_ButtonRelease:
     case XI_Motion: {
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
       Event::FromNativeEvent2 from_native;
 
       // Scrolling the wheel generates press/release events with button id's 4
       // and 5. In case of a wheelscroll, we do not want to show the cursor.
       if (xievent->detail == 4 || xievent->detail == 5) {
         MouseWheelEvent wheelev(xev, from_native);
         return widget->OnMouseEvent(wheelev);
       }
 
       // Is the event coming from a touch device?
       if (TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid)) {
         // Hide the cursor when a touch event comes in.
         TouchFactory::GetInstance()->SetCursorVisible(false, false);
 
         // With XInput 2.0, XI_ButtonPress and XI_ButtonRelease events are
         // ignored, as XI_Motion events contain enough data to detect finger
         // press and release. See more notes in TouchFactory::TouchParam.
         if (cookie->evtype == XI_ButtonPress ||
             cookie->evtype == XI_ButtonRelease)
           return false;
 
-        // If the TouchEvent is processed by |root|, then return. Otherwise let
-        // it fall through so it can be used as a MouseEvent, if desired.
+        // If the TouchEvent is processed by |widget|, then return. Otherwise
+        // let it fall through so it can be used as a MouseEvent, if desired.
         TouchEvent touch(xev, from_native);
         if (widget->OnTouchEvent(touch) != ui::TOUCH_STATUS_UNKNOWN)
           return true;
 
         // We do not want to generate a mouse event for an unprocessed touch
         // event here. That is already done by the gesture manager in
         // RootView::OnTouchEvent.
         return false;
       } else {
         MouseEvent mouseev(xev, from_native);
@@ skipping 78 matching lines @@
 AcceleratorHandler::AcceleratorHandler() {}
 
 base::MessagePumpDispatcher::DispatchStatus
     AcceleratorHandler::Dispatch(XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpDispatcher::EVENT_PROCESSED :
       base::MessagePumpDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views