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

Side by Side Diff: ppapi/cpp/input_event.h

Issue 7715021: Add movement information to PPB_MouseInputEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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
« no previous file with comments | « ppapi/c/ppb_input_event.h ('k') | ppapi/cpp/input_event.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 PPAPI_CPP_INPUT_EVENT_H_ 5 #ifndef PPAPI_CPP_INPUT_EVENT_H_
6 #define PPAPI_CPP_INPUT_EVENT_H_ 6 #define PPAPI_CPP_INPUT_EVENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ppapi/c/ppb_input_event.h" 10 #include "ppapi/c/ppb_input_event.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 /// @param[in] mouse_button The button that changed for mouse down or up 116 /// @param[in] mouse_button The button that changed for mouse down or up
117 /// events. This value will be <code>PP_EVENT_MOUSEBUTTON_NONE</code> for 117 /// events. This value will be <code>PP_EVENT_MOUSEBUTTON_NONE</code> for
118 /// mouse move, enter, and leave events. 118 /// mouse move, enter, and leave events.
119 /// 119 ///
120 /// @param[in] mouse_position A <code>Point</code> containing the x and y 120 /// @param[in] mouse_position A <code>Point</code> containing the x and y
121 /// position of the mouse when the eent occurred. 121 /// position of the mouse when the eent occurred.
122 /// 122 ///
123 /// @param[in] click_count 123 /// @param[in] click_count
124 /// TODO(brettw) figure out exactly what this means. 124 /// TODO(brettw) figure out exactly what this means.
125 /// 125 ///
126 /// @param[in] mouse_movement The change in position of the mouse.
126 MouseInputEvent(Instance* instance, 127 MouseInputEvent(Instance* instance,
127 PP_InputEvent_Type type, 128 PP_InputEvent_Type type,
128 PP_TimeTicks time_stamp, 129 PP_TimeTicks time_stamp,
129 uint32_t modifiers, 130 uint32_t modifiers,
130 PP_InputEvent_MouseButton mouse_button, 131 PP_InputEvent_MouseButton mouse_button,
131 const Point& mouse_position, 132 const Point& mouse_position,
132 int32_t click_count); 133 int32_t click_count,
134 const Point& mouse_movement);
133 135
134 /// GetButton() returns the mouse position for a mouse input event. 136 /// GetButton() returns the mouse position for a mouse input event.
135 /// 137 ///
136 /// @return The mouse button associated with mouse down and up events. This 138 /// @return The mouse button associated with mouse down and up events. This
137 /// value will be PP_EVENT_MOUSEBUTTON_NONE for mouse move, enter, and leave 139 /// value will be PP_EVENT_MOUSEBUTTON_NONE for mouse move, enter, and leave
138 /// events, and for all non-mouse events. 140 /// events, and for all non-mouse events.
139 PP_InputEvent_MouseButton GetButton() const; 141 PP_InputEvent_MouseButton GetButton() const;
140 142
141 /// GetPostion() returns the pixel location of a mouse input event. This 143 /// GetPosition() returns the pixel location of a mouse input event. When
142 /// value is in floating-point units to support high-resolution input events. 144 /// the mouse is locked, it returns the last known mouse position just as
145 /// mouse lock was entered.
143 /// 146 ///
144 /// @return The point associated with the mouse event, relative to the upper- 147 /// @return The point associated with the mouse event, relative to the upper-
145 /// left of the instance receiving the event. These values can be negative for 148 /// left of the instance receiving the event. These values can be negative for
146 /// mouse drags. The return value will be (0, 0) for non-mouse events. 149 /// mouse drags. The return value will be (0, 0) for non-mouse events.
147 Point GetPosition() const; 150 Point GetPosition() const;
148 151
149 // TODO(brettw) figure out exactly what this means. 152 // TODO(brettw) figure out exactly what this means.
150 int32_t GetClickCount() const; 153 int32_t GetClickCount() const;
154
155 /// Returns the change in position of the mouse. When the mouse is locked,
156 /// although the mouse position doesn't actually change, this function
157 /// still provides movement information, which indicates what the change in
158 /// position would be had the mouse not been locked.
159 ///
160 /// @return The change in position of the mouse, relative to the previous
161 /// position.
162 Point GetMovement() const;
151 }; 163 };
152 164
153 class WheelInputEvent : public InputEvent { 165 class WheelInputEvent : public InputEvent {
154 public: 166 public:
155 /// Constructs an is_null() wheel input event object. 167 /// Constructs an is_null() wheel input event object.
156 WheelInputEvent(); 168 WheelInputEvent();
157 169
158 /// This constructor constructs a wheel input event object from the 170 /// This constructor constructs a wheel input event object from the
159 /// provided generic input event. If the given event is itself 171 /// provided generic input event. If the given event is itself
160 /// is_null() or is not a wheel input event, the wheel object will be 172 /// is_null() or is not a wheel input event, the wheel object will be
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 /// 294 ///
283 /// @return A string var representing a single typed character for character 295 /// @return A string var representing a single typed character for character
284 /// input events. For non-character input events the return value will be an 296 /// input events. For non-character input events the return value will be an
285 /// undefined var. 297 /// undefined var.
286 Var GetCharacterText() const; 298 Var GetCharacterText() const;
287 }; 299 };
288 300
289 } // namespace pp 301 } // namespace pp
290 302
291 #endif // PPAPI_CPP_INPUT_EVENT_H_ 303 #endif // PPAPI_CPP_INPUT_EVENT_H_
OLDNEW
« no previous file with comments | « ppapi/c/ppb_input_event.h ('k') | ppapi/cpp/input_event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698