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

InputConfig: code style cleanups

Browse Source
This commit is contained in:
Isaac Freund 2024-02-23 12:21:47 +01:00
parent 0cb7c49cc3
commit f2b6893b00
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
river/InputConfig.zig
View File

@ -218,28 +218,28 @@ pub const MapToOutput = struct {
output_name: ?[]const u8, output_name: ?[]const u8,
fn apply(map_to_output: MapToOutput, device: *wlr.InputDevice) void { fn apply(map_to_output: MapToOutput, device: *wlr.InputDevice) void {
const output = out: { const wlr_output = blk: {
if (map_to_output.output_name) |name| { if (map_to_output.output_name) |name| {
var it = server.root.active_outputs.iterator(.forward); var it = server.root.active_outputs.iterator(.forward);
while (it.next()) |outp| { while (it.next()) |output| {
if (mem.eql(u8, mem.span(outp.wlr_output.name), name)) { if (mem.eql(u8, mem.span(output.wlr_output.name), name)) {
break :out outp.wlr_output; break :blk output.wlr_output;
} }
} }
} }
break :blk null;
break :out null;
}; };
switch (device.type) { switch (device.type) {
.pointer, .touch, .tablet_tool => { .pointer, .touch, .tablet_tool => {
log.debug("mapping input '{s}' -> '{s}'", .{ log.debug("mapping input '{s}' -> '{s}'", .{
device.name, device.name,
if (output) |o| o.name else "<no output>", if (wlr_output) |o| o.name else "<no output>",
}); });
// TODO: support multiple seats // TODO: support multiple seats
server.input_manager.defaultSeat().cursor.wlr_cursor.mapInputToOutput(device, output); const seat = server.input_manager.defaultSeat();
seat.cursor.wlr_cursor.mapInputToOutput(device, wlr_output);
}, },
// These devices do not support being mapped to outputs. // These devices do not support being mapped to outputs.
@ -270,8 +270,9 @@ tap: ?TapState = null,
pub fn deinit(self: *Self) void { pub fn deinit(self: *Self) void {
util.gpa.free(self.glob); util.gpa.free(self.glob);
if (self.@"map-to-output".output_name) |name| if (self.@"map-to-output".output_name) |output_name| {
util.gpa.free(name); util.gpa.free(output_name);
}
} }
pub fn apply(self: *const Self, device: *InputDevice) void { pub fn apply(self: *const Self, device: *InputDevice) void {
@ -281,20 +282,14 @@ pub fn apply(self: *const Self, device: *InputDevice) void {
inline for (@typeInfo(Self).Struct.fields) |field| { inline for (@typeInfo(Self).Struct.fields) |field| {
if (comptime mem.eql(u8, field.name, "glob")) continue; if (comptime mem.eql(u8, field.name, "glob")) continue;
if (@as(if (@typeInfo(field.type) == .Optional)
field.type
else
?field.type, @field(self, field.name))) |setting|
{
log.debug("applying setting: {s}", .{field.name});
if (comptime mem.eql(u8, field.name, "map-to-output")) { if (comptime mem.eql(u8, field.name, "map-to-output")) {
setting.apply(device.wlr_device); @field(self, field.name).apply(device.wlr_device);
} else { } else if (@field(self, field.name)) |setting| {
log.debug("applying setting: {s}", .{field.name});
setting.apply(libinput_device); setting.apply(libinput_device);
} }
} }
} }
}
pub fn parse(self: *Self, setting: []const u8, value: []const u8) !void { pub fn parse(self: *Self, setting: []const u8, value: []const u8) !void {
inline for (@typeInfo(Self).Struct.fields) |field| { inline for (@typeInfo(Self).Struct.fields) |field| {
@ -311,12 +306,16 @@ pub fn parse(self: *Self, setting: []const u8, value: []const u8) !void {
if (ret < 1) return error.InvalidButton; if (ret < 1) return error.InvalidButton;
self.@"scroll-button" = ScrollButton{ .button = @intCast(ret) }; self.@"scroll-button" = ScrollButton{ .button = @intCast(ret) };
} else if (comptime mem.eql(u8, field.name, "map-to-output")) { } else if (comptime mem.eql(u8, field.name, "map-to-output")) {
if (self.@"map-to-output".output_name) |name| const output_name_owned = blk: {
util.gpa.free(name); if (mem.eql(u8, value, "disabled")) {
break :blk null;
self.@"map-to-output" = MapToOutput{ } else {
.output_name = if (std.mem.eql(u8, value, "disabled")) null else try util.gpa.dupe(u8, value), break :blk try util.gpa.dupe(u8, value);
}
}; };
if (self.@"map-to-output".output_name) |old| util.gpa.free(old);
self.@"map-to-output" = .{ .output_name = output_name_owned };
} else { } else {
const T = @typeInfo(field.type).Optional.child; const T = @typeInfo(field.type).Optional.child;
if (@typeInfo(T) != .Enum) { if (@typeInfo(T) != .Enum) {
@ -338,11 +337,12 @@ pub fn write(self: *Self, writer: anytype) !void {
inline for (@typeInfo(Self).Struct.fields) |field| { inline for (@typeInfo(Self).Struct.fields) |field| {
if (comptime mem.eql(u8, field.name, "glob")) continue; if (comptime mem.eql(u8, field.name, "glob")) continue;
if (@as(if (@typeInfo(field.type) == .Optional)
field.type if (comptime mem.eql(u8, field.name, "map-to-output")) {
else if (@field(self, field.name).output_name) |output_name| {
?field.type, @field(self, field.name))) |setting| try writer.print("\tmap-to-output: {s}\n", .{output_name});
{ }
} else if (@field(self, field.name)) |setting| {
// Special-case the settings which are not enums. // Special-case the settings which are not enums.
if (comptime mem.eql(u8, field.name, "pointer-accel")) { if (comptime mem.eql(u8, field.name, "pointer-accel")) {
try writer.print("\tpointer-accel: {d}\n", .{setting.value}); try writer.print("\tpointer-accel: {d}\n", .{setting.value});
@ -350,9 +350,6 @@ pub fn write(self: *Self, writer: anytype) !void {
try writer.print("\tscroll-button: {s}\n", .{ try writer.print("\tscroll-button: {s}\n", .{
mem.sliceTo(c.libevdev_event_code_get_name(c.EV_KEY, setting.button), 0), mem.sliceTo(c.libevdev_event_code_get_name(c.EV_KEY, setting.button), 0),
}); });
} else if (comptime mem.eql(u8, field.name, "map-to-output")) {
if (setting.output_name) |outp|
try writer.print("\tmap-to-output: {s}\n", .{outp});
} else { } else {
const T = @typeInfo(field.type).Optional.child; const T = @typeInfo(field.type).Optional.child;
if (@typeInfo(T) != .Enum) { if (@typeInfo(T) != .Enum) {

4
river/InputManager.zig
View File

@ -23,6 +23,8 @@ const mem = std.mem;
const wlr = @import("wlroots"); const wlr = @import("wlroots");
const wl = @import("wayland").server.wl; const wl = @import("wayland").server.wl;
const globber = @import("globber");
const server = &@import("main.zig").server; const server = &@import("main.zig").server;
const util = @import("util.zig"); const util = @import("util.zig");
@ -144,7 +146,7 @@ pub fn reconfigureDevices(self: *Self) void {
var it = self.devices.iterator(.forward); var it = self.devices.iterator(.forward);
while (it.next()) |device| { while (it.next()) |device| {
for (self.configs.items) |config| { for (self.configs.items) |config| {
if (@import("globber").match(device.identifier, config.glob)) { if (globber.match(device.identifier, config.glob)) {
config.apply(device); config.apply(device);
} }
} }