From c74c38760df69bb87e93dff18cf91464e5d02f37 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:22 +0200 Subject: Imported Upstream version 0.8.1 --- Meter.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'Meter.h') diff --git a/Meter.h b/Meter.h index e564d3c..34f8381 100644 --- a/Meter.h +++ b/Meter.h @@ -21,6 +21,7 @@ in the source distribution for its full text. #include "ListItem.h" #include "String.h" #include "ProcessList.h" +#include "RichString.h" #include "debug.h" #include @@ -96,8 +97,10 @@ typedef enum { #include "TasksMeter.h" #include "LoadAverageMeter.h" #include "UptimeMeter.h" +#include "BatteryMeter.h" #include "ClockMeter.h" + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif @@ -113,12 +116,6 @@ 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); void Meter_delete(Object* cast); @@ -131,24 +128,22 @@ ListItem* Meter_toListItem(Meter* this); /* ---------- TextMeterMode ---------- */ -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 /* ---------- GraphMeterMode ---------- */ #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 + +#ifdef USE_FUNKY_MODES #endif +extern MeterMode* Meter_modes[]; + #endif -- cgit v1.2.3