scal

commit 5b34ff8fe9ed2ad915e4587d6974cd2be455e8a8
parent 68fbc6019ce5ee9aa051a36f8f452fa81a03bf65
Author: Wim Dupont <wim@wimdupont.com>
Date:   Sun, 16 Mar 2025 18:26:32 +0100

underline curday

Diffstat:
M
config.def.h
 | 
9
++++-----
M
scal.c
 | 
18
+++++++++---------

2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -26,12 +26,11 @@
 #define KEY_COMBO_MAKE_ADD 'a'
 #define KEY_COMBO_MAKE_RM 'd'
 
-#define HIGHLIGHT_COLOR		COLOR_YELLOW
+#define DAY_TITLE_COLOR		COLOR_YELLOW
 #define MONTH_TITLE_COLOR	COLOR_MAGENTA
-#define CURDAY_COLOR		COLOR_GREEN
-#define NOTED_COLOR		COLOR_RED
-#define WEEKLY_VIEW_COLOR	COLOR_BLUE
-#define MONTHLY_VIEW_COLOR	COLOR_YELLOW
+#define NOTED_VIEW_COLOR	COLOR_RED
+#define WEEKLY_VIEW_COLOR	COLOR_YELLOW
+#define MONTHLY_VIEW_COLOR	COLOR_BLUE
 #define YEARLY_VIEW_COLOR	COLOR_MAGENTA
 #define PROMPT_COLOR		COLOR_RED
 
diff --git a/scal.c b/scal.c
@@ -26,7 +26,7 @@ typedef struct
 static void init_screen(void);
 static void resize(void);
 static void start(void);
-static void print_words(void);
+static void print_cal(void);
 static void write_notes(void);
 static Note ** get_notes(void);
 static Note * get_note(char *line_buf, ssize_t line_size);
@@ -87,7 +87,7 @@ main(int argc, char **argv)
 	curdate();
 	init_screen();
 
-	print_words();
+	print_cal();
 	print_view();
 
 	start();
@@ -142,20 +142,20 @@ resize(void)
 }
 
 void
-print_words(void)
+print_cal(void)
 {
 	int y = 0;
 
 	wclear(wwin);
 	wclear(vwin);
 
-	attron(COLOR_PAIR(HIGHLIGHT_COLOR));
+	attron(COLOR_PAIR(DAY_TITLE_COLOR));
 	mvprintw(0, 0, "%s %d %s %d\n",
 			DayName[highltm.tm_wday],
 			highltm.tm_mday,
 			MonthName[highltm.tm_mon],
 			highltm.tm_year + 1900);
-	attroff(COLOR_PAIR(HIGHLIGHT_COLOR));
+	attroff(COLOR_PAIR(DAY_TITLE_COLOR));
 
 	print_month(-1, &y);
 	print_month(0, &y);
@@ -196,7 +196,7 @@ print_month(const int monthadd, int *y)
 			color = get_note_view_col(notecol);
 
 		if (today)
-			wattron(wwin, COLOR_PAIR(CURDAY_COLOR));
+			wattron(wwin, A_UNDERLINE);
 		if (wnote)
 			wattron(wwin, COLOR_PAIR(color));
 		if (monthadd == 0 && highlight == i) {
@@ -206,7 +206,7 @@ print_month(const int monthadd, int *y)
 		} else
 			mvwprintw(wwin, *y, x, "%d", otm.tm_mday);
 		if (today)
-			wattroff(wwin, COLOR_PAIR(CURDAY_COLOR));
+			wattroff(wwin, A_UNDERLINE);
 		if (wnote)
 			wattroff(wwin, COLOR_PAIR(color));
 		x+=3;
@@ -266,7 +266,7 @@ start(void)
 			default:
 				break;
 		}
-		print_words();
+		print_cal();
 		print_view();
 	}
 }
@@ -725,7 +725,7 @@ get_note_view_col(Recurring recurring)
 		case YEARLY:
 			return YEARLY_VIEW_COLOR;
 		case NO:
-			return NOTED_COLOR;
+			return NOTED_VIEW_COLOR;
 		default:
 			return -1;
 	}