aura-x11: Add custom web cursor support.

ui/aura/root_window_host_linux.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/aura/root_window_host_linux.h"
 
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput2.h>
 #include <algorithm>
 
@@ skipping 60 matching lines @@
     CHECK_EQ(slave_event.valuators.mask_len, xievent->valuators.mask_len);
     CHECK_EQ(slave_event.mods.base, xievent->mods.base);
     CHECK_EQ(slave_event.mods.latched, xievent->mods.latched);
     CHECK_EQ(slave_event.mods.locked, xievent->mods.locked);
     CHECK_EQ(slave_event.mods.effective, xievent->mods.effective);
   }
 }
 
 // Returns X font cursor shape from an Aura cursor.
 int CursorShapeFromNative(gfx::NativeCursor native_cursor) {
-  switch (native_cursor) {
+  switch (native_cursor.native_type()) {
     case aura::kCursorNull:
       return XC_left_ptr;
     case aura::kCursorPointer:
       return XC_left_ptr;
     case aura::kCursorCross:
       return XC_crosshair;
     case aura::kCursorHand:
       return XC_hand2;
     case aura::kCursorIBeam:
       return XC_xterm;
@@ skipping 55 matching lines @@
     case aura::kCursorAlias:
     case aura::kCursorProgress:
     case aura::kCursorNoDrop:
     case aura::kCursorCopy:
     case aura::kCursorNone:
     case aura::kCursorNotAllowed:
     case aura::kCursorZoomIn:
     case aura::kCursorZoomOut:
     case aura::kCursorGrab:
     case aura::kCursorGrabbing:
+      // TODO(jamescook): Need cursors for these.  crbug.com/111650
+      return XC_left_ptr;
     case aura::kCursorCustom:
-      // TODO(jamescook): Need cursors for these.  crbug.com/111650
+      NOTREACHED();
       return XC_left_ptr;
   }
   NOTREACHED();
   return XC_left_ptr;
 }
 
 // Coalesce all pending motion events that are at the top of the queue, and
 // return the number eliminated, storing the last one in |last_event|.
 int CoalescePendingXIMotionEvents(const XEvent* xev, XEvent* last_event) {
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
@@ skipping 371 matching lines @@
 }
 
 void RootWindowHostLinux::ReleaseCapture() {
 }
 
 void RootWindowHostLinux::SetCursor(gfx::NativeCursor cursor) {
   if (cursor == current_cursor_)
     return;
   current_cursor_ = cursor;
 
-  // Custom web cursors are handled directly.
-  if (cursor == kCursorCustom)
-    return;
-
   if (cursor_shown_)
     SetCursorInternal(cursor);
 }
 
 void RootWindowHostLinux::ShowCursor(bool show) {
   if (show == cursor_shown_)
     return;
   cursor_shown_ = show;
   SetCursorInternal(show ? current_cursor_ : kCursorNone);
 }
@@ skipping 75 matching lines @@
   // Per ICCCM 2.8, "Manager Selections", window managers should take ownership
   // of WM_Sn selections (where n is a screen number).
   ::Atom wm_s0_atom = XInternAtom(xdisplay_, "WM_S0", False);
   return XGetSelectionOwner(xdisplay_, wm_s0_atom) != None;
 }
 
 void RootWindowHostLinux::SetCursorInternal(gfx::NativeCursor cursor) {
   ::Cursor xcursor =
       cursor == kCursorNone ?
       invisible_cursor_ :
+      cursor == kCursorCustom ?
+      cursor.platform() :
       ui::GetXCursor(CursorShapeFromNative(cursor));
   XDefineCursor(xdisplay_, xwindow_, xcursor);
 }
 
 // static
 RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) {
   return new RootWindowHostLinux(bounds);
 }
 
 // static
 gfx::Size RootWindowHost::GetNativeScreenSize() {
   ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }
 
 }  // namespace aura