Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h

Issue 262893002: Removes grab input window and extra grab and ungrab in X11WholeScreenMoveLoop Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Additional SetCapture after Attach and Show in TabDragController Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 23 matching lines...) Expand all
34 public: 34 public:
35 explicit X11WholeScreenMoveLoop(X11WholeScreenMoveLoopDelegate* delegate); 35 explicit X11WholeScreenMoveLoop(X11WholeScreenMoveLoopDelegate* delegate);
36 virtual ~X11WholeScreenMoveLoop(); 36 virtual ~X11WholeScreenMoveLoop();
37 37
38 // ui:::PlatformEventDispatcher: 38 // ui:::PlatformEventDispatcher:
39 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 39 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
40 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 40 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
41 41
42 // Runs the nested message loop. While the mouse is grabbed, use |cursor| as 42 // Runs the nested message loop. While the mouse is grabbed, use |cursor| as
43 // the mouse cursor. Returns true if the move-loop is completed successfully. 43 // the mouse cursor. Returns true if the move-loop is completed successfully.
44 // If the pointer-grab fails, or the move-loop is canceled by the user (e.g. 44 // If the pointer-grab fails, or the move-loop is canceled by the user (e.g.
pkotwicz 2014/05/08 00:03:49 Nit: Can you please update this comment?
varkha 2014/05/09 19:01:01 Done.
45 // by pressing escape), then returns false. 45 // by pressing escape), then returns false.
46 bool RunMoveLoop(aura::Window* window, gfx::NativeCursor cursor); 46 bool RunMoveLoop(gfx::NativeCursor cursor);
47
48 // Updates the cursor while the move loop is running.
49 void UpdateCursor(gfx::NativeCursor cursor);
50 47
51 // Ends the RunMoveLoop() that's currently in progress. 48 // Ends the RunMoveLoop() that's currently in progress.
52 void EndMoveLoop(); 49 void EndMoveLoop();
53 50
54 // Sets an image to be used during the drag.
55 void SetDragImage(const gfx::ImageSkia& image, gfx::Vector2dF offset);
56
57 private: 51 private:
58 // Grabs the pointer and keyboard, setting the mouse cursor to |cursor|.
59 // Returns true if the grab was successful.
60 bool GrabPointerAndKeyboard(gfx::NativeCursor cursor);
61
62 // Creates an input-only window to be used during the drag.
63 Window CreateDragInputWindow(XDisplay* display);
64
65 // Creates a window to show the drag image during the drag.
66 void CreateDragImageWindow();
67
68 // Checks to see if |in_image| is an image that has any visible regions
69 // (defined as having a pixel with alpha > 32). If so, return true.
70 bool CheckIfIconValid();
71
72 // Dispatch mouse movement event to |delegate_| in a posted task. 52 // Dispatch mouse movement event to |delegate_| in a posted task.
73 void DispatchMouseMovement(); 53 void DispatchMouseMovement();
74 54
75 X11WholeScreenMoveLoopDelegate* delegate_; 55 X11WholeScreenMoveLoopDelegate* delegate_;
76 56
77 // Are we running a nested message loop from RunMoveLoop()? 57 // Are we running a nested message loop from RunMoveLoop()?
78 bool in_move_loop_; 58 bool in_move_loop_;
79 scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_; 59 scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_;
80 60
81 bool should_reset_mouse_flags_; 61 bool should_reset_mouse_flags_;
82 62
83 // An invisible InputOnly window . We create this window so we can track the
84 // cursor wherever it goes on screen during a drag, since normal windows
85 // don't receive pointer motion events outside of their bounds.
86 ::Window grab_input_window_;
87
88 base::Closure quit_closure_; 63 base::Closure quit_closure_;
89 64
90 // Keeps track of whether the move-loop is cancled by the user (e.g. by 65 // Keeps track of whether the move-loop is canceled by the user (e.g. by
91 // pressing escape). 66 // pressing escape).
92 bool canceled_; 67 bool canceled_;
93 68
94 // A Widget is created during the drag if there is an image available to be
95 // used during the drag.
96 scoped_ptr<Widget> drag_widget_;
97 gfx::ImageSkia drag_image_;
98 gfx::Vector2dF drag_offset_;
99 XMotionEvent last_xmotion_; 69 XMotionEvent last_xmotion_;
100 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_; 70 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_;
101 71
102 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop); 72 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop);
103 }; 73 };
104 74
105 } // namespace views 75 } // namespace views
106 76
107 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 77 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698