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

Side by Side Diff: ui/events/x/events_x.cc

Issue 2655303004: Add id properties to PointerEvent (Closed)
Patch Set: pointer id Created 3 years, 10 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
« ui/events/event.cc ('K') | « ui/events/test/event_generator.cc ('k') | no next file » | 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) 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/events/event_utils.h" 5 #include "ui/events/event_utils.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 #include <X11/extensions/XInput.h> 9 #include <X11/extensions/XInput.h>
10 #include <X11/extensions/XInput2.h> 10 #include <X11/extensions/XInput2.h>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 return GetTouchAngleFromXEvent(*native_event); 153 return GetTouchAngleFromXEvent(*native_event);
154 } 154 }
155 155
156 PointerDetails GetTouchPointerDetailsFromNative( 156 PointerDetails GetTouchPointerDetailsFromNative(
157 const base::NativeEvent& native_event) { 157 const base::NativeEvent& native_event) {
158 return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 158 return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
159 GetTouchRadiusXFromXEvent(*native_event), 159 GetTouchRadiusXFromXEvent(*native_event),
160 GetTouchRadiusYFromXEvent(*native_event), 160 GetTouchRadiusYFromXEvent(*native_event),
161 GetTouchForceFromXEvent(*native_event), 161 GetTouchForceFromXEvent(*native_event),
162 /* tilt_x */ 0.f, 162 /* tilt_x */ 0.f,
163 /* tilt_y */ 0.f); 163 /* tilt_y */ 0.f,
164 /* tangential_pressure */ 0.0f,
165 /* twist */ 0, GetTouchIdFromXEvent(*native_event));
mustaq 2017/02/27 16:02:26 Nit: odd formatting.
164 } 166 }
165 167
166 bool GetScrollOffsets(const base::NativeEvent& native_event, 168 bool GetScrollOffsets(const base::NativeEvent& native_event,
167 float* x_offset, 169 float* x_offset,
168 float* y_offset, 170 float* y_offset,
169 float* x_offset_ordinal, 171 float* x_offset_ordinal,
170 float* y_offset_ordinal, 172 float* y_offset_ordinal,
171 int* finger_count, 173 int* finger_count,
172 EventMomentumPhase* momentum_phase) { 174 EventMomentumPhase* momentum_phase) {
173 return GetScrollOffsetsFromXEvent(*native_event, x_offset, y_offset, 175 return GetScrollOffsetsFromXEvent(*native_event, x_offset, y_offset,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 xievent->detail = 230 xievent->detail =
229 UpdateX11EventButton(event->changed_button_flags(), xievent->detail); 231 UpdateX11EventButton(event->changed_button_flags(), xievent->detail);
230 break; 232 break;
231 } 233 }
232 default: 234 default:
233 break; 235 break;
234 } 236 }
235 } 237 }
236 238
237 } // namespace ui 239 } // namespace ui
OLDNEW
« ui/events/event.cc ('K') | « ui/events/test/event_generator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698