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

Side by Side Diff: ui/aura/window_tree_host_x11.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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
OLDNEW
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 #ifndef UI_AURA_WINDOW_TREE_HOST_X11_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_X11_H_
6 #define UI_AURA_WINDOW_TREE_HOST_X11_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_X11_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 bool IsWindowManagerPresent(); 85 bool IsWindowManagerPresent();
86 86
87 // Sets the cursor on |xwindow_| to |cursor|. Does not check or update 87 // Sets the cursor on |xwindow_| to |cursor|. Does not check or update
88 // |current_cursor_|. 88 // |current_cursor_|.
89 void SetCursorInternal(gfx::NativeCursor cursor); 89 void SetCursorInternal(gfx::NativeCursor cursor);
90 90
91 // Translates the native mouse location into screen coordinates and and 91 // Translates the native mouse location into screen coordinates and and
92 // dispatches the event via WindowEventDispatcher. 92 // dispatches the event via WindowEventDispatcher.
93 void TranslateAndDispatchMouseEvent(ui::MouseEvent* event); 93 void TranslateAndDispatchMouseEvent(ui::MouseEvent* event);
94 94
95 // Update is_internal_display_ based on delegate_ state
96 void UpdateIsInternalDisplay();
97
98 // Set the CrOS touchpad "tap paused" property. It is used to temporarily 95 // Set the CrOS touchpad "tap paused" property. It is used to temporarily
99 // turn off the Tap-to-click feature when the mouse pointer is invisible. 96 // turn off the Tap-to-click feature when the mouse pointer is invisible.
100 void SetCrOSTapPaused(bool state); 97 void SetCrOSTapPaused(bool state);
101 98
99 bool IsTouchEventTargetingThisRootWindow(const base::NativeEvent& event);
100
101 // Calibrate |touchev|'s location for bezel region.
102 void CalibrateTouchEvent(const base::NativeEvent& event,
103 ui::TouchEvent* touchev);
104
102 // The display and the native X window hosting the root window. 105 // The display and the native X window hosting the root window.
103 XDisplay* xdisplay_; 106 XDisplay* xdisplay_;
104 ::Window xwindow_; 107 ::Window xwindow_;
105 108
106 // The native root window. 109 // The native root window.
107 ::Window x_root_window_; 110 ::Window x_root_window_;
108 111
109 // Current Aura cursor. 112 // Current Aura cursor.
110 gfx::NativeCursor current_cursor_; 113 gfx::NativeCursor current_cursor_;
111 114
112 // Is the window mapped to the screen? 115 // Is the window mapped to the screen?
113 bool window_mapped_; 116 bool window_mapped_;
114 117
115 // The bounds of |xwindow_|. 118 // The bounds of |xwindow_|.
116 gfx::Rect bounds_; 119 gfx::Rect bounds_;
117 120
118 // The insets that specifies the effective area within the |window_|. 121 // The insets that specifies the effective area within the |window_|.
119 gfx::Insets insets_; 122 gfx::Insets insets_;
120 123
121 // True if the root host resides on the internal display
122 bool is_internal_display_;
123
124 scoped_ptr<XID[]> pointer_barriers_; 124 scoped_ptr<XID[]> pointer_barriers_;
125 125
126 scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_; 126 scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
127 127
128 ui::X11AtomCache atom_cache_; 128 ui::X11AtomCache atom_cache_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11); 130 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);
131 }; 131 };
132 132
133 namespace test { 133 namespace test {
134 134
135 // Set the default value of the override redirect flag used to 135 // Set the default value of the override redirect flag used to
136 // create a X window for WindowTreeHostX11. 136 // create a X window for WindowTreeHostX11.
137 AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect); 137 AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect);
138 138
139 } // namespace test 139 } // namespace test
140 } // namespace aura 140 } // namespace aura
141 141
142 #endif // UI_AURA_WINDOW_TREE_HOST_X11_H_ 142 #endif // UI_AURA_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698