X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=75fb53c6de7ec1c6ff590709cc570c330920e9e9;hb=43d379d9d3e82940c5134188895a35fed13d3997;hp=1327a8240a6327882cb237a3800cf8b39224ffc3;hpb=011e995ee05e3fd9a990a39c85d4b279e16fd86e;p=lackey

diff --git a/src/main.c b/src/main.c
index 1327a82..75fb53c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,18 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _POSIX_C_SOURCE 1
-#include <stdarg.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <locale.h>
 #include <ncurses.h>
 
-#include "main.h"
+#include "util.h"
+#include "date.h"
+#include "event.h"
 #include "screen.h"
 
-/* Static data */
-static FILE *debug_fd = NULL;
-
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
 {
@@ -34,90 +32,68 @@ static void on_sigint(int signum)
 	exit(0);
 }
 
-/* Window change */
-static void on_sigwinch(int signum)
-{
-	endwin();
-	refresh();
-	screen_resize();
-	screen_draw();
-}
-
-/* Debugging functions */
-int debug(char *fmt, ...)
-{
-	int rval;
-	va_list ap;
-
-	/* Open log file */
-	if (!debug_fd)
-		debug_fd = fopen("lackey.log", "w+");
-
-	/* 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 */
-	struct sigaction act;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags   = 0;
-	act.sa_handler = on_sigint;
-	sigaction(SIGINT, &act, NULL);
-	act.sa_handler = on_sigwinch;
-	sigaction(SIGWINCH, &act, NULL);
+	signal(SIGINT, on_sigint);
 
-	/* Curses setup */
+	/* Setup Curses */
+	setlocale(LC_ALL, "");
 	initscr();
 	cbreak();
 	noecho();
 	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);
+
+	init_pair(COLOR_TITLE, COLOR_GREEN,   -1);
+	init_pair(COLOR_ERROR, COLOR_RED,     -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);
+
+	/* Initialize */
+	util_init();
+	date_init();
+	event_init();
 	screen_init();
+
+	/* Draw initial screen */
 	screen_draw();
 
 	/* Run */
 	while (1) {
 		MEVENT btn;
 		int chr = getch();
+		if (chr == 'q')
+			break;
 		if (chr == KEY_MOUSE)
 			if (getmouse(&btn) != OK)
 				continue;
-		if (chr == 'q')
-			break;
-		if (KEY_MOUSE)
-			//debug("mouse xyz=%d,%d,%d id=%hd state=%lx\n",
-			//	btn.x, btn.y, btn.z, btn.id, btn.bstate);
 		switch (chr) {
-			case 'L':
+			case ERR:
+				continue;
+			case KEY_RESIZE:
+				endwin();
+				refresh();
+				screen_resize();
+				screen_draw();
+				continue;
+			case '\14':
 				clear();
-			case 'l':
+			case '\7':
 				screen_draw();
-				break;
-			default:
-				screen_run(chr, btn.bstate, btn.y, btn.x);
-				break;
+				continue;
 		}
+		if (screen_run(chr, btn.bstate, btn.y, btn.x))
+			continue;
+		debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>\n",
+				chr, chr, chr, chr);
 	}
 
 	/* Cleanup, see also on_sigint */