X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fi3status.h;h=6e20af3009ae884cfe32cb0b6ac3df9d81a8a318;hb=85bb373095d296a90a7a1e8741229dc4dcb9acc8;hp=d0361d1724014abadafb0b92d09e5de11d672734;hpb=c6e9fc84c6a7213b31d9e2790ea36d42ee10e809;p=i3%2Fi3status

diff --git a/include/i3status.h b/include/i3status.h
index d0361d1..6e20af3 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -30,12 +30,9 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_TERM, O_NONE } output_format;
 #define BATT_TIME "hw.acpi.battery.time"
 #define BATT_STATE "hw.acpi.battery.state"
 
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
 /* Default to acpitz(4) if no path is set. */
 #define THERMAL_ZONE "acpitz%d"
-#elif defined(__NetBSD__)
-/* Rely on envsys(4). The key of the sensor is generally cpu%d temperature */
-#define THERMAL_ZONE "cpu%d temperature"
 #endif
 
 #if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
@@ -88,6 +85,27 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_TERM, O_NONE } output_format;
 #define SEC_CLOSE_MAP \
 	do { \
 		if (output_format == O_I3BAR) { \
+			char *_align = cfg_getstr(sec, "align"); \
+			if (_align) { \
+				yajl_gen_string(json_gen, (const unsigned char *)"align", strlen("align")); \
+				yajl_gen_string(json_gen, (const unsigned char *)_align, strlen(_align)); \
+			} \
+			struct min_width *_width = cfg_getptr(sec, "min_width"); \
+			if (_width) { \
+				/* if the value can be parsed as a number, we use the numerical value */ \
+				if (_width->num > 0) { \
+					yajl_gen_string(json_gen, (const unsigned char *)"min_width", strlen("min_width")); \
+					yajl_gen_integer(json_gen, _width->num); \
+				} else { \
+					yajl_gen_string(json_gen, (const unsigned char *)"min_width", strlen("min_width")); \
+					yajl_gen_string(json_gen, (const unsigned char *)_width->str, strlen(_width->str)); \
+				} \
+			} \
+			const char *_sep = cfg_getstr(cfg_general, "separator"); \
+			if (strlen(_sep) == 0) {\
+				yajl_gen_string(json_gen, (const unsigned char *)"separator", strlen("separator")); \
+				yajl_gen_bool(json_gen, false); \
+			} \
 			yajl_gen_map_close(json_gen); \
 		} \
 	} while (0)
@@ -127,13 +145,21 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_TERM, O_NONE } output_format;
 
 typedef enum { CS_DISCHARGING, CS_CHARGING, CS_FULL } charging_status_t;
 
+/*
+ * The "min_width" module option may either be defined as a string or a number.
+ */
+struct min_width {
+    long num;
+    const char *str;
+};
+
 /* src/general.c */
 char *skip_character(char *input, char character, int amount);
 void die(const char *fmt, ...);
 bool slurp(const char *filename, char *destination, int size);
 
 /* src/output.c */
-void print_seperator();
+void print_separator(const char *separator);
 char *color(const char *colorstr);
 char *endcolor() __attribute__ ((pure));
 void reset_cursor(void);
@@ -144,19 +170,27 @@ char *auto_detect_format();
 /* src/print_time.c */
 void set_timezone(const char *tz);
 
+/* src/first_network_device.c */
+typedef enum {
+	NET_TYPE_WIRELESS = 0,
+	NET_TYPE_ETHERNET = 1
+} net_type_t;
+const char *first_eth_interface(const net_type_t type);
+
 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, const char *format_down, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity);
+void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *format_not_mounted, const char *prefix_type, const char *threshold_type, const double low_threshold);
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds);
 void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t);
 void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
 const char *get_ip_addr();
 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_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format);
 void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int);
 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, const float max_threshold);
-void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *device, const char *mixer, int mixer_idx);
+void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *fmt_muted, const char *device, const char *mixer, int mixer_idx);
 bool process_runs(const char *path);
 
 /* socket file descriptor for general purposes */
@@ -164,4 +198,6 @@ extern int general_socket;
 
 extern cfg_t *cfg, *cfg_general, *cfg_section;
 
+extern void **cur_instance;
+
 #endif