diff options
| -rw-r--r-- | i3status.c | 3 | ||||
| -rw-r--r-- | include/i3status.h | 12 | ||||
| -rw-r--r-- | man/i3status.man | 6 | ||||
| -rw-r--r-- | src/print_cpu_temperature.c | 26 |
4 files changed, 26 insertions, 21 deletions
@@ -243,6 +243,7 @@ int main(int argc, char *argv[]) { cfg_opt_t temp_opts[] = { CFG_STR("format", "%degrees C", CFGF_NONE), CFG_STR("path", NULL, CFGF_NONE), + CFG_INT("max_threshold", 75, CFGF_NONE), CFG_END() }; @@ -460,7 +461,7 @@ int main(int argc, char *argv[]) { CASE_SEC_TITLE("cpu_temperature") { SEC_OPEN_MAP("cpu_temperature"); - print_cpu_temperature_info(json_gen, buffer, atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format")); + print_cpu_temperature_info(json_gen, buffer, atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getint(sec, "max_threshold")); SEC_CLOSE_MAP; } diff --git a/include/i3status.h b/include/i3status.h index 93f9791..fc984f8 100644 --- a/include/i3status.h +++ b/include/i3status.h @@ -27,16 +27,8 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format; #define BATT_STATE "hw.acpi.battery.state" #elif defined(__OpenBSD__) -/* - * Due to the fact there are various ways to obtain a temperature reading, THERMAL_ZONE will need - * to be adjustable enough for those situations. As it can either be hw.sensors.cpu%d.temp0, or - * hw.sensors.acpitz%d.temp0 or even something different entirely within hw.sensors.%s.temp0. - * XXX: - * Due to the fact the i3status API only allows to set the THERMAL_ZONE parameter to an integer, - * we can't make this fully configureable (yet?). - */ +/* Default to acpitz(4) if no path is set. */ #define THERMAL_ZONE "acpitz%d" - #endif #if defined(__FreeBSD_kernel__) && defined(__GLIBC__) @@ -145,7 +137,7 @@ void print_ddate(yajl_gen json_gen, char *buffer, const char *format, struct tm 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_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); diff --git a/man/i3status.man b/man/i3status.man index 9a19ec9..0d98f8f 100644 --- a/man/i3status.man +++ b/man/i3status.man @@ -224,12 +224,16 @@ colored red. The low_threshold type can be of threshold_type "time" or === CPU-Temperature -Gets the temperature of the given thermal zone. +Gets the temperature of the given thermal zone. It is possible to +define a max_threshold that will color the temperature red in case the +specified thermal zone is getting too hot. Defaults to 75 degrees C. *Example order*: +cpu_temperature 0+ *Example format*: +T: %degrees °C+ +*Example max_threshold*: +42+ + === CPU Usage Gets the percentual CPU usage from +/proc/stat+ (Linux) or +sysctl(3)+ (FreeBSD/OpenBSD). diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c index b1d1221..034a079 100644 --- a/src/print_cpu_temperature.c +++ b/src/print_cpu_temperature.c @@ -23,6 +23,8 @@ #include <sys/sensors.h> #include <errno.h> #include <err.h> + +#define MUKTOC(v) ((v - 273150000) / 1000000.0) #endif static char *thermal_zone; @@ -32,11 +34,11 @@ static char *thermal_zone; * returns the temperature in degree celcius. * */ -void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, 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 max_threshold) { #ifdef THERMAL_ZONE const char *walk; char *outwalk = buffer; - static char buf[16]; + bool colorful_output; if (path == NULL) asprintf(&thermal_zone, THERMAL_ZONE, zone); @@ -54,6 +56,7 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const if (BEGINS_WITH(walk+1, "degrees")) { #if defined(LINUX) + static char buf[16]; long int temp; if (!slurp(path, buf, sizeof(buf))) goto error; @@ -87,14 +90,11 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const break; goto error; } - /* - * 'path' is actually the node within the full path (currently always acpitz0). - * XXX: Extend the API to allow a string instead of just an int for path, this would - * allow us to build an arbitrary path. - */ + /* 'path' is the node within the full path (defaults to acpitz0). */ if (strncmp(sensordev.xname, path, strlen(path)) == 0) { mib[3] = SENSOR_TEMP; - for (numt = 0; numt < sensordev.maxnumt[SENSOR_TEMP]; numt++) { + /* Limit to temo0, but should retrieve from a full path... */ + for (numt = 0; numt < 1 /*sensordev.maxnumt[SENSOR_TEMP]*/; numt++) { mib[4] = numt; if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) { if (errno != ENOENT) { @@ -102,7 +102,15 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const continue; } } - outwalk += sprintf(outwalk, "%.2f", (sensor.value - 273150000) / 1000000.0 ); + if ((int)MUKTOC(sensor.value) >= max_threshold) { + START_COLOR("color_bad"); + colorful_output = true; + } + + outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value)); + + if (colorful_output) + END_COLOR; } } } |