Add `Drawable` struct with drawing related state

1 files changed, 5 insertions, 3 deletions

diff --git a/comet.c b/comet.c
index 825dff0..4707337 100644
--- a/comet.c
+++ b/comet.c
@@ -17,7 +17,7 @@ static gboolean mainloop_quit(gpointer data)
 
 static gboolean mainloop_do(gpointer data)
 {
-        draw(data);
+        draw_paint(data);
         return G_SOURCE_REMOVE;
 }
 
@@ -40,12 +40,12 @@ int main(int argc, char **argv)
 
     log_debug("Calculated dimensions [height=%d, x_pad=%d, y_pad=%d]", height, x_padding, y_padding);
 
-    draw_init("Hack 12", height, x_padding, y_padding);
+    Drawable *draw = draw_create(win, "Hack 12", height, x_padding, x_padding, y_padding, 0.99);
 
     guint source_term = g_unix_signal_add(SIGTERM, mainloop_quit, mainloop);
     guint source_int  = g_unix_signal_add(SIGINT,  mainloop_quit, mainloop);
 
-    guint id = g_timeout_add(100, mainloop_do, win);
+    guint id = g_timeout_add(100, mainloop_do, draw);
 
     log_debug("Starting main loop");
     g_main_loop_run(mainloop);
@@ -56,7 +56,9 @@ int main(int argc, char **argv)
     g_source_remove(source_term);
     g_source_remove(source_int);
 
+    draw_destroy(draw);
     window_destroy(win);
+
     return 0;
 }