Allows menu host windows to be enumerated in DragTargetWindowFinder

ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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/views/widget/desktop_aura/x11_whole_screen_move_loop.h"
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
+#include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_x11.h"
 #include "base/run_loop.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 // The minimum alpha before we declare a pixel transparent when searching in
 // our source image.
 const uint32 kMinAlpha = 32;
+const unsigned char kDragWidgetOpacity = 0xc0;
 
 class ScopedCapturer {
  public:
   explicit ScopedCapturer(aura::WindowTreeHost* host)
       : host_(host) {
     host_->SetCapture();
   }
 
   ~ScopedCapturer() {
     host_->ReleaseCapture();
   }
 
  private:
   aura::WindowTreeHost* host_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCapturer);
 };
 
 }  // namespace
 
 X11WholeScreenMoveLoop::X11WholeScreenMoveLoop(
     X11WholeScreenMoveLoopDelegate* delegate)
     : delegate_(delegate),
       in_move_loop_(false),
       should_reset_mouse_flags_(false),
-      grab_input_window_(None) {
+      grab_input_window_(None),
+      motion_task_posted_(false) {
+  last_xmotion_.type = NoEventMask;
 }
 
 X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostLinux, MessagePumpDispatcher implementation:
 
+void X11WholeScreenMoveLoop::DispatchMouseMovement()

[sadrul, 2014/03/26 18:01:07]

{ EOL here

[varkha, 2014/03/27 04:48:13]

Done (moved to https://codereview.chromium.org/214113003/).

+{
+  if (!motion_task_posted_)
+    return;
+
+  motion_task_posted_ = false;
+  gfx::Point screen_point(last_xmotion_.x_root, last_xmotion_.y_root);
+  delegate_->OnMouseMovement(&last_xmotion_);
+}
+
 uint32_t X11WholeScreenMoveLoop::Dispatch(const base::NativeEvent& event) {
   XEvent* xev = event;
 
   // Note: the escape key is handled in the tab drag controller, which has
   // keyboard focus even though we took pointer grab.
   switch (xev->type) {
     case MotionNotify: {
       if (drag_widget_.get()) {
         gfx::Screen* screen = gfx::Screen::GetNativeScreen();
         gfx::Point location = gfx::ToFlooredPoint(
             screen->GetCursorScreenPoint() - drag_offset_);
         drag_widget_->SetBounds(gfx::Rect(location, drag_image_.size()));
+        drag_widget_->StackAtTop();
       }
-      delegate_->OnMouseMovement(&xev->xmotion);
+      last_xmotion_ = xev->xmotion;

[sadrul, 2014/03/26 18:01:07]

Don't copy the whole event. Just keep track of the latest location in a
gfx::Point.

[varkha, 2014/03/27 04:48:13]

This was moved to https://codereview.chromium.org/214113003/. Please comment
there.

We need a NativeEvent& to pass to the delegate->OnMouseMovement. Do you think we
should assume that no other fields in the event are used (other than the time
and coordinates as used by DesktopDragDropClientAuraX11::OnMouseMovement.

+      if (!motion_task_posted_) {
+        gfx::Point screen_point(xev->xmotion.x_root, xev->xmotion.y_root);
+        motion_task_posted_ = true;
+        base::MessageLoopForUI::current()->PostTask(
+            FROM_HERE,
+            base::Bind(&X11WholeScreenMoveLoop::DispatchMouseMovement,
+                       base::Unretained(this)));

[sadrul, 2014/03/26 18:01:07]

You should use a WeakPtr<> here, instead of using Unretained(), and invalidate
the weak-ptr in EndMoveLoop().

You should also get rid of |motion_task_posted_|.

[varkha, 2014/03/27 04:48:13]

Will do in https://codereview.chromium.org/214113003/.

+      }
       break;
     }
     case ButtonRelease: {
       if (xev->xbutton.button == Button1) {
         // Assume that drags are being done with the left mouse button. Only
         // break the drag if the left mouse button was released.
+        if (motion_task_posted_)
+          DispatchMouseMovement();
         delegate_->OnMouseReleased();
       }
       break;
     }
     case KeyPress: {
-      if (ui::KeyboardCodeFromXKeyEvent(xev) == ui::VKEY_ESCAPE)
+      if (ui::KeyboardCodeFromXKeyEvent(xev) == ui::VKEY_ESCAPE) {
+        motion_task_posted_ = false;
         EndMoveLoop();
+      }
       break;
     }
   }
 
   return POST_DISPATCH_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostLinux, aura::client::WindowMoveClient implementation:
 
@@ skipping 156 matching lines @@
   params.opacity = Widget::InitParams::OPAQUE_WINDOW;
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.accept_events = false;
 
   gfx::Point location = gfx::ToFlooredPoint(
       gfx::Screen::GetNativeScreen()->GetCursorScreenPoint() - drag_offset_);
   params.bounds = gfx::Rect(location, drag_image_.size());
   widget->set_focus_on_creation(false);
   widget->set_frame_type(Widget::FRAME_TYPE_FORCE_NATIVE);
   widget->Init(params);
+  widget->SetOpacity(kDragWidgetOpacity);
   widget->GetNativeWindow()->SetName("DragWindow");
 
   ImageView* image = new ImageView();
   image->SetImage(drag_image_);
   image->SetBounds(0, 0, drag_image_.width(), drag_image_.height());
   widget->SetContentsView(image);
   widget->Show();
   widget->GetNativeWindow()->layer()->SetFillsBoundsOpaquely(false);
 
   drag_widget_.reset(widget);
@@ skipping 19 matching lines @@
     for (int x = 0; x < in_bitmap->width(); ++x) {
       if (SkColorGetA(in_row[x]) > kMinAlpha)
         return true;
     }
   }
 
   return false;
 }
 
 }  // namespace views