Fix month drawing

[lackey] / view / year.c

diff --git a/view/year.c b/view/year.c
index d20f22fe4bd86cc2e8eeb41c74786c2bf765ee11..9e892f073277679205f416bf7dd6a23fd2d2d443 100644 (file)
--- a/view/year.c
+++ b/view/year.c
@@ -40,7 +40,9 @@ static void print_month(month_t month, int y, int x)
        for (int d = 0; d < days; d++) {
                int row = (start + d) / 7;
                int col = (start + d) % 7;
+               if (month == MONTH && d == DAY) wattron(win, A_REVERSE);
                mvwprintw(win, y+2+row, x+col*3, "%2d", d+1);
+               if (month == MONTH && d == DAY) wattroff(win, A_REVERSE);
        }
 }
 
@@ -58,6 +60,9 @@ void year_draw(void)
        int y = 0;
        int h[4] = {};
 
+       /* Clear */
+       werase(win);
+
        /* Determine heights */
        for (int m = 0; m < 12; m++) {
                int weeks = weeks_in_month(YEAR, m);
@@ -95,5 +100,25 @@ void year_draw(void)
 /* Year run */
 int year_run(int key, mmask_t btn, int row, int col)
 {
+       wday_t day = day_of_week(YEAR, MONTH, DAY);
+       int days = 0, months = 0, years = 0;
+       switch (key)
+       {
+               case 'k': days   = -7; break;
+               case 'j': days   =  7; break;
+               case 'h': days   = -1; break;
+               case 'l': days   =  1; break;
+               case 'i': years  = -1; break;
+               case 'o': years  =  1; break;
+       }
+       if (day == SUN && days == -1) days = -22;
+       if (day == SAT && days ==  1) days =  22;
+       if (days || months || years) {
+               add_days(&YEAR, &MONTH, &DAY, days);
+               add_months(&YEAR, &MONTH, months);
+               YEAR += years;
+               year_draw();
+               wrefresh(win);
+       }
        return 0;
 }