kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

backend: add syspath and devnode to input devices

Browse source
This commit is contained in:
Julian Orth 2024-03-12 16:37:16 +01:00
parent 813f87faaa
commit 283e438d1b
9 changed files with 107 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/backend.rs
View file

@ -135,6 +135,9 @@ pub trait InputDevice {
}
fn set_transform_matrix(&self, matrix: TransformMatrix);
fn name(&self) -> Rc<String>;
fn dev_t(&self) -> Option<c::dev_t> {
None
}
fn tap_enabled(&self) -> Option<bool> {
None
}

6
src/backends/metal.rs
View file

@ -281,7 +281,7 @@ pub async fn create(state: &Rc<State>) -> Result<Rc<MetalBackend>, MetalError> {
struct MetalInputDevice {
slot: usize,
id: InputDeviceId,
_devnum: c::dev_t,
devnum: c::dev_t,
fd: CloneCell<Option<Rc<OwnedFd>>>,
inputdev: CloneCell<Option<Rc<RegisteredDevice>>>,
devnode: CString,
@ -509,6 +509,10 @@ impl InputDevice for MetalInputDevice {
self.name.get()
}
fn dev_t(&self) -> Option<c::dev_t> {
Some(self.devnum)
}
fn set_tap_enabled(&self, enabled: bool) {
self.desired.tap_enabled.set(Some(enabled));
if let Some(dev) = self.inputdev.get() {

2
src/backends/metal/monitor.rs
View file

@ -278,7 +278,7 @@ impl MetalBackend {
let dev = Rc::new(MetalInputDevice {
slot,
id: device_id,
_devnum: devnum,
devnum,
fd: Default::default(),
inputdev: Default::default(),
devnode: devnode.to_owned(),

8
src/backends/x.rs
View file

@ -1177,6 +1177,10 @@ impl InputDevice for XSeatKeyboard {
self.0.kb_name.clone()
}
fn dev_t(&self) -> Option<dev_t> {
None
}
fn set_tap_enabled(&self, enabled: bool) {
let _ = enabled;
}
@ -1242,6 +1246,10 @@ impl InputDevice for XSeatMouse {
self.0.mouse_name.clone()
}
fn dev_t(&self) -> Option<dev_t> {
None
}
fn set_tap_enabled(&self, enabled: bool) {
let _ = enabled;
}

2
src/state.rs
View file

@ -215,6 +215,8 @@ pub struct InputDeviceData {
pub id: InputDeviceId,
pub data: Rc<DeviceHandlerData>,
pub async_event: Rc<AsyncEvent>,
pub syspath: Option<String>,
pub devnode: Option<String>,
}
pub struct DeviceHandlerData {

1
src/tasks.rs
View file

@ -5,6 +5,7 @@ mod hardware_cursor;
mod idle;
mod input_device;
mod slow_clients;
mod udev_utils;
use {
crate::{

70
src/tasks/drmdev.rs
View file

@ -2,78 +2,24 @@ use {
crate::{
backend::{BackendDrmDevice, DrmDeviceId, DrmEvent},
state::{DrmDevData, State},
udev::{Udev, UdevDeviceType},
utils::{asyncevent::AsyncEvent, errorfmt::ErrorFmt},
tasks::udev_utils::udev_props,
utils::asyncevent::AsyncEvent,
},
jay_config::PciId,
std::{cell::Cell, rc::Rc},
};
pub fn handle(state: &Rc<State>, dev: Rc<dyn BackendDrmDevice>) {
let id = dev.id();
let mut syspath = None;
let mut devnode = None;
let mut vendor = None;
let mut model = None;
let mut pci_id = None;
'properties: {
let udev = match Udev::new() {
Ok(udev) => Rc::new(udev),
Err(e) => {
log::error!("Could not create a udev instance: {}", e);
break 'properties;
}
};
let odev = match udev.create_device_from_devnum(UdevDeviceType::Character, dev.dev_t()) {
Ok(dev) => dev,
Err(e) => {
log::error!("{}", ErrorFmt(e));
break 'properties;
}
};
let dev = match odev.parent() {
Ok(dev) => dev,
Err(e) => {
log::error!("{}", ErrorFmt(e));
break 'properties;
}
};
syspath = dev.syspath().map(|s| s.to_string_lossy().into_owned());
vendor = dev.vendor().map(|s| s.to_string_lossy().into_owned());
model = dev.model().map(|s| s.to_string_lossy().into_owned());
devnode = odev.devnode().map(|s| s.to_string_lossy().into_owned());
'get_pci_id: {
let id = match dev.pci_id() {
Some(id) => id,
_ => break 'get_pci_id,
};
let id = id.to_string_lossy();
let colon = match id.find(':') {
Some(pos) => pos,
_ => break 'get_pci_id,
};
let vendor = &id[..colon];
let model = &id[colon + 1..];
let vendor = match u32::from_str_radix(vendor, 16) {
Ok(v) => v,
_ => break 'get_pci_id,
};
let model = match u32::from_str_radix(model, 16) {
Ok(v) => v,
_ => break 'get_pci_id,
};
pci_id = Some(PciId { vendor, model });
}
}
let props = udev_props(dev.dev_t(), 1);
let data = Rc::new(DrmDevData {
dev: dev.clone(),
handler: Cell::new(None),
connectors: Default::default(),
syspath,
devnode,
vendor,
model,
pci_id,
syspath: props.syspath,
devnode: props.devnode,
vendor: props.vendor,
model: props.model,
pci_id: props.pci_id,
});
let oh = DrvDevHandler {
id,

7
src/tasks/input_device.rs
View file

@ -3,6 +3,7 @@ use {
backend::InputDevice,
ifs::wl_seat::PX_PER_SCROLL,
state::{DeviceHandlerData, InputDeviceData, State},
tasks::udev_utils::{udev_props, UdevProps},
utils::asyncevent::AsyncEvent,
},
std::{cell::Cell, rc::Rc},
@ -22,6 +23,10 @@ pub fn handle(state: &Rc<State>, dev: Rc<dyn InputDevice>) {
ae: ae.clone(),
};
let handler = state.eng.spawn(oh.handle());
let props = match dev.dev_t() {
None => UdevProps::default(),
Some(dev_t) => udev_props(dev_t, 3),
};
state.input_device_handlers.borrow_mut().insert(
dev.id(),
InputDeviceData {
@ -29,6 +34,8 @@ pub fn handle(state: &Rc<State>, dev: Rc<dyn InputDevice>) {
id: dev.id(),
data,
async_event: ae,
syspath: props.syspath,
devnode: props.devnode,
},
);
}

72
src/tasks/udev_utils.rs Normal file
View file

@ -0,0 +1,72 @@
use {
crate::{
udev::{Udev, UdevDeviceType},
utils::errorfmt::ErrorFmt,
},
jay_config::PciId,
std::rc::Rc,
uapi::c,
};
#[derive(Default, Debug)]
pub struct UdevProps {
pub syspath: Option<String>,
pub devnode: Option<String>,
pub vendor: Option<String>,
pub model: Option<String>,
pub pci_id: Option<PciId>,
}
pub fn udev_props(dev_t: c::dev_t, depth: usize) -> UdevProps {
let mut res = UdevProps::default();
let udev = match Udev::new() {
Ok(udev) => Rc::new(udev),
Err(e) => {
log::error!("Could not create a udev instance: {}", e);
return res;
}
};
let mut dev = match udev.create_device_from_devnum(UdevDeviceType::Character, dev_t) {
Ok(dev) => dev,
Err(e) => {
log::error!("{}", ErrorFmt(e));
return res;
}
};
res.devnode = dev.devnode().map(|s| s.to_string_lossy().into_owned());
for _ in 0..depth {
dev = match dev.parent() {
Ok(dev) => dev,
Err(e) => {
log::error!("{}", ErrorFmt(e));
return res;
}
}
}
res.syspath = dev.syspath().map(|s| s.to_string_lossy().into_owned());
res.vendor = dev.vendor().map(|s| s.to_string_lossy().into_owned());
res.model = dev.model().map(|s| s.to_string_lossy().into_owned());
{
let id = match dev.pci_id() {
Some(id) => id,
_ => return res,
};
let id = id.to_string_lossy();
let colon = match id.find(':') {
Some(pos) => pos,
_ => return res,
};
let vendor = &id[..colon];
let model = &id[colon + 1..];
let vendor = match u32::from_str_radix(vendor, 16) {
Ok(v) => v,
_ => return res,
};
let model = match u32::from_str_radix(model, 16) {
Ok(v) => v,
_ => return res,
};
res.pci_id = Some(PciId { vendor, model });
}
res
}