From 134eff259382edad729bdce4f2b36185111898a2 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 1 Jun 2020 00:04:05 +0200 Subject: Rename mode command to enter_mode --- src/Config.zig | 4 ++-- src/command.zig | 6 +++--- src/command/enter_mode.zig | 43 +++++++++++++++++++++++++++++++++++++++++++ src/command/mode.zig | 43 ------------------------------------------- 4 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 src/command/enter_mode.zig delete mode 100644 src/command/mode.zig diff --git a/src/Config.zig b/src/Config.zig index 8677acc..d948a95 100644 --- a/src/Config.zig +++ b/src/Config.zig @@ -228,7 +228,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void { allocator, c.XKB_KEY_F11, mod, - &[_][]const u8{ "mode", "passthrough" }, + &[_][]const u8{ "enter_mode", "passthrough" }, )); // Change master orientation with Mod+{Up,Right,Down,Left} @@ -270,7 +270,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void { allocator, c.XKB_KEY_F11, mod, - &[_][]const u8{ "mode", "normal" }, + &[_][]const u8{ "enter_mode", "normal" }, )); // Float views with app_id "float" diff --git a/src/command.zig b/src/command.zig index 39b8b79..e2c32b1 100644 --- a/src/command.zig +++ b/src/command.zig @@ -29,7 +29,7 @@ const impl = struct { const layout = @import("command/layout.zig").layout; const modMasterCount = @import("command/mod_master_count.zig").modMasterCount; const modMasterFactor = @import("command/mod_master_factor.zig").modMasterFactor; - const mode = @import("command/mode.zig").mode; + const enterMode = @import("command/enter_mode.zig").enterMode; const sendToOutput = @import("command/send_to_output.zig").sendToOutput; const spawn = @import("command/spawn.zig").spawn; const tagView = @import("command/tag_view.zig").tagView; @@ -68,10 +68,10 @@ const str_to_impl_fn = [_]Definition{ .{ .name = "focus_all_tags", .impl = impl.focusAllTags }, .{ .name = "focus_output", .impl = impl.focusOutput }, .{ .name = "focus_tag", .impl = impl.focusTag }, - .{ .name = "layout", .impl = impl.layout}, + .{ .name = "layout", .impl = impl.layout }, .{ .name = "mod_master_count", .impl = impl.modMasterCount }, .{ .name = "mod_master_factor", .impl = impl.modMasterFactor }, - .{ .name = "mode", .impl = impl.mode }, + .{ .name = "enter_mode", .impl = impl.enterMode }, .{ .name = "send_to_output", .impl = impl.sendToOutput }, .{ .name = "spawn", .impl = impl.spawn }, .{ .name = "tag_view", .impl = impl.tagView }, diff --git a/src/command/enter_mode.zig b/src/command/enter_mode.zig new file mode 100644 index 0000000..8c7e3e4 --- /dev/null +++ b/src/command/enter_mode.zig @@ -0,0 +1,43 @@ +// This file is part of river, a dynamic tiling wayland compositor. +// +// Copyright 2020 Isaac Freund +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +const std = @import("std"); + +const Error = @import("../command.zig").Error; +const Seat = @import("../Seat.zig"); + +/// Switch to the given mode +pub fn enterMode( + 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 config = seat.input_manager.server.config; + const target_mode = args[1]; + seat.mode_id = config.mode_to_id.getValue(target_mode) orelse { + failure_message.* = try std.fmt.allocPrint( + allocator, + "cannot enter non-existant mode '{}'", + .{target_mode}, + ); + return Error.CommandFailed; + }; +} diff --git a/src/command/mode.zig b/src/command/mode.zig deleted file mode 100644 index 364e399..0000000 --- a/src/command/mode.zig +++ /dev/null @@ -1,43 +0,0 @@ -// This file is part of river, a dynamic tiling wayland compositor. -// -// Copyright 2020 Isaac Freund -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -const std = @import("std"); - -const Error = @import("../command.zig").Error; -const Seat = @import("../Seat.zig"); - -/// Switch to the given mode -pub fn mode( - 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 config = seat.input_manager.server.config; - const target_mode = args[1]; - seat.mode_id = config.mode_to_id.getValue(target_mode) orelse { - failure_message.* = try std.fmt.allocPrint( - allocator, - "cannot enter non-existant mode '{}'", - .{target_mode}, - ); - return Error.CommandFailed; - }; -} -- cgit v1.2.3