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

Side by Side Diff: views/events/event_x.cc

Issue 6591120: Update MouseEvent (initial pass). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update MouseEvent (initial pass). Created 9 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 | Annotate | Revision Log
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 #include "views/events/event.h" 5 #include "views/events/event.h"
6 6
7 #include <gdk/gdkx.h> 7 #include <gdk/gdkx.h>
8 #if defined(HAVE_XINPUT2) 8 #if defined(HAVE_XINPUT2)
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #endif 10 #endif
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 : Event(native_event_2, 251 : Event(native_event_2,
252 EventTypeFromNative(native_event_2), 252 EventTypeFromNative(native_event_2),
253 GetEventFlagsFromXState(native_event_2->xkey.state), 253 GetEventFlagsFromXState(native_event_2->xkey.state),
254 from_native), 254 from_native),
255 key_code_(ui::KeyboardCodeFromXKeyEvent(native_event_2)) { 255 key_code_(ui::KeyboardCodeFromXKeyEvent(native_event_2)) {
256 } 256 }
257 257
258 //////////////////////////////////////////////////////////////////////////////// 258 ////////////////////////////////////////////////////////////////////////////////
259 // MouseEvent, public: 259 // MouseEvent, public:
260 260
261 MouseEvent::MouseEvent(XEvent* xev) 261 MouseEvent::MouseEvent(NativeEvent2 native_event_2,
262 : LocatedEvent(EventTypeFromNative(xev), 262 FromNativeEvent2 from_native)
263 GetMouseEventLocation(xev), 263 : LocatedEvent(native_event_2, from_native) {
264 GetMouseEventFlags(xev)) {
265 } 264 }
266 265
267 //////////////////////////////////////////////////////////////////////////////// 266 ////////////////////////////////////////////////////////////////////////////////
268 // MouseWheelEvent, public: 267 // MouseWheelEvent, public:
269 268
270 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, 269 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
271 FromNativeEvent2 from_native) 270 FromNativeEvent2 from_native)
272 : LocatedEvent(native_event_2, from_native), 271 : LocatedEvent(native_event_2, from_native),
273 offset_(GetMouseWheelOffset(native_event_2)) { 272 offset_(GetMouseWheelOffset(native_event_2)) {
274 } 273 }
275 274
276 //////////////////////////////////////////////////////////////////////////////// 275 ////////////////////////////////////////////////////////////////////////////////
277 // TouchEvent, public: 276 // TouchEvent, public:
278 277
279 #if defined(HAVE_XINPUT2) 278 #if defined(HAVE_XINPUT2)
280 TouchEvent::TouchEvent(XEvent* xev) 279 TouchEvent::TouchEvent(XEvent* xev)
281 : LocatedEvent(GetTouchEventType(xev), 280 : LocatedEvent(GetTouchEventType(xev),
282 GetTouchEventLocation(xev), 281 GetTouchEventLocation(xev),
283 GetTouchEventFlags(xev)), 282 GetTouchEventFlags(xev)),
284 touch_id_(GetTouchIDFromXEvent(xev)) { 283 touch_id_(GetTouchIDFromXEvent(xev)) {
285 } 284 }
286 #endif 285 #endif
287 286
288 } // namespace views 287 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698