TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-03-07 11:59:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clippy changes

Browse Source
This commit is contained in:
VassiliDev
2024-11-26 17:21:21 -05:00
committed by Ferdinand Schober
parent 3b811ea593
commit beb656e29f
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
input-emulation/src/wlroots.rs
View File

@@ -220,9 +220,8 @@ impl VirtualInput {
KeyboardEvent::Key { time, key, state } => { KeyboardEvent::Key { time, key, state } => {
self.keyboard.key(time, key, state as u32); self.keyboard.key(time, key, state as u32);
if let Ok(mut mods) = self.modifiers.lock() { if let Ok(mut mods) = self.modifiers.lock() {
if mods.from_key_event(key, state) { if mods.update_by_key_event(key, state) {
log::trace!("Key triggers modifier change"); log::trace!("Key triggers modifier change: {:?}", mods);
log::trace!("Modifiers: {:?}", mods);
self.keyboard.modifiers( self.keyboard.modifiers(
mods.mask_pressed().bits(), mods.mask_pressed().bits(),
0, 0,
@@ -240,8 +239,7 @@ impl VirtualInput {
} => { } => {
// Synchronize internal modifier state, assuming server is authoritative // Synchronize internal modifier state, assuming server is authoritative
if let Ok(mut mods) = self.modifiers.lock() { if let Ok(mut mods) = self.modifiers.lock() {
mods.from_mods_event(e); mods.update_by_mods_event(e);
log::trace!("Modifiers: {:?}", mods);
} }
self.keyboard self.keyboard
.modifiers(mods_depressed, mods_latched, mods_locked, group); .modifiers(mods_depressed, mods_latched, mods_locked, group);
@@ -321,18 +319,16 @@ bitflags! {
} }
impl XMods { impl XMods {
fn from_mods_event(&mut self, evt: KeyboardEvent) { fn update_by_mods_event(&mut self, evt: KeyboardEvent) {
match evt { if let KeyboardEvent::Modifiers {
KeyboardEvent::Modifiers { depressed, locked, ..
depressed, locked, .. } = evt
} => { {
*self = XMods::from_bits_truncate(depressed) | XMods::from_bits_truncate(locked); *self = XMods::from_bits_truncate(depressed) | XMods::from_bits_truncate(locked);
}
_ => {}
} }
} }
fn from_key_event(&mut self, key: u32, state: u8) -> bool { fn update_by_key_event(&mut self, key: u32, state: u8) -> bool {
if let Ok(key) = scancode::Linux::try_from(key) { if let Ok(key) = scancode::Linux::try_from(key) {
log::trace!("Attempting to process modifier from: {:#?}", key); log::trace!("Attempting to process modifier from: {:#?}", key);
let pressed_mask = match key { let pressed_mask = match key {