From aa360e05a1ab85e49adad6fa38c02850cd75dfe4 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 6 Oct 2012 08:25:15 +0000 Subject: [PATCH] Fix month drawing --- view/month.c | 30 ++++++++++++++++-------------- view/year.c | 25 +++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/view/month.c b/view/month.c index f93bc74..60f6b60 100644 --- a/view/month.c +++ b/view/month.c @@ -40,8 +40,8 @@ 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); @@ -50,7 +50,7 @@ void month_draw(void) 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); @@ -58,31 +58,33 @@ 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 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-1); - int r = ROUND((col+1)*hstep-1); - int t = ROUND((row+0)*vstep+2); - int b = ROUND((row+1)*vstep+2); + 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); diff --git a/view/year.c b/view/year.c index d20f22f..9e892f0 100644 --- 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; } -- 2.43.2