#include <ncurses.h>
#include "util.h"
+#include "conf.h"
#include "date.h"
#include "cal.h"
#include "view.h"
+/* From day.c */
+int get_col(event_t **list, int n, event_t *event, int *ncols);
+void move_event(int events, int days, int *line);
+
/* Static data */
static int line;
static 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 */
{
int x = 6;
int y = 3 - COMPACT;
- const float hstep = (float)(COLS-x)/7.0;
- event_t *event;
+ int ex, ey, ew, eh;
+ event_t *event, *ee;
/* Get start of week */
- year_t year = YEAR;
- month_t month = MONTH;
- day_t day = DAY;
- int shift = day_of_week(year, month, day);
- add_days(&year, &month, &day, -shift);
+ year_t year = SEL.year;
+ month_t month = SEL.month;
+ day_t day = SEL.day;
+ wday_t wday = day_of_week(year, month, day);
+ add_days(&year, &month, &day, -wday);
/* Load cal data */
cal_load(year, month, day, 7);
/* For today */
- int l = ROUND((shift+0)*hstep);
- int r = ROUND((shift+1)*hstep);
+ int wstart = WEEKENDS ? SUN : MON;
+ int wend = WEEKENDS ? SAT : FRI;
+ int wdays = wend - wstart + 1;
+ float hstep = (float)(COLS-x)/wdays;
+ add_days(&year, &month, &day, wstart);
+
+ /* For today */
+ int l = ROUND((wday-wstart+0)*hstep);
+ int r = ROUND((wday-wstart+1)*hstep);
/* 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);
wattron(win, rev);
- for (int d = 0; d < 7; d++) {
- const char *str = hstep >= 10 ? day_to_string(d) : day_to_str(d);
- if (d == shift) wattrset(win, A_BOLD);
- mvwprintw(win, 0, x+ROUND(d*hstep), "%s", str);
- mvwprintw(win, 1, x+ROUND(d*hstep), "%02d/%02d", month+1, day+1);
- if (d == shift) wattrset(win, rev);
+ for (int i = 0; i < wdays; i++) {
+ const char *str = hstep >= 10 ? day_to_string(wstart+i)
+ : day_to_str(wstart+i);
+ if (wstart+i == wday) wattrset(win, A_BOLD);
+ mvwprintw(win, 0, x+ROUND(i*hstep), "%s", str);
+ mvwprintw(win, 1, x+ROUND(i*hstep), "%02d/%02d", month+1, day+1);
+ if (wstart+i == wday) wattrset(win, rev);
add_days(&year, &month, &day, 1);
}
wattroff(win, rev);
/* Print all day events */
int allday = 0;
event = EVENTS;
- add_days(&year, &month, &day, -7);
- for (int d = 0; d < 7; d++) {
+ add_days(&year, &month, &day, -wdays);
+ for (int i = 0; i < wdays; i++) {
int n = 0;
while (event && before(&event->start, year, month, day, 24, 0)) {
if (!before(&event->end, year, month, day, 0, 1) &&
get_mins(&event->start, &event->end) > 23*60) {
- int s = ROUND(d*hstep);
- int w = ROUND((d+1)*hstep) - 1 - s;
- event_line(win, event, y+n++, x+s, w, 0);
+ int s = ROUND(i*hstep);
+ int w = ROUND((i+1)*hstep) - 1 - s;
+ event_line(win, event, y+n++, x+s, w, SHOW_ACTIVE);
}
event = event->next;
if (n > allday)
mvwprintw(times, !COMPACT+h*4-line, 0, "%02d:%02d", (h-1)%12+1, 0);
/* Print events */
+ if (!EVENT)
+ EVENT = find_event(&SEL);
+ ee = NULL;
event = EVENTS;
- add_days(&year, &month, &day, -7);
- for (int d = 0; d < 7; d++, add_days(&year,&month,&day,1))
+ add_days(&year, &month, &day, -wdays);
+ event_t *active[5] = {};
+ int ncols = 0;
+ for (int i = 0; i < wdays; i++, add_days(&year,&month,&day,1))
for (int h = 0; h < 24; h++)
for (int m = 0; m < 60; m+=15)
while (event && before(&event->start,
year, month, day, h+(m+15)/60, (m+15)%60)) {
if (!before(&event->start, year, month, day, h, m) &&
get_mins(&event->start, &event->end) <= 23*60) {
+ int col = get_col(active, N_ELEMENTS(active), event, &ncols);
int y = h*4 + m/15 - line + !COMPACT;
- int x = ROUND(d*hstep) + 1;
+ int x = ROUND(i*hstep) + 1 + (col*3);
int h = (get_mins(&event->start, &event->end)-1)/15+1;
- int w = ROUND((d+1)*hstep) - x;
- event_box(body, event, y, x, h, w);
+ int w = ROUND((i+1)*hstep) - x - ((ncols-1)-col)*3;
+ if (event == EVENT) {
+ ee = event; ex = x; ey = y; ew = w; eh = h;
+ } else
+ event_box(body, event, y, x, h, w);
}
event = event->next;
}
+ /* Draw current event on top of other events */
+ if (ee)
+ event_box(body, ee, ey, ex, eh, ew);
+
/* Print header lines */
if (!COMPACT)
mvwhline(win, y-1, 0, ACS_HLINE, COLS);
mvwhline(win, y-1+allday, 0, ACS_HLINE, COLS);
/* Print day lines */
- for (int d = 0; d < 7; d++)
- mvwvline(body, !COMPACT, ROUND(d*hstep), ACS_VLINE, LINES-y-2+COMPACT-allday);
+ for (int i = 0; i < wdays; i++)
+ mvwvline(body, !COMPACT, ROUND(i*hstep),
+ ACS_VLINE, LINES-y-2+COMPACT-allday);
mvwvline_set(body, 0, l, WACS_T_VLINE, LINES-y-1+COMPACT);
mvwvline_set(body, 0, r, WACS_T_VLINE, LINES-y-1+COMPACT);
for (int h = (line+3)/4; h < 24; h++) {
/* Week run */
int week_run(int key, mmask_t btn, int row, int col)
{
- int days = 0, ref = 0;
- switch (key)
- {
- case 'h': ref = 1; days = -1; break;
- case 'l': ref = 1; days = 1; break;
- case 'i': ref = 1; days = -7; break;
- case 'o': ref = 1; days = 7; break;
- case 'k': ref = 1; line--; break;
- case 'j': ref = 1; line++; break;
+ int days = 0, events = 0, lines = 0, toggle = 0;
+ switch (key) {
+ case 'h': days = -1; break;
+ case 'l': days = 1; break;
+ case 'i': days = -7; break;
+ case 'o': days = 7; break;
+ case 'k': events = -1; break;
+ case 'j': events = 1; break;
+ case '\031': lines = -1; break; // ctrl-y
+ case '\005': lines = 1; break; // ctrl-e
+ case 'w': toggle = 1; break;
+ case 'e': view_edit(EDIT_EVENT); return 1;
+ case '\012': view_edit(EDIT_EVENT); return 1; // enter
+ default: return 0; // not found
}
- line = CLAMP(line, 0, 24*4);
- if (days)
- add_days(&YEAR, &MONTH, &DAY, days);
- if (ref) {
- werase(win);
- week_draw();
- wrefresh(win);
+
+ wday_t wday = day_of_week(SEL.year, SEL.month, SEL.day);
+ if (!WEEKENDS && ((wday == MON && days == -1) ||
+ (wday == FRI && days == 1)))
+ days *= 3;
+
+ if (toggle) {
+ WEEKENDS = !WEEKENDS;
+ if (wday == SUN) days = 1;
+ if (wday == SAT) days = -1;
+ set_bool("view", NULL, "weekends", WEEKENDS);
}
- return ref;
+
+ if (lines)
+ line = CLAMP(line+lines, 0, 24*4);
+ if (days || events)
+ move_event(events, days, &line);
+
+ werase(win);
+ week_draw();
+ wrefresh(win);
+ return 1;
}
projects / lackey / blobdiff