melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-01-09 23:22:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(trackpad): macos specific scrolling logic

Browse Source
This commit is contained in:
Florian
2025-12-05 12:13:43 +07:00
parent 1edf328a97
commit c4b69d4da6
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/sensors/navigator_trackpad.c
View File

@@ -25,6 +25,11 @@ uint8_t has_motion = 0;
extern bool set_scrolling;
bool trackpad_init;
#ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
float macos_scroll_accumulated_h = 0;
float macos_scroll_accumulated_v = 0;
#endif
#if defined(NAVIGATOR_TRACKPAD_PTP_MODE)
cgen6_report_t ptp_report;
trackpad_gesture_t gesture = {0};
@@ -355,9 +360,33 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
int16_t scroll_x = (scroll_inertia.vx * NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER) / 256;
int16_t scroll_y = (scroll_inertia.vy * NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER) / 256;
// Clamp to int8_t range
# ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
// macOS mode: accumulate scroll and only output when threshold is crossed
macos_scroll_accumulated_h += (float)scroll_x / NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER;
macos_scroll_accumulated_v += (float)scroll_y / NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER;
float abs_h = (macos_scroll_accumulated_h < 0) ? -macos_scroll_accumulated_h : macos_scroll_accumulated_h;
float abs_v = (macos_scroll_accumulated_v < 0) ? -macos_scroll_accumulated_v : macos_scroll_accumulated_v;
// Only output scroll when accumulated value crosses 1.0
if (abs_h >= 1.0f) {
scroll_x = (macos_scroll_accumulated_h > 0) ? 1 : -1;
macos_scroll_accumulated_h -= (macos_scroll_accumulated_h > 0) ? 1.0f : -1.0f;
} else {
scroll_x = 0;
}
if (abs_v >= 1.0f) {
scroll_y = (macos_scroll_accumulated_v > 0) ? 1 : -1;
macos_scroll_accumulated_v -= (macos_scroll_accumulated_v > 0) ? 1.0f : -1.0f;
} else {
scroll_y = 0;
}
# else
// Hi-res mode: clamp to int8_t range
scroll_x = (scroll_x > 127) ? 127 : ((scroll_x < -127) ? -127 : scroll_x);
scroll_y = (scroll_y > 127) ? 127 : ((scroll_y < -127) ? -127 : scroll_y);
# endif
// Check if velocity is too low to continue
int16_t abs_vx = scroll_inertia.vx < 0 ? -scroll_inertia.vx : scroll_inertia.vx;
@@ -418,6 +447,11 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
scroll_inertia.active = false;
scroll_inertia.smooth_vx = 0;
scroll_inertia.smooth_vy = 0;
# endif
# ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
// Reset macOS scroll accumulator when starting new gesture
macos_scroll_accumulated_h = 0;
macos_scroll_accumulated_v = 0;
# endif
}
@@ -581,9 +615,34 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
}
# endif
// Clamp to int8_t range for the report
# ifdef NAVIGATOR_TRACKPAD_MACOS_SCROLLING
// macOS mode: accumulate scroll and only output when threshold is crossed
// This provides fine-grained speed control via the divider
macos_scroll_accumulated_h += (float)scroll_x / NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER;
macos_scroll_accumulated_v += (float)scroll_y / NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER;
float abs_h = (macos_scroll_accumulated_h < 0) ? -macos_scroll_accumulated_h : macos_scroll_accumulated_h;
float abs_v = (macos_scroll_accumulated_v < 0) ? -macos_scroll_accumulated_v : macos_scroll_accumulated_v;
// Only output scroll when accumulated value crosses 1.0
if (abs_h >= 1.0f) {
scroll_x = (macos_scroll_accumulated_h > 0) ? 1 : -1;
macos_scroll_accumulated_h -= (macos_scroll_accumulated_h > 0) ? 1.0f : -1.0f;
} else {
scroll_x = 0;
}
if (abs_v >= 1.0f) {
scroll_y = (macos_scroll_accumulated_v > 0) ? 1 : -1;
macos_scroll_accumulated_v -= (macos_scroll_accumulated_v > 0) ? 1.0f : -1.0f;
} else {
scroll_y = 0;
}
# else
// Hi-res mode: clamp to int8_t range for the report
scroll_x = (scroll_x > 127) ? 127 : ((scroll_x < -127) ? -127 : scroll_x);
scroll_y = (scroll_y > 127) ? 127 : ((scroll_y < -127) ? -127 : scroll_y);
# endif
// Apply scroll inversion if configured
# ifdef NAVIGATOR_SCROLL_INVERT_X

14
drivers/sensors/navigator_trackpad.h
View File

@@ -87,6 +87,20 @@
// Two-finger scrolling (define to enable)
// #define NAVIGATOR_TRACKPAD_SCROLL_WITH_TWO_FINGERS
// macOS scrolling mode (define to enable)
// macOS doesn't respect the HID Resolution Multiplier descriptor and expects
// small 1/-1 scroll reports instead. Enable this for macOS compatibility.
// When enabled, scroll values are normalized to 1/-1 with accumulation for smooth control.
// When disabled (default), uses hi-res scrolling with POINTING_DEVICE_HIRES_SCROLL_ENABLE
// #define NAVIGATOR_TRACKPAD_MACOS_SCROLLING
// macOS scroll speed divider (higher = slower, default: 60)
// Only used when NAVIGATOR_TRACKPAD_MACOS_SCROLLING is enabled
// Adjust this value to control scroll speed on macOS
#ifndef NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER
# define NAVIGATOR_TRACKPAD_MACOS_SCROLL_DIVIDER 60
#endif
// Scroll inversion configuration
// Define these to invert scroll direction on respective axes
// #define NAVIGATOR_SCROLL_INVERT_X