Change output format to be a config option instead of a compile time define

[i3/i3status] / i3status.h

diff --git a/i3status.h b/i3status.h
index d00d3189586e8fef2525568c5f888153bd16df23..4c7d4b4dcb6b6876a89e033aa0bf63ac6d30ff7f 100644 (file)
--- a/i3status.h
+++ b/i3status.h
@@ -1,14 +1,11 @@
 #ifndef _I3STATUS_H
 #define _I3STATUS_H
 
+enum { O_DZEN2, O_XMOBAR, O_NONE } output_format;
+
 #include <stdbool.h>
 #include <confuse.h>
 
-#ifdef DZEN
-       #define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)"
-#elif XMOBAR
-       #define BAR "<fc=#333333> | </fc>"
-#endif
 #define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0)
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
@@ -62,13 +59,14 @@ char *color(const char *colorstr);
 char *endcolor() __attribute__ ((pure));
 
 void print_ipv6_info(const char *format);
-void print_battery_info(int number, const char *format);
+void print_disk_info(const char *path, const char *format);
+void print_battery_info(int number, const char *format, bool last_full_capacity);
 void print_time(const char *format);
 const char *get_ip_addr();
 void print_wireless_info(const char *interface, const char *format_up, const char *format_down);
 void print_run_watch(const char *title, const char *pidfile, const char *format);
 void print_cpu_temperature_info(int zone, const char *format);
-void print_eth_info(const char *interface, const char *format);
+void print_eth_info(const char *interface, const char *format_up, const char *format_down);
 void print_load();
 bool process_runs(const char *path);