[Ozone] Proper cursor support for multi-monitor configurations

ui/ozone/platform/dri/cursor_factory_evdev_dri.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/ozone/platform/dri/cursor_factory_evdev_dri.h"
 
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 
 namespace ui {
 
 CursorFactoryEvdevDri::CursorFactoryEvdevDri(DriSurfaceFactory* dri)
     : dri_(dri) {
   // TODO(dnicoara) Assume the first widget since at this point there are no
   // widgets initialized.
   cursor_window_ = DriSurfaceFactory::kDefaultWidgetHandle;
-  cursor_bounds_ = gfx::RectF(0, 0, 2560, 1700);  // TODO(spang): Argh!
-  cursor_location_ =
-      gfx::PointF(cursor_bounds_.width() / 2, cursor_bounds_.height() / 2);
+  cursor_location_ = gfx::PointF(2560 / 2, 1700 / 2);  // TODO(spang): Argh!
 
   // The DRI cursor is invisible unless explicitly set. Therefore, set the
   // pointer cursor on initialization.
   // TODO(spang): Move this to DRI window initialization.
   SetCursor(cursor_window_, GetDefaultCursor(kCursorPointer));
 }
 
 CursorFactoryEvdevDri::~CursorFactoryEvdevDri() {}
 
 void CursorFactoryEvdevDri::SetBitmapCursor(
     gfx::AcceleratedWidget widget,
     scoped_refptr<BitmapCursorOzone> cursor) {
   if (cursor_ == cursor)
     return;
+
   cursor_ = cursor;
   if (cursor_)
     dri_->SetHardwareCursor(
         cursor_window_, cursor_->bitmap(), bitmap_location());
   else
     dri_->UnsetHardwareCursor(cursor_window_);
 }
 
 void CursorFactoryEvdevDri::MoveCursorTo(gfx::AcceleratedWidget widget,
                                          const gfx::PointF& location) {
+  if (widget != cursor_window_)
+    dri_->UnsetHardwareCursor(cursor_window_);

[spang, 2014/05/06 19:41:26]

why is this needed?

don't we get a SetCursor(None) ?

[dnicoara, 2014/05/06 21:03:42]

Nope, the cursor is never hidden on the original window.

+
   cursor_window_ = widget;
   cursor_location_ = location;
-  cursor_location_.SetToMax(
-      gfx::PointF(cursor_bounds_.x(), cursor_bounds_.y()));
-  cursor_location_.SetToMin(
-      gfx::PointF(cursor_bounds_.right(), cursor_bounds_.bottom()));
+
+  gfx::Size size = dri_->GetWidgetSize(cursor_window_);
+  cursor_location_.SetToMax(gfx::PointF(0, 0));
+  cursor_location_.SetToMin(gfx::PointF(size.width(), size.height()));
+
   if (cursor_)
     dri_->MoveHardwareCursor(cursor_window_, bitmap_location());
 }
 
 void CursorFactoryEvdevDri::MoveCursor(const gfx::Vector2dF& delta) {
   MoveCursorTo(cursor_window_, cursor_location_ + delta);
 }
 
-gfx::AcceleratedWidget CursorFactoryEvdevDri::window() {
+gfx::AcceleratedWidget CursorFactoryEvdevDri::GetActiveWindow() {
   return cursor_window_;
 }
 
 gfx::PointF CursorFactoryEvdevDri::location() { return cursor_location_; }
 
 gfx::Point CursorFactoryEvdevDri::bitmap_location() {
   return gfx::ToFlooredPoint(cursor_location_) -
          cursor_->hotspot().OffsetFromOrigin();
 }
 
 }  // namespace ui