#ifndef _I3STATUS_H
#define _I3STATUS_H
-enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
+enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_TERM, O_NONE } output_format;
#include <stdbool.h>
#include <confuse.h>
#include <time.h>
#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
#include <unistd.h>
#include <string.h>
#define THERMAL_ZONE "/sys/class/thermal/thermal_zone%d/temp"
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
/* this needs the coretemp module to be loaded */
+#if defined(__DragonFly__)
+#define THERMAL_ZONE "hw.sensors.cpu%d.temp0"
+#else
#define THERMAL_ZONE "dev.cpu.%d.temperature"
+#endif
#define BATT_LIFE "hw.acpi.battery.life"
#define BATT_TIME "hw.acpi.battery.time"
#define BATT_STATE "hw.acpi.battery.state"
+#elif defined(__OpenBSD__)
+/* 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__)
#define CASE_SEC(name) \
if (BEGINS_WITH(current, name)) \
- with(cfg_t *, sec, cfg_getsec(cfg, name)) \
+ with(cfg_t *, sec, cfg_section = cfg_getsec(cfg, name)) \
if (sec != NULL)
#define CASE_SEC_TITLE(name) \
if (BEGINS_WITH(current, name)) \
with(const char *, title, current + strlen(name) + 1) \
- with(cfg_t *, sec, cfg_gettsec(cfg, name, title)) \
+ with(cfg_t *, sec, cfg_section = cfg_gettsec(cfg, name, title)) \
if (sec != NULL)
/* Macro which any plugin can use to output the full_text part (when the output
#define SEC_CLOSE_MAP \
do { \
if (output_format == O_I3BAR) { \
+ 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)
#define START_COLOR(colorstr) \
do { \
if (cfg_getbool(cfg_general, "colors")) { \
- const char *val = cfg_getstr(cfg_general, colorstr); \
+ const char *_val = NULL; \
+ if (cfg_section) \
+ _val = cfg_getstr(cfg_section, colorstr); \
+ if (!_val) \
+ _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)); \
+ yajl_gen_string(json_gen, (const unsigned char *)_val, strlen(_val)); \
} else { \
- outwalk += sprintf(outwalk, "%s", color("color_bad")); \
+ outwalk += sprintf(outwalk, "%s", color(colorstr)); \
} \
} \
} while (0)
bool slurp(const char *filename, char *destination, int size);
/* src/output.c */
-void print_seperator();
+void print_seperator(const char *separator);
char *color(const char *colorstr);
char *endcolor() __attribute__ ((pure));
+void reset_cursor(void);
/* src/auto_detect_format.c */
char *auto_detect_format();
+/* src/print_time.c */
+void set_timezone(const char *tz);
+
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);
+void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *prefix_type);
+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, 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_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, 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);
-void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *device, const char *mixer, int mixer_idx);
+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 *fmt_muted, const char *device, const char *mixer, int mixer_idx);
bool process_runs(const char *path);
/* socket file descriptor for general purposes */
extern int general_socket;
-extern cfg_t *cfg, *cfg_general;
+extern cfg_t *cfg, *cfg_general, *cfg_section;
#endif