RSS was not really disabled when it was supposed to be. Experimental wireless support.

[monky] / src / conky.h

diff --git a/src/conky.h b/src/conky.h
index 63136a4..d941121 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -32,6 +32,12 @@
 #include <machine/apm_bios.h>
 #endif /* __FreeBSD__ */
 
+#if defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <machine/apmvar.h>
+#endif /* __OpenBSD__ */
+
 #ifdef AUDACIOUS
 #include "audacious.h"
 #endif
@@ -40,6 +46,11 @@
 #include <xmmsclient/xmmsclient.h>
 #endif
 
+#ifdef RSS
+#include "prss.h"
+#endif
+
+#include "mboxscan.h"
 #include "timed_thread.h"
 
 #define TOP_CPU 1
@@ -49,6 +60,10 @@
 
 #define TEXT_BUFFER_SIZE 1280
 #define P_MAX_SIZE ((TEXT_BUFFER_SIZE * 4) - 2) 
+extern unsigned int text_buffer_size;
+
+/* maximum number of special things, e.g. fonts, offsets, aligns, etc. */
+#define MAX_SPECIALS_DEFAULT 512
 
 /* maximum size of config TEXT buffer, i.e. below TEXT line. */
 #define MAX_USER_TEXT_DEFAULT 16384
@@ -86,9 +101,18 @@ struct net_stat {
        struct sockaddr addr;
        int linkstatus;
        double net_rec[15], net_trans[15];
+       // wireless extensions
+       char essid[32];
+       char bitrate[16];
+       char mode[16];
+       char ap[18];
+       int link_qual;
+       int link_qual_max;
 };
 
 unsigned int diskio_value;
+unsigned int diskio_read_value;
+unsigned int diskio_write_value;
 
 struct fs_stat {
        char *path;
@@ -138,6 +162,7 @@ struct mpd_s {
        int bitrate;
        int length;
        int elapsed;
+       int max_title_len;              /* e.g. ${mpd_title 50} */
 };
 #endif
 
@@ -167,6 +192,7 @@ struct xmms2_s {
 #ifdef AUDACIOUS
 struct audacious_s {
        audacious_t items;              /* e.g. items[AUDACIOUS_STATUS] */
+       int max_title_len;              /* e.g. ${audacious_title 50} */
        timed_thread *p_timed_thread;
 };
 #endif
@@ -183,10 +209,15 @@ struct bmpx_s {
 };
 #endif
 
+void update_entropy();
+struct entropy_s {
+       unsigned int entropy_avail;
+       unsigned int poolsize;
+};
+
 #ifdef TCP_PORT_MONITOR
 #include "libtcp-portmon.h"
-#define MIN_PORT_MONITORS_DEFAULT 16
-#define MIN_PORT_MONITOR_CONNECTIONS_DEFAULT 256
+#define MAX_PORT_MONITOR_CONNECTIONS_DEFAULT 256
 #endif
 
 enum {
@@ -223,13 +254,26 @@ enum {
 #ifdef XMMS2
        INFO_XMMS2 = 22,
 #endif
+       INFO_ENTROPY = 23,
+#ifdef RSS
+       INFO_RSS = 24,
+#endif
 };
 
 
+/* get_battery_stuff() item selector */
+enum {
+       BATTERY_STATUS,
+       BATTERY_TIME
+};
+
 #ifdef MPD
 #include "libmpdclient.h"
 #endif
 
+/* Update interval */
+double update_interval;
+
 volatile int g_signal_pending;
 
 struct information {
@@ -242,8 +286,8 @@ struct information {
        double uptime;
 
        /* memory information in kilobytes */
-       unsigned long mem, memmax, swap, swapmax;
-       unsigned long bufmem, buffers, cached;
+       unsigned long long mem, memmax, swap, swapmax;
+       unsigned long long bufmem, buffers, cached;
 
        unsigned short procs;
        unsigned short run_procs;
@@ -282,9 +326,10 @@ struct information {
        struct process *first_process;
        unsigned long looped;
 #ifdef TCP_PORT_MONITOR
-        tcp_port_monitor_collection_t * p_tcp_port_monitor_collection;
+  tcp_port_monitor_collection_t * p_tcp_port_monitor_collection;
 #endif
        short kflags;  /* kernel settings, see enum KFLAG */
+       struct entropy_s entropy;
 };
 
 enum {
@@ -358,7 +403,8 @@ struct conky_window {
        int width;
        int height;
 #ifdef OWN_WINDOW
-       char wm_class_name[256];
+       char class_name[256];
+  char title[256];
        int x;
        int y;
        unsigned int type;
@@ -385,8 +431,8 @@ extern int workarea[4];
 extern struct conky_window window;
 
 void init_X11();
-void init_window(int use_own_window, int width, int height, int set_trans, int back_colour, char * nodename,
-                char **argv, int argc);
+void init_window(int use_own_window, int width, int height, int set_trans, int back_colour, 
+                 char **argv, int argc);
 void create_gc();
 void set_transparent_background(Window win);
 long get_x11_color(const char *);
@@ -409,6 +455,7 @@ void variable_substitute(const char *s, char *dest, unsigned int n);
 void format_seconds(char *buf, unsigned int n, long t);
 void format_seconds_short(char *buf, unsigned int n, long t);
 struct net_stat *get_net_stat(const char *dev);
+void clear_net_stats(void);
 
 void update_stuff();
 
@@ -423,12 +470,15 @@ extern int no_buffers;
 
 /* system dependant (in linux.c) */
 
+int check_mount(char *s);
 void update_diskio(void);
 void prepare_update(void);
 void update_uptime(void);
 void update_meminfo(void);
 void update_net_stats(void);
+#if 0
 void update_wifi_stats(void);
+#endif
 void update_cpu_usage(void);
 void update_total_processes(void);
 void update_running_processes(void);
@@ -449,7 +499,9 @@ int open_acpi_temperature(const char *name);
 double get_acpi_temperature(int fd);
 void get_acpi_ac_adapter( char *, size_t ); 
 void get_acpi_fan( char *, size_t ); 
-void get_battery_stuff(char *buf, unsigned int n, const char *bat);
+void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item);
+int get_battery_perct(const char *bat);
+int get_battery_perct_bar(const char *bat);
 void get_ibm_acpi_fan(char *buf, size_t client_buffer_size);
 void get_ibm_acpi_temps(void);
 void get_ibm_acpi_volume(char *buf, size_t client_buffer_size);
@@ -462,6 +514,22 @@ struct ibm_acpi_struct {
 
 struct ibm_acpi_struct ibm_acpi;
 
+#if defined(__OpenBSD__)
+void update_obsd_sensors(void);
+void get_obsd_vendor(char *buf, size_t client_buffer_size);
+void get_obsd_product(char *buf, size_t client_buffer_size);
+
+#define OBSD_MAX_SENSORS 256
+struct obsd_sensors_struct {
+       int device;
+       float temp[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+       unsigned int fan[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+       float volt[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+};
+struct obsd_sensors_struct obsd_sensors;
+#endif /* __OpenBSD__ */
+
+
 enum { PB_BATT_STATUS, PB_BATT_PERCENT, PB_BATT_TIME};
 void get_powerbook_batt_info(char*, size_t, int);
 
@@ -513,7 +581,10 @@ void update_mail_count();
 kvm_t *kd;
 #endif
 
-#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+#ifdef __OpenBSD__
+typedef struct apm_power_info *apm_info_t;
+#endif
 int apm_getinfo(int fd, apm_info_t aip);
 char *get_apm_adapter(void);
 char *get_apm_battery_life(void);
@@ -536,6 +607,17 @@ int scan_hddtemp(const char *arg, char **dev, char **addr, int *port);
 char *get_hddtemp_info(char *dev, char *addr, int port, char *unit);
 #endif /* HDDTEMP */
 
+/* in rss.c */
+#ifdef RSS
+PRSS* get_rss_info(char *uri, int delay);
+void init_rss_info();
+void free_rss_info();
+#endif /* RSS */
+
+#if defined(__linux__)
+extern int post_21_kernel;
+#endif /* __linux__ */
+
 /* in linux.c */
 
 #endif