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 1925713002: Changed DeviceDataManagerX11 to use xinput1 for low resolution scroll devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 valuator_min_[deviceid][data_type] = valuator_class_info->min; 766 valuator_min_[deviceid][data_type] = valuator_class_info->min;
767 valuator_max_[deviceid][data_type] = valuator_class_info->max; 767 valuator_max_[deviceid][data_type] = valuator_class_info->max;
768 return IsCMTDataType(data_type); 768 return IsCMTDataType(data_type);
769 } 769 }
770 770
771 void DeviceDataManagerX11::UpdateScrollClassDevice( 771 void DeviceDataManagerX11::UpdateScrollClassDevice(
772 XIScrollClassInfo* scroll_class_info, 772 XIScrollClassInfo* scroll_class_info,
773 int deviceid) { 773 int deviceid) {
774 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum); 774 DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
775 ScrollInfo& info = scroll_data_[deviceid]; 775 ScrollInfo& info = scroll_data_[deviceid];
776
777 bool legacy_scroll_available =
778 (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
779 // If the device's highest resolution is lower than the resolution of xinput1
780 // then use xinput1's events instead (ie. don't configure smooth scrolling).
781 if (legacy_scroll_available &&
782 std::abs(scroll_class_info->increment) <= 1.0) {
783 return;
784 }
785
776 switch (scroll_class_info->scroll_type) { 786 switch (scroll_class_info->scroll_type) {
777 case XIScrollTypeVertical: 787 case XIScrollTypeVertical:
778 info.vertical.number = scroll_class_info->number; 788 info.vertical.number = scroll_class_info->number;
779 info.vertical.increment = scroll_class_info->increment; 789 info.vertical.increment = scroll_class_info->increment;
780 info.vertical.position = 0; 790 info.vertical.position = 0;
781 info.vertical.seen = false; 791 info.vertical.seen = false;
782 break; 792 break;
783 case XIScrollTypeHorizontal: 793 case XIScrollTypeHorizontal:
784 info.horizontal.number = scroll_class_info->number; 794 info.horizontal.number = scroll_class_info->number;
785 info.horizontal.increment = scroll_class_info->increment; 795 info.horizontal.increment = scroll_class_info->increment;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 } else { 884 } else {
875 keyboards.erase(it); 885 keyboards.erase(it);
876 ++blocked_iter; 886 ++blocked_iter;
877 } 887 }
878 } 888 }
879 // Notify base class of updated list. 889 // Notify base class of updated list.
880 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); 890 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
881 } 891 }
882 892
883 } // 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