Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

seperate combined UInputHandle into two handles for mouse and keyboard each (#155)

Browse Source
This commit is contained in:
Diamond White
2025-02-12 19:24:42 +00:00
committed by GitHub
parent bf3f3dafbe
commit 965174c781
1 changed files with 74 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/hid/mod.rs
View File

@@ -68,7 +68,8 @@ struct MouseAction {
} }
pub struct UInputProvider { pub struct UInputProvider {
handle: UInputHandle<File>, keyboard_handle: UInputHandle<File>,
mouse_handle: UInputHandle<File>,
desktop_extent: Vec2, desktop_extent: Vec2,
desktop_origin: Vec2, desktop_origin: Vec2,
cur_modifiers: u8, cur_modifiers: u8,
@@ -90,97 +91,89 @@ const EV_ABS: u16 = 0x3;
impl UInputProvider { impl UInputProvider {
fn try_new() -> Option<Self> { fn try_new() -> Option<Self> {
if let Ok(file) = File::create("/dev/uinput") { let keyboard_file = File::create("/dev/uinput").ok()?;
let handle = UInputHandle::new(file); let keyboard_handle = UInputHandle::new(keyboard_file);
let id = InputId { let mouse_file = File::create("/dev/uinput").ok()?;
bustype: 0x03, let mouse_handle = UInputHandle::new(mouse_file);
vendor: 0x4711,
product: 0x0829,
version: 5,
};
let name = b"WlxOverlay-S Keyboard-Mouse Hybrid Thing\0"; let kbd_id = InputId {
bustype: 0x03,
vendor: 0x4711,
product: 0x0829,
version: 5,
};
let mouse_id = InputId {
bustype: 0x03,
vendor: 0x4711,
product: 0x0830,
version: 5,
};
let kbd_name = b"WlxOverlay-S Keyboard\0";
let mouse_name = b"WlxOverlay-S Mouse\0";
let abs_info = vec![ let abs_info = vec![
AbsoluteInfoSetup { AbsoluteInfoSetup {
axis: input_linux::AbsoluteAxis::X, axis: input_linux::AbsoluteAxis::X,
info: AbsoluteInfo { info: AbsoluteInfo {
value: 0, value: 0,
minimum: 0, minimum: 0,
maximum: MOUSE_EXTENT as _, maximum: MOUSE_EXTENT as _,
fuzz: 0, fuzz: 0,
flat: 0, flat: 0,
resolution: 10, resolution: 10,
},
}, },
AbsoluteInfoSetup { },
axis: input_linux::AbsoluteAxis::Y, AbsoluteInfoSetup {
info: AbsoluteInfo { axis: input_linux::AbsoluteAxis::Y,
value: 0, info: AbsoluteInfo {
minimum: 0, value: 0,
maximum: MOUSE_EXTENT as _, minimum: 0,
fuzz: 0, maximum: MOUSE_EXTENT as _,
flat: 0, fuzz: 0,
resolution: 10, flat: 0,
}, resolution: 10,
}, },
]; },
];
if handle.set_evbit(EventKind::Key).is_err() { keyboard_handle.set_evbit(EventKind::Key).ok()?;
return None; for key in VirtualKey::iter() {
} let mapped_key: Key = unsafe { std::mem::transmute((key as u16) - 8) };
if handle.set_evbit(EventKind::Absolute).is_err() { keyboard_handle.set_keybit(mapped_key).ok()?;
return None;
}
if handle.set_evbit(EventKind::Relative).is_err() {
return None;
}
for btn in MOUSE_LEFT..=MOUSE_MIDDLE {
let key: Key = unsafe { transmute(btn) };
if handle.set_keybit(key).is_err() {
return None;
}
}
for key in VirtualKey::iter() {
let key: Key = unsafe { transmute((key as u16) - 8) };
if handle.set_keybit(key).is_err() {
return None;
}
}
if handle.set_absbit(AbsoluteAxis::X).is_err() {
return None;
}
if handle.set_absbit(AbsoluteAxis::Y).is_err() {
return None;
}
if handle.set_relbit(RelativeAxis::Wheel).is_err() {
return None;
}
if handle.create(&id, name, 0, &abs_info).is_ok() {
return Some(UInputProvider {
handle,
desktop_extent: Vec2::ZERO,
desktop_origin: Vec2::ZERO,
current_action: Default::default(),
cur_modifiers: 0,
});
}
} }
None
}
keyboard_handle.create(&kbd_id, kbd_name, 0, &[]).ok()?;
mouse_handle.set_evbit(EventKind::Absolute).ok()?;
mouse_handle.set_evbit(EventKind::Relative).ok()?;
mouse_handle.set_absbit(AbsoluteAxis::X).ok()?;
mouse_handle.set_absbit(AbsoluteAxis::Y).ok()?;
mouse_handle.set_relbit(RelativeAxis::Wheel).ok()?;
mouse_handle.set_evbit(EventKind::Key).ok()?;
for btn in MOUSE_LEFT..=MOUSE_MIDDLE {
let mouse_btn: Key = unsafe { transmute(btn) };
mouse_handle.set_keybit(mouse_btn).ok()?;
}
mouse_handle.create(&mouse_id, mouse_name, 0, &abs_info).ok()?;
Some(UInputProvider {
keyboard_handle,
mouse_handle,
desktop_extent: Vec2::ZERO,
desktop_origin: Vec2::ZERO,
current_action: Default::default(),
cur_modifiers: 0,
})
}
fn send_button_internal(&self, button: u16, down: bool) { fn send_button_internal(&self, button: u16, down: bool) {
let time = get_time(); let time = get_time();
let events = [ let events = [
new_event(time, EV_KEY, button, down as _), new_event(time, EV_KEY, button, down as _),
new_event(time, EV_SYN, 0, 0), new_event(time, EV_SYN, 0, 0),
]; ];
if let Err(res) = self.handle.write(&events) { if let Err(res) = self.mouse_handle.write(&events) {
log::error!("send_button: {}", res.to_string()); log::error!("send_button: {}", res.to_string());
} }
} }
@@ -196,7 +189,7 @@ impl UInputProvider {
new_event(time, EV_ABS, AbsoluteAxis::Y as _, pos.y as i32), new_event(time, EV_ABS, AbsoluteAxis::Y as _, pos.y as i32),
new_event(time, EV_SYN, 0, 0), new_event(time, EV_SYN, 0, 0),
]; ];
if let Err(res) = self.handle.write(&events) { if let Err(res) = self.mouse_handle.write(&events) {
log::error!("{}", res.to_string()); log::error!("{}", res.to_string());
} }
} }
@@ -206,7 +199,7 @@ impl UInputProvider {
new_event(time, EV_REL, RelativeAxis::Wheel as _, delta), new_event(time, EV_REL, RelativeAxis::Wheel as _, delta),
new_event(time, EV_SYN, 0, 0), new_event(time, EV_SYN, 0, 0),
]; ];
if let Err(res) = self.handle.write(&events) { if let Err(res) = self.mouse_handle.write(&events) {
log::error!("wheel: {}", res.to_string()); log::error!("wheel: {}", res.to_string());
} }
} }
@@ -232,7 +225,7 @@ impl HidProvider for UInputProvider {
new_event(time, EV_KEY, (key as u16) - 8, down as _), new_event(time, EV_KEY, (key as u16) - 8, down as _),
new_event(time, EV_SYN, 0, 0), new_event(time, EV_SYN, 0, 0),
]; ];
if let Err(res) = self.handle.write(&events) { if let Err(res) = self.keyboard_handle.write(&events) {
log::error!("send_key: {}", res.to_string()); log::error!("send_key: {}", res.to_string());
} }
} }