From 130938f69112057b2786b07b17e8686578a292ac Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 23 Mar 2006 18:55:29 +0000 Subject: Fixes for header generation. --- CRT.c | 11 ++++++++++- ColorsListBox.c | 2 +- Meter.c | 5 ++++- Process.c | 3 ++- TraceScreen.c | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CRT.c b/CRT.c index 0858164c..6b1d120c 100644 --- a/CRT.c +++ b/CRT.c @@ -1,6 +1,6 @@ /* htop - CRT.c -(C) 2004,2005 Hisham H. Muhammad +(C) 2004-2006 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -18,6 +18,13 @@ in the source distribution for its full text. #define ColorPair(i,j) COLOR_PAIR((7-i)*8+j) +#define COLORSCHEME_DEFAULT 0 +#define COLORSCHEME_MONOCHROME 1 +#define COLORSCHEME_BLACKONWHITE 2 +#define COLORSCHEME_BLACKONWHITE2 3 +#define COLORSCHEME_MIDNIGHT 4 +#define COLORSCHEME_BLACKNIGHT 5 + #define Black COLOR_BLACK #define Red COLOR_RED #define Green COLOR_GREEN @@ -93,6 +100,8 @@ extern int CRT_delay; extern int CRT_colors[LAST_COLORELEMENT]; +extern int CRT_colorScheme; + }*/ // TODO: centralize these in Settings. diff --git a/ColorsListBox.c b/ColorsListBox.c index 31cfc63b..cf9eb7b2 100644 --- a/ColorsListBox.c +++ b/ColorsListBox.c @@ -28,7 +28,7 @@ typedef struct ColorsListBox_ { }*/ -/* private property */ +/* private */ static char* ColorSchemes[] = { "Default", "Monochromatic", diff --git a/Meter.c b/Meter.c index c35b6a9d..c405e556 100644 --- a/Meter.c +++ b/Meter.c @@ -1,6 +1,6 @@ /* htop - Meter.c -(C) 2004,2005 Hisham H. Muhammad +(C) 2004-2006 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -66,6 +66,9 @@ extern char* METER_CLASS; #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif +#ifndef MAX +#define MAX(a,b) ((a)>(b)?(a):(b)) +#endif /* private property */ char* METER_CLASS = "Meter"; diff --git a/Process.c b/Process.c index 041f4d4a..900bb921 100644 --- a/Process.c +++ b/Process.c @@ -1,6 +1,6 @@ /* htop - Process.c -(C) 2004,2005 Hisham H. Muhammad +(C) 2004-2006 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -235,6 +235,7 @@ static void Process_printTTY(RichString* str, int tty_nr) { char* buffer[11]; } +/* private */ inline static void Process_writeCommand(Process* this, int attr, RichString* str) { if (this->pl->highlightBaseName) { char* firstSpace = strchr(this->comm, ' '); diff --git a/TraceScreen.c b/TraceScreen.c index 96282905..8d5bb798 100644 --- a/TraceScreen.c +++ b/TraceScreen.c @@ -1,6 +1,6 @@ /* htop - TraceScreen.c -(C) 2005 Hisham H. Muhammad +(C) 2005-2006 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -16,6 +16,8 @@ in the source distribution for its full text. #include "ProcessList.h" #include "Process.h" #include "ListItem.h" +#include "ListBox.h" +#include "FunctionBar.h" /*{ -- cgit v1.2.3