Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 04:06:03 +00:00
Code Issues Releases Activity

convert memperc to callbacks.percentage

Browse Source
This commit is contained in:
Phil Sutter 2009-11-25 01:33:13 +01:00
parent 07f82f5cb6
commit feba298efa
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.c
View File

@ -487,6 +487,13 @@ uint8_t cpu_barval(struct text_object *obj)
return round_to_int(info.cpu_usage[obj->data.i] * 255.0);
}
uint8_t mem_percentage(struct text_object *obj)
{
(void)obj;
return (info.memmax ? round_to_int(info.mem * 100 / info.memmax) : 0);
}
uint8_t mem_barval(struct text_object *obj)
{
(void)obj;

1
src/common.h
View File

@ -77,6 +77,7 @@ uint8_t loadgraphval(struct text_object *);
uint8_t cpu_percentage(struct text_object *);
uint8_t cpu_barval(struct text_object *);
uint8_t mem_percentage(struct text_object *);
uint8_t mem_barval(struct text_object *);
uint8_t swap_barval(struct text_object *);

4
src/conky.c
View File

@ -976,10 +976,6 @@ void generate_text_internal(char *p, int p_max_size,
OBJ(memmax) {
human_readable(cur->memmax * 1024, p, 255);
}
OBJ(memperc) {
if (cur->memmax)
percent_print(p, p_max_size, cur->mem * 100 / cur->memmax);
}
#ifdef X11
#define NOT_IN_X "Not running in X"
OBJ(monitor) {

1
src/core.c
View File

@ -769,6 +769,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
END OBJ(memfree, &update_meminfo)
END OBJ(memmax, &update_meminfo)
END OBJ(memperc, &update_meminfo)
obj->callbacks.percentage = &mem_percentage;
END OBJ(memgauge, &update_meminfo)
scan_gauge(obj, arg);
obj->callbacks.gaugeval = &mem_barval;