Move drawing code to screen.c, work on day view

[lackey] / view / month.c

diff --git a/view/month.c b/view/month.c
index f93bc74a183f257dfdb242caf021259c5035a17d..2179f4f2c178f9e611d6a696375eb7311eb70ea5 100644 (file)
--- a/view/month.c
+++ b/view/month.c
@@ -20,8 +20,10 @@
 #include <string.h>
 #include <ncurses.h>
 
-#include "main.h"
 #include "util.h"
+#include "date.h"
+#include "event.h"
+#include "screen.h"
 
 /* Static data */
 static WINDOW *win;
@@ -32,6 +34,11 @@ void month_init(WINDOW *_win)
        win = _win;
 }
 
+/* Month size */
+void month_size(int rows, int cols)
+{
+}
+
 /* Month draw */
 void month_draw(void)
 {
@@ -40,17 +47,14 @@ void month_draw(void)
        const int   days  = days_in_month(YEAR, MONTH);
        const int   weeks = weeks_in_month(YEAR, MONTH);
        const float midpt = (float)COLS/2.0 - (strlen(name) + 1 + 4)/2.0;
-       const float hstep = (float)COLS/7.0;
-       const float vstep = (float)(LINES-4)/weeks;
-
-       /* Clear */
-       werase(win);
+       const float hstep = (float)(COLS-1)/7.0;
+       const float vstep = (float)(LINES-6)/weeks;
 
        /* Print Header */
        mvwprintw(win, 0, midpt, "%s %d", name, YEAR);
        for (int d = 0; d < 7; d++) {
                const char *str = hstep >= 10 ? day_to_string(d+SUN) : day_to_str(d+SUN);
-               mvwprintw(win, 1, ROUND(d*hstep), "%s", str);
+               mvwprintw(win, 1, ROUND(1+d*hstep), "%s", str);
        }
        mvwhline(win, 2, 0, ACS_HLINE, COLS);
 
@@ -58,31 +62,50 @@ void month_draw(void)
        for (int d = 0; d < days; d++) {
                int row = (start + d) / 7;
                int col = (start + d) % 7;
-               mvwprintw(win, ROUND(3+row*vstep), ROUND(col*hstep), "%d", d+1);
+               if (d == DAY) wattron(win, A_BOLD);
+               mvwprintw(win, ROUND(4+row*vstep), ROUND(1+col*hstep), "%d", d+1);
+               if (d == DAY) wattroff(win, A_BOLD);
+       }
+
+       /* Print events */
+       event_t *event = EVENTS;
+       for (int d = 0; d < days; d++) {
+               int y = ROUND(4+(((start + d) / 7)  )*vstep);
+               int e = ROUND(4+(((start + d) / 7)+1)*vstep)-2;
+               int x = ROUND(1+(((start + d) % 7)  )*hstep)+3;
+               int w = ROUND(1+(((start + d) % 7)+1)*hstep)-x-1;
+               while (event && before(&event->start, YEAR, MONTH, d, 24, 0)) {
+                       if (!before(&event->start, YEAR, MONTH, d, 0, 0)){
+                               if (y == e) mvwhline(win, y, x-3, ACS_DARROW, 2);
+                               if (y <= e) event_line(win, event, y, x, w);
+                               y++;
+                       }
+                       event = event->next;
+               }
        }
 
        /* Print lines */
        for (int w = 1; w < weeks; w++)
-               mvwhline(win, ROUND(2+w*vstep), 0, ACS_HLINE, COLS);
+               mvwhline(win, ROUND(3+w*vstep), 1, ACS_HLINE, COLS-2);
        for (int d = 1; d < 7; d++) {
-               int top = d >=  start         ? 0     : 1;
-               int bot = d <= (start+days)%7 ? weeks : weeks-1;
-               mvwvline(win, ROUND(3+top*vstep), ROUND(d*hstep-1),
+               int top = d >=  start             ? 0     : 1;
+               int bot = d <= (start+days-1)%7+1 ? weeks : weeks-1;
+               mvwvline(win, ROUND(4+top*vstep), ROUND(d*hstep),
                                ACS_VLINE, (bot-top)*vstep);
                for (int w = 1; w < weeks; w++) {
                        int chr = w == top ? ACS_TTEE :
                                  w == bot ? ACS_BTEE : ACS_PLUS;
-                       mvwaddch(win, ROUND(2+w*vstep), ROUND(d*hstep-1), chr);
+                       mvwaddch(win, ROUND(3+w*vstep), ROUND(d*hstep), chr);
                }
        }
 
        /* Draw today */
        int col = day_of_week(YEAR, MONTH, DAY);
        int row = (start+DAY) / 7;
-       int l = ROUND((col+0)*hstep-1);
-       int r = ROUND((col+1)*hstep-1);
-       int t = ROUND((row+0)*vstep+2);
-       int b = ROUND((row+1)*vstep+2);
+       int l = ROUND((col+0)*hstep);
+       int r = ROUND((col+1)*hstep);
+       int t = ROUND((row+0)*vstep+3);
+       int b = ROUND((row+1)*vstep+3);
        mvwvline_set(win, t, l, WACS_T_VLINE, b-t);
        mvwvline_set(win, t, r, WACS_T_VLINE, b-t);
        mvwhline_set(win, t, l, WACS_T_HLINE, r-l);
@@ -109,6 +132,7 @@ int month_run(int key, mmask_t btn, int row, int col)
        if (days || months) {
                add_days(&YEAR, &MONTH, &DAY, days);
                add_months(&YEAR, &MONTH, months);
+               werase(win);
                month_draw();
                wrefresh(win);
        }