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

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

Issue 2114143002: Disabled xinput2 until edge cases can be fixed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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 | 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 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 #include "ui/events/devices/x11/device_data_manager_x11.h" 5 #include "ui/events/devices/x11/device_data_manager_x11.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <X11/extensions/XInput.h> 8 #include <X11/extensions/XInput.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 valuator_max_[deviceid][data_type] = valuator_class_info->max; 765 valuator_max_[deviceid][data_type] = valuator_class_info->max;
766 return IsCMTDataType(data_type); 766 return IsCMTDataType(data_type);
767 } 767 }
768 768
769 void DeviceDataManagerX11::UpdateScrollClassDevice( 769 void DeviceDataManagerX11::UpdateScrollClassDevice(
770 XIScrollClassInfo* scroll_class_info, 770 XIScrollClassInfo* scroll_class_info,
771 int deviceid) { 771 int deviceid) {
772 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum); 772 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
773 ScrollInfo& info = scroll_data_[deviceid]; 773 ScrollInfo& info = scroll_data_[deviceid];
774 774
775 // TODO: xinput2 is disabled until edge cases are fixed.
776 // http://crbug.com/616308
777 return;
778
775 bool legacy_scroll_available = 779 bool legacy_scroll_available =
776 (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0; 780 (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
777 // If the device's highest resolution is lower than the resolution of xinput1 781 // If the device's highest resolution is lower than the resolution of xinput1
778 // then use xinput1's events instead (ie. don't configure smooth scrolling). 782 // then use xinput1's events instead (ie. don't configure smooth scrolling).
779 if (legacy_scroll_available && 783 if (legacy_scroll_available &&
780 std::abs(scroll_class_info->increment) <= 1.0) { 784 std::abs(scroll_class_info->increment) <= 1.0) {
781 return; 785 return;
782 } 786 }
783 787
784 switch (scroll_class_info->scroll_type) { 788 switch (scroll_class_info->scroll_type) {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 } else { 885 } else {
882 keyboards.erase(it); 886 keyboards.erase(it);
883 ++blocked_iter; 887 ++blocked_iter;
884 } 888 }
885 } 889 }
886 // Notify base class of updated list. 890 // Notify base class of updated list.
887 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); 891 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
888 } 892 }
889 893
890 } // namespace ui 894 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698