Cleanup headers and whitespace

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4161b031deb31d77ed554a8d64f9bdb1e959a654..3a20fe87feaa9ae6fa00efd4c68dd8a9bf0ccd93 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,14 +1,29 @@
-#define _POSIX_C_SOURCE 1
-#include <stdarg.h>
+/*
+ * Copyright (C) 2012 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 "main.h"
-#include "screen.h"
-
-/* Static data */
-static FILE *debug_fd = NULL;
+#include "util.h"
+#include "date.h"
+#include "cal.h"
+#include "view.h"
 
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
@@ -17,87 +32,72 @@ 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;
-
-       /* 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;
-       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);
-       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);
+
+       /* Initialize */
+       util_init();
+       date_init();
+       cal_init();
+       view_init();
+
+       /* Draw initial view */
+       view_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();
+                               view_resize();
+                               view_draw();
+                               continue;
+                       case '\14':
                                clear();
-                       case 'l':
-                               screen_draw();
-                               break;
-                       default:
-                               screen_run(chr, btn.bstate, btn.y, btn.x);
-                               break;
+                       case '\7':
+                               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>\n",
+                               chr, chr, chr, chr);
        }
 
        /* Cleanup, see also on_sigint */