Skip to content

Handle horizontal scrolling on macOS touchpads #794

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
barkure wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle horizontal scrolling on macOS touchpads #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f8bf8e
input: fix vertical scroll jitter on macOS touchpads
barkure Apr 7, 2026
19427b5
Ignore unrelated mouse keys
lhecker Apr 7, 2026
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
7 changes: 7 additions & 0 deletions crates/edit/src/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ pub const COORD_TYPE_SAFE_MAX: CoordType = (1 << (CoordType::BITS / 2 - 1)) - 1;

/// A 2D point. Uses [`CoordType`].
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
#[repr(C)]
pub struct Point {
pub x: CoordType,
pub y: CoordType,
Expand All @@ -56,6 +57,10 @@ pub struct Point {
impl Point {
pub const MIN: Self = Self { x: CoordType::MIN, y: CoordType::MIN };
pub const MAX: Self = Self { x: CoordType::MAX, y: CoordType::MAX };

pub fn as_array(&mut self) -> &mut [CoordType; 2] {
unsafe { &mut *(self as *mut Self as *mut [CoordType; 2]) }
}
}

impl PartialOrd<Self> for Point {
Expand All @@ -72,6 +77,7 @@ impl Ord for Point {

/// A 2D size. Uses [`CoordType`].
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
#[repr(C)]
pub struct Size {
pub width: CoordType,
pub height: CoordType,
Expand All @@ -85,6 +91,7 @@ impl Size {

/// A 2D rectangle. Uses [`CoordType`].
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
#[repr(C)]
pub struct Rect {
pub left: CoordType,
pub top: CoordType,
Expand Down
26 changes: 15 additions & 11 deletions crates/edit/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,21 @@ impl<'input> Iterator for Stream<'_, '_, 'input> {
};

mouse.state = InputMouseState::None;
if (btn & 0x40) != 0 {
mouse.state = InputMouseState::Scroll;
mouse.scroll.y += if (btn & 0x01) != 0 { 3 } else { -3 };
} else if csi.final_byte == 'M' {
const STATES: [InputMouseState; 4] = [
InputMouseState::Left,
InputMouseState::Middle,
InputMouseState::Right,
InputMouseState::None,
];
mouse.state = STATES[(btn as usize) & 0x03];

match csi.params[0] {
btn @ 0..3 if csi.final_byte == 'M' => match btn {
0 => mouse.state = InputMouseState::Left,
1 => mouse.state = InputMouseState::Middle,
2 => mouse.state = InputMouseState::Right,
_ => {}
},
btn @ 64..68 => {
let delta = if (btn & 1) != 0 { 3 } else { -3 };
let idx = if (btn & 2) != 0 { 0 } else { 1 };
mouse.scroll.as_array()[idx] += delta;
mouse.state = InputMouseState::Scroll;
}
_ => {}
}

mouse.modifiers = kbmod::NONE;
Expand Down
Loading