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

Side by Side Diff: ui/events/devices/x11/device_data_manager_x11.h

Issue 2153683002: Added a command line switch to disable xinput2, enabled xinput2 by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed ui_events_devices_x11_switches files Created 4 years, 4 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
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.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 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_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 5 #ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
6 #define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 6 #define UI_EVENTS_DEVICES_X11_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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 // The set of keys allowed while the keyboard is blocked. 352 // The set of keys allowed while the keyboard is blocked.
353 std::unique_ptr<std::set<KeyboardCode>> blocked_keyboard_allowed_keys_; 353 std::unique_ptr<std::set<KeyboardCode>> blocked_keyboard_allowed_keys_;
354 354
355 // Number of valuators on the specific device. 355 // Number of valuators on the specific device.
356 int valuator_count_[kMaxDeviceNum]; 356 int valuator_count_[kMaxDeviceNum];
357 357
358 // Index table to find the valuator for DataType on the specific device 358 // Index table to find the valuator for DataType on the specific device
359 // by valuator_lookup_[device_id][data_type]. 359 // by valuator_lookup_[device_id][data_type].
360 std::vector<int> valuator_lookup_[kMaxDeviceNum]; 360 std::vector<int> valuator_lookup_[kMaxDeviceNum];
361 361
362 // Indicates if the user has disabled high precision scrolling support.
363 bool high_precision_scrolling_disabled_;
364
362 // Index table to find the horizontal and vertical scroll valuator 365 // Index table to find the horizontal and vertical scroll valuator
363 // numbers, scroll increments and scroll position. 366 // numbers, scroll increments and scroll position.
364 ScrollInfo scroll_data_[kMaxDeviceNum]; 367 ScrollInfo scroll_data_[kMaxDeviceNum];
365 368
366 // Index table to find the DataType for valuator on the specific device 369 // Index table to find the DataType for valuator on the specific device
367 // by data_type_lookup_[device_id][valuator]. 370 // by data_type_lookup_[device_id][valuator].
368 std::vector<int> data_type_lookup_[kMaxDeviceNum]; 371 std::vector<int> data_type_lookup_[kMaxDeviceNum];
369 372
370 // Index table to find the min & max value of the Valuator on a specific 373 // Index table to find the min & max value of the Valuator on a specific
371 // device. 374 // device.
(...skipping 18 matching lines...) Expand all
390 393
391 unsigned char button_map_[256]; 394 unsigned char button_map_[256];
392 int button_map_count_; 395 int button_map_count_;
393 396
394 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); 397 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
395 }; 398 };
396 399
397 } // namespace ui 400 } // namespace ui
398 401
399 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 402 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
OLDNEW
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698