A non-GTK version of menus for touchui.

views/focus/accelerator_handler_touch.cc

 // Copyright (c) 2010 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 <gtk/gtk.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #else
@@ skipping 83 matching lines @@
 }
 
 #endif  // HAVE_XINPUT2
 
 bool DispatchXEvent(XEvent* xev) {
   GdkDisplay* gdisp = gdk_display_get_default();
   XID xwindow = xev->xany.window;
 
 #if defined(HAVE_XINPUT2)
   if (xev->type == GenericEvent) {
-    if (XGetEventData(xev->xgeneric.display, &xev->xcookie)) {
-      XGenericEventCookie* cookie = &xev->xcookie;
-      XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(cookie->data);
-      xwindow = xiev->event;
-    } else {
-      DLOG(WARNING) << "Error fetching XGenericEventCookie for event.";
-      return false;
-    }
+    XGenericEventCookie* cookie = &xev->xcookie;
+    XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(cookie->data);
+    xwindow = xiev->event;

[Evan Martin, 2010/11/22 20:43:26]

This seems unrelated to the change.  (?)

[sadrul, 2010/11/22 21:23:06]

This is necessary for the change in message_pump_glib_x.cc. The call to
XGetEventData is removed from here and added to the message-pump, and making
this call on the same event twice results in an error.

   }
 #endif
 
   GdkWindow* gwind = gdk_window_lookup_for_display(gdisp, xwindow);
 
   if (RootView* root = FindRootViewForGdkWindow(gwind)) {
     switch (xev->type) {
       case KeyPress:
       case KeyRelease: {
         KeyEvent keyev(xev);
@@ skipping 25 matching lines @@
         if (mouseev.GetType() == Event::ET_MOUSE_DRAGGED) {
           return root->OnMouseDragged(mouseev);
         } else {
           root->OnMouseMoved(mouseev);
           return true;
         }
       }
 
 #if defined(HAVE_XINPUT2)
       case GenericEvent: {
-        bool ret = DispatchX2Event(root, xev);
-        XFreeEventData(xev->xgeneric.display, &xev->xcookie);
-        return ret;
+        return DispatchX2Event(root, xev);
       }
 #endif
     }
   }
 
   return false;
 }
 
 AcceleratorHandler::AcceleratorHandler() {}
 
 bool AcceleratorHandler::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return true;
 }
 
 bool AcceleratorHandler::Dispatch(XEvent* xev) {
   return DispatchXEvent(xev);
 }
 
 }  // namespace views