projects
/
monky
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix device name parsing for diskio variables.
[monky]
/
src
/
conky.h
diff --git
a/src/conky.h
b/src/conky.h
index
e7d0166
..
9a6b80d
100644
(file)
--- a/
src/conky.h
+++ b/
src/conky.h
@@
-10,7
+10,7
@@
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* (see AUTHORS)
* All rights reserved.
*
@@
-132,14
+132,10
@@
struct text_object;
* one doesn't know what to choose. Defaults to 256. */
extern unsigned int text_buffer_size;
* one doesn't know what to choose. Defaults to 256. */
extern unsigned int text_buffer_size;
-struct entropy_s {
- unsigned int entropy_avail;
- unsigned int poolsize;
-};
-
struct usr_info {
char *names;
char *times;
struct usr_info {
char *names;
char *times;
+ char *ctime;
char *terms;
int number;
};
char *terms;
int number;
};
@@
-231,6
+227,8
@@
struct information {
unsigned short procs;
unsigned short run_procs;
unsigned short procs;
unsigned short run_procs;
+ unsigned short threads;
+ unsigned short run_threads;
float *cpu_usage;
/* struct cpu_stat cpu_summed; what the hell is this? */
float *cpu_usage;
/* struct cpu_stat cpu_summed; what the hell is this? */
@@
-261,7
+259,6
@@
struct information {
#endif
struct process *first_process;
unsigned long looped;
#endif
struct process *first_process;
unsigned long looped;
- struct entropy_s entropy;
double music_player_interval;
#ifdef X11
double music_player_interval;
#ifdef X11
@@
-312,6
+309,7
@@
extern struct information info;
/* defined in users.c */
void update_users(void);
/* defined in users.c */
void update_users(void);
+void update_user_time(char *tty);
/* defined in conky.c */
extern double current_update_time, last_update_time, update_interval;
/* defined in conky.c */
extern double current_update_time, last_update_time, update_interval;
@@
-322,9
+320,9
@@
int spaced_print(char *, int, const char *, int, ...)
extern int inotify_fd;
/* defined in conky.c
extern int inotify_fd;
/* defined in conky.c
- * evaluates 'text' and places the result in 'buffer'
+ * evaluates 'text' and places the result in 'p' of max length 'p_max_size'
*/
*/
-void evaluate(const char *text, char *buffer);
+void evaluate(const char *text, char *p, int p_max_size);
/* maximum size of config TEXT buffer, i.e. below TEXT line. */
extern unsigned int max_user_text;
/* maximum size of config TEXT buffer, i.e. below TEXT line. */
extern unsigned int max_user_text;
@@
-361,7
+359,7
@@
void set_update_interval(double interval);
#define UNUSED_ATTR __attribute__ ((unused))
void parse_conky_vars(struct text_object *, const char *,
#define UNUSED_ATTR __attribute__ ((unused))
void parse_conky_vars(struct text_object *, const char *,
- char *, struct information *);
+ char *, int, struct information *);
void generate_text_internal(char *, int, struct text_object,
struct information *);
void generate_text_internal(char *, int, struct text_object,
struct information *);