Skip to content

fix(Composite Device): Increase minimum event delay. #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pastaq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(Composite Device): Increase minimum event delay. #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/input/composite_device/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ pub enum InterceptMode {
GamepadOnly,
}

/// The minimum time permitted between DOWN and UP button events for
/// userspace to see a valid input.
const MIN_EVENT_TIME: Duration = Duration::from_millis(16);

/// A [CompositeDevice] represents any number source input devices that
/// can translate input to any target devices
#[derive(Debug)]
Expand Down Expand Up @@ -1138,13 +1142,12 @@ impl CompositeDevice {
self.is_new_active_event(&cap, event.pressed());
// Check to see if the event is in recently translated.
// If it is, spawn a task to delay emit the event.
let sleep_time = Duration::from_millis(4);
let cap = event.as_capability();
if self.translated_recent_events.contains(&cap) {
if self.translated_recent_events.contains(&cap) && !event.pressed() {
log::debug!("Event emitted too quickly. Delaying emission.");
let tx = self.tx.clone();
tokio::task::spawn(async move {
tokio::time::sleep(sleep_time).await;
tokio::time::sleep(MIN_EVENT_TIME).await;
if let Err(e) = tx.send(CompositeCommand::WriteEvent(event)).await {
log::error!("Failed to send delayed event command: {:?}", e);
}
Expand All @@ -1159,7 +1162,7 @@ impl CompositeDevice {
// Spawn a task to remove the event from recent translated
let tx = self.tx.clone();
tokio::task::spawn(async move {
tokio::time::sleep(sleep_time).await;
tokio::time::sleep(MIN_EVENT_TIME).await;
if let Err(e) = tx.send(CompositeCommand::RemoveRecentEvent(cap)).await {
log::error!("Failed to send remove recent event command: {:?}", e);
}
Expand Down Expand Up @@ -1434,16 +1437,15 @@ impl CompositeDevice {

// Emit the translated events. If this translated event has been emitted
// very recently, delay sending subsequent events of the same type.
let sleep_time = Duration::from_millis(4);
for event in emit_queue {
// Check to see if the event is in recently translated.
// If it is, spawn a task to delay emit the event.
let cap = event.as_capability();
if self.translated_recent_events.contains(&cap) {
if self.translated_recent_events.contains(&cap) && !event.pressed() {
log::debug!("Event emitted too quickly. Delaying emission.");
let tx = self.tx.clone();
tokio::task::spawn(async move {
tokio::time::sleep(sleep_time).await;
tokio::time::sleep(MIN_EVENT_TIME).await;
if let Err(e) = tx.send(CompositeCommand::HandleEvent(event)).await {
log::error!("Failed to send delayed event command: {:?}", e);
}
Expand All @@ -1458,7 +1460,7 @@ impl CompositeDevice {
// Spawn a task to remove the event from recent translated
let tx = self.tx.clone();
tokio::task::spawn(async move {
tokio::time::sleep(sleep_time).await;
tokio::time::sleep(MIN_EVENT_TIME).await;
if let Err(e) = tx.send(CompositeCommand::RemoveRecentEvent(cap)).await {
log::error!("Failed to send remove recent event command: {:?}", e);
}
Expand Down
Loading