Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: add scroll-factor configuration

Browse Source
This commit is contained in:
István Donkó 2024-04-11 22:29:43 +02:00 committed by Isaac Freund
parent 4a019142be
commit 8a3018a311
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
7 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
completions/bash/riverctl
View File

@ -93,6 +93,7 @@ function __riverctl_completion ()
disable-while-trackpointing \
middle-emulation \
natural-scroll \
scroll-factor \
left-handed \
tap \
tap-button-map \

1
completions/fish/riverctl.fish
View File

@ -113,6 +113,7 @@ complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'disable-while-trackpointing' -d 'Enable or disable the disable-while-trackpointing functionality'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'middle-emulation' -d 'Enable or disable the middle-emulation functionality'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'natural-scroll' -d 'Enable or disable the natural-scroll functionality'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'scroll-factor' -d 'Set the scroll factor'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'left-handed' -d 'Enable or disable the left handed mode'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'tap' -d 'Enable or disable the tap functionality'
complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'tap-button-map' -d 'Configure the button mapping for tapping'

1
completions/zsh/_riverctl
View File

@ -120,6 +120,7 @@ _riverctl()
'disable-while-trackpointing:Enable or disable the disable-while-trackpointing functionality'
'middle-emulation:Enable or disable the middle click emulation functionality'
'natural-scroll:Enable or disable the natural scroll functionality'
'scroll-factor:Set the scroll factor'
'left-handed:Enable or disable the left handed mode'
'tap:Enable or disable the tap functionality'
'tap-button-map:Configure the button mapping for tapping'

3
doc/riverctl.1.scd
View File

@ -505,6 +505,9 @@ However note that not every input device supports every property.
Enable or disable the natural scroll functionality of the input device. If
active, the scroll direction is inverted.
*input* _name_ *scroll-factor* _factor_
Set the scroll factor of the input device. Needs a non-negative float.
*input* _name_ *left-handed* *enabled*|*disabled*
Enable or disable the left handed mode of the input device.

5
river/Cursor.zig
View File

@ -304,6 +304,7 @@ fn clearFocus(cursor: *Cursor) void {
/// Axis event is a scroll wheel or similiar
fn handleAxis(listener: *wl.Listener(*wlr.Pointer.event.Axis), event: *wlr.Pointer.event.Axis) void {
const cursor = @fieldParentPtr(Cursor, "axis", listener);
const device: *InputDevice = @ptrFromInt(event.device.data);
cursor.seat.handleActivity();
cursor.unhide();
@ -312,8 +313,8 @@ fn handleAxis(listener: *wl.Listener(*wlr.Pointer.event.Axis), event: *wlr.Point
cursor.seat.wlr_seat.pointerNotifyAxis(
event.time_msec,
event.orientation,
event.delta,
event.delta_discrete,
event.delta * device.scroll_factor,
@intFromFloat(@as(f32, @floatFromInt(event.delta_discrete)) * device.scroll_factor),
event.source,
);
}

19
river/InputConfig.zig
View File

@ -252,6 +252,14 @@ pub const MapToOutput = struct {
}
};
pub const ScrollFactor = struct {
value: ?f32,
fn apply(scroll_factor: ScrollFactor, device: *InputDevice) void {
device.scroll_factor = scroll_factor.value orelse 1.0;
}
};
glob: []const u8,
// Note: Field names equal name of the setting in the 'input' command.
@ -264,6 +272,7 @@ drag: ?DragState = null,
@"disable-while-trackpointing": ?DwtpState = null,
@"middle-emulation": ?MiddleEmulation = null,
@"natural-scroll": ?NaturalScroll = null,
@"scroll-factor": ScrollFactor = .{ .value = 1.0 },
@"left-handed": ?LeftHanded = null,
tap: ?TapState = null,
@"tap-button-map": ?TapButtonMap = null,
@ -288,6 +297,8 @@ pub fn apply(config: *const InputConfig, device: *InputDevice) void {
if (comptime mem.eql(u8, field.name, "map-to-output")) {
@field(config, field.name).apply(device);
} else if (comptime mem.eql(u8, field.name, "scroll-factor")) {
@field(config, field.name).apply(device);
} else if (@field(config, field.name)) |setting| {
log.debug("applying setting: {s}", .{field.name});
setting.apply(libinput_device);
@ -305,6 +316,10 @@ pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void
config.@"pointer-accel" = PointerAccel{
.value = math.clamp(try std.fmt.parseFloat(f32, value), -1.0, 1.0),
};
} else if (comptime mem.eql(u8, field.name, "scroll-factor")) {
config.@"scroll-factor" = ScrollFactor{
.value = @max(try std.fmt.parseFloat(f32, value), 0.0),
};
} else if (comptime mem.eql(u8, field.name, "scroll-button")) {
const ret = c.libevdev_event_code_from_name(c.EV_KEY, value.ptr);
if (ret < 1) return error.InvalidButton;
@ -346,6 +361,10 @@ pub fn write(config: *InputConfig, writer: anytype) !void {
if (@field(config, field.name).output_name) |output_name| {
try writer.print("\tmap-to-output: {s}\n", .{output_name});
}
} else if (comptime mem.eql(u8, field.name, "scroll-factor")) {
if (@field(config, field.name).value) |value| {
try writer.print("\tscroll-factor: {d}\n", .{value});
}
} else if (@field(config, field.name)) |setting| {
// Special-case the settings which are not enums.
if (comptime mem.eql(u8, field.name, "pointer-accel")) {

2
river/InputDevice.zig
View File

@ -34,6 +34,7 @@ const Tablet = @import("Tablet.zig");
const log = std.log.scoped(.input_manager);
scroll_factor: f32,
seat: *Seat,
wlr_device: *wlr.InputDevice,
@ -73,6 +74,7 @@ pub fn init(device: *InputDevice, seat: *Seat, wlr_device: *wlr.InputDevice) !vo
}
device.* = .{
.scroll_factor = 1.0,
.seat = seat,
.wlr_device = wlr_device,
.identifier = identifier,