Regenerated all headers.

Panel.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_Panel
 #define HEADER_Panel
 /*
-htop
+htop - Panel.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -15,7 +15,6 @@ in the source distribution for its full text.
 #include "RichString.h"
 
 #include <math.h>
-#include <sys/param.h>
 #include <stdbool.h>
 
 #include "debug.h"
@@ -48,9 +47,15 @@ struct Panel_ {
    Panel_EventHandler eventHandler;
 };
 
-extern char* PANEL_CLASS;
 
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
 
+extern char* PANEL_CLASS;
 
 Panel* Panel_new(int x, int y, int w, int h, char* type, bool owner);
 
@@ -60,11 +65,11 @@ void Panel_init(Panel* this, int x, int y, int w, int h, char* type, bool owner)
 
 void Panel_done(Panel* this);
 
-void Panel_setEventHandler(Panel* this, Panel_EventHandler eh);
+inline void Panel_setRichHeader(Panel* this, RichString header);
 
-void Panel_setRichHeader(Panel* this, RichString header);
+inline void Panel_setHeader(Panel* this, char* header);
 
-void Panel_setHeader(Panel* this, char* header);
+void Panel_setEventHandler(Panel* this, Panel_EventHandler eh);
 
 void Panel_move(Panel* this, int x, int y);
 

Process.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_Process
 #define HEADER_Process
@@ -106,12 +106,10 @@ typedef struct Process_ {
    char user[PROCESS_USER_LEN + 1];
 } Process;
 
-extern char* PROCESS_CLASS;
-
-extern char* Process_fieldNames[];
-
 
+extern char* PROCESS_CLASS;
 
+extern char *Process_fieldNames[];
 
 Process* Process_new(struct ProcessList_ *pl);
 

ProcessList.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_ProcessList
 #define HEADER_ProcessList
 /*
-htop - ProcessList.c
+htop - ProcessList.h
 (C) 2004,2005 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -103,15 +103,11 @@ typedef struct ProcessList_ {
 
 } ProcessList;
 
-
 #ifdef DEBUG
 
-
 #define ProcessList_read(this, buffer, format, ...) ProcessList_xread(this, (vxscanf) vsscanf, buffer, format, ## __VA_ARGS__ )
 #define ProcessList_fread(this, file, format, ...)  ProcessList_xread(this, (vxscanf) vfscanf, file, format, ## __VA_ARGS__ )
 
-
-
 #else
 
 #ifndef ProcessList_read
@@ -141,10 +137,8 @@ Process* ProcessList_get(ProcessList* this, int index);
 
 int ProcessList_size(ProcessList* this);
 
-
 void ProcessList_sort(ProcessList* this);
 
-
 bool ProcessList_readStatusFile(ProcessList* this, Process* proc, char* dirname, char* name);
 
 void ProcessList_processEntries(ProcessList* this, char* dirname, int parent, float period);

RichString.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_RichString
 #define HEADER_RichString
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <curses.h>
-#include <sys/param.h>
 
 #include "debug.h"
 #include <assert.h>
@@ -21,6 +20,9 @@ typedef struct RichString_ {
 } RichString;
 
 
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
 
 RichString RichString_new();
 

ScreenManager.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_ScreenManager
 #define HEADER_ScreenManager
@@ -32,9 +32,9 @@ typedef struct ScreenManager_ {
    int y2;
    Orientation orientation;
    Vector* items;
+   Vector* fuBars;
    int itemCount;
    FunctionBar* fuBar;
-   Vector* fuBars;
    bool owner;
 } ScreenManager;
 

Settings.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_Settings
 #define HEADER_Settings
 /*
-htop - Settings.c
+htop - Settings.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -32,8 +32,6 @@ Settings* Settings_new(ProcessList* pl, Header* header);
 
 void Settings_delete(Settings* this);
 
-
-
 bool Settings_read(Settings* this, char* fileName);
 
 bool Settings_write(Settings* this);

SignalItem.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
-#ifndef HEADER_Signal
-#define HEADER_Signal
+#ifndef HEADER_SignalItem
+#define HEADER_SignalItem
 /*
-htop
+htop - SignalItem.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -25,8 +25,8 @@ typedef struct Signal_ {
    int number;
 } Signal;
 
-extern char* SIGNAL_CLASS;
 
+extern char* SIGNAL_CLASS;
 
 Signal* Signal_new(char* name, int number);
 

SignalsPanel.h

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

String.h

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

SwapMeter.h

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

TasksMeter.h

@@ -17,7 +17,9 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+extern int TasksMeter_attributes[];
 
+extern MeterType TasksMeter;
 
 void TasksMeter_setValues(Meter* this, char* buffer, int len);
 

TraceScreen.h

+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_TraceScreen
+#define HEADER_TraceScreen
 /*
 htop - TraceScreen.h
-(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.
 */
-#ifndef HEADER_TraceScreen
-#define HEADER_TraceScreen
 
 #define _GNU_SOURCE
 #include <stdio.h>
@@ -13,11 +15,16 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "ProcessList.h"
+#include "Process.h"
+#include "ListItem.h"
 #include "Panel.h"
 #include "FunctionBar.h"
 
+
 typedef struct TraceScreen_ {
    Process* process;
    Panel* display;
@@ -25,6 +32,7 @@ typedef struct TraceScreen_ {
    bool tracing;
 } TraceScreen;
 
+
 TraceScreen* TraceScreen_new(Process* process);
 
 void TraceScreen_delete(TraceScreen* this);
@@ -34,4 +42,3 @@ void TraceScreen_draw(TraceScreen* this);
 void TraceScreen_run(TraceScreen* this);
 
 #endif
-

UptimeMeter.h

@@ -17,8 +17,10 @@ in the source distribution for its full text.
 
 #include "debug.h"
 
+extern int UptimeMeter_attributes[];
 
+extern MeterType UptimeMeter;
 
-void UptimeMeter_setValues(Meter* cast, char* buffer, int len);
+void UptimeMeter_setValues(Meter* this, char* buffer, int len);
 
 #endif

UsersTable.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_UsersTable
 #define HEADER_UsersTable
 /*
-htop
+htop - UsersTable.h
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -20,10 +20,6 @@ in the source distribution for its full text.
 #include "debug.h"
 #include <assert.h>
 
-#ifndef SYSCONFDIR
-#define SYSCONFDIR "/etc"
-#endif
-
 typedef struct UsersTable_ {
    Hashtable* users;
 } UsersTable;
@@ -36,6 +32,6 @@ char* UsersTable_getRef(UsersTable* this, int uid);
 
 inline int UsersTable_size(UsersTable* this);
 
-void UsersTable_foreach(UsersTable*, Hashtable_PairFunction, void*);
+inline void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
 
 #endif

Vector.h

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

debug.h

@@ -3,12 +3,12 @@
 
    /* Full debug */
    #include "DebugMemory.h"
-   #define calloc(a, b) DebugMemory_calloc(a, b, __FILE__, __LINE__);
-   #define malloc(x) DebugMemory_malloc(x, __FILE__, __LINE__, #x);
-   #define realloc(x,s) DebugMemory_realloc(x, s, __FILE__, __LINE__, #x);
-   #define strdup(x) DebugMemory_strdup(x, __FILE__, __LINE__);
-   #define free(x) DebugMemory_free(x, __FILE__, __LINE__);
-   #define debug_done() DebugMemory_report();
+   #define calloc(a, b) DebugMemory_calloc(a, b, __FILE__, __LINE__)
+   #define malloc(x) DebugMemory_malloc(x, __FILE__, __LINE__, #x)
+   #define realloc(x,s) DebugMemory_realloc(x, s, __FILE__, __LINE__, #x)
+   #define strdup(x) DebugMemory_strdup(x, __FILE__, __LINE__)
+   #define free(x) DebugMemory_free(x, __FILE__, __LINE__)
+   #define debug_done() DebugMemory_report()
 
 #elif defined(DEBUGLITE)
 

htop.h

-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_htop
 #define HEADER_htop
@@ -9,6 +9,13 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <math.h>
+#include <sys/param.h>
+#include <ctype.h>
+#include <stdbool.h>
+
 #include "ProcessList.h"
 #include "CRT.h"
 #include "Panel.h"
@@ -21,32 +28,24 @@ in the source distribution for its full text.
 #include "ListItem.h"
 #include "CategoriesPanel.h"
 #include "SignalsPanel.h"
+#include "TraceScreen.h"
 
 #include "config.h"
 #include "debug.h"
 
-#include <unistd.h>
-#include <math.h>
-#include <sys/param.h>
-#include <ctype.h>
-#include <stdbool.h>
-
-int usleep(int usec);
-
 //#link m
 
 #define INCSEARCH_MAX 40
 
-
 void printVersionFlag();
 
 void printHelpFlag();
 
 void showHelp();
 
-void showColumnConfig(ProcessList* pl);
+void addUserToList(int key, void* userCast, void* panelCast);
 
-void Setup_run(Settings* settings, int headerHeight);
+void setUserOnly(const char* userName, bool* userOnly, uid_t* userId);
 
 int main(int argc, char** argv);