Various icccm and ewmh properties

[wmpus] / main.c

diff --git a/main.c b/main.c
index 119005e346957bbac926d42fdb3fca157cddcf7e..327066e625dfdf5bfb7f615826b4e92be46690cf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,16 +15,32 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <signal.h>
 
 #include "util.h"
+#include "conf.h"
+#include "types.h"
 #include "sys.h"
 #include "wm.h"
 
+void on_sigint(int signum)
+{
+       sys_exit();
+}
+
 int main(int argc, char **argv)
 {
        setbuf(stdout, NULL); // debug
-       win_t *root = sys_init();
-       wm_init(root);
-       sys_run(root);
+       signal(SIGINT, on_sigint);
+
+       conf_init(argc, argv);
+       sys_init();
+       wm_init();
+
+       sys_run();
+
+       wm_free();
+       sys_free();
+       conf_free();
        return 0;
 }