mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-scrollback-multiplier-on-alt-screen'

Browse source 
Closes #787
This commit is contained in:
Daniel Eklöf 2021-11-13 11:05:45 +01:00
commit 9412389051
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -63,6 +63,8 @@
“yes|true|on|1|no|false|off|0”, Previously, anything that did not
match “yes|true|on”, or a number greater than 0, was treated as
“false”.
* `[scrollback].multiplier` is no longer applied when the alternate
screen is in use (https://codeberg.org/dnkl/foot/issues/787).
### Deprecated

15
input.c
View file

@ -2151,6 +2151,14 @@ mouse_scroll(struct seat *seat, int amount, enum wl_pointer_axis axis)
}
}
static float
mouse_scroll_multiplier(const struct terminal *term)
{
return term->grid == &term->normal
? term->conf->scrollback.multiplier
: 1.0;
}
static void
wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
uint32_t time, uint32_t axis, wl_fixed_t value)
@ -2169,9 +2177,8 @@ wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
* Without this, very slow scrolling will never actually scroll
* anything.
*/
seat->mouse.aggregated[axis]
+= seat->wayl->conf->scrollback.multiplier * wl_fixed_to_double(value);
seat->mouse.aggregated[axis] +=
mouse_scroll_multiplier(seat->mouse_focus) * wl_fixed_to_double(value);
if (fabs(seat->mouse.aggregated[axis]) < seat->mouse_focus->cell_height)
return;
@ -2192,7 +2199,7 @@ wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
/* Treat mouse wheel left/right as regular buttons */
} else
amount *= seat->wayl->conf->scrollback.multiplier;
amount *= mouse_scroll_multiplier(seat->mouse_focus);
mouse_scroll(seat, amount, axis);
}