X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=fdcfbd8dd637ed0bce733eb58b4d4f06d0e5505e;hb=296fd1bb5f87b1961e98c7ea4c224219012f7161;hp=e02cda019f724d92cabc0a98c530a1007ebcd4a9;hpb=9d6df8f874cef59df16086c71031db2ba0267d3a;p=lackey

diff --git a/src/main.c b/src/main.c
index e02cda0..fdcfbd8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,30 +1,40 @@
 /*
- * Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
- * 
+ * Copyright (C) 2012-2013 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/>.
  */
 
+#define _XOPEN_SOURCE
+
 #include <stdlib.h>
 #include <signal.h>
 #include <locale.h>
 #include <ncurses.h>
 
 #include "util.h"
+#include "conf.h"
 #include "date.h"
 #include "cal.h"
 #include "view.h"
 
+/* Config parser */
+static void on_config(const char *group, const char *name, const char *key, const char *value)
+{
+	view_config(group, name, key, value);
+	cal_config(group, name, key, value);
+}
+
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
 {
@@ -38,6 +48,10 @@ int main(int argc, char **argv)
 	/* Misc setup */
 	signal(SIGINT, on_sigint);
 
+	/* Set default escape timeout */
+	if (!getenv("ESCDELAY"))
+		putenv("ESCDELAY=25");
+
 	/* Setup Curses */
 	setlocale(LC_ALL, "");
 	initscr();
@@ -52,13 +66,21 @@ int main(int argc, char **argv)
 	init_pair(COLOR_TITLE, COLOR_GREEN,   -1);
 	init_pair(COLOR_ERROR, COLOR_RED,     -1);
 
+	init_pair(COLOR_NEW,   COLOR_RED,     -1);
+	init_pair(COLOR_WIP,   COLOR_YELLOW,  -1);
+	init_pair(COLOR_DONE,  COLOR_GREEN,   -1);
+
 	init_pair(COLOR_CLASS, COLOR_BLUE,    -1);
 	init_pair(COLOR_EC,    COLOR_GREEN,   -1);
 	init_pair(COLOR_WORK,  COLOR_MAGENTA, -1);
 	init_pair(COLOR_OTHER, COLOR_RED,     -1);
 
+	/* Configuration */
+	conf_setup(argc, argv, ".lackeyrc", on_config);
+
 	/* Initialize */
 	util_init();
+	conf_init();
 	date_init();
 	cal_init();
 	view_init();
@@ -69,6 +91,7 @@ int main(int argc, char **argv)
 	/* Run */
 	while (1) {
 		MEVENT btn;
+		conf_sync();
 		int chr = getch();
 		if (chr == 'q')
 			break;
@@ -84,19 +107,20 @@ int main(int argc, char **argv)
 				view_resize();
 				view_draw();
 				continue;
-			case '\14':
+			case '\14': // Ctrl-L
 				clear();
-			case '\7':
+			case '\7':  // Ctrl-G
+				view_resize();
 				view_draw();
 				continue;
 		}
 		if (view_run(chr, btn.bstate, btn.y, btn.x))
 			continue;
-		debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>\n",
+		debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>",
 				chr, chr, chr, chr);
 	}
 
-	/* Cleanup, see also on_sigint */
+	/* Cleanup, see also on_sigint, error */
 	endwin();
 	return 0;
 }