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 aa89b9a..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.
  *
@@ -90,10 +90,6 @@ struct text_object;
 #include "mpd.h"
 #endif
 
-#ifdef NVIDIA
-#include "nvidia.h"
-#endif
-
 #ifdef HAVE_CURL
 #include "ccurl_thread.h"
 #endif /* HAVE_CURL */
@@ -136,24 +132,14 @@ struct text_object;
  * 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;
+       char *ctime;
        char *terms;
        int number;
 };
 
-struct gateway_info {
-       char *iface;
-       char *ip;
-       int count;
-};
-
 #ifdef X11
 struct monitor_info {
        int number;
@@ -187,6 +173,9 @@ long get_current_text_color(void);
 void set_updatereset(int);
 int get_updatereset(void);
 
+int percent_print(char *, int, unsigned);
+void human_readable(long long, char *, int);
+
 struct conftree {
        char* string;
        struct conftree* horz_next;
@@ -208,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
@@ -238,10 +234,12 @@ 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? */
-       unsigned int cpu_count;
+       int cpu_count;
        int cpu_avg_samples;
 
        int net_avg_samples;
@@ -250,8 +248,6 @@ struct information {
 
        float loadavg[3];
 
-       struct mail_s *mail;
-       int mail_running;
 #ifdef XMMS2
        struct xmms2_s xmms2;
 #endif
@@ -262,8 +258,6 @@ struct information {
        struct bmpx_s bmpx;
 #endif
        struct usr_info users;
-       struct gateway_info gw_info;
-       struct dns_data nameserver_info;
        struct process *cpu[10];
        struct process *memu[10];
        struct process *time[10];
@@ -272,7 +266,6 @@ struct information {
 #endif
        struct process *first_process;
        unsigned long looped;
-       struct entropy_s entropy;
        double music_player_interval;
 
 #ifdef X11
@@ -310,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;
@@ -322,7 +313,8 @@ 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 */
 extern double current_update_time, last_update_time, update_interval;
@@ -333,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;
@@ -343,9 +335,6 @@ extern unsigned int max_user_text;
 /* path to config file */
 extern char *current_config;
 
-/* just a wrapper for read_exec() defined in conky.c */
-void do_read_exec(const char *data, char *buf, const int size);
-
 #ifdef X11
 #define TO_X 1
 #endif /* X11 */
@@ -374,4 +363,9 @@ void set_update_interval(double interval);
 #define UNUSED(a)  (void)a
 #define UNUSED_ATTR __attribute__ ((unused))
 
+void parse_conky_vars(struct text_object *, const char *,
+                       char *, int, struct information *);
+
+void generate_text_internal(char *, int, struct text_object,
+                                   struct information *);
 #endif /* _conky_h_ */