X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=views%2Fevents.c;h=d5cdf99e6041706b14476b38f5983bc1eaaf82f7;hp=6505cb37a8cffe6904c44d84239ba51e60bf786e;hb=c104b1f201f243dabb18cbd712b20a8351d269be;hpb=daded0f3fb930e7758e1009683c0cdb46eada3f6

diff --git a/views/events.c b/views/events.c
index 6505cb3..d5cdf99 100644
--- a/views/events.c
+++ b/views/events.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -15,14 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define DEBUG
-
+#include <string.h>
 #include <ncurses.h>
 
-#include <util.h>
-#include <date.h>
-#include <cal.h>
-#include <view.h>
+#include "util.h"
+#include "date.h"
+#include "cal.h"
+#include "view.h"
 
 /* Static data */
 static WINDOW *win;
@@ -46,10 +45,11 @@ void events_draw(void)
 	int days = 2*7;
 	int min  = 12;
 
-	date_t start = {YEAR, MONTH, DAY,    0, 0};
-	date_t cur   = {YEAR, MONTH, DAY-1,  0, 0};
-	date_t end   = {YEAR, MONTH, DAY,   24, 0};
+	date_t start = {SEL.year, SEL.month, SEL.day,    0, 0};
+	date_t cur   = {SEL.year, SEL.month, SEL.day-1,  0, 0};
+	date_t end   = {SEL.year, SEL.month, SEL.day,   24, 0};
 	add_days(&end.year, &end.month, &end.day, days);
+	cal_load(SEL.year, SEL.month, SEL.day, days);
 
 	int      row   = 0;
 	int      count = 0;
@@ -62,23 +62,37 @@ void events_draw(void)
 			              cur.day   != next.day   ;
 			int newtime = cur.hour  != next.hour  ||
 			              cur.min   != next.min   ;
+
+			/* Update events */
+			if (EVENT == NULL || compare(&EVENT->start, &start) < 0)
+				EVENT = event;
+
+			/* Spacing before the date */
 			if ((newdate || newtime) && row != 0)
 				row++;
 			if (newdate && row != 0)
 				row++;
+
+			/* Print date */
 			if (newdate) {
 				wday_t wday = day_of_week(next.year, next.month, next.day);
-				wattron(win, A_UNDERLINE);
+				wattron(win, A_BOLD);
 				mvwprintw(win, row-line, 0,  "%04d-%02d-%02d",
 					next.year, next.month+1, next.day+1);
 				mvwprintw(win, row-line, 13, "%s, %s %d",
-					day_to_string(wday), month_to_string(next.month), next.day);
-				wattroff(win, A_UNDERLINE);
+					day_to_string(wday), month_to_string(next.month), next.day+1);
+				wattroff(win, A_BOLD);
 				row++;
 			}
-			event_line(win, event, row++-line, 4, COLS-2, 1);
-			if (event->name && event->desc)
-				mvwprintw(win, row++-line, 14, "%s", event->desc);
+
+			/* Print event info */
+			event_line(win, event, row++-line, 4, COLS-4,
+					SHOW_DETAILS | SHOW_ACTIVE);
+			if (event->name && event->desc) {
+				int n = MIN(COLS-14, strcspn(event->desc, "\n"));
+				mvwprintw(win, row++-line, 14, "%.*s", n, event->desc);
+			}
+
 			cur = next;
 			count += 1;
 		}
@@ -90,23 +104,31 @@ void events_draw(void)
 /* Events run */
 int events_run(int key, mmask_t btn, int row, int col)
 {
-	int scroll = 0;
+	int scroll = 0, move = 0;
 	switch (key)
 	{
-		case 'g': scroll = -line;    break;
-		case 'G': scroll =  rows;    break;
-		case 'j': scroll =  1;       break;
-		case 'k': scroll = -1;       break;
-		case 'd': scroll =  LINES/2; break;
-		case 'u': scroll = -LINES/2; break;
-		case 'D': scroll =  LINES;   break;
-		case 'U': scroll = -LINES;   break;
+		case 'g':    scroll = -line;    break;
+		case 'G':    scroll =  rows;    break;
+		case '\005': scroll =  1;       break; // ctrl-e
+		case '\031': scroll = -1;       break; // ctrl-y
+		case 'd':    scroll =  LINES/2; break;
+		case 'u':    scroll = -LINES/2; break;
+		case 'D':    scroll =  LINES;   break;
+		case 'U':    scroll = -LINES;   break;
+		case 'j':    move   =  1;       break;
+		case 'k':    move   = -1;       break;
+		case 'e':    view_edit(EDIT_EVENT); return 1;
+		case '\012': view_edit(EDIT_EVENT); return 1; // enter
 	}
-	line = CLAMP(line+scroll, 0, rows-1);
-	if (scroll) {
+	line   = CLAMP(line+scroll, 0, rows-1);
+	for (int i=0; i<move && EVENT && EVENT->next; i++)
+		EVENT = EVENT->next;
+	for (int i=0; i>move && EVENT && EVENT->prev; i--)
+		EVENT = EVENT->prev;
+	if (scroll || move) {
 		werase(win);
 		events_draw();
 		wrefresh(win);
 	}
-	return 0;
+	return scroll || move;
 }