X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fcommon.h;h=2c1ddd1757d9c40de5b55125980f3ba3d4886c2f;hb=dc55c7d0a90b79105cd9b20cb86af94a20a2daab;hp=da91d60f752dce3bf747bc38cd4c11b8cc9a27ba;hpb=098e28598f92a2b91951ea1cce0c2d35f65b7462;p=monky

diff --git a/src/common.h b/src/common.h
index da91d60..2c1ddd1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,14 +1,20 @@
-/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- 
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ */
 
 #ifndef _COMMON_H
 #define _COMMON_H
 
-#include "structs.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
+#include "text_object.h"
+
+void add_update_callback(void (*func)(void));
+void free_update_callbacks(void);
+void start_update_threading(void);
+
 
 void strfold(char *start, int count);
 int check_mount(char *s);
@@ -18,13 +24,13 @@ void update_meminfo(void);
 void update_net_stats(void);
 void update_cpu_usage(void);
 void update_total_processes(void);
-void update_uname(conky_context *ctx);
+void update_uname(void);
+void update_threads(void);
 void update_running_processes(void);
-void update_i8k(void);
-void update_stuff(conky_context *ctx);
+void update_stuff(void);
 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 */
+void print_voltage_mv(struct text_object *, char *, int);
+void print_voltage_v(struct text_object *, char *, int);
 void update_load_average(void);
 void update_top(void);
 void free_all_processes(void);
@@ -51,38 +57,8 @@ int round_to_int_temp(float);
 
 unsigned int round_to_int(float);
 
-extern unsigned long long need_mask;
 extern int no_buffers;
 
-void free_dns_data(conky_context *ctx);
-
-struct net_stat {
-        char *dev;
-        int up;
-        long long last_read_recv, last_read_trans;
-        long long recv, trans;
-        double recv_speed, trans_speed;
-        struct sockaddr addr;
-#if defined(__linux__)
-        char addrs[273];
-#endif /* __linux__ */
-        double net_rec[15], net_trans[15];
-        // wireless extensions
-        char essid[32];
-        char bitrate[16];
-        char mode[16];
-        int link_qual;
-        int link_qual_max;
-        char ap[18];
-};
-void clear_net_stats(void);
-void clear_cpu_stats(void);
-struct net_stat *get_net_stat(const char *dev, void *free_at_crash1, void *free_at_crash2);
-int interface_up(const char *dev);
-
-void get_adt746x_cpu(char *, size_t);
-void get_adt746x_fan(char *, size_t);
-
 int open_acpi_temperature(const char *name);
 double get_acpi_temperature(int fd);
 void get_acpi_ac_adapter(char *, size_t);
@@ -92,4 +68,11 @@ 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);
 
+void scan_loadavg_arg(struct text_object *, const char *);
+void print_loadavg(struct text_object *, char *, int);
+#ifdef X11
+void scan_loadgraph_arg(struct text_object *, const char *);
+void print_loadgraph(struct text_object *, char *, int);
+#endif /* X11 */
+
 #endif /* _COMMON_H */