Add box packing to day view

[lackey] / view / day.c

diff --git a/view/day.c b/view/day.c
index 37f9e2f4b6d7d289f6144dec9ad2578e5bb922ea..4ddc1d31739d3eca67539d7f0cb03216449ca47b 100644 (file)
--- a/view/day.c
+++ b/view/day.c
@@ -15,22 +15,96 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE_EXTENDED
+
+#include <string.h>
 #include <ncurses.h>
 
+#include "util.h"
 #include "date.h"
+#include "event.h"
+#include "screen.h"
 
 /* Static data */
+static int     line;
 static WINDOW *win;
+static WINDOW *head;
+static WINDOW *times;
+static WINDOW *body;
+
+/* Box packing helpers */
+static void clear_old(event_t **list, int n, event_t *cur)
+{
+       for (int i = 0; i < n; i++)
+               if (list[i] && compare(&list[i]->end, &cur->start) < 0)
+                       list[i] = NULL;
+}
+
+static int next_free(event_t **list, int n)
+{
+       for (int i = 0; i < n; i++)
+               if (!list[i])
+                       return i;
+       return n-1;
+}
+
+static int count_busy(event_t **list, int n)
+{
+       int sum = 0;
+       for (int i = 0; i < n; i++)
+               if (list[i])
+                       sum++;
+       return sum;
+}
+
+static int get_ncols(event_t *event, int n)
+{
+       int ncols = 0;
+       event_t *preview[n];
+       memset(preview, 0, sizeof(preview));
+       for (event_t *cur = event; cur; cur = cur->next) {
+               int col = next_free(preview, n);
+               preview[col] = cur;
+               ncols = MAX(ncols, col+1);
+               if (cur->next)
+                       clear_old(preview, n, cur->next);
+               if (count_busy(preview, n) == 0)
+                       break;
+       }
+       return ncols;
+}
+
+static int get_col(event_t **list, int n, event_t *event, int *ncols)
+{
+       clear_old(list, n, event);
+
+       /* If there are current events, then recalculate
+        * ncols for the next series of events */
+       if (count_busy(list, n) == 0)
+               *ncols = get_ncols(event, n);
+
+       /* Find next open slot */
+       int col = next_free(list, n);
+       list[col] = event;
+       return col;
+}
 
 /* Day init */
 void day_init(WINDOW *_win)
 {
-       win = _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);
+       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);
 }
 
 /* Day draw */
@@ -39,34 +113,57 @@ void day_draw(void)
        const char *mstr = month_to_string(MONTH);
        const char *dstr = day_to_string(day_of_week(YEAR, MONTH, DAY));
 
-       /* Clear */
-       werase(win);
-
        /* Print Header */
-       mvwprintw(win, 0, 0, "%s, %s %d", dstr, mstr, DAY+1);
-       mvwprintw(win, 0, COLS-10, "%d-%02d-%02d", YEAR, MONTH, DAY+1);
-       mvwhline(win, 1, 0, ACS_HLINE, COLS);
+       mvwprintw(head, 0, 0, "%s, %s %d", dstr, mstr, DAY+1);
+       mvwprintw(head, 0, COLS-10, "%d-%02d-%02d", YEAR, MONTH, DAY+1);
 
        /* Print times */
-       int start = 8;
-       for (int h = 0; h < (LINES-5)/4+1; h++)
-               mvwprintw(win, 2+h*4, 0,"%02d:%02d", (start+h)%12, 0);
+       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_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)) {
+                       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 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);
+               }
+               event = event->next;
+       }
+
+       /* Print lines */
+       mvwhline(win, 1, 0, ACS_HLINE, COLS);
        mvwvline(win, 2, 5, ACS_VLINE, LINES-4);
 }
 
 /* Day run */
 int day_run(int key, mmask_t btn, int row, int col)
 {
-       int days = 0;
+       int days = 0, ref = 0;
        switch (key)
        {
-               case 'h': days = -1; break;
-               case 'l': days =  1; break;
-               case 'i': days = -7; break;
-               case 'o': days =  7; break;
+               case 'h': ref = 1; days = -1; break;
+               case 'l': ref = 1; days =  1; break;
+               case 'i': ref = 1; days = -7; break;
+               case 'o': ref = 1; days =  7; break;
+               case 'k': ref = 1; line--;    break;
+               case 'j': ref = 1; line++;    break;
        }
-       if (days) {
+       line = CLAMP(line, 0, 24*4);
+       if (days)
                add_days(&YEAR, &MONTH, &DAY, days);
+       if (ref) {
+               werase(win);
                day_draw();
                wrefresh(win);
        }