From 841159c272ac08b1cd5bdef5167a8ce11383fbb5 Mon Sep 17 00:00:00 2001
From: Diogo Ferreira <defer@cyngn.com>
Date: Wed, 14 Jan 2015 11:13:52 +0000
Subject: htop: Update to 1.0.3

Change-Id: I416c44803b3a79c2fd752e342ea113875fa533e0
---
 MemoryMeter.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'MemoryMeter.c')

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",
-- 
cgit v1.2.3