X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=views%2Fday.c;h=088873cf86b1a3f6faa9beeb270602172eeef422;hp=62ef827b77e021afec25d36b42b39acf5bc93d5d;hb=bfc415555da3be7f94738b3ac62c511a53b78674;hpb=e1c3ab2bd61a81054b713f735fa31f827d258d76

diff --git a/views/day.c b/views/day.c
index 62ef827..088873c 100644
--- a/views/day.c
+++ b/views/day.c
@@ -73,7 +73,7 @@ static int get_ncols(event_t *event, int n)
 	return ncols;
 }
 
-static int get_col(event_t **list, int n, event_t *event, int *ncols)
+int get_col(event_t **list, int n, event_t *event, int *ncols)
 {
 	clear_old(list, n, event);
 
@@ -88,13 +88,51 @@ static int get_col(event_t **list, int n, event_t *event, int *ncols)
 	return col;
 }
 
+/* Event setting helper functions */
+void move_event(int events, int days, int *line)
+{
+	/* Move forward/back in event list */
+	if (events && EVENT) {
+		for (int i=0; i<events && EVENT->next &&
+				same_day(&EVENT->start, &EVENT->next->start); i++)
+			EVENT = EVENT->next;
+		for (int i=0; i>events && EVENT->next &&
+				same_day(&EVENT->start, &EVENT->prev->start); i--)
+			EVENT = EVENT->prev;
+	}
+
+	/* Set current event */
+	if (days) {
+		add_days(&SEL.year, &SEL.month, &SEL.day, days);
+		date_t target = SEL;
+		if (EVENT) {
+			target.hour = EVENT->start.hour;
+			target.min  = EVENT->start.min;
+			target.sec  = EVENT->start.sec;
+		}
+		if ((EVENT = find_event(&target)))
+			SEL = EVENT->start;
+	}
+
+	/* Update line */
+	if (line && EVENT && !all_day(&EVENT->start, &EVENT->end)) {
+		int lines = LINES-4+COMPACT+COMPACT;
+		int begin = EVENT->start.hour *  4
+		          + EVENT->start.min  / 15;
+		if (begin+4 > *line+lines)
+			*line = begin-lines+4;
+		if (begin < *line)
+			*line = begin;
+	}
+}
+
 /* Day init */
 void day_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;
 }
 
 /* Day size */
@@ -108,29 +146,29 @@ void day_size(int rows, int cols)
 /* Day draw */
 void day_draw(void)
 {
-	const char *mstr = month_to_string(MONTH);
-	const char *dstr = day_to_string(day_of_week(YEAR, MONTH, DAY));
+	const char *mstr = month_to_string(SEL.month);
+	const char *dstr = day_to_string(day_of_week(SEL.year, SEL.month, SEL.day));
 
 	int y = !COMPACT+1;
 	event_t *event;
 
 	/* Load cal data */
-	cal_load(YEAR, MONTH, DAY, 1);
+	cal_load(SEL.year, SEL.month, SEL.day, 1);
 
 	/* Print Header */
 	if (COMPACT) wattron(win, A_REVERSE | A_BOLD);
 	mvwhline(win, 0, 0, ' ', COLS);
-	mvwprintw(win, 0, 0, "%s, %s %d", dstr, mstr, DAY+1);
-	mvwprintw(win, 0, COLS-10, "%d-%02d-%02d", YEAR, MONTH, DAY+1);
+	mvwprintw(win, 0, 0, "%s, %s %d", dstr, mstr, SEL.day+1);
+	mvwprintw(win, 0, COLS-10, "%d-%02d-%02d", SEL.year, SEL.month+1, SEL.day+1);
 	if (COMPACT) wattroff(win, A_REVERSE | A_BOLD);
 
 	/* Print all day events */
 	event = EVENTS;
 	int allday = 0;
-	while (event && before(&event->start, YEAR, MONTH, DAY, 24, 0)) {
-		if (!before(&event->end, YEAR, MONTH, DAY, 0, 1) &&
+	while (event && before(&event->start, SEL.year, SEL.month, SEL.day, 24, 0)) {
+		if (!before(&event->end, SEL.year, SEL.month, SEL.day, 0, 1) &&
 		    get_mins(&event->start, &event->end) > 23*60)
-			event_line(win, event, y+allday++, 6, COLS, 1);
+			event_line(win, event, y+allday++, 6, COLS-6, SHOW_ACTIVE | SHOW_DETAILS);
 		event = event->next;
 	}
 	if (allday && !COMPACT)
@@ -146,14 +184,16 @@ void day_draw(void)
 		mvwprintw(times, h*4-line, 0, "%02d:%02d", (h-1)%12+1, 0);
 
 	/* Print events */
+	if (!EVENT)
+		EVENT = find_event(&SEL);
 	event = EVENTS;
 	event_t *active[10] = {};
 	int ncols = 0;
 	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) &&
+			SEL.year, SEL.month, SEL.day, h+(m+15)/60, (m+15)%60)) {
+		if (!before(&event->start, SEL.year, SEL.month, SEL.day, h, m) &&
 		    get_mins(&event->start, &event->end) <= 23*60) {
 			int col    = get_col(active, N_ELEMENTS(active), event, &ncols);
 			int left   = ROUND((col+0.0)*(COLS-6)/ncols) + 1;
@@ -176,23 +216,27 @@ void day_draw(void)
 /* Day run */
 int day_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;
+	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 '\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);
-		day_draw();
-		wrefresh(win);
-	}
-	return ref;
+
+	if (lines)
+		line = CLAMP(line+lines, 0, 24*4);
+	if (days || events)
+		move_event(events, days, &line);
+
+	werase(win);
+	day_draw();
+	wrefresh(win);
+	return 1;
 }