X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=src%2Fmain.c;h=ce355394baec00373c7ec3ba6d89896f6f10b347;hp=fdcfbd8dd637ed0bce733eb58b4d4f06d0e5505e;hb=39c440444ff38c0e1702209c67cf018b92c71882;hpb=e1c3ab2bd61a81054b713f735fa31f827d258d76

diff --git a/src/main.c b/src/main.c
index fdcfbd8..ce35539 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,13 +15,10 @@
  * 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 "args.h"
 #include "util.h"
 #include "conf.h"
 #include "date.h"
@@ -31,14 +28,15 @@
 /* Config parser */
 static void on_config(const char *group, const char *name, const char *key, const char *value)
 {
-	view_config(group, name, key, value);
+	date_config(group, name, key, value);
 	cal_config(group, name, key, value);
+	view_config(group, name, key, value);
 }
 
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
 {
-	endwin();
+	view_exit();
 	exit(0);
 }
 
@@ -48,79 +46,24 @@ 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();
-	cbreak();
-	noecho();
-	keypad(stdscr, TRUE);
-	start_color();
-	curs_set(false);
-	use_default_colors();
-	mousemask(ALL_MOUSE_EVENTS, NULL);
-
-	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);
+	args_setup(argc, argv);
+	conf_setup(".lackeyrc", on_config);
 
 	/* Initialize */
+	args_init();
 	util_init();
 	conf_init();
 	date_init();
 	cal_init();
-	view_init();
 
-	/* Draw initial view */
-	view_draw();
+	/* Run args main */
+	args_main();
 
-	/* Run */
-	while (1) {
-		MEVENT btn;
-		conf_sync();
-		int chr = getch();
-		if (chr == 'q')
-			break;
-		if (chr == KEY_MOUSE)
-			if (getmouse(&btn) != OK)
-				continue;
-		switch (chr) {
-			case ERR:
-				continue;
-			case KEY_RESIZE:
-				endwin();
-				refresh();
-				view_resize();
-				view_draw();
-				continue;
-			case '\14': // Ctrl-L
-				clear();
-			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>",
-				chr, chr, chr, chr);
-	}
+	/* Run view main */
+	view_init();
+	view_main();
+	view_exit();
 
-	/* Cleanup, see also on_sigint, error */
-	endwin();
 	return 0;
 }