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 kernel and machine to callbacks.print

Browse Source
This commit is contained in:
Phil Sutter 2009-11-26 00:12:44 +01:00
parent 177da5ffbb
commit f84b14904c
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common.c
View File

@ -529,3 +529,15 @@ uint8_t swap_barval(struct text_object *obj)
return round_to_int(info.swapmax ? (info.swap * 255 / info.swapmax) : 0); return round_to_int(info.swapmax ? (info.swap * 255 / info.swapmax) : 0);
} }
void print_kernel(struct text_object *obj, char *p, int p_max_size)
{
(void)obj;
snprintf(p, p_max_size, "%s", info.uname_s.release);
}
void print_machine(struct text_object *obj, char *p, int p_max_size)
{
(void)obj;
snprintf(p, p_max_size, "%s", info.uname_s.machine);
}

3
src/common.h
View File

@ -86,4 +86,7 @@ uint8_t mem_barval(struct text_object *);
uint8_t swap_percentage(struct text_object *); uint8_t swap_percentage(struct text_object *);
uint8_t swap_barval(struct text_object *); uint8_t swap_barval(struct text_object *);
void print_kernel(struct text_object *, char *, int);
void print_machine(struct text_object *, char *, int);
#endif /* _COMMON_H */ #endif /* _COMMON_H */

7
src/conky.c
View File

@ -956,13 +956,6 @@ void generate_text_internal(char *p, int p_max_size,
DO_JUMP; DO_JUMP;
} }
} }
OBJ(kernel) {
snprintf(p, p_max_size, "%s", cur->uname_s.release);
}
OBJ(machine) {
snprintf(p, p_max_size, "%s", cur->uname_s.machine);
}
OBJ(format_time) { OBJ(format_time) {
char buf[max_user_text]; char buf[max_user_text];

2
src/core.c
View File

@ -711,7 +711,9 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->data.s = strndup(buf, text_buffer_size); obj->data.s = strndup(buf, text_buffer_size);
#endif #endif
END OBJ(kernel, 0) END OBJ(kernel, 0)
obj->callbacks.print = &print_kernel;
END OBJ(machine, 0) END OBJ(machine, 0)
obj->callbacks.print = &print_machine;
END OBJ(mails, 0) END OBJ(mails, 0)
parse_local_mail_args(obj, arg); parse_local_mail_args(obj, arg);
obj->callbacks.print = &print_mails; obj->callbacks.print = &print_mails;