Add day and week output flags

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 75fb53c6de7ec1c6ff590709cc570c330920e9e9..99816b13fb40f76af822b511ba13130036c85e94 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,34 +1,41 @@
 /*
- * 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 <stdlib.h>
 #include <signal.h>
-#include <locale.h>
-#include <ncurses.h>
 
+#include "args.h"
 #include "util.h"
+#include "conf.h"
 #include "date.h"
-#include "event.h"
-#include "screen.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)
 {
-       endwin();
+       view_exit();
        exit(0);
 }
 
@@ -38,65 +45,24 @@ int main(int argc, char **argv)
        /* Misc setup */
        signal(SIGINT, on_sigint);
 
-       /* 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_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 */
+       args_setup(argc, argv);
+       conf_setup(".lackeyrc", on_config);
 
        /* Initialize */
+       args_init();
        util_init();
+       conf_init();
        date_init();
-       event_init();
-       screen_init();
+       cal_init();
 
-       /* Draw initial screen */
-       screen_draw();
+       /* Run args main */
+       args_main();
 
-       /* Run */
-       while (1) {
-               MEVENT btn;
-               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();
-                               screen_resize();
-                               screen_draw();
-                               continue;
-                       case '\14':
-                               clear();
-                       case '\7':
-                               screen_draw();
-                               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);
-       }
+       /* Run view main */
+       view_init();
+       view_main();
+       view_exit();
 
-       /* Cleanup, see also on_sigint */
-       endwin();
        return 0;
 }