diary

commit b5508e6f377c70fbdbe235f8438fbd1bb59f0258
parent 2bfdc724fb0244180b8186f230af8c502b3ac7a8
Author: in0rdr <andreas.gruhler@uzh.ch>
Date:   Wed, 23 Nov 2016 17:39:27 +0800

Merge commit 'a72fc62a9839d509696a3d76c9a71a422b29ade5'

of @ryanbahneman into feature/highlight
Applies the highlighting feature.

Diffstat:
M
diary.c
 | 
17
+++++++++++++++--

1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/diary.c b/diary.c
@@ -39,6 +39,10 @@ void draw_calendar(WINDOW* number_pad, WINDOW* month_pad) {
     while (mktime(&i) <= mktime(&cal_end)) {
         getyx(number_pad, cy, cx);
         mvwprintw(number_pad, cy, cx, "%2i", i.tm_mday);
+
+        // Highlight current day
+        if ((cur_date.tm_year == i.tm_year) && (cur_date.tm_yday == i.tm_yday))
+            wchgat(number_pad, 2, A_UNDERLINE, 0, NULL);
         waddch(number_pad, ' ');
 
         if (i.tm_mday == 1) {
@@ -121,8 +125,17 @@ bool go_to(WINDOW* calendar, WINDOW* month_sidebar, time_t date, int* cur_pad_po
     localtime_r(&date, &curs_date);
 
     getyx(calendar, cy, cx);
-    mvwchgat(calendar, cy        , 0             , -1, A_NORMAL,   0, NULL);
-    mvwchgat(calendar, diff_weeks, diff_wdays * 3,  2, A_STANDOUT, 0, NULL);
+
+    // Remove the STANDOUT attribute from the day we are leaving
+    chtype current_attrs = mvwinch(calendar, cy, cx) & A_ATTRIBUTES;
+    // Leave every attr as is, but turn off A_STANDOUT
+    current_attrs &= ~A_STANDOUT;
+    mvwchgat(calendar, cy, cx, 2, current_attrs, 0, NULL);
+
+    // Add the STANDOUT attribute to the day we are entering
+    chtype new_attrs =  mvwinch(calendar, diff_weeks, diff_wdays * 3) & A_ATTRIBUTES;
+    new_attrs |= A_STANDOUT;
+    mvwchgat(calendar, diff_weeks, diff_wdays * 3, 2, new_attrs, 0, NULL);
 
     if (diff_weeks < *cur_pad_pos)
         *cur_pad_pos = diff_weeks;