events: Make platform specific events code into ui/events/.

ui/base/x/x11_util.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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 17 matching lines @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "base/threading/thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPostConfig.h"
 #include "ui/base/touch/touch_factory_x11.h"
-#include "ui/base/x/device_data_manager.h"
 #include "ui/base/x/x11_error_tracker.h"
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/x/device_data_manager.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_FREEBSD)
 #include <sys/sysctl.h>
@@ skipping 75 matching lines @@
                             max_length, // max length to get
                             False,      // deleted
                             AnyPropertyType,
                             type,
                             format,
                             num_items,
                             &remaining_bytes,
                             property);
 }
 
-// Converts ui::EventType to XKeyEvent state.
-unsigned int XKeyEventState(int flags) {
-  return
-      ((flags & ui::EF_SHIFT_DOWN) ? ShiftMask : 0) |
-      ((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) |
-      ((flags & ui::EF_ALT_DOWN) ? Mod1Mask : 0) |
-      ((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0);
-}
-
-// Converts EventType to XKeyEvent type.
-int XKeyEventType(ui::EventType type) {
-  switch (type) {
-    case ui::ET_KEY_PRESSED:
-      return KeyPress;
-    case ui::ET_KEY_RELEASED:
-      return KeyRelease;
-    default:
-      return 0;
-  }
-}
-
-// Converts KeyboardCode to XKeyEvent keycode.
-unsigned int XKeyEventKeyCode(ui::KeyboardCode key_code,
-                              int flags,
-                              XDisplay* display) {
-  const int keysym = XKeysymForWindowsKeyCode(key_code,
-                                              flags & ui::EF_SHIFT_DOWN);
-  // Tests assume the keycode for XK_less is equal to the one of XK_comma,
-  // but XKeysymToKeycode returns 94 for XK_less while it returns 59 for
-  // XK_comma. Here we convert the value for XK_less to the value for XK_comma.
-  return (keysym == XK_less) ? 59 : XKeysymToKeycode(display, keysym);
-}
-
 // A process wide singleton that manages the usage of X cursors.
 class XCursorCache {
  public:
   XCursorCache() {}
   ~XCursorCache() {
     Clear();
   }
 
   ::Cursor GetCursor(int cursor_shape) {
     // Lookup cursor by attempting to insert a null value, which avoids
@@ skipping 96 matching lines @@
   XCustomCursorCache() {}
   ~XCustomCursorCache() {
     Clear();
   }
 
   std::map< ::Cursor, XCustomCursor*> cache_;
   DISALLOW_COPY_AND_ASSIGN(XCustomCursorCache);
 };
 #endif  // defined(USE_AURA)
 
-// A singleton object that remembers remappings of mouse buttons.
-class XButtonMap {
- public:
-  static XButtonMap* GetInstance() {
-    return Singleton<XButtonMap>::get();
-  }
-
-  void UpdateMapping() {
-    count_ = XGetPointerMapping(gfx::GetXDisplay(), map_, arraysize(map_));
-  }
-
-  int GetMappedButton(int button) {
-    return button > 0 && button <= count_ ? map_[button - 1] : button;
-  }
-
- private:
-  friend struct DefaultSingletonTraits<XButtonMap>;
-
-  XButtonMap() {
-    UpdateMapping();
-  }
-
-  ~XButtonMap() {}
-
-  unsigned char map_[256];
-  int count_;
-
-  DISALLOW_COPY_AND_ASSIGN(XButtonMap);
-};
-
 bool IsShapeAvailable() {
   int dummy;
   static bool is_shape_available =
     XShapeQueryExtension(gfx::GetXDisplay(), &dummy, &dummy);
   return is_shape_available;
 
 }
 
 }  // namespace
 
@@ skipping 1041 matching lines @@
   // TODO(erg): Actually doing this correctly would require pulling out xrandr,
   // which we don't even do in the desktop screen yet.
   ::XDisplay* display = gfx::GetXDisplay();
   ::Screen* screen = DefaultScreenOfDisplay(display);
   int width = WidthOfScreen(screen);
   int height = HeightOfScreen(screen);
   return window_rect.size() == gfx::Size(width, height);
 #endif
 }
 
-bool IsMotionEvent(XEvent* event) {
-  int type = event->type;
-  if (type == GenericEvent)
-    type = event->xgeneric.evtype;
-  return type == MotionNotify;
-}
-
-int GetMappedButton(int button) {
-  return XButtonMap::GetInstance()->GetMappedButton(button);
-}
-
-void UpdateButtonMap() {
-  XButtonMap::GetInstance()->UpdateMapping();
-}
-
-void InitXKeyEventForTesting(EventType type,
-                             KeyboardCode key_code,
-                             int flags,
-                             XEvent* event) {
-  CHECK(event);
-  XDisplay* display = gfx::GetXDisplay();
-  XKeyEvent key_event;
-  key_event.type = XKeyEventType(type);
-  CHECK_NE(0, key_event.type);
-  key_event.serial = 0;
-  key_event.send_event = 0;
-  key_event.display = display;
-  key_event.time = 0;
-  key_event.window = 0;
-  key_event.root = 0;
-  key_event.subwindow = 0;
-  key_event.x = 0;
-  key_event.y = 0;
-  key_event.x_root = 0;
-  key_event.y_root = 0;
-  key_event.state = XKeyEventState(flags);
-  key_event.keycode = XKeyEventKeyCode(key_code, flags, display);
-  key_event.same_screen = 1;
-  event->type = key_event.type;
-  event->xkey = key_event;
-}
-
 const unsigned char* XRefcountedMemory::front() const {
   return x11_data_;
 }
 
 size_t XRefcountedMemory::size() const {
   return length_;
 }
 
 XRefcountedMemory::~XRefcountedMemory() {
   XFree(x11_data_);
@@ skipping 157 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui