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

Side by Side Diff: ui/events/x/hotplug_event_handler_x11.cc

Issue 618283003: Adds special support to the device manager for keyboards devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update device list on disable/enable. Created 6 years, 2 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
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/x/hotplug_event_handler_x11.h" 5 #include "ui/events/x/hotplug_event_handler_x11.h"
6 6
7 #include <X11/extensions/XInput.h> 7 #include <X11/extensions/XInput.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 9
10 #include <algorithm>
10 #include <cmath> 11 #include <cmath>
11 #include <set> 12 #include <set>
12 #include <string> 13 #include <string>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/command_line.h" 16 #include "base/command_line.h"
16 #include "base/files/file_enumerator.h" 17 #include "base/files/file_enumerator.h"
17 #include "base/logging.h" 18 #include "base/logging.h"
18 #include "base/process/launch.h" 19 #include "base/process/launch.h"
19 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
20 #include "base/sys_info.h" 21 #include "base/sys_info.h"
21 #include "ui/events/device_hotplug_event_observer.h" 22 #include "ui/events/device_hotplug_event_observer.h"
23 #include "ui/events/input_device.h"
24 #include "ui/events/keyboard_device.h"
22 #include "ui/events/touchscreen_device.h" 25 #include "ui/events/touchscreen_device.h"
23 #include "ui/gfx/x/x11_types.h" 26 #include "ui/gfx/x/x11_types.h"
24 27
25 namespace ui { 28 namespace ui {
26 29
27 namespace { 30 namespace {
28 31
32 // The name of the xinput device corresponding to the internal keyboard.
33 const char kInternalKeyboardName[] = "AT Translated Set 2 keyboard";
kpschoedel 2014/10/06 17:16:20 Is this known to be true for all boards?
flackr 2014/10/06 18:31:11 We may have to revisit this later but I believe al
34
35 // Returns true if |name| is the name of a known keyboard device. Note, this may
36 // return false negatives.
37 bool IsKnownKeyboard(const std::string& name) {
38 std::string lower(name);
39 std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
40 return lower.find("keyboard") != std::string::npos;
41 }
42
43 // Returns true if |name| is the name of a known XTEST device. Note, this may
44 // return false negatives.
45 bool IsTestKeyboard(const std::string& name) {
46 return name.find("XTEST") != std::string::npos;
47 }
48
29 // We consider the touchscreen to be internal if it is an I2c device. 49 // We consider the touchscreen to be internal if it is an I2c device.
30 // With the device id, we can query X to get the device's dev input 50 // With the device id, we can query X to get the device's dev input
31 // node eventXXX. Then we search all the dev input nodes registered 51 // node eventXXX. Then we search all the dev input nodes registered
32 // by I2C devices to see if we can find eventXXX. 52 // by I2C devices to see if we can find eventXXX.
33 bool IsTouchscreenInternal(XDisplay* dpy, int device_id) { 53 bool IsTouchscreenInternal(XDisplay* dpy, int device_id) {
34 using base::FileEnumerator; 54 using base::FileEnumerator;
35 using base::FilePath; 55 using base::FilePath;
36 56
37 #if !defined(CHROMEOS) 57 #if !defined(CHROMEOS)
38 return false; 58 return false;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 : delegate_(delegate) { 129 : delegate_(delegate) {
110 } 130 }
111 131
112 HotplugEventHandlerX11::~HotplugEventHandlerX11() { 132 HotplugEventHandlerX11::~HotplugEventHandlerX11() {
113 } 133 }
114 134
115 void HotplugEventHandlerX11::OnHotplugEvent() { 135 void HotplugEventHandlerX11::OnHotplugEvent() {
116 const XIDeviceList& device_list = 136 const XIDeviceList& device_list =
117 DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay()); 137 DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay());
118 HandleTouchscreenDevices(device_list); 138 HandleTouchscreenDevices(device_list);
139 HandleKeyboardDevices(device_list);
140 }
141
142 void HotplugEventHandlerX11::HandleKeyboardDevices(
143 const XIDeviceList& x11_devices) {
144 std::vector<KeyboardDevice> devices;
145
146 for (int i = 0; i < x11_devices.count; i++) {
147 if (!x11_devices[i].enabled || x11_devices[i].use != XISlaveKeyboard)
148 continue; // Assume all keyboards are keyboard slaves
149 std::string device_name(x11_devices[i].name);
150 base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING,
151 &device_name);
152 InputDeviceType type;
153 if (IsTestKeyboard(device_name))
154 continue; // Skip test devices.
155
156 if (device_name == kInternalKeyboardName) {
157 type = InputDeviceType::INTERNAL;
158 } else if (IsKnownKeyboard(device_name)) {
159 type = InputDeviceType::EXTERNAL;
160 } else {
161 type = InputDeviceType::UNKNOWN;
162 }
163 devices.push_back(KeyboardDevice(x11_devices[i].deviceid,
164 type, device_name));
165 }
166 delegate_->OnKeyboardDevicesUpdated(devices);
119 } 167 }
120 168
121 void HotplugEventHandlerX11::HandleTouchscreenDevices( 169 void HotplugEventHandlerX11::HandleTouchscreenDevices(
122 const XIDeviceList& x11_devices) { 170 const XIDeviceList& x11_devices) {
123 std::vector<TouchscreenDevice> devices; 171 std::vector<TouchscreenDevice> devices;
124 Display* display = gfx::GetXDisplay(); 172 Display* display = gfx::GetXDisplay();
125 Atom valuator_x = XInternAtom(display, "Abs MT Position X", False); 173 Atom valuator_x = XInternAtom(display, "Abs MT Position X", False);
126 Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False); 174 Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False);
127 if (valuator_x == None || valuator_y == None) 175 if (valuator_x == None || valuator_y == None)
128 return; 176 return;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 XITouchClassInfo* touch_info = 210 XITouchClassInfo* touch_info =
163 reinterpret_cast<XITouchClassInfo*>(class_info); 211 reinterpret_cast<XITouchClassInfo*>(class_info);
164 is_direct_touch = touch_info->mode == XIDirectTouch; 212 is_direct_touch = touch_info->mode == XIDirectTouch;
165 } 213 }
166 #endif 214 #endif
167 } 215 }
168 216
169 // Touchscreens should have absolute X and Y axes, and be direct touch 217 // Touchscreens should have absolute X and Y axes, and be direct touch
170 // devices. 218 // devices.
171 if (width > 0.0 && height > 0.0 && is_direct_touch) { 219 if (width > 0.0 && height > 0.0 && is_direct_touch) {
172 bool is_internal = 220 InputDeviceType type =
173 IsTouchscreenInternal(display, x11_devices[i].deviceid); 221 IsTouchscreenInternal(display, x11_devices[i].deviceid) ?
222 InputDeviceType::INTERNAL : InputDeviceType::EXTERNAL;
223 std::string name(x11_devices[i].name);
174 devices.push_back(TouchscreenDevice( 224 devices.push_back(TouchscreenDevice(
175 x11_devices[i].deviceid, gfx::Size(width, height), is_internal)); 225 x11_devices[i].deviceid, type, name, gfx::Size(width, height)));
176 } 226 }
177 } 227 }
178 228
179 delegate_->OnTouchscreenDevicesUpdated(devices); 229 delegate_->OnTouchscreenDevicesUpdated(devices);
180 } 230 }
181 231
182 } // namespace ui 232 } // namespace ui
OLDNEW
« ui/events/x/device_data_manager_x11.cc ('K') | « ui/events/x/hotplug_event_handler_x11.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698