diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2011-09-08 04:41:03 +0000 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-09-08 04:41:03 +0000 |
commit | bb3e773c4958e76005915e3fd0c4b3a3c51ed941 (patch) | |
tree | d690a197e3c763b92fe7bfb89064436104bbf370 | |
parent | b288eb88c07bfc0eaca5a2e30f0063e4dc039237 (diff) |
Interface improvements for large numbers.
-rw-r--r-- | SwapMeter.c | 21 | ||||
-rw-r--r-- | SwapMeter.h | 5 |
2 files changed, 23 insertions, 3 deletions
diff --git a/SwapMeter.c b/SwapMeter.c index ed21292a..403b0576 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -19,25 +19,40 @@ in the source distribution for its full text. #include "debug.h" #include <assert.h> +#define KILOBYTE 1 +#define MEGABYTE 1024 +#define GIGABYTE 1048576 + int SwapMeter_attributes[] = { SWAP }; +/* NOTE: Value is in kilobytes */ +static void SwapMeter_humanNumber(char* buffer, const long int* value) { + if (*value >= 10*GIGABYTE) + sprintf(buffer, "%ldG ", *value / GIGABYTE); + else if (*value >= 10*MEGABYTE) + sprintf(buffer, "%ldM ", *value / MEGABYTE); + else + sprintf(buffer, "%ldK ", *value); +} + static void SwapMeter_setValues(Meter* this, char* buffer, int len) { long int usedSwap = this->pl->usedSwap; this->total = this->pl->totalSwap; this->values[0] = usedSwap; - snprintf(buffer, len, "%ld/%ldMB", (long int) usedSwap / 1024, (long int) this->total / 1024); + snprintf(buffer, len, "%ld/%ldMB", (long int) usedSwap / MEGABYTE, (long int) this->total / MEGABYTE); } static void SwapMeter_display(Object* cast, RichString* out) { char buffer[50]; Meter* this = (Meter*)cast; long int swap = (long int) this->values[0]; + long int total = (long int) this->total; RichString_write(out, CRT_colors[METER_TEXT], ":"); - sprintf(buffer, "%ldM ", (long int) this->total / 1024); + SwapMeter_humanNumber(buffer, &total); RichString_append(out, CRT_colors[METER_VALUE], buffer); - sprintf(buffer, "%ldk", swap); + SwapMeter_humanNumber(buffer, &swap); RichString_append(out, CRT_colors[METER_TEXT], "used:"); RichString_append(out, CRT_colors[METER_VALUE], buffer); } diff --git a/SwapMeter.h b/SwapMeter.h index f243a5bd..6bdd130b 100644 --- a/SwapMeter.h +++ b/SwapMeter.h @@ -22,8 +22,13 @@ in the source distribution for its full text. #include "debug.h" #include <assert.h> +#define KILOBYTE 1 +#define MEGABYTE 1024 +#define GIGABYTE 1048576 + extern int SwapMeter_attributes[]; +/* NOTE: Value is in kilobytes */ extern MeterType SwapMeter; #endif |