X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/fb524b60508dd8adee66ae30e834632fd6b4402c..74c4f4ebdae8a12fc95840954dde574692234b01:/slstatus.h

diff --git a/slstatus.h b/slstatus.h
index 7d764ab..8bd8bb5 100644
--- a/slstatus.h
+++ b/slstatus.h
@@ -1,33 +1,78 @@
 /* See LICENSE file for copyright and license details. */
 
-/* global variables */
-static Display *dpy;
-
-/* statusbar configuration type and struct */
-typedef char *(*op_fun) (const char *);
-struct arg {
-    op_fun func;
-    const char *format;
-    const char *args;
-};
-
-/* functions */
-void setstatus(const char *);
-char *smprintf(const char *, ...);
-char *battery_perc(const char *);
-char *cpu_perc(const char *);
-char *datetime(const char *);
-char *disk_free(const char *);
-char *disk_perc(const char *);
-char *disk_total(const char *);
-char *disk_used(const char *);
-char *entropy(const char*);
-char *hostname(const char *);
-char *ip(const char *);
-char *ram_free(const char *);
-char *ram_perc(const char *);
-char *ram_used(const char *);
-char *ram_total(const char *);
-char *temp(const char *);
-char *vol_perc(const char *);
-char *wifi_perc(const char *);
+/* battery */
+const char *battery_perc(const char *);
+const char *battery_state(const char *);
+const char *battery_remaining(const char*);
+
+/* cpu */
+const char *cpu_freq(void);
+const char *cpu_perc(void);
+
+/* datetime */
+const char *datetime(const char *);
+
+/* disk */
+const char *disk_free(const char *);
+const char *disk_perc(const char *);
+const char *disk_total(const char *);
+const char *disk_used(const char *);
+
+/* entropy */
+const char *entropy(void);
+
+/* hostname */
+const char *hostname(void);
+
+/* ip */
+const char *ipv4(const char *);
+const char *ipv6(const char *);
+
+/* kernel_release */
+const char *kernel_release(void);
+
+/* keyboard_indicators */
+const char *keyboard_indicators(void);
+
+/* load_avg */
+const char *load_avg(const char *);
+
+/* netspeeds */
+const char *netspeed_rx(const char *);
+const char *netspeed_tx(const char *);
+
+/* num_files */
+const char *num_files(const char *);
+
+/* ram */
+const char *ram_free(void);
+const char *ram_perc(void);
+const char *ram_total(void);
+const char *ram_used(void);
+
+/* run_command */
+const char *run_command(const char *);
+
+/* swap */
+const char *swap_free(void);
+const char *swap_perc(void);
+const char *swap_total(void);
+const char *swap_used(void);
+
+/* temperature */
+const char *temp(const char *);
+
+/* uptime */
+const char *uptime(void);
+
+/* user */
+const char *gid(void);
+const char *username(void);
+const char *uid(void);
+
+/* volume */
+const char *vol_perc(const char *);
+
+/* wifi */
+const char *wifi_perc(const char *);
+const char *wifi_essid(const char *);