Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-17 01:06:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

core: be explicit about float rounding for mouse scroll multiplier

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-01-27 21:14:42 -08:00
parent 890fd11fc1
commit 5095c8f477
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Surface.zig
View File

@ -1476,10 +1476,6 @@ pub fn scrollCallback(
yoff: f64, yoff: f64,
scroll_mods: input.ScrollMods, scroll_mods: input.ScrollMods,
) !void { ) !void {
// The mouse scroll multiplier is clamped in Config.zig, so we can assume it's valid here.
const xoff_adjusted = xoff * self.config.mouse_scroll_multiplier;
const yoff_adjusted = yoff * self.config.mouse_scroll_multiplier;
// log.info("SCROLL: xoff={} yoff={} mods={}", .{ xoff, yoff, scroll_mods }); // log.info("SCROLL: xoff={} yoff={} mods={}", .{ xoff, yoff, scroll_mods });
// Always show the mouse again if it is hidden // Always show the mouse again if it is hidden
@ -1492,16 +1488,13 @@ pub fn scrollCallback(
delta: isize = 0, delta: isize = 0,
}; };
const y: ScrollAmount = if (yoff_adjusted == 0) .{} else y: { const y: ScrollAmount = if (yoff == 0) .{} else y: {
// Non-precision scrolling is easy to calculate. // Non-precision scrolling is easy to calculate.
if (!scroll_mods.precision) { if (!scroll_mods.precision) {
const y_sign: isize = if (yoff_adjusted > 0) -1 else 1; const y_sign: isize = if (yoff > 0) -1 else 1;
const grid_size: f64 = @floatFromInt(self.grid_size.rows); const grid_rows: f64 = @floatFromInt(self.grid_size.rows);
const y_delta_unsigned: usize = @max( const y_delta_f64 = @round((grid_rows * self.config.mouse_scroll_multiplier) / 15.0);
@as(usize, @intFromFloat(@divFloor( const y_delta_unsigned: usize = @max(1, @as(usize, @intFromFloat(y_delta_f64)));
grid_size * self.config.mouse_scroll_multiplier,
15.0,))),
1,);
const y_delta: isize = y_sign * @as(isize, @intCast(y_delta_unsigned)); const y_delta: isize = y_sign * @as(isize, @intCast(y_delta_unsigned));
break :y .{ .sign = y_sign, .delta_unsigned = y_delta_unsigned, .delta = y_delta }; break :y .{ .sign = y_sign, .delta_unsigned = y_delta_unsigned, .delta = y_delta };
} }
@ -1510,6 +1503,9 @@ pub fn scrollCallback(
// to build up a pending scroll amount if we're only scrolling by a // to build up a pending scroll amount if we're only scrolling by a
// tiny amount so that we can scroll by a full row when we have enough. // tiny amount so that we can scroll by a full row when we have enough.
// Adjust our offset by the multiplier
const yoff_adjusted = yoff * self.config.mouse_scroll_multiplier;
// Add our previously saved pending amount to the offset to get the // Add our previously saved pending amount to the offset to get the
// new offset value. // new offset value.
// //
@ -1540,14 +1536,15 @@ pub fn scrollCallback(
}; };
// For detailed comments see the y calculation above. // For detailed comments see the y calculation above.
const x: ScrollAmount = if (xoff_adjusted == 0) .{} else x: { const x: ScrollAmount = if (xoff == 0) .{} else x: {
if (!scroll_mods.precision) { if (!scroll_mods.precision) {
const x_sign: isize = if (xoff_adjusted < 0) -1 else 1; const x_sign: isize = if (xoff < 0) -1 else 1;
const x_delta_unsigned: usize = @intFromFloat(1 * self.config.mouse_scroll_multiplier); const x_delta_unsigned: usize = @intFromFloat(@round(1 * self.config.mouse_scroll_multiplier));
const x_delta: isize = x_sign * @as(isize, @intCast(x_delta_unsigned)); const x_delta: isize = x_sign * @as(isize, @intCast(x_delta_unsigned));
break :x .{ .sign = x_sign, .delta_unsigned = x_delta_unsigned, .delta = x_delta }; break :x .{ .sign = x_sign, .delta_unsigned = x_delta_unsigned, .delta = x_delta };
} }
const xoff_adjusted = xoff * self.config.mouse_scroll_multiplier;
const poff = self.mouse.pending_scroll_x + (xoff_adjusted * -1); const poff = self.mouse.pending_scroll_x + (xoff_adjusted * -1);
const cell_size: f64 = @floatFromInt(self.cell_size.width); const cell_size: f64 = @floatFromInt(self.cell_size.width);
if (@abs(poff) < cell_size) { if (@abs(poff) < cell_size) {

9
src/config/Config.zig
View File

@ -350,8 +350,13 @@ palette: Palette = .{},
/// requests otherwise, set this to `never`. /// requests otherwise, set this to `never`.
@"mouse-shift-capture": MouseShiftCapture = .false, @"mouse-shift-capture": MouseShiftCapture = .false,
/// Multiplier for scrolling distance with the mouse wheel. Any value less than 0.01 or greater than /// Multiplier for scrolling distance with the mouse wheel. Any value less
/// 10,000 will be clamped to the nearest valid value. /// than 0.01 or greater than 10,000 will be clamped to the nearest valid
/// value.
///
/// A value of "1" (default) scrolls te default amount. A value of "2" scrolls
/// double the default amount. A value of "0.5" scrolls half the default amount.
/// Et cetera.
@"mouse-scroll-multiplier": f64 = 1.0, @"mouse-scroll-multiplier": f64 = 1.0,
/// The opacity level (opposite of transparency) of the background. A value of /// The opacity level (opposite of transparency) of the background. A value of