Add day and week output flags

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 5de195da34a006558770a10cc66a8d9be5e22b41..99816b13fb40f76af822b511ba13130036c85e94 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,108 +1,68 @@
-#define _POSIX_C_SOURCE 1
-#include <stdarg.h>
+/*
+ * 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 <ncurses.h>
 
-#include "main.h"
-#include "screen.h"
+#include "args.h"
+#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)
 {
-       endwin();
-       debug("got sigint\n");
+       view_exit();
        exit(0);
 }
 
-/* Window change */
-static void on_sigwinch(int signum)
-{
-       endwin();
-       refresh();
-       screen_draw();
-}
-
-/* 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 */
-       debug_fd = fopen("acal.log", "w+");
-       struct sigaction act;
-       sigemptyset(&act.sa_mask);
-       act.sa_flags   = 0;
-       act.sa_handler = on_sigint;
-       if (sigaction(SIGINT, &act, NULL) < 0)
-               debug("sigint error\n");
-       act.sa_handler = on_sigwinch;
-       if (sigaction(SIGWINCH, &act, NULL) < 0)
-               debug("sigwinch error\n");
+       signal(SIGINT, on_sigint);
+
+       /* Configuration */
+       args_setup(argc, argv);
+       conf_setup(".lackeyrc", on_config);
+
+       /* Initialize */
+       args_init();
+       util_init();
+       conf_init();
+       date_init();
+       cal_init();
 
-       /* Curses setup */
-       initscr();
-       cbreak();
-       noecho();
-       keypad(stdscr, TRUE);
-       start_color();
-       curs_set(false);
-       mousemask(ALL_MOUSE_EVENTS, NULL);
-       init_pair(COLOR_TITLE, COLOR_GREEN, COLOR_BLACK);
-       init_pair(COLOR_ERROR, COLOR_RED,   COLOR_BLACK);
-       screen_init();
+       /* Run args main */
+       args_main();
 
-       /* Run */
-       while (1) {
-               MEVENT btn;
-               int chr = getch();
-               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':
-                               clear();
-                       case 'l':
-                               screen_draw();
-                               break;
-                       default:
-                               screen_run(chr, btn.bstate, btn.y, btn.x);
-                               break;
-               }
-       }
+       /* Run view main */
+       view_init();
+       view_main();
+       view_exit();
 
-       /* Cleanup, see also on_sigint */
-       endwin();
-       debug("cleanup");
        return 0;
 }