Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 19:15:12 +00:00
Code Issues Releases Activity

convert swapperc to callbacks.percentage

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

7
src/common.c
View File

@ -501,6 +501,13 @@ uint8_t mem_barval(struct text_object *obj)
return round_to_int(info.memmax ? (info.mem * 255 / info.memmax) : 0); return round_to_int(info.memmax ? (info.mem * 255 / info.memmax) : 0);
} }
uint8_t swap_percentage(struct text_object *obj)
{
(void)obj;
return (info.swapmax ? round_to_int(info.swap * 100 / info.swapmax) : 0);
}
uint8_t swap_barval(struct text_object *obj) uint8_t swap_barval(struct text_object *obj)
{ {
(void)obj; (void)obj;

1
src/common.h
View File

@ -79,6 +79,7 @@ uint8_t cpu_percentage(struct text_object *);
uint8_t cpu_barval(struct text_object *); uint8_t cpu_barval(struct text_object *);
uint8_t mem_percentage(struct text_object *); uint8_t mem_percentage(struct text_object *);
uint8_t mem_barval(struct text_object *); uint8_t mem_barval(struct text_object *);
uint8_t swap_percentage(struct text_object *);
uint8_t swap_barval(struct text_object *); uint8_t swap_barval(struct text_object *);
#endif /* _COMMON_H */ #endif /* _COMMON_H */

7
src/conky.c
View File

@ -1329,13 +1329,6 @@ void generate_text_internal(char *p, int p_max_size,
OBJ(swapmax) { OBJ(swapmax) {
human_readable(cur->swapmax * 1024, p, 255); human_readable(cur->swapmax * 1024, p, 255);
} }
OBJ(swapperc) {
if (cur->swapmax == 0) {
strncpy(p, "No swap", p_max_size);
} else {
percent_print(p, p_max_size, cur->swap * 100 / cur->swapmax);
}
}
OBJ(sysname) { OBJ(sysname) {
snprintf(p, p_max_size, "%s", cur->uname_s.sysname); snprintf(p, p_max_size, "%s", cur->uname_s.sysname);
} }

1
src/core.c
View File

@ -972,6 +972,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
END OBJ(swapfree, &update_meminfo) END OBJ(swapfree, &update_meminfo)
END OBJ(swapmax, &update_meminfo) END OBJ(swapmax, &update_meminfo)
END OBJ(swapperc, &update_meminfo) END OBJ(swapperc, &update_meminfo)
obj->callbacks.percentage = &swap_percentage;
END OBJ(swapbar, &update_meminfo) END OBJ(swapbar, &update_meminfo)
scan_bar(obj, arg); scan_bar(obj, arg);
obj->callbacks.barval = &swap_barval; obj->callbacks.barval = &swap_barval;