X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=views%2Fweek.c;h=9f972521ad8c220f994d5bcc8ca5fe51b8ab15f7;hb=1c539418e58a005e670b48a83345f80d47445228;hp=4c550a359d9a430df2fce1c2faa59ebaf4163de4;hpb=992542eb3341474f168e8b970332b4c388c5c1e7;p=lackey

diff --git a/views/week.c b/views/week.c
index 4c550a3..9f97252 100644
--- a/views/week.c
+++ b/views/week.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
@@ -36,7 +36,7 @@ void week_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;
 }
 
 /* Week size */
@@ -56,12 +56,15 @@ void week_draw(void)
 	event_t *event;
 
 	/* Get start of week */
-	year_t  year  = YEAR;
-	month_t month = MONTH;
-	day_t   day   = DAY;
+	year_t  year  = SEL.year;
+	month_t month = SEL.month;
+	day_t   day   = SEL.day;
 	int shift = day_of_week(year, month, day);
 	add_days(&year, &month, &day, -shift);
 
+	/* Load cal data */
+	cal_load(year, month, day, 7);
+
 	/* For today */
 	int l = ROUND((shift+0)*hstep);
 	int r = ROUND((shift+1)*hstep);
@@ -69,8 +72,8 @@ void week_draw(void)
 	/* Print Header */
 	int rev = COMPACT ? A_REVERSE | A_BOLD : 0;
 	wattron(win, rev);
-	mvwprintw(win, 0, 0, "%-*s",  COLS, month_to_str(MONTH));
-	mvwprintw(win, 1, 0, "%-0*d", COLS, YEAR);
+	mvwprintw(win, 0, 0, "%-*s",  COLS, month_to_str(SEL.month));
+	mvwprintw(win, 1, 0, "%-0*d", COLS, SEL.year);
 	wattroff(win, rev);
 	mvwhline(win, 0, x+l, ' ', r-l-1);
 	mvwhline(win, 1, x+l, ' ', r-l-1);
@@ -169,7 +172,7 @@ int week_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);
 		week_draw();