added alternate codepath that gets battery info from dbus when power kernel is not...

[monky] / src / conky.h

diff --git a/src/conky.h b/src/conky.h
index 9f58bc5..9ab26bf 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
- * 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.
  *
@@ -197,11 +197,18 @@ extern struct conftree *currentconffile;
 #define MAX_TEMPLATES 10
 char **get_templates(void);
 
-/* get_battery_stuff() item selector
+/* get_xxxxx_stuff() item selector
  * needed by conky.c, linux.c and freebsd.c */
 enum {
        BATTERY_STATUS,
-       BATTERY_TIME
+       BATTERY_TIME,
+       BATTERY_VOLTS,
+       BATTERY_TEMP,
+       DBUS_CELL_DBM,
+       DBUS_CELL_PERCENT,
+       DBUS_HAL_BATTERY_CHRG_STATUS,
+       DBUS_HAL_BATTERY_PERCENT,
+       DBUS_HAL_BATTERY_VOLTS_CURRENT
 };
 
 /* if_up strictness selector
@@ -228,6 +235,7 @@ struct information {
        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? */
@@ -295,9 +303,7 @@ extern int top_cpu, top_mem, top_time;
 #ifdef IOSTATS
 extern int top_io;
 #endif
-#ifdef __linux__
 extern int top_running;
-#endif
 
 /* defined in conky.c, needed by top.c */
 extern int cpu_separate;
@@ -307,7 +313,7 @@ extern int cpu_separate;
 extern struct information info;
 
 /* defined in users.c */
-void update_users(void);
+int update_users(void);
 void update_user_time(char *tty);
 
 /* defined in conky.c */
@@ -319,9 +325,9 @@ int spaced_print(char *, int, const char *, int, ...)
 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;
@@ -358,7 +364,7 @@ void set_update_interval(double interval);
 #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 *);