X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=debug.h;h=46442d4bb6ac9b8132acd3a088b6314960069f5a;hb=0e1e4e76ddae605f4d587bb7097f7bd86aa6ef16;hp=01f4ea3dc1adc1c7fb703b91ea98dc5ba202aab9;hpb=c7f2604be3b23b2837864699b0bf059c0abd1f85;p=calc.git diff --git a/debug.h b/debug.h index 01f4ea3..46442d4 100644 --- a/debug.h +++ b/debug.h @@ -1,6 +1,8 @@ #ifndef __DEBUG_H__ #define __DEBUG_H__ +#include "color.h" + /* constants */ #define DEBUG 3 @@ -8,29 +10,17 @@ #define WARNING 1 #define ERROR 0 -/* colors */ - -#define COLOR_BLACK 30 -#define COLOR_RED 31 -#define COLOR_GREEN 32 -#define COLOR_YELLOW 33 -#define COLOR_BLUE 34 -#define COLOR_MAGENTA 35 -#define COLOR_CYAN 36 -#define COLOR_WHITE 37 -#define COLOR_DEFAULT 39 - /* macros */ #define VERBOSE(level, statement...) \ do { if (level <= verbose) { CHANGE_COLOR(level); statement; CHANGE_COLOR(-1); } } while(0) #define CHANGE_COLOR(level) \ - fprintf ((level == ERROR) ? stderr : stdout, \ - "\1\033[%dm\1", (level == ERROR) ? COLOR_RED : \ - (level == WARNING) ? COLOR_YELLOW : \ - (level == INFO) ? COLOR_BLUE : \ - (level == DEBUG) ? COLOR_GREEN : COLOR_DEFAULT) + color_set ((level == ERROR) ? stderr : stdout, \ + (level == ERROR) ? FG_RED : \ + (level == WARNING) ? FG_YELLOW : \ + (level == INFO) ? FG_BLUE : \ + (level == DEBUG) ? FG_GREEN : COLOR_DEFAULT) /* vim: set ts=4 sw=4 et: */ /* gobal variables */