/*
- * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
const int start = start_of_month(YEAR, MONTH);
const int days = days_in_month(YEAR, MONTH);
const int weeks = weeks_in_month(YEAR, MONTH);
+ const int hdr = COMPACT ? 3 : 4;
const float midpt = (float)COLS/2.0 - (strlen(name) + 1 + 4)/2.0;
const float hstep = (float)(COLS-1)/7.0;
- const float vstep = (float)(LINES-6)/weeks;
+ const float vstep = (float)(LINES-2-hdr+COMPACT)/weeks;
+
+ /* Load cal data */
+ cal_load(YEAR, MONTH, 0, days);
/* Print Header */
+ if (COMPACT) wattron(win, A_REVERSE | A_BOLD);
+ if (COMPACT) mvwhline(win, 0, 0, ' ' | A_REVERSE | A_BOLD, COLS);
+ if (COMPACT) mvwhline(win, 1, 0, ' ' | A_REVERSE | A_BOLD, COLS);
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(1+d*hstep), "%s", str);
}
- mvwhline(win, 2, 0, ACS_HLINE, COLS);
+ if (COMPACT) wattroff(win, A_REVERSE | A_BOLD);
+ if (!COMPACT) mvwhline(win, 2, 0, ACS_HLINE, COLS);
/* Print days */
for (int d = 0; d < days; d++) {
int row = (start + d) / 7;
int col = (start + d) % 7;
if (d == DAY) wattron(win, A_BOLD);
- mvwprintw(win, ROUND(4+row*vstep), ROUND(1+col*hstep), "%d", d+1);
+ mvwprintw(win, ROUND(hdr+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;
+ int y = ROUND(hdr+(((start + d) / 7) )*vstep);
+ int e = ROUND(hdr+(((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);
/* Print lines */
for (int w = 1; w < weeks; w++)
- mvwhline(win, ROUND(3+w*vstep), 1, ACS_HLINE, COLS-2);
+ mvwhline(win, ROUND(hdr-1+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-1)%7+1 ? weeks : weeks-1;
- mvwvline(win, ROUND(4+top*vstep), ROUND(d*hstep),
+ mvwvline(win, ROUND(hdr+top*vstep), ROUND(d*hstep),
ACS_VLINE, (bot-top)*vstep);
for (int w = 1; w < weeks; w++) {
int chr = w == top ? ACS_TTEE :
w == bot ? ACS_BTEE : ACS_PLUS;
- mvwaddch(win, ROUND(3+w*vstep), ROUND(d*hstep), chr);
+ mvwaddch(win, ROUND(hdr-1+w*vstep), ROUND(d*hstep), chr);
}
}
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);
+ int t = ROUND((row+0)*vstep+hdr-1);
+ int b = ROUND((row+1)*vstep+hdr-1);
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);
month_draw();
wrefresh(win);
}
- return 0;
+ return days || months;
}