Add bit flags for event and todo line items

[lackey] / views / day.c

diff --git a/views/day.c b/views/day.c
index c72b1725afdc77edb16b63d6b1cdf619438d51fa..3873204f3bd4e8f7cd754292246bec23e4a279ef 100644 (file)
--- a/views/day.c
+++ b/views/day.c
@@ -1,16 +1,16 @@
 /*
- * 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
  * 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/>.
  */
@@ -28,7 +28,6 @@
 /* Static data */
 static int     line;
 static WINDOW *win;
-static WINDOW *head;
 static WINDOW *times;
 static WINDOW *body;
 
@@ -92,19 +91,18 @@ static int get_col(event_t **list, int n, event_t *event, int *ncols)
 /* Day init */
 void day_init(WINDOW *_win)
 {
-       win   = _win; //  lines  cols  y  x
-       head  = derwin(win,         1, COLS,   0, 0);
-       times = derwin(win, LINES-2-2,      5, 2, 0);
-       body  = derwin(win, LINES-2-2, COLS-6, 2, 6);
+       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
 }
 
 /* Day size */
 void day_size(int rows, int cols)
 {
-       wresize(head,       1, cols  );
-       wresize(times, rows-2,      5);
-       wresize(body,  rows-2, cols-6);
+       int hdr = 2-COMPACT;
+       wmvresize(times, hdr, 0, rows-hdr,      5);
+       wmvresize(body,  hdr, 5, rows-hdr, cols-5);
 }
 
 /* Day draw */
@@ -113,9 +111,34 @@ void day_draw(void)
        const char *mstr = month_to_string(MONTH);
        const char *dstr = day_to_string(day_of_week(YEAR, MONTH, DAY));
 
+       int y = !COMPACT+1;
+       event_t *event;
+
+       /* Load cal data */
+       cal_load(YEAR, MONTH, DAY, 1);
+
        /* Print Header */
-       mvwprintw(head, 0, 0, "%s, %s %d", dstr, mstr, DAY+1);
-       mvwprintw(head, 0, COLS-10, "%d-%02d-%02d", YEAR, MONTH, DAY+1);
+       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);
+       if (COMPACT) wattroff(win, A_REVERSE | A_BOLD);
+
+       /* Print all day events */
+       event = EVENTS;
+       int allday = 0;
+       while (event && before(&event->start, YEAR, MONTH, DAY, 24, 0)) {
+               if (!before(&event->end, YEAR, MONTH, 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+allday);
+       wshrink(body,  y+allday);
 
        /* Print times */
        mvwprintw(times, 0, 0, "%02d:%02d", ((line/4)-1)%12+1, (line*15)%60);
@@ -123,17 +146,18 @@ void day_draw(void)
                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)) {
+               if (!before(&event->start, YEAR, MONTH, 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);
-                       int right  = ROUND((col+1.0)*(COLS-6)/ncols);
+                       int left   = ROUND((col+0.0)*(COLS-6)/ncols) + 1;
+                       int right  = ROUND((col+1.0)*(COLS-6)/ncols) + 1;
                        int row    = h*4 + m/15 - line;
                        int height = (get_mins(&event->start, &event->end)-1)/15+1;
                        event_box(body, event, row, left, height, right-left);
@@ -142,8 +166,11 @@ void day_draw(void)
        }
 
        /* Print lines */
-       mvwhline(win, 1, 0, ACS_HLINE, COLS);
-       mvwvline(win, 2, 5, ACS_VLINE, LINES-4);
+       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);
 }
 
 /* Day run */
@@ -167,5 +194,5 @@ int day_run(int key, mmask_t btn, int row, int col)
                day_draw();
                wrefresh(win);
        }
-       return 0;
+       return ref;
 }