From e199bcba43174403a578f7a1e92e0a95076495c8 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 2 May 2020 23:11:56 +0200 Subject: [PATCH] Rename files contatining top level structs This respects the naming convention of snake_case namespaces and TitleCase types. --- src/{box.zig => Box.zig} | 0 src/{config.zig => Config.zig} | 2 +- src/{cursor.zig => Cursor.zig} | 8 ++++---- src/{decoration.zig => Decoration.zig} | 2 +- ...{decoration_manager.zig => DecorationManager.zig} | 4 ++-- src/{input_manager.zig => InputManager.zig} | 4 ++-- src/{keyboard.zig => Keyboard.zig} | 2 +- src/{layer_surface.zig => LayerSurface.zig} | 4 ++-- src/{output.zig => Output.zig} | 8 ++++---- src/{root.zig => Root.zig} | 6 +++--- src/{seat.zig => Seat.zig} | 12 ++++++------ src/{server.zig => Server.zig} | 12 ++++++------ src/{view.zig => View.zig} | 8 ++++---- src/{xdg_popup.zig => XdgPopup.zig} | 2 +- src/{xdg_toplevel.zig => XdgToplevel.zig} | 6 +++--- src/command.zig | 2 +- src/command/close_view.zig | 2 +- src/command/exit_compositor.zig | 2 +- src/command/focus_output.zig | 4 ++-- src/command/focus_tags.zig | 2 +- src/command/focus_view.zig | 4 ++-- src/command/modify_master_count.zig | 2 +- src/command/modify_master_factor.zig | 2 +- src/command/send_to_output.zig | 4 ++-- src/command/set_view_tags.zig | 2 +- src/command/spawn.zig | 2 +- src/command/toggle_float.zig | 2 +- src/command/toggle_tags.zig | 2 +- src/command/toggle_view_tags.zig | 2 +- src/command/zoom.zig | 4 ++-- src/main.zig | 2 +- src/render.zig | 10 +++++----- src/view_stack.zig | 2 +- 33 files changed, 66 insertions(+), 66 deletions(-) rename src/{box.zig => Box.zig} (100%) rename src/{config.zig => Config.zig} (99%) rename src/{cursor.zig => Cursor.zig} (98%) rename src/{decoration.zig => Decoration.zig} (97%) rename src/{decoration_manager.zig => DecorationManager.zig} (95%) rename src/{input_manager.zig => InputManager.zig} (98%) rename src/{keyboard.zig => Keyboard.zig} (99%) rename src/{layer_surface.zig => LayerSurface.zig} (98%) rename src/{output.zig => Output.zig} (99%) rename src/{root.zig => Root.zig} (98%) rename src/{seat.zig => Seat.zig} (97%) rename src/{server.zig => Server.zig} (97%) rename src/{view.zig => View.zig} (97%) rename src/{xdg_popup.zig => XdgPopup.zig} (98%) rename src/{xdg_toplevel.zig => XdgToplevel.zig} (98%) diff --git a/src/box.zig b/src/Box.zig similarity index 100% rename from src/box.zig rename to src/Box.zig diff --git a/src/config.zig b/src/Config.zig similarity index 99% rename from src/config.zig rename to src/Config.zig index 6866f80..315a045 100644 --- a/src/config.zig +++ b/src/Config.zig @@ -22,7 +22,7 @@ const std = @import("std"); const c = @import("c.zig"); const command = @import("command.zig"); -const Server = @import("server.zig"); +const Server = @import("Server.zig"); /// Width of borders in pixels border_width: u32, diff --git a/src/cursor.zig b/src/Cursor.zig similarity index 98% rename from src/cursor.zig rename to src/Cursor.zig index 9f6fc78..98e33a6 100644 --- a/src/cursor.zig +++ b/src/Cursor.zig @@ -21,11 +21,11 @@ const std = @import("std"); const c = @import("c.zig"); -const LayerSurface = @import("layer_surface.zig"); +const LayerSurface = @import("LayerSurface.zig"); const Log = @import("log.zig").Log; -const Output = @import("output.zig"); -const Seat = @import("seat.zig"); -const View = @import("view.zig"); +const Output = @import("Output.zig"); +const Seat = @import("Seat.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; const CursorMode = enum { diff --git a/src/decoration.zig b/src/Decoration.zig similarity index 97% rename from src/decoration.zig rename to src/Decoration.zig index fd49740..91c5bed 100644 --- a/src/decoration.zig +++ b/src/Decoration.zig @@ -21,7 +21,7 @@ const std = @import("std"); const c = @import("c.zig"); -const DecorationManager = @import("decoration_manager.zig"); +const DecorationManager = @import("DecorationManager.zig"); // TODO: this needs to listen for destroy and free nodes from the deco list decoration_manager: *DecorationManager, diff --git a/src/decoration_manager.zig b/src/DecorationManager.zig similarity index 95% rename from src/decoration_manager.zig rename to src/DecorationManager.zig index 5ba11c4..5a9abb4 100644 --- a/src/decoration_manager.zig +++ b/src/DecorationManager.zig @@ -21,8 +21,8 @@ const std = @import("std"); const c = @import("c.zig"); -const Decoration = @import("decoration.zig"); -const Server = @import("server.zig"); +const Decoration = @import("Decoration.zig"); +const Server = @import("Server.zig"); server: *Server, diff --git a/src/input_manager.zig b/src/InputManager.zig similarity index 98% rename from src/input_manager.zig rename to src/InputManager.zig index 31ca0a7..3a95346 100644 --- a/src/input_manager.zig +++ b/src/InputManager.zig @@ -22,8 +22,8 @@ const std = @import("std"); const c = @import("c.zig"); const Log = @import("log.zig").Log; -const Seat = @import("seat.zig"); -const Server = @import("server.zig"); +const Seat = @import("Seat.zig"); +const Server = @import("Server.zig"); const default_seat_name = "default"; diff --git a/src/keyboard.zig b/src/Keyboard.zig similarity index 99% rename from src/keyboard.zig rename to src/Keyboard.zig index 84c63a1..8c19b84 100644 --- a/src/keyboard.zig +++ b/src/Keyboard.zig @@ -22,7 +22,7 @@ const std = @import("std"); const c = @import("c.zig"); const Log = @import("log.zig").Log; -const Seat = @import("seat.zig"); +const Seat = @import("Seat.zig"); seat: *Seat, wlr_input_device: *c.wlr_input_device, diff --git a/src/layer_surface.zig b/src/LayerSurface.zig similarity index 98% rename from src/layer_surface.zig rename to src/LayerSurface.zig index 33652a3..5da7025 100644 --- a/src/layer_surface.zig +++ b/src/LayerSurface.zig @@ -21,9 +21,9 @@ const std = @import("std"); const c = @import("c.zig"); -const Box = @import("box.zig"); +const Box = @import("Box.zig"); const Log = @import("log.zig").Log; -const Output = @import("output.zig"); +const Output = @import("Output.zig"); output: *Output, wlr_layer_surface: *c.wlr_layer_surface_v1, diff --git a/src/output.zig b/src/Output.zig similarity index 99% rename from src/output.zig rename to src/Output.zig index 59d72c8..a7921f0 100644 --- a/src/output.zig +++ b/src/Output.zig @@ -22,11 +22,11 @@ const std = @import("std"); const c = @import("c.zig"); const render = @import("render.zig"); -const Box = @import("box.zig"); -const LayerSurface = @import("layer_surface.zig"); +const Box = @import("Box.zig"); +const LayerSurface = @import("LayerSurface.zig"); const Log = @import("log.zig").Log; -const Root = @import("root.zig"); -const View = @import("view.zig"); +const Root = @import("Root.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; root: *Root, diff --git a/src/root.zig b/src/Root.zig similarity index 98% rename from src/root.zig rename to src/Root.zig index 43f860d..8483969 100644 --- a/src/root.zig +++ b/src/Root.zig @@ -22,9 +22,9 @@ const std = @import("std"); const c = @import("c.zig"); const Log = @import("log.zig").Log; -const Output = @import("output.zig"); -const Server = @import("server.zig"); -const View = @import("view.zig"); +const Output = @import("Output.zig"); +const Server = @import("Server.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; /// Responsible for all windowing operations diff --git a/src/seat.zig b/src/Seat.zig similarity index 97% rename from src/seat.zig rename to src/Seat.zig index b69c1e9..4335c00 100644 --- a/src/seat.zig +++ b/src/Seat.zig @@ -21,12 +21,12 @@ const std = @import("std"); const c = @import("c.zig"); -const Cursor = @import("cursor.zig"); -const InputManager = @import("input_manager.zig"); -const Keyboard = @import("keyboard.zig"); -const LayerSurface = @import("layer_surface.zig"); -const Output = @import("output.zig"); -const View = @import("view.zig"); +const Cursor = @import("Cursor.zig"); +const InputManager = @import("InputManager.zig"); +const Keyboard = @import("Keyboard.zig"); +const LayerSurface = @import("LayerSurface.zig"); +const Output = @import("Output.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; const FocusTarget = union(enum) { diff --git a/src/server.zig b/src/Server.zig similarity index 97% rename from src/server.zig rename to src/Server.zig index b0f7c5a..b255aff 100644 --- a/src/server.zig +++ b/src/Server.zig @@ -21,13 +21,13 @@ const std = @import("std"); const c = @import("c.zig"); -const Config = @import("config.zig"); -const DecorationManager = @import("decoration_manager.zig"); -const InputManager = @import("input_manager.zig"); +const Config = @import("Config.zig"); +const DecorationManager = @import("DecorationManager.zig"); +const InputManager = @import("InputManager.zig"); const Log = @import("log.zig").Log; -const Output = @import("output.zig"); -const Root = @import("root.zig"); -const View = @import("view.zig"); +const Output = @import("Output.zig"); +const Root = @import("Root.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; allocator: *std.mem.Allocator, diff --git a/src/view.zig b/src/View.zig similarity index 97% rename from src/view.zig rename to src/View.zig index bc024f5..51e0b98 100644 --- a/src/view.zig +++ b/src/View.zig @@ -21,12 +21,12 @@ const std = @import("std"); const c = @import("c.zig"); -const Box = @import("box.zig"); +const Box = @import("Box.zig"); const Log = @import("log.zig").Log; -const Output = @import("output.zig"); -const Root = @import("root.zig"); +const Output = @import("Output.zig"); +const Root = @import("Root.zig"); const ViewStack = @import("view_stack.zig").ViewStack; -const XdgToplevel = @import("xdg_toplevel.zig"); +const XdgToplevel = @import("XdgToplevel.zig"); const ViewImpl = union(enum) { xdg_toplevel: XdgToplevel, diff --git a/src/xdg_popup.zig b/src/XdgPopup.zig similarity index 98% rename from src/xdg_popup.zig rename to src/XdgPopup.zig index ca06e5d..afc01b3 100644 --- a/src/xdg_popup.zig +++ b/src/XdgPopup.zig @@ -21,7 +21,7 @@ const std = @import("std"); const c = @import("c.zig"); -const XdgToplevel = @import("xdg_toplevel.zig"); +const XdgToplevel = @import("XdgToplevel.zig"); /// The toplevel this popup is a child of xdg_toplevel: *XdgToplevel, diff --git a/src/xdg_toplevel.zig b/src/XdgToplevel.zig similarity index 98% rename from src/xdg_toplevel.zig rename to src/XdgToplevel.zig index a0153d4..f1433e6 100644 --- a/src/xdg_toplevel.zig +++ b/src/XdgToplevel.zig @@ -21,11 +21,11 @@ const std = @import("std"); const c = @import("c.zig"); -const Box = @import("box.zig"); +const Box = @import("Box.zig"); const Log = @import("log.zig").Log; -const View = @import("view.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; -const XdgPopup = @import("xdg_popup.zig"); +const XdgPopup = @import("XdgPopup.zig"); /// The view this xdg toplevel implements view: *View, diff --git a/src/command.zig b/src/command.zig index a6b8bec..f559315 100644 --- a/src/command.zig +++ b/src/command.zig @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -const Seat = @import("seat.zig"); +const Seat = @import("Seat.zig"); pub const Direction = enum { Next, diff --git a/src/command/close_view.zig b/src/command/close_view.zig index 1240d09..7bee0b6 100644 --- a/src/command/close_view.zig +++ b/src/command/close_view.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Close the focused view, if any. pub fn close_view(seat: *Seat, arg: Arg) void { diff --git a/src/command/exit_compositor.zig b/src/command/exit_compositor.zig index d6c77f8..7736452 100644 --- a/src/command/exit_compositor.zig +++ b/src/command/exit_compositor.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Exit the compositor, terminating the wayland session. pub fn exitCompositor(seat: *Seat, arg: Arg) void { diff --git a/src/command/focus_output.zig b/src/command/focus_output.zig index 188bd2d..5140943 100644 --- a/src/command/focus_output.zig +++ b/src/command/focus_output.zig @@ -20,8 +20,8 @@ const std = @import("std"); const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Output = @import("../output.zig"); -const Seat = @import("../seat.zig"); +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. diff --git a/src/command/focus_tags.zig b/src/command/focus_tags.zig index 7ccd0e8..aa29b7c 100644 --- a/src/command/focus_tags.zig +++ b/src/command/focus_tags.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Switch focus to the passed tags. pub fn focusTags(seat: *Seat, arg: Arg) void { diff --git a/src/command/focus_view.zig b/src/command/focus_view.zig index 85a2975..225fa5e 100644 --- a/src/command/focus_view.zig +++ b/src/command/focus_view.zig @@ -18,8 +18,8 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); -const View = @import("../view.zig"); +const Seat = @import("../Seat.zig"); +const View = @import("../View.zig"); const ViewStack = @import("../view_stack.zig").ViewStack; /// Focus either the next or the previous visible view, depending on the enum diff --git a/src/command/modify_master_count.zig b/src/command/modify_master_count.zig index f03c075..c7a5ac1 100644 --- a/src/command/modify_master_count.zig +++ b/src/command/modify_master_count.zig @@ -20,7 +20,7 @@ const std = @import("std"); const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Modify the number of master views pub fn modifyMasterCount(seat: *Seat, arg: Arg) void { diff --git a/src/command/modify_master_factor.zig b/src/command/modify_master_factor.zig index e0ae8f4..b2af06f 100644 --- a/src/command/modify_master_factor.zig +++ b/src/command/modify_master_factor.zig @@ -20,7 +20,7 @@ const std = @import("std"); const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Modify the percent of the width of the screen that the master views occupy. pub fn modifyMasterFactor(seat: *Seat, arg: Arg) void { diff --git a/src/command/send_to_output.zig b/src/command/send_to_output.zig index bece494..f0658ca 100644 --- a/src/command/send_to_output.zig +++ b/src/command/send_to_output.zig @@ -20,8 +20,8 @@ const std = @import("std"); const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Output = @import("../output.zig"); -const Seat = @import("../seat.zig"); +const Output = @import("../Output.zig"); +const Seat = @import("../Seat.zig"); /// Send the focused view to the the next or the previous output, depending on /// the bool passed. Does nothing if there is only one output. diff --git a/src/command/set_view_tags.zig b/src/command/set_view_tags.zig index 38ae677..562d311 100644 --- a/src/command/set_view_tags.zig +++ b/src/command/set_view_tags.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Set the tags of the focused view. pub fn setViewTags(seat: *Seat, arg: Arg) void { diff --git a/src/command/spawn.zig b/src/command/spawn.zig index b9b9c95..53566fa 100644 --- a/src/command/spawn.zig +++ b/src/command/spawn.zig @@ -21,7 +21,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; const Log = @import("../log.zig").Log; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Spawn a program. pub fn spawn(seat: *Seat, arg: Arg) void { diff --git a/src/command/toggle_float.zig b/src/command/toggle_float.zig index da16270..27e3186 100644 --- a/src/command/toggle_float.zig +++ b/src/command/toggle_float.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Make the focused view float or stop floating, depending on its current /// state. diff --git a/src/command/toggle_tags.zig b/src/command/toggle_tags.zig index 53242f8..2d9f86e 100644 --- a/src/command/toggle_tags.zig +++ b/src/command/toggle_tags.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Toggle focus of the passsed tags. pub fn toggleTags(seat: *Seat, arg: Arg) void { diff --git a/src/command/toggle_view_tags.zig b/src/command/toggle_view_tags.zig index 5ae7874..2f5ba3e 100644 --- a/src/command/toggle_view_tags.zig +++ b/src/command/toggle_view_tags.zig @@ -18,7 +18,7 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); +const Seat = @import("../Seat.zig"); /// Toggle the passed tags of the focused view pub fn toggleViewTags(seat: *Seat, arg: Arg) void { diff --git a/src/command/zoom.zig b/src/command/zoom.zig index 617e4bb..5a5ca93 100644 --- a/src/command/zoom.zig +++ b/src/command/zoom.zig @@ -18,8 +18,8 @@ const c = @import("../c.zig"); const Arg = @import("../command.zig").Arg; -const Seat = @import("../seat.zig"); -const View = @import("../view.zig"); +const Seat = @import("../Seat.zig"); +const View = @import("../View.zig"); const ViewStack = @import("../view_stack.zig").ViewStack; /// Bump the focused view to the top of the stack. If the view on the top of diff --git a/src/main.zig b/src/main.zig index e10e4dd..a5f5334 100644 --- a/src/main.zig +++ b/src/main.zig @@ -20,7 +20,7 @@ const std = @import("std"); const c = @import("c.zig"); const Log = @import("log.zig").Log; -const Server = @import("server.zig"); +const Server = @import("Server.zig"); pub fn main() !void { Log.init(Log.Debug); diff --git a/src/render.zig b/src/render.zig index 4b22011..ac37e42 100644 --- a/src/render.zig +++ b/src/render.zig @@ -19,11 +19,11 @@ const std = @import("std"); const c = @import("c.zig"); -const Box = @import("box.zig"); -const LayerSurface = @import("layer_surface.zig"); -const Output = @import("output.zig"); -const Server = @import("server.zig"); -const View = @import("view.zig"); +const Box = @import("Box.zig"); +const LayerSurface = @import("LayerSurface.zig"); +const Output = @import("Output.zig"); +const Server = @import("Server.zig"); +const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; pub fn renderOutput(output: *Output) void { diff --git a/src/view_stack.zig b/src/view_stack.zig index 41ead61..7e32a91 100644 --- a/src/view_stack.zig +++ b/src/view_stack.zig @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -const View = @import("view.zig"); +const View = @import("View.zig"); /// A specialized doubly-linked stack that allows for filtered iteration /// over the nodes. T must be View or *View.