X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=view%2Fweek.c;h=94adfe573f64aa97f500364617c97c43191b4abb;hb=328bd5c03655ddda1b43aadc72b1753d69048d74;hp=9f8419db1dfefe43d86596f18cc48a79857ee2e2;hpb=c4a0c84c3e569bac79c82cb588d8fd600b234c0b;p=lackey diff --git a/view/week.c b/view/week.c index 9f8419d..94adfe5 100644 --- a/view/week.c +++ b/view/week.c @@ -17,43 +17,68 @@ #define _XOPEN_SOURCE_EXTENDED +#include #include #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; /* Local functions */ static void print_event(event_t *event, wday_t day, hour_t hour, min_t min, float hstep) { - int x = 6+ROUND(day*hstep); - int y = 3+hour*4; - int l = (event->end.min - event->start.min)/15; - mvwprintw(win, y, x, "%s", event->name); + int x = ROUND(day*hstep); + int y = hour*4 + min/15 - line; + int w = ROUND((day+1)*hstep) - 1 - x; + int h = (get_mins(&event->start, &event->end)-1)/15+1; + int l = 0; + int s = y < 0 ? -y-1 : 0; + + int color = event->cat == NULL ? 0 : + !strcmp(event->cat, "class") ? COLOR_CLASS : + !strcmp(event->cat, "ec") ? COLOR_EC : + !strcmp(event->cat, "work") ? COLOR_WORK : COLOR_OTHER ; + + if (color) wattron(body, COLOR_PAIR(color)); + + if (h <= 1) mvwadd_wch(body, y, x, WACS_BULLET); + if (h >= 2) mvwadd_wch(body, y, x, WACS_T_ULCORNER); + if (h >= 3) mvwvline_set(body, y+1+s, x, WACS_T_VLINE, h-2-s); + if (h >= 2) mvwadd_wch(body, y+h-1, x, WACS_T_LLCORNER); + + if (color) wattroff(body, COLOR_PAIR(color)); + + if (lname) mvwprintw(body, y+l++, x+1, "%-*.*s", w-1, w-1, event->name); + if (lloc) mvwprintw(body, y+l++, x+1, "@ %-*.*s", w-3, w-3, event->loc); + if (ldesc) mvwprintw(body, y+l++, x+1, "%-*.*s", w-1, w-1, event->desc); + debug("week: event = %s\n", event->name); - (void)l; } -static int before(date_t *start, int year, int month, int day, int hour, int min) +/* Week init */ +void week_init(WINDOW *_win) { - int rval = start->year < year ? 1 : start->year > year ? 0 : - start->month < month ? 1 : start->month > month? 0 : - start->day < day ? 1 : start->day > day ? 0 : - start->hour < hour ? 1 : start->hour > hour ? 0 : - start->min < min ? 1 : start->min > min ? 0 : 0; - debug("week: %04d-%02d-%02d %02d:%02d < %04d-%02d-%02d %02d:%02d == %d\n", - start->year, start->month, start->day, start->hour, start->min, - year, month, day, hour, min, rval); - return rval; + win = _win; // lines cols y x + head = derwin(win, 2, COLS, 0, 0); + times = derwin(win, LINES-2-3, 5, 3, 0); + body = derwin(win, LINES-2-3, COLS-6, 3, 6); + line = 10*4; // 10:00 } -/* Week init */ -void week_init(WINDOW *_win) +/* Week size */ +void week_size(int rows, int cols) { - win = _win; + wresize(head, 2, cols ); + wresize(times, rows-3, 5); + wresize(body, rows-3, cols-6); } /* Week draw */ @@ -74,42 +99,40 @@ void week_draw(void) add_days(&year, &month, &day, -shift); /* Print Header */ - mvwprintw(win, 1, 0, "%s", month_to_str(MONTH)); + mvwprintw(head, 0, 0, "%s", month_to_str(MONTH)); + mvwprintw(head, 1, 0, "%04d", YEAR); for (int d = 0; d < 7; d++) { const char *str = hstep >= 10 ? day_to_string(d) : day_to_str(d); - if (d == shift) wattron(win, A_BOLD); - mvwprintw(win, 0, x+ROUND(d*hstep), "%02d/%02d", month+1, day+1); - mvwprintw(win, 1, x+ROUND(d*hstep), "%s", str); - if (d == shift) wattroff(win, A_BOLD); + if (d == shift) wattron(head, A_BOLD); + mvwprintw(head, 0, x+ROUND(d*hstep), "%s", str); + mvwprintw(head, 1, x+ROUND(d*hstep), "%02d/%02d", month+1, day+1); + if (d == shift) wattroff(head, A_BOLD); add_days(&year, &month, &day, 1); } /* Print times */ - hour_t start = 8; - for (int h = 0; h < (LINES-6)/4+1; h++) - mvwprintw(win, 3+h*4, 0,"%02d:%02d", (start+h)%12, 0); - - /* Print lines */ - mvwhline(win, y-1, 0, ACS_HLINE, COLS); - for (int d = 0; d < 7; d++) - mvwvline(win, y, x+ROUND(d*hstep)-1, ACS_VLINE, LINES-y-2); + 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; add_days(&year, &month, &day, -7); - for (int d = 0; d < 7; d++) { - for (int h = 0; h < (LINES-6)/4+1; h++) { - for (int m = 0; m < 60; m+=15) { - while (event && before(&event->start, year, month, day, start+h+(m+15)/60, (m+15)%60)) { - if (!before(&event->start, year, month, day, start+h, m)) - print_event(event, d, h, m, hstep); - event = event->next; - } - } - } - add_days(&year, &month, &day, 1); + for (int d = 0; d < 7; d++, add_days(&year,&month,&day,1)) + 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)) + print_event(event, d, h, m, hstep); + event = event->next; } + /* Print lines */ + mvwhline(win, y-1, 0, ACS_HLINE, COLS); + for (int d = 0; d < 7; d++) + mvwvline(win, y, x+ROUND(d*hstep)-1, ACS_VLINE, LINES-y-2); + /* Draw today */ int l = x+ROUND((shift+0)*hstep)-1; int r = x+ROUND((shift+1)*hstep)-1; @@ -121,16 +144,20 @@ void week_draw(void) /* Week run */ int week_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) { week_draw(); wrefresh(win); }