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;
+    }

[sadrul, 2011/09/12 16:20:38]

I think you should just #endif here, and let the existing code for Mouse events
happen as usual.

[ningxin.hu, 2011/09/13 00:51:08]

It's a good idea. Thanks for the comment. 
I used to avoid to generate touch event from a mouse event if it is from a touch
device. But the mouse event from a touch device is already filtered out by
TouchFactory::ShouldProcessXI2Event(XEvent* xev). So it is OK to let mouse event
go through usual logic.

     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);
+      }
+
+      MouseEvent mouseev(xev, from_native);
+
+      // Show the cursor. Start a timer to hide the cursor after a delay on
+      // move (not drag) events, or if the only button pressed is released.
+      bool start_timer = mouseev.type() == ui::ET_MOUSE_MOVED;
+      start_timer |= mouseev.type() == ui::ET_MOUSE_RELEASED &&
+                     (mouseev.IsOnlyLeftMouseButton() ||
+                      mouseev.IsOnlyMiddleMouseButton() ||
+                      mouseev.IsOnlyRightMouseButton());
+      TouchFactory::GetInstance()->SetCursorVisible(true, start_timer);
+
+      return widget->OnMouseEvent(mouseev);
+    }
+#else
+    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.

[sadrul, 2011/09/12 16:20:38]

Thanks!

[ningxin.hu, 2011/09/13 00:51:08]

My pleasure.

         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);
 
         // Show the cursor. Start a timer to hide the cursor after a delay on
         // move (not drag) events, or if the only button pressed is released.
         bool start_timer = mouseev.type() == ui::ET_MOUSE_MOVED;
         start_timer |= mouseev.type() == ui::ET_MOUSE_RELEASED &&
                        (mouseev.IsOnlyLeftMouseButton() ||
                         mouseev.IsOnlyMiddleMouseButton() ||
                         mouseev.IsOnlyRightMouseButton());
         TouchFactory::GetInstance()->SetCursorVisible(true, start_timer);
 
         return widget->OnMouseEvent(mouseev);
       }
     }
+#endif // defined(USE_XI2_MT)

[sadrul, 2011/09/12 16:20:38]

Two-blank spaces before '//' comments.

[ningxin.hu, 2011/09/13 00:51:08]

Thanks. Will correct it.

   }
   return false;
 }
 
 bool DispatchXEvent(XEvent* xev) {
   GdkDisplay* gdisp = gdk_display_get_default();
   XID xwindow = xev->xany.window;
 
   if (xev->type == GenericEvent) {
     if (!TouchFactory::GetInstance()->ShouldProcessXI2Event(xev))
@@ skipping 55 matching lines @@
 AcceleratorHandler::AcceleratorHandler() {}
 
 base::MessagePumpDispatcher::DispatchStatus
     AcceleratorHandler::Dispatch(XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpDispatcher::EVENT_PROCESSED :
       base::MessagePumpDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views