auesnthaeou

[monky] / src / common.h

diff --git a/src/common.h b/src/common.h
index d68d075..f2f38da 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -1,21 +1,27 @@
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
+
 #ifndef _COMMON_H
 #define _COMMON_H
 
+#include "structs.h"
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 
+void strfold(char *start, int count);
 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);
 void update_cpu_usage(void);
 void update_total_processes(void);
-void update_uname(void);
+void update_uname(conky_context *ctx);
 void update_running_processes(void);
 void update_i8k(void);
-void update_stuff(void);
+void update_stuff(conky_context *ctx);
 char get_freq(char *, size_t, const char *, int, unsigned int);
 void get_freq_dynamic(char *, size_t, const char *, int);
 char get_voltage(char *, size_t, const char *, int, unsigned int);     /* ptarjan */
@@ -26,7 +32,12 @@ struct process *get_first_process(void);
 void get_cpu_count(void);
 double get_time(void);
 
-FILE *open_file(const char *, int *);
+/* Converts '~/...' paths to '/home/blah/...' assumes that 'dest' is at least
+ * DEFAULT_TEXT_BUFFER_SIZE.  It's similar to variable_substitute, except only
+ * cheques for $HOME and ~/ in path */
+void to_real_path(char *dest, const char *source);
+FILE *open_file(const char *file, int *reported);
+int open_fifo(const char *file, int *reported);
 void variable_substitute(const char *s, char *dest, unsigned int n);
 
 void format_seconds(char *buf, unsigned int n, long t);
@@ -36,25 +47,25 @@ void format_seconds_short(char *buf, unsigned int n, long t);
 void update_x11info(void);
 #endif
 
-int round_to_int(float);
+int round_to_int_temp(float);
+
+unsigned int round_to_int(float);
 
 extern unsigned long long need_mask;
 extern int no_buffers;
 
-struct dns_data {
-        int nscount;
-        char **ns_list;
-};
-void free_dns_data(void);
+void free_dns_data(conky_context *ctx);
 
 struct net_stat {
-        const char *dev;
+        char *dev;
         int up;
         long long last_read_recv, last_read_trans;
         long long recv, trans;
         double recv_speed, trans_speed;
         struct sockaddr addr;
-        char* addrs;
+#if defined(__linux__)
+        char addrs[273];
+#endif /* __linux__ */
         double net_rec[15], net_trans[15];
         // wireless extensions
         char essid[32];
@@ -65,23 +76,12 @@ struct net_stat {
         char ap[18];
 };
 void clear_net_stats(void);
-struct net_stat *get_net_stat(const char *);
-
-int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
-       int *divisor, char *devtype);
-
-#define open_i2c_sensor(dev, type, n, divisor, devtype) \
-       open_sysfs_sensor("/sys/bus/i2c/devices/", dev, type, n, divisor, devtype)
-#define open_platform_sensor(dev, type, n, divisor, devtype) \
-       open_sysfs_sensor("/sys/bus/platform/devices/", dev, type, n, divisor, devtype)
-#define open_hwmon_sensor(dev, type, n, divisor, devtype) \
-       open_sysfs_sensor("/sys/class/hwmon/", dev, type, n, divisor, devtype)
-
-double get_sysfs_info(int *fd, int arg, char *devtype, char *type);
+void clear_cpu_stats(void);
+struct net_stat *get_net_stat(conky_context *ctx, const char *dev, void *free_at_crash1, void *free_at_crash2);
+int interface_up(conky_context *ctx, const char *dev);
 
 void get_adt746x_cpu(char *, size_t);
 void get_adt746x_fan(char *, size_t);
-unsigned int get_diskio(void);
 
 int open_acpi_temperature(const char *name);
 double get_acpi_temperature(int fd);
@@ -90,5 +90,6 @@ void get_acpi_fan(char *, size_t);
 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_battery_short_status(char *buf, unsigned int n, const char *bat);
 
 #endif /* _COMMON_H */