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

diff --git a/src/main.c b/src/main.c
index 20bea55..fdcfbd8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,37 +1,39 @@
 /*
- * 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/>.
  */
 
-#include <stdarg.h>
+#define _XOPEN_SOURCE
+
 #include <stdlib.h>
 #include <signal.h>
-#include <time.h>
 #include <locale.h>
 #include <ncurses.h>
 
-#include "main.h"
-#include "screen.h"
-
-/* Debugging */
-year_t  YEAR  = 2012;
-month_t MONTH = 8;
-day_t   DAY   = 29;
+#include "util.h"
+#include "conf.h"
+#include "date.h"
+#include "cal.h"
+#include "view.h"
 
-/* Static data */
-static FILE *debug_fd = NULL;
+/* 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)
@@ -40,45 +42,17 @@ static void on_sigint(int signum)
 	exit(0);
 }
 
-/* Debugging functions */
-int debug(char *fmt, ...)
-{
-	int rval;
-	va_list ap;
-
-	/* Log to debug file */
-	va_start(ap, fmt);
-	vfprintf(debug_fd, "debug: ", ap);
-	rval = vfprintf(debug_fd, fmt, ap);
-
-	/* Log to status bar */
-	va_start(ap, fmt);
-	mvhline(LINES-2, 0, ACS_HLINE, COLS);
-	move(LINES-1, 0);
-	attron(COLOR_PAIR(COLOR_ERROR));
-	vwprintw(stdscr, fmt, ap);
-	attroff(COLOR_PAIR(COLOR_ERROR));
-	clrtoeol();
-
-	va_end(ap);
-	return rval;
-}
-
 /* Main */
 int main(int argc, char **argv)
 {
 	/* Misc setup */
 	signal(SIGINT, on_sigint);
-	debug_fd = fopen("/tmp/lackey.log", "w+");
 
-	/* Time setup */
-	time_t sec = time(NULL);
-	struct tm *tm = localtime(&sec);
-	YEAR  = tm->tm_year+1900;
-	MONTH = tm->tm_mon;
-	DAY   = tm->tm_mday-1;
+	/* Set default escape timeout */
+	if (!getenv("ESCDELAY"))
+		putenv("ESCDELAY=25");
 
-	/* Curses setup */
+	/* Setup Curses */
 	setlocale(LC_ALL, "");
 	initscr();
 	cbreak();
@@ -86,15 +60,38 @@ int main(int argc, char **argv)
 	keypad(stdscr, TRUE);
 	start_color();
 	curs_set(false);
+	use_default_colors();
 	mousemask(ALL_MOUSE_EVENTS, NULL);
-	init_pair(COLOR_TITLE, COLOR_GREEN, COLOR_BLACK);
-	init_pair(COLOR_ERROR, COLOR_RED,   COLOR_BLACK);
-	screen_init();
-	screen_draw();
+
+	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();
+
+	/* Draw initial view */
+	view_draw();
 
 	/* Run */
 	while (1) {
 		MEVENT btn;
+		conf_sync();
 		int chr = getch();
 		if (chr == 'q')
 			break;
@@ -107,22 +104,23 @@ int main(int argc, char **argv)
 			case KEY_RESIZE:
 				endwin();
 				refresh();
-				screen_resize();
-				screen_draw();
+				view_resize();
+				view_draw();
 				continue;
-			case '\14':
+			case '\14': // Ctrl-L
 				clear();
-			case '\7':
-				screen_draw();
+			case '\7':  // Ctrl-G
+				view_resize();
+				view_draw();
 				continue;
 		}
-		if (screen_run(chr, btn.bstate, btn.y, btn.x))
+		if (view_run(chr, btn.bstate, btn.y, btn.x))
 			continue;
-		//debug("Unhandled key: Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>\n",
-		//		chr, chr, chr, chr);
+		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;
 }