ash: ozone: apply transformation to events outside the root window

ui/ozone/platform/dri/dri_cursor.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/dri_cursor.h"
 
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
@@ skipping 40 matching lines @@
                                gfx::Point(), 0);
 }
 
 void DriCursor::MoveCursorTo(gfx::AcceleratedWidget widget,
                              const gfx::PointF& location) {
   if (widget != cursor_window_ && cursor_window_ != gfx::kNullAcceleratedWidget)
     HideCursor();
 
   cursor_window_ = widget;
   cursor_location_ = location;
+  cursor_root_location_ = location;
 
   if (cursor_window_ == gfx::kNullAcceleratedWidget)
     return;
 
   DriWindow* window = window_manager_->GetWindow(cursor_window_);
-  const gfx::Size& size = window->GetBounds().size();
+  gfx::Rect bounds = window->GetBounds();
+  const gfx::Size& size = bounds.size();
   cursor_location_.SetToMax(gfx::PointF(0, 0));
   // Right and bottom edges are exclusive.
   cursor_location_.SetToMin(gfx::PointF(size.width() - 1, size.height() - 1));
 
+  cursor_root_location_.Offset(bounds.origin().x(), bounds.origin().y());

[spang, 2014/11/10 20:30:47]

I noticed a bug. This is using the original location prior to clamping it to the
window bounds. So the location is wrong.

Please just do:

  cursor_root_location_ = cursor_location_ + bounds.OffsetFromOrigin();

after clamping.

[llandwerlin-old, 2014/11/11 11:03:53]

Done.

+
   if (cursor_.get())
     hardware_->MoveHardwareCursor(cursor_window_, bitmap_location());
 }
 
 void DriCursor::MoveCursor(const gfx::Vector2dF& delta) {
   MoveCursorTo(cursor_window_, cursor_location_ + delta);
 }
 
 gfx::AcceleratedWidget DriCursor::GetCursorWindow() {
   return cursor_window_;
 }
 
 bool DriCursor::IsCursorVisible() {
   return cursor_.get();
 }
 
 gfx::PointF DriCursor::location() {
   return cursor_location_;
 }
 
+gfx::PointF DriCursor::root_location() {
+  return cursor_root_location_;
+}
+
 gfx::Point DriCursor::bitmap_location() {
   return gfx::ToFlooredPoint(cursor_location_) -
          cursor_->hotspot().OffsetFromOrigin();
 }
 
 }  // namespace ui