X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fi3status.h;h=43110548ff20f58a9acdea3131ae428f59c38d80;hb=0686906b892aba4df014d440c313610bfac513e0;hp=1bcf86abf8274e0e60d1b35d632fc5f6515a20cf;hpb=4ec02bea7bbe534ef4b610bc63d1694bf0823174;p=i3%2Fi3status

diff --git a/include/i3status.h b/include/i3status.h
index 1bcf86a..4311054 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -1,10 +1,14 @@
 #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>
+#include <time.h>
+#include <yajl/yajl_gen.h>
+#include <unistd.h>
+#include <string.h>
 
 #define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0)
 #define max(a, b) ((a) > (b) ? (a) : (b))
@@ -15,7 +19,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"
@@ -45,6 +50,65 @@ enum { O_DZEN2, O_XMOBAR, O_NONE } output_format;
                         with(cfg_t *, sec, cfg_gettsec(cfg, name, title)) \
                                 if (sec != NULL)
 
+/* Macro which any plugin can use to output the full_text part (when the output
+ * format is JSON) or just output to stdout (any other output format). */
+#define OUTPUT_FULL_TEXT(text) \
+	do { \
+		/* Terminate the output buffer here in any case, so that it’s \
+		 * not forgotten in the module */ \
+		*outwalk = '\0'; \
+		if (output_format == O_I3BAR) { \
+			yajl_gen_string(json_gen, (const unsigned char *)"full_text", strlen("full_text")); \
+			yajl_gen_string(json_gen, (const unsigned char *)text, strlen(text)); \
+		} else { \
+			printf("%s", text); \
+		} \
+	} while (0)
+
+#define SEC_OPEN_MAP(name) \
+	do { \
+		if (output_format == O_I3BAR) { \
+			yajl_gen_map_open(json_gen); \
+			yajl_gen_string(json_gen, (const unsigned char *)"name", strlen("name")); \
+			yajl_gen_string(json_gen, (const unsigned char *)name, strlen(name)); \
+		} \
+	} while (0)
+
+#define SEC_CLOSE_MAP \
+	do { \
+		if (output_format == O_I3BAR) { \
+			yajl_gen_map_close(json_gen); \
+		} \
+	} while (0)
+
+#define START_COLOR(colorstr) \
+	do { \
+		if (cfg_getbool(cfg_general, "colors")) { \
+			const char *val = cfg_getstr(cfg_general, colorstr); \
+			if (output_format == O_I3BAR) { \
+				yajl_gen_string(json_gen, (const unsigned char *)"color", strlen("color")); \
+				yajl_gen_string(json_gen, (const unsigned char *)val, strlen(val)); \
+			} else { \
+				outwalk += sprintf(outwalk, "%s", color("color_bad")); \
+			} \
+		} \
+	} while (0)
+
+#define END_COLOR \
+	do { \
+		if (cfg_getbool(cfg_general, "colors") && output_format != O_I3BAR) { \
+			outwalk += sprintf(outwalk, "%s", endcolor()); \
+		} \
+	} while (0)
+
+#define INSTANCE(instance) \
+	do { \
+		if (output_format == O_I3BAR) { \
+			yajl_gen_string(json_gen, (const unsigned char *)"instance", strlen("instance")); \
+			yajl_gen_string(json_gen, (const unsigned char *)instance, strlen(instance)); \
+		} \
+	} while (0)
+
 
 typedef enum { CS_DISCHARGING, CS_CHARGING, CS_FULL } charging_status_t;
 
@@ -58,18 +122,22 @@ void print_seperator();
 char *color(const char *colorstr);
 char *endcolor() __attribute__ ((pure));
 
-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_time(const char *format);
-void print_ddate(const char *format);
+/* src/auto_detect_format.c */
+char *auto_detect_format();
+
+void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
+void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format);
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, bool last_full_capacity);
+void print_time(yajl_gen json_gen, char *buffer, const char *format, struct tm *current_tm);
+void print_ddate(yajl_gen json_gen, char *buffer, const char *format, struct tm *current_tm);
 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 *path, const char *format);
-void print_eth_info(const char *interface, const char *format_up, const char *format_down);
-void print_load();
-void print_volume(const char *fmt, const char *device, const char *mixer, int mixer_idx);
+void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
+void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format);
+void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format);
+void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format);
+void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
+void print_load(yajl_gen json_gen, char *buffer, const char *format);
+void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *device, const char *mixer, int mixer_idx);
 bool process_runs(const char *path);
 
 /* socket file descriptor for general purposes */