Implement the i3bar JSON protocol

[i3/i3status] / include / i3status.h

diff --git a/include/i3status.h b/include/i3status.h
index 125ca557f97850b9e3aff84210af4aa87d793ff7..e40003ca7f4987b1b7ac85f5bd04e2a278918e06 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -1,7 +1,7 @@
 #ifndef _I3STATUS_H
 #define _I3STATUS_H
 
-enum { O_DZEN2, O_XMOBAR, O_NONE } output_format;
+enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
 
 #include <stdbool.h>
 #include <confuse.h>
@@ -16,7 +16,8 @@ enum { O_DZEN2, O_XMOBAR, O_NONE } output_format;
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
-#define THERMAL_ZONE "hw.acpi.thermal.tz%d.temperature"
+/* this needs the coretemp module to be loaded */
+#define THERMAL_ZONE "dev.cpu.%d.temperature"
 #define BATT_LIFE "hw.acpi.battery.life"
 #define BATT_TIME "hw.acpi.battery.time"
 #define BATT_STATE "hw.acpi.battery.state"
@@ -64,7 +65,7 @@ char *auto_detect_format();
 
 void print_ipv6_info(const char *format_up, const char *format_down);
 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_battery_info(int number, const char *path, const char *format, bool last_full_capacity);
 void print_time(const char *format, struct tm *current_tm);
 void print_ddate(const char *format, struct tm *current_tm);
 const char *get_ip_addr();