aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-27 09:11:45 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-29 17:42:31 +0000
commita0ce7e40afb140be252c97b97667a5ba28b1593a (patch)
tree825fdc61b4c89b1fd71b377ef0fd462f1262d176
parentMerge branch 'reflow-retain-scrollback-position' into master (diff)
input: trackpad scroll: correctly convert pixel movements to line movements
Trackpad scroll movements are in pixels. Foot previously “translated” these directly to line movements (i.e. a one pixel scroll event was translated into a one line scroll). Now we use the line height of the terminal and correctly convert pixels to lines. This makes the trackpad scroll speed in foot consistent with the scroll speed in e.g. Alacritty and Kitty.
-rw-r--r--CHANGELOG.md4
-rw-r--r--input.c12
2 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2b30c01..0eb90527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,10 @@
(https://codeberg.org/dnkl/foot/issues/141).
* Scrollback position is now retained when resizing the window
(https://codeberg.org/dnkl/foot/issues/142).
+* Trackpad scrolling speed. Note that it is much slower compared to
+ previous foot versions. Use the **multiplier** option in `foot.ini`
+ if you find the new speed too slow
+ (https://codeberg.org/dnkl/foot/issues/144).
### Security
diff --git a/input.c b/input.c
index cc14d41b..20c1381c 100644
--- a/input.c
+++ b/input.c
@@ -1688,6 +1688,8 @@ wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
if (seat->mouse.have_discrete)
return;
+ assert(seat->mouse_focus != NULL);
+
/*
* Aggregate scrolled amount until we get at least 1.0
*
@@ -1697,10 +1699,12 @@ wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
seat->mouse.axis_aggregated
+= seat->wayl->conf->scrollback.multiplier * wl_fixed_to_double(value);
- if (fabs(seat->mouse.axis_aggregated) >= 1.) {
- mouse_scroll(seat, round(seat->mouse.axis_aggregated));
- seat->mouse.axis_aggregated = 0.;
- }
+ if (fabs(seat->mouse.axis_aggregated) < seat->mouse_focus->cell_height)
+ return;
+
+ int lines = seat->mouse.axis_aggregated / seat->mouse_focus->cell_height;
+ mouse_scroll(seat, lines);
+ seat->mouse.axis_aggregated -= (double)lines * seat->mouse_focus->cell_height;
}
static void