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

input: change ScrollFactor and MapToOutput to align with other options

Browse Source
This commit is contained in:
Alex Mirrlees-Black 2024-04-24 23:59:54 +10:00
parent bd5da261eb
commit 5262a4c5a6
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
river/InputConfig.zig
View File

@ -253,12 +253,10 @@ pub const MapToOutput = struct {
}; };
pub const ScrollFactor = struct { pub const ScrollFactor = struct {
value: ?f32 = null, value: f32,
fn apply(scroll_factor: ScrollFactor, device: *InputDevice) void { fn apply(scroll_factor: ScrollFactor, device: *InputDevice) void {
if (scroll_factor.value) |value| { device.config.scroll_factor = scroll_factor.value;
device.config.scroll_factor = value;
}
} }
}; };
@ -274,21 +272,23 @@ drag: ?DragState = null,
@"disable-while-trackpointing": ?DwtpState = null, @"disable-while-trackpointing": ?DwtpState = null,
@"middle-emulation": ?MiddleEmulation = null, @"middle-emulation": ?MiddleEmulation = null,
@"natural-scroll": ?NaturalScroll = null, @"natural-scroll": ?NaturalScroll = null,
@"scroll-factor": ScrollFactor = .{}, @"scroll-factor": ?ScrollFactor = null,
@"left-handed": ?LeftHanded = null, @"left-handed": ?LeftHanded = null,
tap: ?TapState = null, tap: ?TapState = null,
@"tap-button-map": ?TapButtonMap = null, @"tap-button-map": ?TapButtonMap = null,
@"pointer-accel": ?PointerAccel = null, @"pointer-accel": ?PointerAccel = null,
@"scroll-method": ?ScrollMethod = null, @"scroll-method": ?ScrollMethod = null,
@"scroll-button": ?ScrollButton = null, @"scroll-button": ?ScrollButton = null,
@"map-to-output": MapToOutput = .{ .output_name = null }, @"map-to-output": ?MapToOutput = null,
pub fn deinit(config: *InputConfig) void { pub fn deinit(config: *InputConfig) void {
util.gpa.free(config.glob); util.gpa.free(config.glob);
if (config.@"map-to-output".output_name) |output_name| { if (config.@"map-to-output") |@"map-to-output"| {
if (@"map-to-output".output_name) |output_name| {
util.gpa.free(output_name); util.gpa.free(output_name);
} }
} }
}
pub fn apply(config: *const InputConfig, device: *InputDevice) void { pub fn apply(config: *const InputConfig, device: *InputDevice) void {
const libinput_device: *c.libinput_device = @ptrCast(device.wlr_device.getLibinputDevice() orelse return); const libinput_device: *c.libinput_device = @ptrCast(device.wlr_device.getLibinputDevice() orelse return);
@ -297,16 +297,18 @@ pub fn apply(config: *const InputConfig, device: *InputDevice) void {
inline for (@typeInfo(InputConfig).Struct.fields) |field| { inline for (@typeInfo(InputConfig).Struct.fields) |field| {
if (comptime mem.eql(u8, field.name, "glob")) continue; if (comptime mem.eql(u8, field.name, "glob")) continue;
if (comptime mem.eql(u8, field.name, "map-to-output")) { if (@field(config, field.name)) |setting| {
@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}); log.debug("applying setting: {s}", .{field.name});
if (comptime mem.eql(u8, field.name, "scroll-factor")) {
setting.apply(device);
} else if (comptime mem.eql(u8, field.name, "map-to-output")) {
setting.apply(device);
} else {
setting.apply(libinput_device); setting.apply(libinput_device);
} }
} }
} }
}
pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void { pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void {
inline for (@typeInfo(InputConfig).Struct.fields) |field| { inline for (@typeInfo(InputConfig).Struct.fields) |field| {
@ -338,7 +340,9 @@ pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void
} }
}; };
if (config.@"map-to-output".output_name) |old| util.gpa.free(old); if (config.@"map-to-output") |@"map-to-output"| {
if (@"map-to-output".output_name) |old| util.gpa.free(old);
}
config.@"map-to-output" = .{ .output_name = output_name_owned }; config.@"map-to-output" = .{ .output_name = output_name_owned };
} else { } else {
const T = @typeInfo(field.type).Optional.child; const T = @typeInfo(field.type).Optional.child;
@ -363,12 +367,12 @@ pub fn write(config: *InputConfig, writer: anytype) !void {
if (comptime mem.eql(u8, field.name, "glob")) continue; if (comptime mem.eql(u8, field.name, "glob")) continue;
if (comptime mem.eql(u8, field.name, "map-to-output")) { if (comptime mem.eql(u8, field.name, "map-to-output")) {
if (@field(config, field.name).output_name) |output_name| { if (@field(config, field.name)) |@"map-to-output"| {
try writer.print("\tmap-to-output: {s}\n", .{output_name}); try writer.print("\tmap-to-output: {s}\n", .{@"map-to-output".output_name orelse "disabled"});
} }
} else if (comptime mem.eql(u8, field.name, "scroll-factor")) { } else if (comptime mem.eql(u8, field.name, "scroll-factor")) {
if (@field(config, field.name).value) |value| { if (@field(config, field.name)) |@"scroll-offset"| {
try writer.print("\tscroll-factor: {d}\n", .{value}); try writer.print("\tscroll-factor: {d}\n", .{@"scroll-offset".value});
} }
} else if (@field(config, field.name)) |setting| { } else if (@field(config, field.name)) |setting| {
// Special-case the settings which are not enums. // Special-case the settings which are not enums.