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

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: 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
« no previous file with comments | « ui/events/x/hotplug_event_handler_x11.h ('k') | 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/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 AT internal keyboard.
33 const char kATKeyboardName[] = "AT Translated Set 2 keyboard";
34
35 // The prefix of xinput devices corresponding to CrOS EC internal keyboards.
36 const char kCrosEcKeyboardPrefix[] = "cros-ec";
37
38 // Returns true if |name| is the name of a known keyboard device. Note, this may
39 // return false negatives.
40 bool IsKnownKeyboard(const std::string& name) {
41 std::string lower(name);
42 std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
43 return lower.find("keyboard") != std::string::npos;
44 }
45
46 // Returns true if |name| is the name of a known internal keyboard device. Note,
47 // this may return false negatives.
48 bool IsInternalKeyboard(const std::string& name) {
49 // TODO(rsadam@): Come up with a more generic way of identifying internal
50 // keyboards. See crbug.com/420728.
51 if (name == kATKeyboardName)
52 return true;
53 return name.compare(
54 0u, strlen(kCrosEcKeyboardPrefix), kCrosEcKeyboardPrefix) == 0u;
flackr 2014/10/15 00:11:18 while find returns a size_t, compare returns an in
rsadam 2014/10/20 15:36:53 Done.
55 }
56
57 // Returns true if |name| is the name of a known XTEST device. Note, this may
58 // return false negatives.
59 bool IsTestKeyboard(const std::string& name) {
60 return name.find("XTEST") != std::string::npos;
61 }
62
29 // We consider the touchscreen to be internal if it is an I2c device. 63 // 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 64 // 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 65 // node eventXXX. Then we search all the dev input nodes registered
32 // by I2C devices to see if we can find eventXXX. 66 // by I2C devices to see if we can find eventXXX.
33 bool IsTouchscreenInternal(XDisplay* dpy, int device_id) { 67 bool IsTouchscreenInternal(XDisplay* dpy, int device_id) {
34 using base::FileEnumerator; 68 using base::FileEnumerator;
35 using base::FilePath; 69 using base::FilePath;
36 70
37 #if !defined(CHROMEOS) 71 #if !defined(CHROMEOS)
38 return false; 72 return false;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 : delegate_(delegate) { 143 : delegate_(delegate) {
110 } 144 }
111 145
112 HotplugEventHandlerX11::~HotplugEventHandlerX11() { 146 HotplugEventHandlerX11::~HotplugEventHandlerX11() {
113 } 147 }
114 148
115 void HotplugEventHandlerX11::OnHotplugEvent() { 149 void HotplugEventHandlerX11::OnHotplugEvent() {
116 const XIDeviceList& device_list = 150 const XIDeviceList& device_list =
117 DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay()); 151 DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay());
118 HandleTouchscreenDevices(device_list); 152 HandleTouchscreenDevices(device_list);
153 HandleKeyboardDevices(device_list);
154 }
155
156 void HotplugEventHandlerX11::HandleKeyboardDevices(
157 const XIDeviceList& x11_devices) {
158 std::vector<KeyboardDevice> devices;
159
160 for (int i = 0; i < x11_devices.count; i++) {
161 if (!x11_devices[i].enabled || x11_devices[i].use != XISlaveKeyboard)
162 continue; // Assume all keyboards are keyboard slaves
163 std::string device_name(x11_devices[i].name);
164 base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING,
165 &device_name);
166 InputDeviceType type;
167 if (IsTestKeyboard(device_name))
168 continue; // Skip test devices.
169
170 if (IsInternalKeyboard(device_name)) {
171 type = InputDeviceType::INTERNAL;
172 } else if (IsKnownKeyboard(device_name)) {
173 type = InputDeviceType::EXTERNAL;
174 } else {
175 type = InputDeviceType::UNKNOWN;
176 }
177 devices.push_back(KeyboardDevice(x11_devices[i].deviceid,
178 type, device_name));
179 }
180 delegate_->OnKeyboardDevicesUpdated(devices);
119 } 181 }
120 182
121 void HotplugEventHandlerX11::HandleTouchscreenDevices( 183 void HotplugEventHandlerX11::HandleTouchscreenDevices(
122 const XIDeviceList& x11_devices) { 184 const XIDeviceList& x11_devices) {
123 std::vector<TouchscreenDevice> devices; 185 std::vector<TouchscreenDevice> devices;
124 Display* display = gfx::GetXDisplay(); 186 Display* display = gfx::GetXDisplay();
125 Atom valuator_x = XInternAtom(display, "Abs MT Position X", False); 187 Atom valuator_x = XInternAtom(display, "Abs MT Position X", False);
126 Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False); 188 Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False);
127 if (valuator_x == None || valuator_y == None) 189 if (valuator_x == None || valuator_y == None)
128 return; 190 return;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 XITouchClassInfo* touch_info = 224 XITouchClassInfo* touch_info =
163 reinterpret_cast<XITouchClassInfo*>(class_info); 225 reinterpret_cast<XITouchClassInfo*>(class_info);
164 is_direct_touch = touch_info->mode == XIDirectTouch; 226 is_direct_touch = touch_info->mode == XIDirectTouch;
165 } 227 }
166 #endif 228 #endif
167 } 229 }
168 230
169 // Touchscreens should have absolute X and Y axes, and be direct touch 231 // Touchscreens should have absolute X and Y axes, and be direct touch
170 // devices. 232 // devices.
171 if (width > 0.0 && height > 0.0 && is_direct_touch) { 233 if (width > 0.0 && height > 0.0 && is_direct_touch) {
172 bool is_internal = 234 InputDeviceType type =
173 IsTouchscreenInternal(display, x11_devices[i].deviceid); 235 IsTouchscreenInternal(display, x11_devices[i].deviceid) ?
236 InputDeviceType::INTERNAL : InputDeviceType::EXTERNAL;
237 std::string name(x11_devices[i].name);
174 devices.push_back(TouchscreenDevice( 238 devices.push_back(TouchscreenDevice(
175 x11_devices[i].deviceid, gfx::Size(width, height), is_internal)); 239 x11_devices[i].deviceid, type, name, gfx::Size(width, height)));
176 } 240 }
177 } 241 }
178 242
179 delegate_->OnTouchscreenDevicesUpdated(devices); 243 delegate_->OnTouchscreenDevicesUpdated(devices);
180 } 244 }
181 245
182 } // namespace ui 246 } // namespace ui
OLDNEW
« no previous file with comments | « 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