summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aclock.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/aclock.c b/aclock.c
index 03309e3..2e00de3 100644
--- a/aclock.c
+++ b/aclock.c
@@ -20,7 +20,7 @@
int die = 0;
int redraw = 0;
-enum {RED = 1, CYAN, BLUE};
+enum {RED = 1, CYAN, BLUE, GREEN};
char *strtime(char *, size_t, struct tm *);
void sevenseg(char [3][80], size_t, char *);
@@ -111,6 +111,7 @@ main(void)
init_pair(RED, COLOR_RED, COLOR_BLACK);
init_pair(CYAN, COLOR_CYAN, COLOR_BLACK);
init_pair(BLUE, COLOR_BLUE, COLOR_BLACK);
+ init_pair(GREEN, COLOR_GREEN, COLOR_BLACK);
if (hascolors)
attron(A_BOLD);
@@ -142,27 +143,18 @@ main(void)
erase();
draw_circle(hand_max, sYcen, sXcen, FontHW);
- attron(COLOR_PAIR(CYAN));
+ attron(COLOR_PAIR(GREEN));
strftime(digital_time, sizeof(digital_time), "%d-%m-%y", ltime);
-#if 1
sevenseg(dtime, sizeof(dtime[0]), digital_time);
for (i = 0; i < 3; i++)
mvprintw(i + sYcen - sYmax / 4 - 1,
sXcen - strlen(dtime[i]) / 2, dtime[i]);
-#else
- mvprintw(sYmax / 4, sXcen - strlen(digital_time) / 2, digital_time);
-#endif
strftime(digital_time, sizeof(digital_time), "%H:%M:%S", ltime);
-#if 1
sevenseg(dtime, sizeof(dtime[0]), digital_time);
for (i = 0; i < 3; i++)
mvprintw(i + sYcen + sYmax / 4 - 1,
sXcen - strlen(dtime[i]) / 2, dtime[i]);
-#else
- mvprintw(3 * sYmax / 4, sXcen - strlen(digital_time) / 2, digital_time);
-#endif
- attroff(COLOR_PAIR(CYAN));
- strtime(stime, sizeof(stime), ltime);
+ attroff(COLOR_PAIR(GREEN));
attron(COLOR_PAIR(RED));
draw_hand((ltime->tm_hour * 5) + (ltime->tm_min / 10),
@@ -178,6 +170,7 @@ main(void)
attroff(COLOR_PAIR(BLUE));
attron(COLOR_PAIR(BLUE));
+ strtime(stime, sizeof(stime), ltime);
mvprintw(sYmax - 1, sXcen - strlen(stime) / 2, stime);
attroff(COLOR_PAIR(BLUE));