Skip to content

Smooth move-repeat pointer movement #584

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

Merged
enaboapps merged 1 commit into from
Aug 11, 2026
+520 −118
Merged

Smooth move-repeat pointer movement #584

Show file tree
Hide file tree
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
48 changes: 26 additions & 22 deletions src-tauri/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use enigo::{Axis, Button, Coordinate, Direction, Enigo, Key, Keyboard, Mouse};
use serde_json::Value;

use crate::modifier_overlay::ModifierKeyOverlayNotifier;
use crate::mouse_repeat::RepeatCommand;
use crate::protocol::MouseButton;
use crate::state::{SwitchBinding, SwitchProfile};

Expand Down Expand Up @@ -295,21 +294,13 @@ impl<I: InputInjector> DesktopInput<I> {
pub fn set_pointer_scale_percent(&mut self, scale_percent: u8) {
self.pointer_scale_percent = u32::from(scale_percent.clamp(5, 225));
}
pub fn execute_repeat(
&mut self,
command: RepeatCommand,
acceleration_scale: f64,
) -> Result<PointerFeedback, String> {
match command.scaled(acceleration_scale) {
RepeatCommand::Move { dx, dy } => {
self.move_pointer(dx, dy)?;
Ok(self.pointer_feedback_for_move())
}
RepeatCommand::Scroll { dx, dy } => {
self.injector.scroll(dx, dy)?;
Ok(PointerFeedback::Scroll { dx, dy })
}
}
pub fn move_pointer_pixels(&mut self, dx: i32, dy: i32) -> Result<PointerFeedback, String> {
self.injector.move_pointer(dx, dy)?;
Ok(self.pointer_feedback_for_move())
}
pub fn execute_repeat_scroll(&mut self, dx: i32, dy: i32) -> Result<PointerFeedback, String> {
self.injector.scroll(dx, dy)?;
Ok(PointerFeedback::Scroll { dx, dy })
}
pub fn click_pointer(&mut self, button: MouseButton, click_count: u8) -> Result<(), String> {
self.release_held_button()?;
Expand Down Expand Up @@ -1059,6 +1050,7 @@ mod tests {
struct FakeInjector {
text: Vec<String>,
moves: Vec<(i32, i32)>,
scrolls: Vec<(i32, i32)>,
clicks: Vec<(MouseButton, u8)>,
pointer_states: Vec<(MouseButton, bool)>,
fail_pointer_release: bool,
Expand Down Expand Up @@ -1086,7 +1078,8 @@ mod tests {
self.pointer_states.push((button, down));
Ok(())
}
fn scroll(&mut self, _dx: i32, _dy: i32) -> Result<(), String> {
fn scroll(&mut self, dx: i32, dy: i32) -> Result<(), String> {
self.scrolls.push((dx, dy));
Ok(())
}
fn set_key(&mut self, key: &str, down: bool) -> Result<(), String> {
Expand Down Expand Up @@ -1169,13 +1162,24 @@ mod tests {
}

#[test]
fn repeat_movement_applies_acceleration_and_pointer_speed() {
fn repeat_pixel_movement_bypasses_normal_pointer_scaling() {
let mut input = DesktopInput::new(FakeInjector::default());
input.set_pointer_scale_percent(50);
input
.execute_repeat(RepeatCommand::Move { dx: 40, dy: -20 }, 0.25)
.unwrap();
assert_eq!(input.injector.moves, vec![(5, -3)]);
assert_eq!(
input.move_pointer_pixels(1, -1).unwrap(),
PointerFeedback::Move
);
assert_eq!(input.injector.moves, vec![(1, -1)]);
}

#[test]
fn repeat_scroll_preserves_the_existing_delta() {
let mut input = DesktopInput::new(FakeInjector::default());
assert_eq!(
input.execute_repeat_scroll(4, -3).unwrap(),
PointerFeedback::Scroll { dx: 4, dy: -3 }
);
assert_eq!(input.injector.scrolls, vec![(4, -3)]);
}

#[test]
Expand Down
94 changes: 63 additions & 31 deletions src-tauri/src/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::time::Duration;
use std::time::{Duration, Instant};

use corebluetooth::prelude::*;
use enigo::{Enigo, Settings};
Expand All @@ -11,9 +11,7 @@ use tauri::{AppHandle, Manager};

use crate::input::{DesktopInput, PointerFeedback};
use crate::modifier_overlay::ModifierOverlay;
use crate::mouse_repeat::{
acceleration_scale, MouseRepeatController, RepeatCommand, INITIAL_SCALE,
};
use crate::mouse_repeat::{MouseRepeatController, RepeatCommand, MOVE_TICK_INTERVAL_MS};
use crate::overlay::CursorOverlay;
use crate::protocol::{
bluetooth_status_payload, pointer_profile_response, switch_profile_catalog_response,
Expand Down Expand Up @@ -954,24 +952,43 @@ impl MacRuntime {
"Accessibility permission is required before the pointer can move.".into(),
);
}
let input = self.input.as_mut().ok_or_else(|| {
"Accessibility permission is required before the pointer can move.".to_string()
})?;
input.set_pointer_scale_percent(settings.pointer_scale_percent);
let initial_scale = if matches!(repeat_command, RepeatCommand::Move { .. })
&& settings.mouse_repeat_acceleration_duration_ms > 0
{
INITIAL_SCALE
} else {
1.0
};
let initial_feedback = input.execute_repeat(repeat_command, initial_scale)?;
let active = self.repeats.start(
command.device_id.clone(),
repeat_command,
settings.mouse_repeat_acceleration_duration_ms,
now_ms(),
Instant::now(),
);
let initial = match repeat_command {
RepeatCommand::Move { .. } => {
let (dx, dy) = self
.repeats
.initial_move(&command.device_id, active.generation)
.unwrap_or((0, 0));
match self.input.as_mut() {
Some(input) if dx == 0 && dy == 0 => Ok(input.pointer_feedback_for_move()),
Some(input) => input.move_pointer_pixels(dx, dy),
None => Err(
"Accessibility permission is required before the pointer can move."
.to_string(),
),
}
}
RepeatCommand::Scroll { dx, dy } => match self.input.as_mut() {
Some(input) => input.execute_repeat_scroll(dx, dy),
None => Err(
"Accessibility permission is required before input can be controlled."
.to_string(),
),
},
};
let initial_feedback = match initial {
Ok(feedback) => feedback,
Err(error) => {
self.repeats
.stop_if_current(&command.device_id, active.generation);
return Err(error);
}
};
self.app.state::<CursorOverlay>().begin_repeat(
active.generation,
repeat_command,
Expand All @@ -982,7 +999,12 @@ impl MacRuntime {
self.schedule_repeat_tick(
command.device_id.clone(),
active.generation,
repeat_command.interval_ms(&settings),
match repeat_command {
RepeatCommand::Move { .. } => MOVE_TICK_INTERVAL_MS,
RepeatCommand::Scroll { .. } => {
u64::from(repeat_command.interval_ms(&settings))
}
},
);
Ok(())
});
Expand Down Expand Up @@ -1020,10 +1042,10 @@ impl MacRuntime {
emit_state(&self.app, &self.shared);
}

fn schedule_repeat_tick(&self, device_id: String, generation: u64, interval_ms: u32) {
fn schedule_repeat_tick(&self, device_id: String, generation: u64, interval_ms: u64) {
let app = self.app.clone();
tauri::async_runtime::spawn(async move {
tokio::time::sleep(Duration::from_millis(u64::from(interval_ms))).await;
tokio::time::sleep(Duration::from_millis(interval_ms)).await;
let callback_app = app.clone();
let _ = app.run_on_main_thread(move || {
let _ = with_runtime(|runtime| runtime.repeat_tick(device_id, generation));
Expand All @@ -1041,31 +1063,41 @@ impl MacRuntime {
self.stop_repeat_if_current(&device_id, generation);
return Ok(());
}
let scale = if matches!(active.command, RepeatCommand::Move { .. }) {
acceleration_scale(
now_ms() - active.started_at_ms,
active.acceleration_duration_ms,
)
} else {
1.0
let movement = match active.command {
RepeatCommand::Move { .. } => self.repeats.advance_move(
&device_id,
generation,
Instant::now(),
settings.move_repeat_interval_ms,
settings.pointer_scale_percent,
),
RepeatCommand::Scroll { .. } => None,
};
let result = self
.input
.as_mut()
.ok_or_else(|| {
"Accessibility permission is required before input can be controlled.".to_string()
})
.and_then(|input| {
input.set_pointer_scale_percent(settings.pointer_scale_percent);
input.execute_repeat(active.command, scale).map(|_| ())
.and_then(|input| match active.command {
RepeatCommand::Move { .. } => match movement {
Some((0, 0)) => Ok(()),
Some((dx, dy)) => input.move_pointer_pixels(dx, dy).map(|_| ()),
None => Ok(()),
},
RepeatCommand::Scroll { dx, dy } => input.execute_repeat_scroll(dx, dy).map(|_| ()),
});
if let Err(error) = result {
if self.stop_repeat_if_current(&device_id, generation) {
self.report_error(format!("Mouse repeat stopped: {error}"));
}
return Ok(());
}
self.schedule_repeat_tick(device_id, generation, active.command.interval_ms(&settings));
let delay_ms = match active.command {
RepeatCommand::Move { .. } => MOVE_TICK_INTERVAL_MS,
RepeatCommand::Scroll { .. } => u64::from(active.command.interval_ms(&settings)),
};
self.schedule_repeat_tick(device_id, generation, delay_ms);
Ok(())
}

Expand Down
Loading