wayland patch for inspection

ui/base/events/event.cc

 // Copyright (c) 2012 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/base/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include <cmath>
 #include <cstring>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
-#if defined(USE_X11)
+#if defined(USE_WAYLAND)
+#include "base/wayland/wayland_event.h"
+#include "ui/base/keycodes/keyboard_code_conversion_wayland.h"
+#elif defined(USE_X11)
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #endif
 
 namespace {
 
 base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) {
-#if defined(USE_X11)
+#if defined(USE_WAYLAND)
+  if (!event)
+    return NULL;
+  base::wayland::WaylandEvent* copy = new base::wayland::WaylandEvent;
+  *copy = *event;
+  return copy;
+#elif defined(USE_X11)
   if (!event || event->type == GenericEvent)
     return NULL;
   XEvent* copy = new XEvent;
   *copy = *event;
   return copy;
 #elif defined(OS_WIN)
   return event;
 #else
   NOTREACHED() <<
       "Don't know how to copy base::NativeEvent for this platform";
@@ skipping 57 matching lines @@
     case ui::ET_LAST: NOTREACHED(); return std::string();
     // Don't include default, so that we get an error when new type is added.
   }
 #undef CASE_TYPE
 
   NOTREACHED();
   return std::string();
 }
 
 bool IsX11SendEventTrue(const base::NativeEvent& event) {
-#if defined(USE_X11)
+#if defined(USE_WAYLAND)
+  return false;
+#elif defined(USE_X11)
   if (event && event->xany.send_event)
     return true;
 #endif
   return false;
 }
 
 }  // namespace
 
 namespace ui {
 
@@ skipping 383 matching lines @@
       unmodified_character_(0) {
 }
 
 uint16 KeyEvent::GetCharacter() const {
   if (character_)
     return character_;
 
 #if defined(OS_WIN)
   return (native_event().message == WM_CHAR) ? key_code_ :
       GetCharacterFromKeyCode(key_code_, flags());
+#elif defined(USE_WAYLAND)
+  if (!native_event())
+    return ui::GetCharacterFromKeyCode(key_code_, flags());
+
+  uint16 ch = 0;
+  if (!IsControlDown())
+    ch = ui::GetCharacterFromWaylandEvent(native_event());
+  return ch ? ch : ui::GetCharacterFromKeyCode(key_code_, flags());
 #elif defined(USE_X11)
   if (!native_event())
     return GetCharacterFromKeyCode(key_code_, flags());
 
   DCHECK(native_event()->type == KeyPress ||
          native_event()->type == KeyRelease);
 
   uint16 ch = 0;
   if (!IsControlDown())
     ch = GetCharacterFromXEvent(native_event());
   return ch ? ch : GetCharacterFromKeyCode(key_code_, flags());
 #else
   NOTIMPLEMENTED();
   return 0;
 #endif
 }
 
 uint16 KeyEvent::GetUnmodifiedCharacter() const {
   if (unmodified_character_)
     return unmodified_character_;
 
 #if defined(OS_WIN)
   // Looks like there is no way to get unmodified character on Windows.
   return (native_event().message == WM_CHAR) ? key_code_ :
       GetCharacterFromKeyCode(key_code_, flags() & EF_SHIFT_DOWN);
+#elif defined(USE_WAYLAND)
+  if (!native_event())
+    return ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+
+  uint16 ch = ui::GetCharacterFromWaylandEvent(native_event());
+  return ch ? ch :
+      ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
 #elif defined(USE_X11)
   if (!native_event())
     return GetCharacterFromKeyCode(key_code_, flags() & EF_SHIFT_DOWN);
 
   DCHECK(native_event()->type == KeyPress ||
          native_event()->type == KeyRelease);
 
   static const unsigned int kIgnoredModifiers = ControlMask | LockMask |
       Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask;
 
@@ skipping 185 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui