Convert YEAR/MONTH/DAY to Selection struct

[lackey] / views / events.c

diff --git a/views/events.c b/views/events.c
index 8b1c7aafdf5748cbaababba3d76e86fb0313509e..ced1a3fc3e3bb577333ed17a594a8810a2b8a17c 100644 (file)
--- a/views/events.c
+++ b/views/events.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -15,14 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define DEBUG
-
 #include <ncurses.h>
 
-#include <util.h>
-#include <date.h>
-#include <cal.h>
-#include <view.h>
+#include "util.h"
+#include "date.h"
+#include "cal.h"
+#include "view.h"
 
 /* Static data */
 static WINDOW *win;
@@ -46,10 +44,11 @@ void events_draw(void)
        int days = 2*7;
        int min  = 12;
 
-       date_t start = {YEAR, MONTH, DAY,    0, 0};
-       date_t cur   = {YEAR, MONTH, DAY-1,  0, 0};
-       date_t end   = {YEAR, MONTH, DAY,   24, 0};
+       date_t start = {SEL.year, SEL.month, SEL.day,    0, 0};
+       date_t cur   = {SEL.year, SEL.month, SEL.day-1,  0, 0};
+       date_t end   = {SEL.year, SEL.month, SEL.day,   24, 0};
        add_days(&end.year, &end.month, &end.day, days);
+       cal_load(SEL.year, SEL.month, SEL.day, days);
 
        int      row   = 0;
        int      count = 0;
@@ -68,15 +67,15 @@ void events_draw(void)
                                row++;
                        if (newdate) {
                                wday_t wday = day_of_week(next.year, next.month, next.day);
-                               wattron(win, A_UNDERLINE);
+                               wattron(win, A_BOLD);
                                mvwprintw(win, row-line, 0,  "%04d-%02d-%02d",
                                        next.year, next.month+1, next.day+1);
                                mvwprintw(win, row-line, 13, "%s, %s %d",
                                        day_to_string(wday), month_to_string(next.month), next.day);
-                               wattroff(win, A_UNDERLINE);
+                               wattroff(win, A_BOLD);
                                row++;
                        }
-                       event_line(win, event, row++-line, 4, COLS-2, 1);
+                       event_line(win, event, row++-line, 4, COLS-4, SHOW_DETAILS);
                        if (event->name && event->desc)
                                mvwprintw(win, row++-line, 14, "%s", event->desc);
                        cur = next;