diff options
author | Diogo Ferreira <defer@cyngn.com> | 2015-01-14 11:13:52 +0000 |
---|---|---|
committer | Diogo Ferreira <defer@cyngn.com> | 2015-01-14 11:38:57 +0000 |
commit | 841159c272ac08b1cd5bdef5167a8ce11383fbb5 (patch) | |
tree | d7272ef150e58eaa1acc9ab62cf9e6c0aecbc2da /MemoryMeter.c | |
parent | e1a8535012ab86d3e926bebfb7731dab1eb7320a (diff) | |
download | android_external_htop-841159c272ac08b1cd5bdef5167a8ce11383fbb5.tar.gz android_external_htop-841159c272ac08b1cd5bdef5167a8ce11383fbb5.tar.bz2 android_external_htop-841159c272ac08b1cd5bdef5167a8ce11383fbb5.zip |
htop: Update to 1.0.3HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-12.1stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Ilineage-15.0cm-14.1cm-14.0cm-13.0cm-12.1cm-12.0
Change-Id: I416c44803b3a79c2fd752e342ea113875fa533e0
Diffstat (limited to 'MemoryMeter.c')
-rw-r--r-- | MemoryMeter.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/MemoryMeter.c b/MemoryMeter.c index e3e18ec..0151625 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -1,24 +1,25 @@ /* -htop -(C) 2004-2010 Hisham H. Muhammad +htop - MemoryMeter.c +(C) 2004-2011 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ #include "MemoryMeter.h" -#include "Meter.h" +#include "CRT.h" #include "ProcessList.h" #include <stdlib.h> -#include <curses.h> #include <string.h> #include <math.h> #include <sys/param.h> - -#include "debug.h" #include <assert.h> +/*{ +#include "Meter.h" +}*/ + int MemoryMeter_attributes[] = { MEMORY_USED, MEMORY_BUFFERS, MEMORY_CACHE }; @@ -51,17 +52,21 @@ static void MemoryMeter_display(Object* cast, RichString* out) { RichString_append(out, CRT_colors[MEMORY_USED], buffer); sprintf(buffer, format, buffersMem); RichString_append(out, CRT_colors[METER_TEXT], "buffers:"); - RichString_append(out, CRT_colors[MEMORY_BUFFERS], buffer); + RichString_append(out, CRT_colors[MEMORY_BUFFERS_TEXT], buffer); sprintf(buffer, format, cachedMem); RichString_append(out, CRT_colors[METER_TEXT], "cache:"); RichString_append(out, CRT_colors[MEMORY_CACHE], buffer); } -MeterType MemoryMeter = { +MeterClass MemoryMeter_class = { + .super = { + .extends = Class(Meter), + .delete = Meter_delete, + .display = MemoryMeter_display, + }, .setValues = MemoryMeter_setValues, - .display = MemoryMeter_display, - .mode = BAR_METERMODE, - .items = 3, + .defaultMode = BAR_METERMODE, + .maxItems = 3, .total = 100.0, .attributes = MemoryMeter_attributes, "Memory", |