Regenerated all headers.

AvailableColumnsPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_AvailableColumnsPanel
 #define HEADER_AvailableColumnsPanel
@@ -6,6 +6,7 @@
 #include "Settings.h"
 #include "Header.h"
 #include "ScreenManager.h"
+#include "ColumnsPanel.h"
 
 #include "Panel.h"
 
@@ -15,10 +16,10 @@
 
 typedef struct AvailableColumnsPanel_ {
    Panel super;
+   Panel* columns;
 
    Settings* settings;
    ScreenManager* scr;
-   Panel* columns;
 } AvailableColumnsPanel;
 
 

AvailableMetersPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_AvailableMetersPanel
 #define HEADER_AvailableMetersPanel
@@ -6,6 +6,7 @@
 #include "Settings.h"
 #include "Header.h"
 #include "ScreenManager.h"
+#include "CPUMeter.h"
 
 #include "Panel.h"
 
@@ -27,7 +28,6 @@ AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Panel* leftMe
 
 void AvailableMetersPanel_delete(Object* object);
 
-
 HandlerResult AvailableMetersPanel_EventHandler(Panel* super, int ch);
 
 #endif

CPUMeter.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_CPUMeter
 #define HEADER_CPUMeter
 /*
-htop - CPUMeter.c
+htop - CPUMeter.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -21,8 +21,11 @@ in the source distribution for its full text.
 #include "debug.h"
 #include <assert.h>
 
+extern int CPUMeter_attributes[];
 
+extern MeterType CPUMeter;
 
+extern MeterType AllCPUsMeter;
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))

CRT.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_CRT
 #define HEADER_CRT
@@ -19,6 +19,8 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+#define ColorPair(i,j) COLOR_PAIR((7-i)*8+j)
+
 #define COLORSCHEME_DEFAULT 0
 #define COLORSCHEME_MONOCHROME 1
 #define COLORSCHEME_BLACKONWHITE 2
@@ -26,6 +28,15 @@ in the source distribution for its full text.
 #define COLORSCHEME_MIDNIGHT 4
 #define COLORSCHEME_BLACKNIGHT 5
 
+#define Black COLOR_BLACK
+#define Red COLOR_RED
+#define Green COLOR_GREEN
+#define Yellow COLOR_YELLOW
+#define Blue COLOR_BLUE
+#define Magenta COLOR_MAGENTA
+#define Cyan COLOR_CYAN
+#define White COLOR_WHITE
+
 //#link curses
 
 bool CRT_hasColors;
@@ -87,26 +98,31 @@ typedef enum ColorElements_ {
    LAST_COLORELEMENT
 } ColorElements;
 
-extern int CRT_colors[LAST_COLORELEMENT];
 
-extern int CRT_colorScheme;
+// TODO: centralize these in Settings.
 
 extern int CRT_delay;
 
-void CRT_init();
+extern int CRT_colorScheme;
+
+extern int CRT_colors[LAST_COLORELEMENT];
+
+// TODO: pass an instance of Settings instead.
+
+void CRT_init(int delay, int colorScheme);
 
 void CRT_done();
 
 int CRT_readKey();
 
+void CRT_disableDelay();
+
+void CRT_enableDelay();
+
 void CRT_handleSIGSEGV(int signal);
 
 void CRT_handleSIGTERM(int signal);
 
 void CRT_setColors(int colorScheme);
 
-void CRT_enableDelay();
-
-void CRT_disableDelay();
-
 #endif

CategoriesPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_CategoriesPanel
 #define HEADER_CategoriesPanel
@@ -6,6 +6,9 @@
 #include "AvailableMetersPanel.h"
 #include "MetersPanel.h"
 #include "DisplayOptionsPanel.h"
+#include "ColumnsPanel.h"
+#include "ColorsPanel.h"
+#include "AvailableColumnsPanel.h"
 
 #include "Panel.h"
 
@@ -21,8 +24,6 @@ typedef struct CategoriesPanel_ {
 } CategoriesPanel;
 
 
-
-
 CategoriesPanel* CategoriesPanel_new(Settings* settings, ScreenManager* scr);
 
 void CategoriesPanel_delete(Object* object);

CheckItem.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_CheckItem
 #define HEADER_CheckItem
@@ -21,8 +21,8 @@ typedef struct CheckItem_ {
    bool* value;
 } CheckItem;
 
-extern char* CHECKITEM_CLASS;
 
+extern char* CHECKITEM_CLASS;
 
 CheckItem* CheckItem_new(char* text, bool* value);
 

ClockMeter.h

@@ -15,6 +15,9 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+extern int ClockMeter_attributes[];
+
+extern MeterType ClockMeter;
 
 void ClockMeter_setValues(Meter* this, char* buffer, int size);
 

ColorsPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_ColorsPanel
 #define HEADER_ColorsPanel
 
+#include "CRT.h"
 
 #include "Panel.h"
 #include "CheckItem.h"
@@ -12,6 +13,12 @@
 #include "debug.h"
 #include <assert.h>
 
+// TO ADD A NEW SCHEME:
+// * Increment the size of bool check in ColorsPanel.h
+// * Add the entry in the ColorSchemes array below in the file
+// * Add a define in CRT.h that matches the order of the array
+// * Add the colors in CRT_setColors
+
 
 typedef struct ColorsPanel_ {
    Panel super;

ColumnsPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_ColumnsPanel
 #define HEADER_ColumnsPanel
@@ -16,7 +16,6 @@ typedef struct ColumnsPanel_ {
    Panel super;
 
    Settings* settings;
-   Vector* columns;
    ScreenManager* scr;
 } ColumnsPanel;
 

DebugMemory.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_DebugMemory
 #define HEADER_DebugMemory
 
 #define _GNU_SOURCE
-
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdbool.h>
-
 #include <assert.h>
 
-
 #undef strdup
 #undef malloc
 #undef realloc
 #undef calloc
 #undef free
 
+
+
 typedef struct DebugMemoryItem_ DebugMemoryItem;
 
 struct DebugMemoryItem_ {
+   int magic;
    void* data;
    char* file;
    int line;
@@ -33,17 +33,20 @@ typedef struct DebugMemory_ {
    int allocations;
    int deallocations;
    int size;
+   bool totals;
    FILE* file;
 } DebugMemory;
 
 
+#if defined(DEBUG)
+
 void DebugMemory_new();
 
-void* DebugMemory_malloc(int size, char* file, int line);
+void* DebugMemory_malloc(int size, char* file, int line, char* str);
 
 void* DebugMemory_calloc(int a, int b, char* file, int line);
 
-void* DebugMemory_realloc(void* ptr, int size, char* file, int line);
+void* DebugMemory_realloc(void* ptr, int size, char* file, int line, char* str);
 
 void* DebugMemory_strdup(char* str, char* file, int line);
 
@@ -59,4 +62,10 @@ void DebugMemory_registerDeallocation(void* data, char* file, int line);
 
 void DebugMemory_report();
 
+#elif defined(DEBUGLITE)
+
+//#include "efence.h"
+
+#endif
+
 #endif

DisplayOptionsPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_DisplayOptionsPanel
 #define HEADER_DisplayOptionsPanel

FunctionBar.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_FunctionBar
 #define HEADER_FunctionBar
 /*
-htop
+htop - FunctionBar.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -30,16 +30,17 @@ typedef struct FunctionBar_ {
    bool staticData;
 } FunctionBar;
 
+
 extern char* FUNCTIONBAR_CLASS;
 
 FunctionBar* FunctionBar_new(int size, char** functions, char** keys, int* events);
 
-void FunctionBar_delete(Object* this);
-
-void FunctionBar_draw(FunctionBar* this, char* buffer);
+void FunctionBar_delete(Object* cast);
 
 void FunctionBar_setLabel(FunctionBar* this, int event, char* text);
 
+void FunctionBar_draw(FunctionBar* this, char* buffer);
+
 void FunctionBar_drawAttr(FunctionBar* this, char* buffer, int attr);
 
 int FunctionBar_synthesizeEvent(FunctionBar* this, int pos);

Hashtable.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_Hashtable
 #define HEADER_Hashtable

Header.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_Header
 #define HEADER_Header
 /*
-htop - Header.c
+htop - Header.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.

ListItem.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_ListItem
 #define HEADER_ListItem
 /*
-htop
+htop - ListItem.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -16,24 +16,27 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+
 typedef struct ListItem_ {
    Object super;
    char* value;
    int key;
 } ListItem;
 
+
 extern char* LISTITEM_CLASS;
 
 ListItem* ListItem_new(char* value, int key);
 
+void ListItem_append(ListItem* this, char* text);
+
 void ListItem_delete(Object* cast);
 
 void ListItem_display(Object* cast, RichString* out);
 
-void ListItem_append(ListItem* this, char* text);
-
 const char* ListItem_getRef(ListItem* this);
 
-int ListItem_compare(const Object*, const Object*);
+int ListItem_compare(const Object* cast1, const Object* cast2);
+
 
 #endif

LoadAverageMeter.h

@@ -15,10 +15,13 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+extern int LoadAverageMeter_attributes[];
 
+extern MeterType LoadAverageMeter;
 
+extern int LoadMeter_attributes[];
 
-
+extern MeterType LoadMeter;
 
 void LoadAverageMeter_setValues(Meter* this, char* buffer, int size);
 

MemoryMeter.h

@@ -22,7 +22,9 @@ in the source distribution for its full text.
 #include "debug.h"
 #include <assert.h>
 
+extern int MemoryMeter_attributes[];
 
+extern MeterType MemoryMeter;
 
 void MemoryMeter_setValues(Meter* this, char* buffer, int size);
 

Meter.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_Meter
 #define HEADER_Meter
 /*
-htop - Meter.c
+htop - Meter.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -78,18 +78,6 @@ struct Meter_ {
    double total;
 };
 
-extern char* METER_CLASS;
-
-extern MeterType CPUMeter;
-extern MeterType ClockMeter;
-extern MeterType LoadAverageMeter;
-extern MeterType LoadMeter;
-extern MeterType MemoryMeter;
-extern MeterType SwapMeter;
-extern MeterType TasksMeter;
-extern MeterType UptimeMeter;
-extern MeterType AllCPUsMeter;
-
 typedef enum {
    CUSTOM_METERMODE = 0,
    BAR_METERMODE,
@@ -101,9 +89,13 @@ typedef enum {
    LAST_METERMODE
 } MeterModeId;
 
-extern MeterType* Meter_types[];
-extern MeterMode* Meter_modes[];
 
+#include "CPUMeter.h"
+#include "MemoryMeter.h"
+#include "SwapMeter.h"
+#include "TasksMeter.h"
+#include "LoadAverageMeter.h"
+#include "UptimeMeter.h"
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -112,15 +104,15 @@ extern MeterMode* Meter_modes[];
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
+extern char* METER_CLASS;
 
-
-
+extern MeterType* Meter_types[];
 
 #ifdef USE_FUNKY_MODES
 
 #endif
 
-
+extern MeterMode* Meter_modes[];
 
 Meter* Meter_new(ProcessList* pl, int param, MeterType* type);
 
@@ -128,7 +120,6 @@ void Meter_delete(Object* cast);
 
 void Meter_setCaption(Meter* this, char* caption);
 
-
 void Meter_setMode(Meter* this, int modeIndex);
 
 ListItem* Meter_toListItem(Meter* this);
@@ -139,7 +130,6 @@ void TextMeterMode_draw(Meter* this, int x, int y, int w);
 
 /* ---------- BarMeterMode ---------- */
 
-
 void BarMeterMode_draw(Meter* this, int x, int y, int w);
 
 #ifdef USE_FUNKY_MODES
@@ -148,14 +138,10 @@ void BarMeterMode_draw(Meter* this, int x, int y, int w);
 
 #define DrawDot(a,y,c) do { attrset(a); mvaddch(y, x+k, c); } while(0)
 
-
-
 void GraphMeterMode_draw(Meter* this, int x, int y, int w);
 
 /* ---------- LEDMeterMode ---------- */
 
-
-
 void LEDMeterMode_draw(Meter* this, int x, int y, int w);
 
 #endif

MetersPanel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_MetersPanel
 #define HEADER_MetersPanel

Object.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_Object
 #define HEADER_Object
@@ -30,7 +30,6 @@ struct Object_ {
    Object_Delete delete;
 };
 
-
 void Object_new();
 
 bool Object_instanceOf(Object* this, char* class);