Add ncursesw CPPFLAGS

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4be87502b6224040c53358dda14cfb29cd2fd69b..cc1444afcc6743f4e7809d17526c74cfdc966002 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,8 +22,8 @@
 
 #include "util.h"
 #include "date.h"
-#include "event.h"
-#include "screen.h"
+#include "cal.h"
+#include "view.h"
 
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
@@ -46,18 +46,29 @@ int main(int argc, char **argv)
        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_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();
-       event_init();
-       screen_init();
+       cal_init();
+       view_init();
 
-       /* Draw initial screen */
-       screen_draw();
+       /* Draw initial view */
+       view_draw();
 
        /* Run */
        while (1) {
@@ -74,16 +85,16 @@ int main(int argc, char **argv)
                        case KEY_RESIZE:
                                endwin();
                                refresh();
-                               screen_resize();
-                               screen_draw();
+                               view_resize();
+                               view_draw();
                                continue;
                        case '\14':
                                clear();
                        case '\7':
-                               screen_draw();
+                               view_draw();
                                continue;
                }
-               if (screen_run(chr, btn.bstate, btn.y, btn.x))
+               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);