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_1)
+    case XI_TouchBegin:
+    case XI_TouchEnd:
+    case XI_TouchUpdate: {
+      XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
+      Event::FromNativeEvent2 from_native;
+
+      // Is the event coming from a touch device?
+      if (TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid)) {

[sadrul, 2011/09/07 14:56:37]

This check is probably not necessary here. If something is generating XI_Touch
events, we should just assume it is a touch device.

[ningxin.hu, 2011/09/08 08:24:50]

Agree. I am removing the check.

+        // Hide the cursor when a touch event comes in.
+        TouchFactory::GetInstance()->SetCursorVisible(false, 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.

[sadrul, 2011/09/07 14:56:37]

|root| should become |widget| (and possibly corrected in a comment below too).

Do you know if unprocessed XI_Touch events do generate a mouse event? If not,
this comment can just be removed.

[ningxin.hu, 2011/09/08 08:24:50]

Will correct the comments. Thanks.

+        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 {
+        return false;
+      }
+    }
+#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);
@@ skipping 30 matching lines @@
         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

[sadrul, 2011/09/07 14:56:37]

#endif  // defined(USE_XI2_1)

[ningxin.hu, 2011/09/08 08:24:50]

Added. Thanks.

   }
   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