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

convert if_smapi_bat_installed to callbacks.iftest

Browse Source
This commit is contained in:
Phil Sutter 2009-11-25 02:06:14 +01:00
parent 9887bfdfdf
commit 2dca262c00
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conky.c
View File

@ -1412,17 +1412,6 @@ void generate_text_internal(char *p, int p_max_size,
} }
#endif /* HAVE_ICONV */ #endif /* HAVE_ICONV */
#ifdef IBM
OBJ(if_smapi_bat_installed) {
int idx;
if(obj->data.s && sscanf(obj->data.s, "%i", &idx) == 1) {
if(!smapi_bat_installed(idx)) {
DO_JUMP;
}
} else
NORM_ERR("argument to if_smapi_bat_installed must be an integer");
}
#endif /* IBM */
OBJ(include) { OBJ(include) {
if(obj->sub) { if(obj->sub) {
char buf[max_user_text]; char buf[max_user_text];

1
src/core.c
View File

@ -1067,6 +1067,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->callbacks.free = &gen_free_opaque; obj->callbacks.free = &gen_free_opaque;
END OBJ_IF_ARG(if_smapi_bat_installed, 0, "if_smapi_bat_installed needs an argument") END OBJ_IF_ARG(if_smapi_bat_installed, 0, "if_smapi_bat_installed needs an argument")
obj->data.s = strndup(arg, text_buffer_size); obj->data.s = strndup(arg, text_buffer_size);
obj->callbacks.iftest = &smapi_bat_installed;
obj->callbacks.free = &gen_free_opaque; obj->callbacks.free = &gen_free_opaque;
END OBJ_ARG(smapi_bat_perc, 0, "smapi_bat_perc needs an argument") END OBJ_ARG(smapi_bat_perc, 0, "smapi_bat_perc needs an argument")
obj->data.s = strndup(arg, text_buffer_size); obj->data.s = strndup(arg, text_buffer_size);

12
src/smapi.c
View File

@ -179,3 +179,15 @@ uint8_t smapi_bat_barval(struct text_object *obj)
return round_to_int(smapi_get_bat_int(obj->data.i, "remaining_percent") * 2.55); return round_to_int(smapi_get_bat_int(obj->data.i, "remaining_percent") * 2.55);
return 0; return 0;
} }
int smapi_bat_installed(struct text_object *obj)
{
int idx;
if(obj->data.s && sscanf(obj->data.s, "%i", &idx) == 1) {
if(!smapi_bat_installed(idx)) {
return 0;
}
} else
NORM_ERR("argument to if_smapi_bat_installed must be an integer");
return 1;
}

1
src/smapi.h
View File

@ -41,5 +41,6 @@ uint8_t smapi_bat_percentage(struct text_object *);
void print_smapi_bat_temp(struct text_object *, char *, int); void print_smapi_bat_temp(struct text_object *, char *, int);
void print_smapi_bat_power(struct text_object *, char *, int); void print_smapi_bat_power(struct text_object *, char *, int);
uint8_t smapi_bat_barval(struct text_object *); uint8_t smapi_bat_barval(struct text_object *);
int smapi_bat_installed(struct text_object *obj)
#endif /* _SMAPI_H */ #endif /* _SMAPI_H */