OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" | 5 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" |
6 | 6 |
7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
9 #undef RootWindow | 9 #undef RootWindow |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... | |
38 | 38 |
39 // Note: the escape key is handled in the tab drag controller, which has | 39 // Note: the escape key is handled in the tab drag controller, which has |
40 // keyboard focus even though we took pointer grab. | 40 // keyboard focus even though we took pointer grab. |
41 switch (xev->type) { | 41 switch (xev->type) { |
42 case MotionNotify: { | 42 case MotionNotify: { |
43 delegate_->OnMouseMovement(&xev->xmotion); | 43 delegate_->OnMouseMovement(&xev->xmotion); |
44 break; | 44 break; |
45 } | 45 } |
46 case ButtonPress: | 46 case ButtonPress: |
47 case ButtonRelease: { | 47 case ButtonRelease: { |
48 EndMoveLoop(); | 48 delegate_->OnMouseReleased(); |
Daniel Erat
2013/06/17 22:09:57
is it intentional that this is also called for but
Elliot Glaysher
2013/06/18 00:06:39
Removed ButtonPress. (The historical reasons here
| |
49 break; | 49 break; |
50 } | 50 } |
51 } | 51 } |
52 | 52 |
53 return true; | 53 return true; |
54 } | 54 } |
55 | 55 |
56 //////////////////////////////////////////////////////////////////////////////// | 56 //////////////////////////////////////////////////////////////////////////////// |
57 // DesktopRootWindowHostLinux, aura::client::WindowMoveClient implementation: | 57 // DesktopRootWindowHostLinux, aura::client::WindowMoveClient implementation: |
58 | 58 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
129 base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow( | 129 base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow( |
130 grab_input_window_); | 130 grab_input_window_); |
131 delegate_->OnMoveLoopEnded(); | 131 delegate_->OnMoveLoopEnded(); |
132 XDestroyWindow(display, grab_input_window_); | 132 XDestroyWindow(display, grab_input_window_); |
133 | 133 |
134 in_move_loop_ = false; | 134 in_move_loop_ = false; |
135 quit_closure_.Run(); | 135 quit_closure_.Run(); |
136 } | 136 } |
137 | 137 |
138 } // namespace views | 138 } // namespace views |
OLD | NEW |