From a32ee816f7856cb24f6bfef6f2ed91e07d476693 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Sat, 11 Apr 2009 22:03:26 +0200 Subject: [PATCH] Improve color switch thing --- ttyclock.c | 13 +++++++------ ttyclock.h | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ttyclock.c b/ttyclock.c index 598fa49..f8c44de 100644 --- a/ttyclock.c +++ b/ttyclock.c @@ -36,7 +36,7 @@ void init(void) { struct sigaction sig; - int bg = COLOR_BLACK; + ttyclock->bg = COLOR_BLACK; /* Init ncurses */ initscr(); @@ -48,12 +48,12 @@ init(void) /* Init default terminal color */ if(use_default_colors() == OK) - bg = -1; + ttyclock->bg = -1; /* Init color pair */ - init_pair(0, bg, bg); - init_pair(1, bg, ttyclock->option.color); - init_pair(2, ttyclock->option.color, bg); + init_pair(0, ttyclock->bg, ttyclock->bg); + init_pair(1, ttyclock->bg, ttyclock->option.color); + init_pair(2, ttyclock->option.color, ttyclock->bg); refresh(); /* Init signal handler */ @@ -388,7 +388,8 @@ key_event(void) if(c == (i + '0')) { ttyclock->option.color = i; - init(); + init_pair(1, ttyclock->bg, i); + init_pair(2, i, ttyclock->bg); } break; } diff --git a/ttyclock.h b/ttyclock.h index 729eb82..7940d1f 100644 --- a/ttyclock.h +++ b/ttyclock.h @@ -55,6 +55,7 @@ typedef struct { /* while() boolean */ Bool running; + int bg; /* Running option */ struct