1 files changed, 9 insertions, 6 deletions
diff --git a/src/comet.c b/src/comet.c
index 752f147..53be0b2 100644
--- a/src/comet.c
+++ b/src/comet.c
@@ -73,15 +73,15 @@ int main(int argc, char **argv)
         config_read(&config, config_file);
     }
 
+    signal(SIGINT,  signal_quit);
+    signal(SIGTERM, signal_quit);
+
     display_t display;
     display_init(&display);
 
     window_t window;
     window_init(&window, &display, &config);
 
-    // FIXME
-    config.main_block.min_width = config.main_block.max_width = config.width;
-
     int x_padding = 10;
     int y_padding = 8;
 
@@ -98,6 +98,9 @@ int main(int argc, char **argv)
     window_resize(&window, config.width, config.height);
     window_move(&window, x_padding, y_padding);
 
+    block_t main_block = { 0 };
+    config_resolve(&config, &main_block);
+
     // TODO: Allow ondemand rendering
     struct timespec rate, start, end, diff;
 
@@ -105,13 +108,13 @@ int main(int argc, char **argv)
     rate.tv_sec = (long)freq;
     rate.tv_nsec = (freq - rate.tv_sec) * 1000000000ul;
 
-    while (true) {
+    while (running) {
         timespec_get(&start, TIME_UTC);
 
-        block_update(&config.main_block);
+        block_update(&main_block);
 
         layout_t layout;
-        layout_init(&layout, &config.main_block, info);
+        layout_init(&layout, &main_block, info);
 
         event_dispatch(&display, &layout);