Make Output a toplevel struct

src/command/focus_output.zig

@@ -2,7 +2,7 @@ const c = @import("../c.zig");
 const std = @import("std");
 
 const Arg = @import("../command.zig").Arg;
-const Output = @import("../output.zig").Output;
+const Output = @import("../output.zig");
 const Seat = @import("../seat.zig");
 
 /// Focus either the next or the previous output, depending on the bool passed.

src/command/send_to_output.zig

@@ -2,7 +2,7 @@ const c = @import("../c.zig");
 const std = @import("std");
 
 const Arg = @import("../command.zig").Arg;
-const Output = @import("../output.zig").Output;
+const Output = @import("../output.zig");
 const Seat = @import("../seat.zig");
 
 /// Send the focused view to the the next or the previous output, depending on

src/cursor.zig

@@ -3,7 +3,7 @@ const c = @import("c.zig");
 
 const LayerSurface = @import("layer_surface.zig").LayerSurface;
 const Log = @import("log.zig").Log;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const Seat = @import("seat.zig");
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;

src/layer_surface.zig

@@ -3,7 +3,7 @@ const c = @import("c.zig");
 
 const Box = @import("box.zig");
 const Log = @import("log.zig").Log;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 
 pub const LayerSurface = struct {
     const Self = @This();

src/output.zig

@@ -1,4 +1,7 @@
+const Self = @This();
+
 const std = @import("std");
+
 const c = @import("c.zig");
 const render = @import("render.zig");
 
@@ -9,9 +12,6 @@ const Root = @import("root.zig").Root;
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;
 
-pub const Output = struct {
-    const Self = @This();
-
 root: *Root,
 wlr_output: *c.wlr_output,
 
@@ -531,7 +531,7 @@ pub const Output = struct {
     self.wlr_output.data = null;
 
     // Remove the destroyed output from the list
-        const node = @fieldParentPtr(std.TailQueue(Output).Node, "data", self);
+    const node = @fieldParentPtr(std.TailQueue(Self).Node, "data", self);
     root.outputs.remove(node);
     root.server.allocator.destroy(node);
 
@@ -551,4 +551,3 @@ pub const Output = struct {
     self.arrangeLayers();
     self.root.arrange();
 }
-};

src/render.zig

@@ -3,7 +3,7 @@ const c = @import("c.zig");
 
 const Box = @import("box.zig");
 const LayerSurface = @import("layer_surface.zig").LayerSurface;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const Server = @import("server.zig");
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;

src/root.zig

@@ -4,7 +4,7 @@ const util = @import("util.zig");
 
 const Box = @import("box.zig").Box;
 const Log = @import("log.zig").Log;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const Server = @import("server.zig");
 const Seat = @import("seat.zig").Seat;
 const View = @import("view.zig").View;

src/seat.zig

@@ -7,7 +7,7 @@ const Cursor = @import("cursor.zig").Cursor;
 const InputManager = @import("input_manager.zig");
 const Keyboard = @import("keyboard.zig").Keyboard;
 const LayerSurface = @import("layer_surface.zig").LayerSurface;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;
 

src/server.zig

@@ -8,7 +8,7 @@ const Config = @import("config.zig");
 const DecorationManager = @import("decoration_manager.zig");
 const InputManager = @import("input_manager.zig");
 const Log = @import("log.zig").Log;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const Root = @import("root.zig").Root;
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;

src/view.zig

@@ -3,7 +3,7 @@ const c = @import("c.zig");
 
 const Box = @import("box.zig");
 const Log = @import("log.zig").Log;
-const Output = @import("output.zig").Output;
+const Output = @import("output.zig");
 const Root = @import("root.zig").Root;
 const ViewStack = @import("view_stack.zig").ViewStack;
 const XdgToplevel = @import("xdg_toplevel.zig");