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 134 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 99 matching lines @@
 }
 
 }  // namespace
 
 RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds)
     : root_window_(NULL),
       xdisplay_(base::MessagePumpX::GetDefaultXDisplay()),
       xwindow_(0),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       current_cursor_(aura::kCursorNull),
+      custom_cursor_(0),
       cursor_shown_(true),
       bounds_(bounds) {
   XSetWindowAttributes swa;
   memset(&swa, 0, sizeof(swa));
   swa.background_pixmap = None;
   xwindow_ = XCreateWindow(
       xdisplay_, x_root_window_,
       bounds_.x(), bounds_.y(), bounds_.width(), bounds_.height(),
       0,               // border width
       CopyFromParent,  // depth
@@ skipping 24 matching lines @@
   black.red = black.green = black.blue = 0;
   Pixmap blank = XCreateBitmapFromData(xdisplay_, xwindow_,
                                        nodata, 8, 8);
   invisible_cursor_ = XCreatePixmapCursor(xdisplay_, blank, blank,
                                           &black, &black, 0, 0);
   if (RootWindow::hide_host_cursor())
     XDefineCursor(xdisplay_, x_root_window_, invisible_cursor_);
 }
 
 RootWindowHostLinux::~RootWindowHostLinux() {
+  if (custom_cursor_) {
+    ui::UnrefCustomXCursor(custom_cursor_);
+    custom_cursor_ = 0;
+  }
+
   XDestroyWindow(xdisplay_, xwindow_);
 
   // Clears XCursorCache.
   ui::GetXCursor(ui::kCursorClearXCursorCache);
 
   XFreeCursor(xdisplay_, invisible_cursor_);
 
   MessageLoopForUI::current()->RemoveDestructionObserver(this);
   base::MessagePumpX::SetDefaultDispatcher(NULL);
 }
@@ skipping 205 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 (custom_cursor_) {
+    ui::UnrefCustomXCursor(custom_cursor_);
+    custom_cursor_ = 0;
+  }
 
   if (cursor_shown_)
     SetCursorInternal(cursor);
 }
 
+void RootWindowHostLinux::SetCustomCursor(const gfx::PlatformCursor& cursor) {
+  if (custom_cursor_)
+    ui::UnrefCustomXCursor(custom_cursor_);
+  custom_cursor_ = cursor;
+  if (custom_cursor_)

[Daniel Erat, 2012/02/24 23:19:31]

should this method CHECK(cursor)?  i'm pretty sure that passing 0 will generate
a BadCursor error

[sadrul, 2012/02/25 00:02:30]

I just removed the if check here. The XCustomCursorCache code will crash for a 0
(or any unknown cursor).

+    ui::RefCustomXCursor(custom_cursor_);
+  current_cursor_ = kCursorCustom;
+  if (cursor_shown_)
+    SetCursorInternal(current_cursor_);
+}
+
 void RootWindowHostLinux::ShowCursor(bool show) {
   if (show == cursor_shown_)
     return;
   cursor_shown_ = show;
   SetCursorInternal(show ? current_cursor_ : kCursorNone);
 }
 
 gfx::Point RootWindowHostLinux::QueryMouseLocation() {
   ::Window root_return, child_return;
   int root_x_return, root_y_return, win_x_return, win_y_return;
@@ 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 ?
+      custom_cursor_ :
       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