OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ | 5 #ifndef UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ |
6 #define UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ | 6 #define UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ |
7 | 7 |
8 // Generically-named #defines from Xlib is conflicting with symbols in GTest. | 8 // Generically-named #defines from Xlib is conflicting with symbols in GTest. |
9 // So many tests .cc file #undef Bool before including device_data_manager.h, | 9 // So many tests .cc file #undef Bool before including device_data_manager.h, |
10 // which makes Bool unrecognized in XInput2.h. | 10 // which makes Bool unrecognized in XInput2.h. |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 // Beginning of touch data types. | 76 // Beginning of touch data types. |
77 | 77 |
78 // Define the valuators following the Multi-touch Protocol. Used by | 78 // Define the valuators following the Multi-touch Protocol. Used by |
79 // touchscreen devices. | 79 // touchscreen devices. |
80 DT_TOUCH_MAJOR, // Length of the touch area. | 80 DT_TOUCH_MAJOR, // Length of the touch area. |
81 DT_TOUCH_MINOR, // Width of the touch area. | 81 DT_TOUCH_MINOR, // Width of the touch area. |
82 DT_TOUCH_ORIENTATION, // Angle between the X-axis and the major axis of the | 82 DT_TOUCH_ORIENTATION, // Angle between the X-axis and the major axis of the |
83 // touch area. | 83 // touch area. |
84 DT_TOUCH_PRESSURE, // Pressure of the touch contact. | 84 DT_TOUCH_PRESSURE, // Pressure of the touch contact. |
85 | 85 |
| 86 DT_TOUCH_POSITION_X, // Touch X position. |
| 87 DT_TOUCH_POSITION_Y, // Touch Y position. |
| 88 |
86 // NOTE for XInput MT: 'Tracking ID' is provided in every touch event to | 89 // NOTE for XInput MT: 'Tracking ID' is provided in every touch event to |
87 // track individual touch. 'Tracking ID' is an unsigned 32-bit value and | 90 // track individual touch. 'Tracking ID' is an unsigned 32-bit value and |
88 // is increased for each new touch. It will wrap back to 0 when reaching | 91 // is increased for each new touch. It will wrap back to 0 when reaching |
89 // the numerical limit. | 92 // the numerical limit. |
90 DT_TOUCH_TRACKING_ID, // ID of the touch point. | 93 DT_TOUCH_TRACKING_ID, // ID of the touch point. |
91 | 94 |
92 // Kernel timestamp from touch screen (if available). | 95 // Kernel timestamp from touch screen (if available). |
93 DT_TOUCH_RAW_TIMESTAMP, | 96 DT_TOUCH_RAW_TIMESTAMP, |
94 | 97 |
95 // End of touch data types. | 98 // End of touch data types. |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 | 311 |
309 unsigned char button_map_[256]; | 312 unsigned char button_map_[256]; |
310 int button_map_count_; | 313 int button_map_count_; |
311 | 314 |
312 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); | 315 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); |
313 }; | 316 }; |
314 | 317 |
315 } // namespace ui | 318 } // namespace ui |
316 | 319 |
317 #endif // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ | 320 #endif // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ |
OLD | NEW |