implement get_sys_path() and dev node iterator for virtual devices #72
Conversation
This commit switches the underlying evdev library from evdev-rs to evdev again. Using the evdev-rs library for uinput devices caused a regression in mouse button functionality. Git bisect shows that the mouse functionality broke in commit 6b4a7e5. In addition, it looks like a PR is currently open for getting the dev node info in the evdev crate, so hopefully there will be feature parity to support the symlink code soon: emberian/evdev#72
|
@jeff-hiner This is ready for review. |
This commit switches the underlying evdev library from evdev-rs to evdev again. Using the evdev-rs library for uinput devices caused a regression in mouse button functionality. Git bisect shows that the mouse functionality broke in commit 6b4a7e5. In addition, it looks like a PR is currently open for getting the dev node info in the evdev crate, so hopefully there will be feature parity to support the symlink code soon: emberian/evdev#72
src/uinput.rs
Outdated
|
|
||
| /// This struct is returned from the [VirtualDevice::enumerate_dev_nodes] function and will yield | ||
| /// the syspaths corresponding to the virtual device. These are of the form `/dev/input123`. | ||
| #[cfg(not(feature = "tokio"))] |
There was a problem hiding this comment.
Bit of a further nit, but can we either ungate this or gate this behind a blocking feature? In a single binary if one crate user were to define tokio and another does not it'll really confuse cargo. I'd like to make sure that if someone really wants to they could build and use both simultaneously.
There was a problem hiding this comment.
Oh right, it makes sense to not even have the feature gate there if we are differentiating them anyway.
There was a problem hiding this comment.
You will need to somehow disambiguate the two DevNodes structs as well.
There was a problem hiding this comment.
That's right. I had a much better look now and fixed a few other things too:
- Added
fsfeature flag to the tokio dependency, socargo b --features tokioactually works. - Because of the
.await?, the async version of the iterator is dealing with justOption<T>which simplifies the code. - Renamed the
DevNodesvariant for the sync version toDevNodesBlockingso they can co-exist.
With the tokio feature flag, one should have access to both the sync and async versions.
This addresses issue #70 by:
VirtualDevice::get_syspath()function, which returns the syspath of the form/sys/devices/virtual/input/inputXfor the virtual device.VirtualDevice::enumerate_dev_nodes()depending on thetokiofeature flag that essentially yields an iterator over the devices nodes of the form/dev/input/eventXthat correspond to the virtual device.