Allow ~/... and $HOME/... paths for more stuff.

[monky] / src / conky.h

diff --git a/src/conky.h b/src/conky.h
index 2010f8e..78f6e1f 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -43,6 +43,7 @@
 #define FALSE 0
 #define TRUE 1
 
+#define DEFAULT_BAR_WIDTH_NO_X 10
 
 #if !defined(__GNUC__)
 #  define __attribute__(x) /* nothing */
@@ -90,6 +91,10 @@ char *strndup(const char *s, size_t n);
 #include "rss.h"
 #endif
 
+#ifdef HAVE_LUA
+#include "llua.h"
+#endif
+
 #ifdef TCP_PORT_MONITOR
 #include "tcp-portmon.h"
 #endif
@@ -103,6 +108,13 @@ char *strndup(const char *s, size_t n);
 #include "smapi.h"
 #endif
 
+#ifdef APCUPSD
+#include "apcupsd.h"
+#endif
+
+/* sony support */
+#include "sony.h"
+
 /* A size for temporary, static buffers to use when
  * one doesn't know what to choose. Defaults to 256.  */
 extern unsigned int text_buffer_size;
@@ -187,7 +199,10 @@ enum {
 #endif
        INFO_DNS = 30,
 #ifdef MOC
-  INFO_MOC = 31
+       INFO_MOC = 31,
+#endif
+#ifdef APCUPSD
+       INFO_APCUPSD = 32,
 #endif
 };
 
@@ -225,9 +240,11 @@ struct information {
        float *cpu_usage;
        /* struct cpu_stat cpu_summed; what the hell is this? */
        unsigned int cpu_count;
-       unsigned int cpu_avg_samples;
+       int cpu_avg_samples;
 
-       unsigned int net_avg_samples;
+       int net_avg_samples;
+
+       int diskio_avg_samples;
 
        float loadavg[3];
 
@@ -235,8 +252,6 @@ struct information {
        int mail_running;
 #ifdef XMMS2
        struct xmms2_s xmms2;
-       int xmms2_conn_state;
-       xmmsc_connection_t *xmms2_conn;
 #endif
 #ifdef AUDACIOUS
        AUDACIOUS_S audacious;
@@ -259,6 +274,10 @@ struct information {
        struct x11_info x11;
 #endif
 
+#ifdef APCUPSD
+       APCUPSD_S apcupsd;
+#endif
+
        short kflags;   /* kernel settings, see enum KFLAG */
 };
 
@@ -291,10 +310,26 @@ extern struct information info;
 void update_users(void);
 
 /* defined in conky.c */
-extern double current_update_time, last_update_time;
+extern double current_update_time, last_update_time, update_interval;
 
 /* defined in conky.c */
 int spaced_print(char *, int, const char *, int, ...)
        __attribute__((format(printf, 3, 5)));
+extern int inotify_fd;
+
+#define TO_X 1
+#define TO_STDOUT 2
+#define TO_STDERR 4
+#define OVERWRITE_FILE 8
+#define APPEND_FILE 16
+enum x_initialiser_state {
+       NO = 0,
+       YES = 1,
+       NEVER = 2
+};
+extern int output_methods;
+extern enum x_initialiser_state x_initialised;
 
-#endif
+#define DEFAULT_TEXT_BUFFER_SIZE_S "##DEFAULT_TEXT_BUFFER_SIZE"
+
+#endif /* _conky_h_ */