X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=main.c;h=8ac32d046400835286ea866adb6a1ffffd3d51b1;hp=8fbec9c8dd92d967a9b648ace348e2d05e97508c;hb=6676472c287a8163d53b2ba14ca8ec39bf7443eb;hpb=eefa2034ad0f5c2ef5eb478984cfc53a6a40c6b7

diff --git a/main.c b/main.c
index 8fbec9c..8ac32d0 100644
--- a/main.c
+++ b/main.c
@@ -1,32 +1,44 @@
 /*
- * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  */
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <signal.h>
 
 #include "util.h"
+#include "conf.h"
 #include "sys.h"
 #include "wm.h"
 
+void on_sigint(int signum)
+{
+	sys_exit();
+}
+
 int main(int argc, char **argv)
 {
 	setbuf(stdout, NULL); // debug
+	signal(SIGINT, on_sigint);
+
+	conf_init(argc, argv);
 	win_t *root = sys_init();
 	wm_init(root);
+
 	sys_run(root);
+
+	wm_free(root);
+	sys_free(root);
 	return 0;
 }