X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=view%2Fmonth.c;h=4e8b237a9942f356be668d3feeecab7e35a1ee59;hb=328bd5c03655ddda1b43aadc72b1753d69048d74;hp=fb2be064a2612e38a39ffd8a555840aec161f86b;hpb=ee82a6d611fb17b94462b7b2a87b0b5cc3ec1178;p=lackey

diff --git a/view/month.c b/view/month.c
index fb2be06..4e8b237 100644
--- a/view/month.c
+++ b/view/month.c
@@ -15,21 +15,45 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE_EXTENDED
+
 #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;
 
+/* Local functions */
+static void print_event(event_t *event, int y, int x, int w)
+{
+	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(win, COLOR_PAIR(color));
+	mvwaddch(win, y, x+0, ACS_BLOCK);
+	if (color) wattroff(win, COLOR_PAIR(color));
+
+	mvwprintw(win, y, x+1, "%-*.*s", w-1, w-1, event->name);
+}
+
 /* Month init */
 void month_init(WINDOW *_win)
 {
 	win = _win;
 }
 
+/* Month size */
+void month_size(int rows, int cols)
+{
+}
+
 /* Month draw */
 void month_draw(void)
 {
@@ -38,14 +62,17 @@ 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;
+	const float hstep = (float)(COLS-1)/7.0;
+	const float vstep = (float)(LINES-6)/weeks;
+
+	/* Clear */
+	werase(win);
 
 	/* 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);
 
@@ -53,27 +80,78 @@ 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) print_event(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),
-				ACS_VLINE, (bot-top)*vstep);
+		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-1);
 		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);
+	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);
+	mvwhline_set(win, b, l, WACS_T_HLINE, r-l);
+	mvwadd_wch(win, t, l, WACS_T_ULCORNER);
+	mvwadd_wch(win, t, r, WACS_T_URCORNER);
+	mvwadd_wch(win, b, l, WACS_T_LLCORNER);
+	mvwadd_wch(win, b, r, WACS_T_LRCORNER);
 }
 
 /* Month run */
 int month_run(int key, mmask_t btn, int row, int col)
 {
+	int days = 0, months = 0;
+	switch (key)
+	{
+		case 'h': days   = -1; break;
+		case 'j': days   =  7; break;
+		case 'k': days   = -7; break;
+		case 'l': days   =  1; break;
+		case 'i': months = -1; break;
+		case 'o': months =  1; break;
+	}
+	if (days || months) {
+		add_days(&YEAR, &MONTH, &DAY, days);
+		add_months(&YEAR, &MONTH, months);
+		month_draw();
+		wrefresh(win);
+	}
 	return 0;
 }