From d9ca9db5a49f0af2f6bef6f198b28a8d29808e6d Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 26 May 2020 22:55:07 +0200 Subject: Rework commands to be string based This allows for significantly more flexibility and should make implementing the bind command possible. --- src/command/focus_output.zig | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/command/focus_output.zig') diff --git a/src/command/focus_output.zig b/src/command/focus_output.zig index 02b7999..b11664f 100644 --- a/src/command/focus_output.zig +++ b/src/command/focus_output.zig @@ -19,14 +19,23 @@ const std = @import("std"); const c = @import("../c.zig"); -const Arg = @import("../Command.zig").Arg; +const Error = @import("../command.zig").Error; +const Direction = @import("../command.zig").Direction; const Output = @import("../Output.zig"); const Seat = @import("../Seat.zig"); /// Focus either the next or the previous output, depending on the bool passed. /// Does nothing if there is only one output. -pub fn focusOutput(seat: *Seat, arg: Arg) void { - const direction = arg.direction; +pub fn focusOutput( + allocator: *std.mem.Allocator, + seat: *Seat, + args: []const []const u8, + failure_message: *[]const u8, +) Error!void { + if (args.len < 2) return Error.NotEnoughArguments; + if (args.len > 2) return Error.TooManyArguments; + + const direction = try Direction.parse(args[1]); const root = &seat.input_manager.server.root; // If the noop output is focused, there are no other outputs to switch to if (seat.focused_output == &root.noop_output) { -- cgit v1.2.3