Make morning time configurable

[lackey] / views / day.c

diff --git a/views/day.c b/views/day.c
index d3ead1cd97eb980db033095dba479ebb11bdeec6..3d7e1953c226f100bd3664d9213da87338340fd2 100644 (file)
--- a/views/day.c
+++ b/views/day.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
@@ -94,7 +94,7 @@ void day_init(WINDOW *_win)
        win   = _win; //    lines    cols    y  x
        times = derwin(win, LINES-2,      5, 0, 0);
        body  = derwin(win, LINES-2, COLS-5, 0, 5);
-       line  = 10*4; // 10:00
+       line  = MORNING*4;
 }
 
 /* Day size */
@@ -108,35 +108,53 @@ void day_size(int rows, int cols)
 /* Day draw */
 void day_draw(void)
 {
-       const char *mstr = month_to_string(MONTH);
-       const char *dstr = day_to_string(day_of_week(YEAR, MONTH, DAY));
+       const char *mstr = month_to_string(SEL.month);
+       const char *dstr = day_to_string(day_of_week(SEL.year, SEL.month, SEL.day));
 
        int y = !COMPACT+1;
+       event_t *event;
+
+       /* Load cal data */
+       cal_load(SEL.year, SEL.month, SEL.day, 1);
 
        /* Print Header */
        if (COMPACT) wattron(win, A_REVERSE | A_BOLD);
        mvwhline(win, 0, 0, ' ', COLS);
-       mvwprintw(win, 0, 0, "%s, %s %d", dstr, mstr, DAY+1);
-       mvwprintw(win, 0, COLS-10, "%d-%02d-%02d", YEAR, MONTH, DAY+1);
+       mvwprintw(win, 0, 0, "%s, %s %d", dstr, mstr, SEL.day+1);
+       mvwprintw(win, 0, COLS-10, "%d-%02d-%02d", SEL.year, SEL.month+1, SEL.day+1);
        if (COMPACT) wattroff(win, A_REVERSE | A_BOLD);
 
+       /* Print all day events */
+       event = EVENTS;
+       int allday = 0;
+       while (event && before(&event->start, SEL.year, SEL.month, SEL.day, 24, 0)) {
+               if (!before(&event->end, SEL.year, SEL.month, SEL.day, 0, 1) &&
+                   get_mins(&event->start, &event->end) > 23*60)
+                       event_line(win, event, y+allday++, 6, COLS, SHOW_DETAILS);
+               event = event->next;
+       }
+       if (allday && !COMPACT)
+               allday++;
+
        /* Resize body */
-       wshrink(times, y);
-       wshrink(body,  y);
+       wshrink(times, y+allday);
+       wshrink(body,  y+allday);
+
        /* Print times */
        mvwprintw(times, 0, 0, "%02d:%02d", ((line/4)-1)%12+1, (line*15)%60);
        for (int h = 0; h < 24; h++)
                mvwprintw(times, h*4-line, 0, "%02d:%02d", (h-1)%12+1, 0);
 
        /* Print events */
-       event_t *event = EVENTS;
+       event = EVENTS;
        event_t *active[10] = {};
        int ncols = 0;
        for (int h = 0; h < 24; h++)
        for (int m = 0; m < 60; m+=15)
        while (event && before(&event->start,
-                       YEAR, MONTH, DAY, h+(m+15)/60, (m+15)%60)) {
-               if (!before(&event->start, YEAR, MONTH, DAY, h, m)) {
+                       SEL.year, SEL.month, SEL.day, h+(m+15)/60, (m+15)%60)) {
+               if (!before(&event->start, SEL.year, SEL.month, SEL.day, h, m) &&
+                   get_mins(&event->start, &event->end) <= 23*60) {
                        int col    = get_col(active, N_ELEMENTS(active), event, &ncols);
                        int left   = ROUND((col+0.0)*(COLS-6)/ncols) + 1;
                        int right  = ROUND((col+1.0)*(COLS-6)/ncols) + 1;
@@ -150,6 +168,8 @@ void day_draw(void)
        /* Print lines */
        if (!COMPACT)
                mvwhline(win, 1, 0, ACS_HLINE, COLS);
+       if (!COMPACT && allday)
+               mvwhline(win, allday+1, 0, ACS_HLINE, COLS);
        mvwvline(body, 0, 0, ACS_VLINE, LINES-4+COMPACT+COMPACT);
 }
 
@@ -168,7 +188,7 @@ int day_run(int key, mmask_t btn, int row, int col)
        }
        line = CLAMP(line, 0, 24*4);
        if (days)
-               add_days(&YEAR, &MONTH, &DAY, days);
+               add_days(&SEL.year, &SEL.month, &SEL.day, days);
        if (ref) {
                werase(win);
                day_draw();