Rework things to stop invalidating pointers

1 files changed, 38 insertions, 53 deletions

diff --git a/src/view.zig b/src/view.zig
index 74a7cab..39c9306 100644
--- a/src/view.zig
+++ b/src/view.zig
@@ -7,55 +7,36 @@ pub const View = struct {
     server: *Server,
     wlr_xdg_surface: *c.wlr_xdg_surface,
 
+    mapped: bool,
+    x: c_int,
+    y: c_int,
+
     listen_map: c.wl_listener,
     listen_unmap: c.wl_listener,
     listen_destroy: c.wl_listener,
     // listen_request_move: c.wl_listener,
     // listen_request_resize: c.wl_listener,
 
-    mapped: bool,
-    x: c_int,
-    y: c_int,
+    pub fn init(self: *@This(), server: *Server, wlr_xdg_surface: *c.wlr_xdg_surface) void {
+        self.server = server;
+        self.wlr_xdg_surface = wlr_xdg_surface;
+
+        self.mapped = false;
+        self.x = 0;
+        self.y = 0;
 
-    pub fn init(server: *Server, wlr_xdg_surface: *c.wlr_xdg_surface) @This() {
-        var view = @This(){
-            .server = server,
-            .wlr_xdg_surface = wlr_xdg_surface,
-            .listen_map = c.wl_listener{
-                .link = undefined,
-                .notify = handle_map,
-            },
-            .listen_unmap = c.wl_listener{
-                .link = undefined,
-                .notify = handle_unmap,
-            },
-            .listen_destroy = c.wl_listener{
-                .link = undefined,
-                .notify = handle_destroy,
-            },
-            // .listen_request_move = c.wl_listener{
-            //     .link = undefined,
-            //     .notify = handle_request_move,
-            // },
-            // .listen_request_resize = c.wl_listener{
-            //     .link = undefined,
-            //     .notify = handle_request_resize,
-            // },
-            .mapped = false,
-            .x = 0,
-            .y = 0,
-        };
-
-        // Listen to the various events it can emit
-        c.wl_signal_add(&view.wlr_xdg_surface.events.map, &view.listen_map);
-        c.wl_signal_add(&view.wlr_xdg_surface.events.unmap, &view.listen_unmap);
-        c.wl_signal_add(&view.wlr_xdg_surface.events.destroy, &view.listen_destroy);
+        self.listen_map.notify = handle_map;
+        c.wl_signal_add(&self.wlr_xdg_surface.events.map, &self.listen_map);
+
+        self.listen_unmap.notify = handle_unmap;
+        c.wl_signal_add(&self.wlr_xdg_surface.events.unmap, &self.listen_unmap);
+
+        self.listen_destroy.notify = handle_destroy;
+        c.wl_signal_add(&self.wlr_xdg_surface.events.destroy, &self.listen_destroy);
 
         // var toplevel = xdg_surface.*.unnamed_160.toplevel;
         // c.wl_signal_add(&toplevel.*.events.request_move, &view.*.request_move);
         // c.wl_signal_add(&toplevel.*.events.request_resize, &view.*.request_resize);
-
-        return view;
     }
 
     fn handle_map(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void {
@@ -72,13 +53,17 @@ pub const View = struct {
 
     fn handle_destroy(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void {
         var view = @fieldParentPtr(View, "listen_destroy", listener);
-        var server = view.*.server;
-        const idx = for (server.*.views.span()) |*v, i| {
-            if (v == view) {
-                break i;
+        var server = view.server;
+
+        var it = server.views.first;
+        const target = while (it) |node| : (it = node.next) {
+            if (&node.data == view) {
+                break node;
             }
-        } else return;
-        _ = server.*.views.orderedRemove(idx);
+        } else unreachable;
+
+        server.views.remove(target);
+        server.views.destroyNode(target, server.allocator);
     }
 
     // fn xdg_toplevel_request_move(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void {
@@ -107,20 +92,20 @@ pub const View = struct {
             _ = c.wlr_xdg_toplevel_set_activated(prev_xdg_surface, false);
         }
 
-        // Find the index
-        const idx = for (server.views.span()) |*v, i| {
-            if (self == v) {
-                break i;
+        // Find the node
+        var it = server.views.first;
+        const target = while (it) |node| : (it = node.next) {
+            if (&node.data == self) {
+                break node;
             }
         } else unreachable;
 
         // Move the view to the front
-        server.views.append(server.views.orderedRemove(idx)) catch unreachable;
-
-        var moved_self = &server.views.span()[server.views.span().len - 1];
+        server.views.remove(target);
+        server.views.prepend(target);
 
         // Activate the new surface
-        _ = c.wlr_xdg_toplevel_set_activated(moved_self.wlr_xdg_surface, true);
+        _ = c.wlr_xdg_toplevel_set_activated(self.wlr_xdg_surface, true);
 
         // Tell the seat to have the keyboard enter this surface. wlroots will keep
         // track of this and automatically send key events to the appropriate
@@ -128,7 +113,7 @@ pub const View = struct {
         var keyboard = c.wlr_seat_get_keyboard(wlr_seat);
         c.wlr_seat_keyboard_notify_enter(
             wlr_seat,
-            moved_self.wlr_xdg_surface.surface,
+            self.wlr_xdg_surface.surface,
             &keyboard.*.keycodes,
             keyboard.*.num_keycodes,
             &keyboard.*.modifiers,