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

merge apcupsd_loadbar to callbacks.barval

Browse Source
This commit is contained in:
Phil Sutter 2009-11-23 23:56:50 +01:00
parent 4988947829
commit cba2460397
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apcupsd.c
View File

@ -259,15 +259,11 @@ void print_apcupsd_loadgauge(struct text_object *obj, char *p, int p_max_size)
new_gauge(obj, p, p_max_size, (int)progress);
}
void print_apcupsd_loadbar(struct text_object *obj, char *p, int p_max_size)
uint8_t apcupsd_loadbarval(struct text_object *obj)
{
double progress;
(void)obj;
if (!p_max_size)
return;
progress = atof(info.apcupsd.items[APCUPSD_LOAD]) / 100.0 * 255.0;
new_bar(obj, p, p_max_size, (int) progress);
return round_to_int(atof(info.apcupsd.items[APCUPSD_LOAD]) * 2.55);
}
#define APCUPSD_PRINT_GENERATOR(name, idx) \

2
src/apcupsd.h
View File

@ -54,7 +54,7 @@ void update_apcupsd(void);
void print_apcupsd_nop(struct text_object *, char *, int);
void print_apcupsd_loadgraph(struct text_object *, char *, int);
void print_apcupsd_loadgauge(struct text_object *, char *, int);
void print_apcupsd_loadbar(struct text_object *, char *, int);
uint8_t apcupsd_loadbarval(struct text_object *);
void print_apcupsd_name(struct text_object *, char *, int);
void print_apcupsd_model(struct text_object *, char *, int);

2
src/core.c
View File

@ -1444,7 +1444,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->callbacks.print = &print_apcupsd_load;
END OBJ(apcupsd_loadbar, &update_apcupsd)
scan_bar(obj, arg);
obj->callbacks.print = &print_apcupsd_loadbar;
obj->callbacks.barval = &apcupsd_loadbarval;
#ifdef X11
END OBJ(apcupsd_loadgraph, &update_apcupsd)
char* buf = 0;