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

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

Issue 2108283002: Disabled xinput2 until edge cases can be fixed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed comment to TODO and removed if 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 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 valuator_max_[deviceid][data_type] = valuator_class_info->max; 764 valuator_max_[deviceid][data_type] = valuator_class_info->max;
765 return IsCMTDataType(data_type); 765 return IsCMTDataType(data_type);
766 } 766 }
767 767
768 void DeviceDataManagerX11::UpdateScrollClassDevice( 768 void DeviceDataManagerX11::UpdateScrollClassDevice(
769 XIScrollClassInfo* scroll_class_info, 769 XIScrollClassInfo* scroll_class_info,
770 int deviceid) { 770 int deviceid) {
771 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum); 771 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
772 ScrollInfo& info = scroll_data_[deviceid]; 772 ScrollInfo& info = scroll_data_[deviceid];
773 773
774 // TODO: xinput2 is disabled until edge cases are fixed.
775 // http://crbug.com/616308
776 return;
777
774 bool legacy_scroll_available = 778 bool legacy_scroll_available =
775 (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0; 779 (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
776 // If the device's highest resolution is lower than the resolution of xinput1 780 // If the device's highest resolution is lower than the resolution of xinput1
777 // then use xinput1's events instead (ie. don't configure smooth scrolling). 781 // then use xinput1's events instead (ie. don't configure smooth scrolling).
778 if (legacy_scroll_available && 782 if (legacy_scroll_available &&
779 std::abs(scroll_class_info->increment) <= 1.0) { 783 std::abs(scroll_class_info->increment) <= 1.0) {
780 return; 784 return;
781 } 785 }
782 786
783 switch (scroll_class_info->scroll_type) { 787 switch (scroll_class_info->scroll_type) {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 } else { 884 } else {
881 keyboards.erase(it); 885 keyboards.erase(it);
882 ++blocked_iter; 886 ++blocked_iter;
883 } 887 }
884 } 888 }
885 // Notify base class of updated list. 889 // Notify base class of updated list.
886 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); 890 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
887 } 891 }
888 892
889 } // namespace ui 893 } // 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