heap toots stick around

src/config.zig

@@ -90,7 +90,7 @@ pub const HttpInfo = struct {
   response_code: c_long,
   tree: std.json.ValueTree,
   column: *ColumnInfo,
-  toot: toot_lib.Toot()
+  toot: *toot_lib.Type
 };
 
 pub const ColumnAuth = struct {

src/gui/gtk.zig

@@ -129,7 +129,7 @@ pub extern fn update_column_ui_schedule(in: *c_void) c_int {
   return 0;
 }
 
-pub const TootPic = struct { toot: toot_lib.Type, pic: []const u8 };
+pub const TootPic = struct { toot: *toot_lib.Type, pic: []const u8 };
 pub extern fn toot_media_schedule(in: *c_void) c_int {
   const tootpic = @ptrCast(*TootPic, @alignCast(8,in));
   toot_media(tootpic.toot, tootpic.pic);
@@ -381,8 +381,8 @@ extern fn widget_destroy(widget: [*c]c.GtkWidget, userdata: ?*c_void) void {
   c.gtk_widget_destroy(widget);
 }
 
-pub fn makeTootBox(toot: toot_lib.Toot(), colconfig: *config.ColumnConfig) [*c]c.GtkBuilder {
-  //warn("toot #{} gui building img {} {}\n", toot.id(), toot.imgList.count(), toot.imgList);
+pub fn makeTootBox(toot: *toot_lib.Type, colconfig: *config.ColumnConfig) [*c]c.GtkBuilder {
+  warn("maketootbox toot #{} {*} gui building img {} {}\n", toot.id(), toot, toot.imgList.count(), toot.imgList);
   const builder = c.gtk_builder_new_from_file (c"glade/toot.glade");
   const tootbox = builder_get_widget(builder, c"tootbox");
 
@@ -453,7 +453,7 @@ fn photo_refresh(acct: []const u8, builder: *c.GtkBuilder) void {
   c.gtk_image_set_from_pixbuf(@ptrCast([*c]c.GtkImage, avatar), pixbuf);
 }
 
-fn toot_media(toot: toot_lib.Toot(), pic: []const u8) void {
+fn toot_media(toot: *toot_lib.Type, pic: []const u8) void {
   if(findColumnByTootId(toot.id())) |column| {
     const tootbuilder = column.guitoots.get(toot.id()).?.value;
     const imageBox = builder_get_widget(tootbuilder, c"image_box");

src/main.zig

@@ -114,7 +114,7 @@ fn profileget(column: *config.ColumnInfo) void {
   var netthread = thread.create(net.go, verb, profileback) catch unreachable;
 }
 
-fn photoget(toot: toot_lib.Toot(), url: []const u8) void {
+fn photoget(toot: *toot_lib.Type, url: []const u8) void {
   var verb = allocator.create(thread.CommandVerb) catch unreachable;
   var httpInfo = allocator.create(config.HttpInfo) catch unreachable;
   httpInfo.url = url;
@@ -126,7 +126,7 @@ fn photoget(toot: toot_lib.Toot(), url: []const u8) void {
   var netthread = thread.create(net.go, verb, photoback) catch unreachable;
 }
 
-fn mediaget(toot: toot_lib.Toot(), url: []const u8) void {
+fn mediaget(toot: *toot_lib.Type, url: []const u8) void {
   var verb = allocator.create(thread.CommandVerb) catch unreachable;
   var httpInfo = allocator.create(config.HttpInfo) catch unreachable;
   httpInfo.url = url;
@@ -135,6 +135,7 @@ fn mediaget(toot: toot_lib.Toot(), url: []const u8) void {
   httpInfo.response_code = 0;
   httpInfo.toot = toot;
   verb.http = httpInfo;
+  warn("mediaget toot {} {*}\n", toot.id(), &toot);
   var netthread = thread.create(net.go, verb, mediaback) catch unreachable;
 }
 
@@ -228,9 +229,10 @@ fn netback(command: *thread.Command) void {
           column.inError = false;
           for(tree.root.Array.toSlice()) |jsonValue| {
             const item = jsonValue.Object;
-            const toot = toot_lib.Type.init(item, allocator);
+            var toot = allocator.create(toot_lib.Type) catch unreachable;
+            toot.init(item, allocator);
             var id = toot.id();
-            warn("netback json toot #{} {*}\n", toot.id(), toot.ptr);
+            warn("netback json create toot #{} {*}\n", toot.id(), toot);
             if(column.toots.contains(toot)) {
               // dupe
             } else {
@@ -290,7 +292,7 @@ fn profileback(command: *thread.Command) void {
   gui.schedule(gui.update_column_ui_schedule, @ptrCast(*c_void, reqres.column));
 }
 
-fn cache_update(toot: toot_lib.Toot()) void {
+fn cache_update(toot: *toot_lib.Type) void {
   var account = toot.get("account").?.value.Object;
   const acct: []const u8 = account.get("acct").?.value.String;
   const avatar_url: []const u8 = account.get("avatar").?.value.String;

src/toot.zig

@@ -25,14 +25,11 @@ pub fn Toot() type {
     const Toothashmap = std.hash_map.HashMap(K, V,
                                              std.mem.hash_slice_u8,
                                              std.mem.eql_slice_u8);
-    pub fn init(hash: Toothashmap, allocator: *Allocator) Self {
-      var newToot = Self{
-        .hashmap = hash,
-        .tagList = TagList.init(allocator),
-        .imgList = ImgList.init(allocator)
-      };
-      newToot.parseTags(allocator);
-      return newToot;
+    pub fn init(self: *Self, hash: Toothashmap, allocator: *Allocator) void {
+      self.hashmap = hash;
+      self.tagList = TagList.init(allocator);
+      self.imgList = ImgList.init(allocator);
+      self.parseTags(allocator);
     }
 
     pub fn get(self: *const Self, key: K) ?*Toothashmap.KV {

src/toot_list.zig

@@ -6,7 +6,7 @@ const Allocator = std.mem.Allocator;
 const toot_lib = @import("./toot.zig");
 const util = @import("./util.zig");
 
-pub const TootList = SomeList(toot_lib.Toot());
+pub const TootList = SomeList(*toot_lib.Type);
 
 pub fn SomeList(comptime T: type) type {
   return struct {