Make View a toplevel struct

src/command/focus_view.zig

@@ -2,7 +2,7 @@ const c = @import("../c.zig");
 
 const Arg = @import("../command.zig").Arg;
 const Seat = @import("../seat.zig");
-const View = @import("../view.zig").View;
+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

src/command/zoom.zig

@@ -2,7 +2,7 @@ const c = @import("../c.zig");
 
 const Arg = @import("../command.zig").Arg;
 const Seat = @import("../seat.zig");
-const View = @import("../view.zig").View;
+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

src/cursor.zig

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

src/output.zig

@@ -9,7 +9,7 @@ const Box = @import("box.zig");
 const LayerSurface = @import("layer_surface.zig");
 const Log = @import("log.zig").Log;
 const Root = @import("root.zig").Root;
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 
 root: *Root,

src/render.zig

@@ -5,7 +5,7 @@ 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").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 
 pub fn renderOutput(output: *Output) void {

src/root.zig

@@ -7,7 +7,7 @@ const Log = @import("log.zig").Log;
 const Output = @import("output.zig");
 const Server = @import("server.zig");
 const Seat = @import("seat.zig").Seat;
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 
 /// Responsible for all windowing operations

src/seat.zig

@@ -8,7 +8,7 @@ const InputManager = @import("input_manager.zig");
 const Keyboard = @import("keyboard.zig").Keyboard;
 const LayerSurface = @import("layer_surface.zig");
 const Output = @import("output.zig");
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 
 const FocusTarget = union(enum) {

src/server.zig

@@ -10,7 +10,7 @@ const InputManager = @import("input_manager.zig");
 const Log = @import("log.zig").Log;
 const Output = @import("output.zig");
 const Root = @import("root.zig").Root;
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 
 allocator: *std.mem.Allocator,

src/view.zig

@@ -1,4 +1,7 @@
+const Self = @This();
+
 const std = @import("std");
+
 const c = @import("c.zig");
 
 const Box = @import("box.zig");
@@ -8,9 +11,6 @@ const Root = @import("root.zig").Root;
 const ViewStack = @import("view_stack.zig").ViewStack;
 const XdgToplevel = @import("xdg_toplevel.zig");
 
-pub const View = struct {
-    const Self = @This();
-
 const ViewImpl = union(enum) {
     xdg_toplevel: XdgToplevel,
 };
@@ -155,7 +155,7 @@ pub const View = struct {
 /// Move a view from one output to another, sending the required enter/leave
 /// events.
 pub fn sendToOutput(self: *Self, destination_output: *Output) void {
-        const node = @fieldParentPtr(ViewStack(View).Node, "view", self);
+    const node = @fieldParentPtr(ViewStack(Self).Node, "view", self);
 
     self.output.views.remove(node);
     destination_output.views.push(node);
@@ -181,4 +181,3 @@ pub const View = struct {
         .xdg_toplevel => |xdg_toplevel| xdg_toplevel.forEachSurface(iterator, user_data),
     }
 }
-};

src/view_stack.zig

@@ -1,4 +1,4 @@
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 
 /// A specialized doubly-linked stack that allows for filtered iteration
 /// over the nodes. T must be View or *View.

src/xdg_toplevel.zig

@@ -5,7 +5,7 @@ const std = @import("std");
 
 const Box = @import("box.zig");
 const Log = @import("log.zig").Log;
-const View = @import("view.zig").View;
+const View = @import("view.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
 const XdgPopup = @import("xdg_popup.zig");