- Overhaul meters implementation;

- add AllCPUsMeter;
- because of that, the new .htoprc is incompatible with previous released versions.

1 files changed, 16 insertions, 11 deletions

diff --git a/CPUMeter.h b/CPUMeter.h
index 22589dc0..65ee37cb 100644
--- a/CPUMeter.h
+++ b/CPUMeter.h
@@ -1,9 +1,9 @@
-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_CPUMeter
 #define HEADER_CPUMeter
 /*
-htop
+htop - CPUMeter.c
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
@@ -17,25 +17,30 @@ in the source distribution for its full text.
 #include <curses.h>
 #include <string.h>
 #include <math.h>
-#include <sys/param.h>
 
 #include "debug.h"
 #include <assert.h>
 
 
-typedef struct CPUMeter_ CPUMeter;
 
-struct CPUMeter_ {
-   Meter super;
-   ProcessList* pl;
-   int processor;
-};
 
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
 
-CPUMeter* CPUMeter_new(ProcessList* pl, int processor);
+void CPUMeter_init(Meter* this);
 
-void CPUMeter_setValues(Meter* cast);
+void CPUMeter_setValues(Meter* this, char* buffer, int size);
 
 void CPUMeter_display(Object* cast, RichString* out);
 
+void AllCPUsMeter_init(Meter* this);
+
+void AllCPUsMeter_done(Meter* this);
+
+void AllCPUsMeter_draw(Meter* this, int x, int y, int w);
+
 #endif