aboutsummaryrefslogtreecommitdiff
path: root/src/Config.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Config.zig')
-rw-r--r--src/Config.zig70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/Config.zig b/src/Config.zig
index e887efe..20b7504 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -23,7 +23,7 @@ const c = @import("c.zig");
const Log = @import("log.zig").Log;
const Server = @import("Server.zig");
-const Keybind = @import("Keybind.zig");
+const Mapping = @import("Mapping.zig");
/// Width of borders in pixels
border_width: u32,
@@ -34,11 +34,11 @@ view_padding: u32,
/// Amount of padding arount the outer edge of the layout in pixels
outer_padding: u32,
-/// Map of mode name to mode id
+/// Map of keymap mode name to mode id
mode_to_id: std.StringHashMap(usize),
-/// All user-defined keybinding modes, indexed by mode id
-modes: std.ArrayList(std.ArrayList(Keybind)),
+/// All user-defined keymap modes, indexed by mode id
+modes: std.ArrayList(std.ArrayList(Mapping)),
/// List of app_ids which will be started floating
float_filter: std.ArrayList([*:0]const u8),
@@ -52,9 +52,9 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
try self.mode_to_id.putNoClobber("normal", 0);
try self.mode_to_id.putNoClobber("passthrough", 1);
- self.modes = std.ArrayList(std.ArrayList(Keybind)).init(allocator);
- try self.modes.append(std.ArrayList(Keybind).init(allocator));
- try self.modes.append(std.ArrayList(Keybind).init(allocator));
+ self.modes = std.ArrayList(std.ArrayList(Mapping)).init(allocator);
+ try self.modes.append(std.ArrayList(Mapping).init(allocator));
+ try self.modes.append(std.ArrayList(Mapping).init(allocator));
self.float_filter = std.ArrayList([*:0]const u8).init(allocator);
@@ -62,7 +62,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
const mod = c.WLR_MODIFIER_LOGO;
// Mod+Shift+Return to start an instance of alacritty
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Return,
mod | c.WLR_MODIFIER_SHIFT,
@@ -70,7 +70,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+Q to close the focused view
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_q,
mod,
@@ -78,7 +78,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+E to exit river
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_e,
mod,
@@ -86,13 +86,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+J and Mod+K to focus the next/previous view in the layout stack
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_j,
mod,
&[_][]const u8{ "focus", "next" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_k,
mod,
@@ -101,7 +101,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
// Mod+Return to bump the focused view to the top of the layout stack,
// making it the new master
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Return,
mod,
@@ -109,13 +109,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+H and Mod+L to increase/decrease the width of the master column
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_h,
mod,
&[_][]const u8{ "mod_master_factor", "+0.05" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_l,
mod,
@@ -124,13 +124,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
// Mod+Shift+H and Mod+Shift+L to increment/decrement the number of
// master views in the layout
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_h,
mod | c.WLR_MODIFIER_SHIFT,
&[_][]const u8{ "mod_master_count", "+1" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_l,
mod | c.WLR_MODIFIER_SHIFT,
@@ -141,28 +141,28 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
inline while (i < 9) : (i += 1) {
const str = &[_]u8{i + '0' + 1};
// Mod+[1-9] to focus tag [1-9]
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_1 + i,
mod,
&[_][]const u8{ "focus_tag", str },
));
// Mod+Shift+[1-9] to tag focused view with tag [1-9]
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_1 + i,
mod | c.WLR_MODIFIER_SHIFT,
&[_][]const u8{ "tag_view", str },
));
// Mod+Ctrl+[1-9] to toggle focus of tag [1-9]
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_1 + i,
mod | c.WLR_MODIFIER_CTRL,
&[_][]const u8{ "toggle_tag_focus", str },
));
// Mod+Shift+Ctrl+[1-9] to toggle tag [1-9] of focused view
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_1 + i,
mod | c.WLR_MODIFIER_CTRL | c.WLR_MODIFIER_SHIFT,
@@ -171,7 +171,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
}
// Mod+0 to focus all tags
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_0,
mod,
@@ -179,7 +179,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+Shift+0 to tag focused view with all tags
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_0,
mod | c.WLR_MODIFIER_SHIFT,
@@ -187,13 +187,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+Period and Mod+Comma to focus the next/previous output
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_period,
mod,
&[_][]const u8{ "focus_output", "next" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_comma,
mod,
@@ -202,13 +202,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
// Mod+Shift+Period/Comma to send the focused view to the the
// next/previous output
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_period,
mod | c.WLR_MODIFIER_SHIFT,
&[_][]const u8{ "send_to_output", "next" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_comma,
mod | c.WLR_MODIFIER_SHIFT,
@@ -216,7 +216,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+Space to toggle float
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_space,
mod,
@@ -224,7 +224,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+F11 to enter passthrough mode
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_F11,
mod,
@@ -232,25 +232,25 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Change master orientation with Mod+{Up,Right,Down,Left}
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Up,
mod,
&[_][]const u8{ "layout", "TopMaster" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Right,
mod,
&[_][]const u8{ "layout", "RightMaster" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Down,
mod,
&[_][]const u8{ "layout", "BottomMaster" },
));
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_Left,
mod,
@@ -258,7 +258,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+f to change to Full layout
- try normal_keybinds.append(try Keybind.init(
+ try normal_keybinds.append(try Mapping.init(
allocator,
c.XKB_KEY_f,
mod,
@@ -266,7 +266,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
));
// Mod+F11 to return to normal mode
- try self.modes.items[1].append(try Keybind.init(
+ try self.modes.items[1].append(try Mapping.init(
allocator,
c.XKB_KEY_F11,
mod,
You can read more about the author.