Ozone X11 platform

ui/events/platform/x11/x11_event_source.cc

 // Copyright 2014 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 "ui/events/platform/x11/x11_event_source.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
 #include "base/logging.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/x11/x11_hotplug_event_handler.h"
+#include "ui/events/x/events_x.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 int g_xinput_opcode = -1;
 
 bool InitializeXInput2(XDisplay* display) {
   if (!display)
@@ skipping 86 matching lines @@
     // Block until there's a message of |event_mask| type on |w|. Then remove
     // it from the queue and stuff it in |event|.
     XWindowEvent(display_, window, StructureNotifyMask, &event);
     DispatchEvent(&event);
   } while (event.type != MapNotify);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // X11EventSource, private
 
-uint32_t X11EventSource::DispatchEvent(XEvent* xevent) {
+uint32_t X11EventSource::DispatchEvent(base::NativeEvent event) {
+  XEvent* xevent = static_cast<XEvent*>(event);
   bool have_cookie = false;
   if (xevent->type == GenericEvent &&
       XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     have_cookie = true;
   }
 
-  uint32_t action = PlatformEventSource::DispatchEvent(xevent);
+  uint32_t action = POST_DISPATCH_STOP_PROPAGATION;
+#if defined(USE_OZONE) && !defined(USE_X11)
+  event = TranslateXEventToNativeEvent(xevent);
+#endif
+  if (event)
+    action = PlatformEventSource::DispatchEvent(event);
   if (xevent->type == GenericEvent &&
       xevent->xgeneric.evtype == XI_HierarchyChanged) {
     ui::UpdateDeviceList();
     hotplug_event_handler_->OnHotplugEvent();
   }
 
   if (have_cookie)
     XFreeEventData(xevent->xgeneric.display, &xevent->xcookie);
   return action;
 }
 
 void X11EventSource::StopCurrentEventStream() {
   continue_stream_ = false;
 }
 
 void X11EventSource::OnDispatcherListChanged() {
   if (!hotplug_event_handler_) {
     hotplug_event_handler_.reset(new X11HotplugEventHandler());
     // Force the initial device query to have an update list of active devices.
     hotplug_event_handler_->OnHotplugEvent();
   }
 }
 
 }  // namespace ui