From e844687f88c6611efb9a0e27c5d123501f123ecf Mon Sep 17 00:00:00 2001 From: Wessels Date: Mon, 2 Mar 2015 14:55:13 -0800 Subject: [PATCH 1/2] Make both colons blink when -s (seconds) enabled and simplify the logic by setting a variable for the dot color. --- ttyclock.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/ttyclock.c b/ttyclock.c index ba6f61a..1b6b2ca 100644 --- a/ttyclock.c +++ b/ttyclock.c @@ -253,30 +253,14 @@ draw_clock(void) /* Draw hour numbers */ draw_number(ttyclock->date.hour[0], 1, 1); draw_number(ttyclock->date.hour[1], 1, 8); + chtype dotcolor = COLOR_PAIR(1); + if (ttyclock->option.blink && time(NULL) % 2 == 0) + dotcolor = COLOR_PAIR(2); - if (ttyclock->option.blink){ - time_t seconds; - seconds = time(NULL); - - if (seconds % 2 != 0){ - /* 2 dot for number separation */ - wbkgdset(ttyclock->framewin, COLOR_PAIR(1)); - mvwaddstr(ttyclock->framewin, 2, 16, " "); - mvwaddstr(ttyclock->framewin, 4, 16, " "); - } - else if (seconds % 2 == 0){ - /*2 dot black for blinking */ - wbkgdset(ttyclock->framewin, COLOR_PAIR(2)); - mvwaddstr(ttyclock->framewin, 2, 16, " "); - mvwaddstr(ttyclock->framewin, 4, 16, " "); - } - } - else{ /* 2 dot for number separation */ - wbkgdset(ttyclock->framewin, COLOR_PAIR(1)); + wbkgdset(ttyclock->framewin, dotcolor); mvwaddstr(ttyclock->framewin, 2, 16, " "); mvwaddstr(ttyclock->framewin, 4, 16, " "); - } /* Draw minute numbers */ draw_number(ttyclock->date.minute[0], 1, 20); @@ -299,7 +283,7 @@ draw_clock(void) if(ttyclock->option.second) { /* Again 2 dot for number separation */ - wbkgdset(ttyclock->framewin, COLOR_PAIR(1)); + wbkgdset(ttyclock->framewin, dotcolor); mvwaddstr(ttyclock->framewin, 2, NORMFRAMEW, " "); mvwaddstr(ttyclock->framewin, 4, NORMFRAMEW, " "); From c1490a11226858bd28ccb7c25602d01bec17933a Mon Sep 17 00:00:00 2001 From: Wessels Date: Mon, 2 Mar 2015 14:57:48 -0800 Subject: [PATCH 2/2] match original indentation --- ttyclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ttyclock.c b/ttyclock.c index 1b6b2ca..d140c3f 100644 --- a/ttyclock.c +++ b/ttyclock.c @@ -255,12 +255,12 @@ draw_clock(void) draw_number(ttyclock->date.hour[1], 1, 8); chtype dotcolor = COLOR_PAIR(1); if (ttyclock->option.blink && time(NULL) % 2 == 0) - dotcolor = COLOR_PAIR(2); + dotcolor = COLOR_PAIR(2); - /* 2 dot for number separation */ - wbkgdset(ttyclock->framewin, dotcolor); - mvwaddstr(ttyclock->framewin, 2, 16, " "); - mvwaddstr(ttyclock->framewin, 4, 16, " "); + /* 2 dot for number separation */ + wbkgdset(ttyclock->framewin, dotcolor); + mvwaddstr(ttyclock->framewin, 2, 16, " "); + mvwaddstr(ttyclock->framewin, 4, 16, " "); /* Draw minute numbers */ draw_number(ttyclock->date.minute[0], 1, 20);