X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fi3status.h;h=09394bd1bfade9396da1c87ffd1cd0224a7959eb;hb=0eeded8bc013857a5e8a2efbc20002a22502897e;hp=24097b02ca6bf90fd4ac067dab83cef8f09fcc9b;hpb=7148eb52790f78e4e4fb60555d19c5c958f271c7;p=i3%2Fi3status diff --git a/include/i3status.h b/include/i3status.h index 24097b0..09394bd 100644 --- a/include/i3status.h +++ b/include/i3status.h @@ -1,11 +1,15 @@ #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 #include #include +#include +#include +#include +#include #define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -14,14 +18,21 @@ enum { O_DZEN2, O_XMOBAR, O_NONE } output_format; #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" #endif #if defined(__FreeBSD_kernel__) && defined(__GLIBC__) @@ -38,15 +49,78 @@ enum { O_DZEN2, O_XMOBAR, O_NONE } output_format; #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 + * 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 = 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)); \ + } else { \ + outwalk += sprintf(outwalk, "%s", color(colorstr)); \ + } \ + } \ + } 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; @@ -63,24 +137,24 @@ char *endcolor() __attribute__ ((pure)); /* src/auto_detect_format.c */ 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 *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); +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, int low_threshold, char *threshold_type, 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_cpu_usage(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, 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); 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