// vim:ts=8:expandtab
+#include <ctype.h>
#include <time.h>
#include <string.h>
#include <stdlib.h>
#include "i3status.h"
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
* worn off your battery is.
*
*/
-void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int threshold, bool last_full_capacity) {
+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, bool integer_battery_capacity) {
time_t empty_time;
struct tm *empty_tm;
char buf[1024];
char consumptionbuf[256];
const char *walk, *last;
char *outwalk = buffer;
+ bool watt_as_unit;
+ bool colorful_output = false;
int full_design = -1,
remaining = -1,
present_rate = -1,
- voltage = -1,
- current = -1;
+ voltage = -1;
charging_status_t status = CS_DISCHARGING;
memset(statusbuf, '\0', sizeof(statusbuf));
if (*walk != '=')
continue;
- if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") ||
- BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW"))
+ if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW")) {
+ watt_as_unit = true;
remaining = atoi(walk+1);
+ }
+ else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) {
+ watt_as_unit = false;
+ remaining = atoi(walk+1);
+ }
else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
- current = atoi(walk+1);
+ present_rate = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW"))
voltage = atoi(walk+1);
+ /* on some systems POWER_SUPPLY_POWER_NOW does not exist, but actually
+ * it is the same as POWER_SUPPLY_CURRENT_NOW but with μWh as
+ * unit instead of μAh. We will calculate it as we need it
+ * later. */
else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
present_rate = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
}
}
- if (present_rate == -1) /* on some systems POWER_SUPPLY_POWER_NOW does not exist, so we have to calculate it */
- present_rate = ((float)voltage / 1000.0) * ((float)current / 1000.0);
+ /* the difference between POWER_SUPPLY_ENERGY_NOW and
+ * POWER_SUPPLY_CHARGE_NOW is the unit of measurement. The energy is
+ * given in mWh, the charge in mAh. So calculate every value given in
+ * ampere to watt */
+ if (!watt_as_unit) {
+ present_rate = (((float)voltage / 1000.0) * ((float)present_rate / 1000.0));
+ remaining = (((float)voltage / 1000.0) * ((float)remaining / 1000.0));
+ full_design = (((float)voltage / 1000.0) * ((float)full_design / 1000.0));
+ }
if ((full_design == -1) || (remaining == -1)) {
OUTPUT_FULL_TEXT("No battery");
(void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
- (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
- (((float)remaining / (float)full_design) * 100));
+ float percentage_remaining = (((float)remaining / (float)full_design) * 100);
+ if (integer_battery_capacity) {
+ (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00f%%", percentage_remaining);
+ } else {
+ (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%", percentage_remaining);
+ }
if (present_rate > 0) {
float remaining_time;
minutes = seconds / 60;
seconds -= (minutes * 60);
- if (status == CS_DISCHARGING && threshold > 0 && seconds_remaining < 60 * threshold)
- START_COLOR("color_bad");
+ if (status == CS_DISCHARGING && low_threshold > 0) {
+ if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0
+ && percentage_remaining < low_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0
+ && seconds_remaining < 60 * low_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ } else {
+ colorful_output = false;
+ }
+ }
(void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
max(hours, 0), max(minutes, 0), max(seconds, 0));
(void)snprintf(consumptionbuf, sizeof(consumptionbuf), "%1.2fW",
((float)present_rate / 1000.0 / 1000.0));
-
- END_COLOR;
+ } else {
+ /* On some systems, present_rate may not exist. Still, make sure
+ * we colorize the output if threshold_type is set to percentage
+ * (since we don't have any information on remaining time). */
+ if (status == CS_DISCHARGING && low_threshold > 0) {
+ if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0
+ && percentage_remaining < low_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ }
+ }
}
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
int state;
int sysctl_rslt;
size_t sysctl_size = sizeof(sysctl_rslt);
* probing acpi(4) devices.
*/
struct apm_power_info apm_info;
- int apm_fd, ac_status, charging;
+ int apm_fd;
apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd < 0) {
switch(apm_info.ac_state) {
case APM_AC_OFF:
- ac_status = CS_DISCHARGING;
+ status = CS_DISCHARGING;
break;
case APM_AC_ON:
- ac_status = CS_CHARGING;
+ status = CS_CHARGING;
break;
default:
/* If we don't know what's going on, just assume we're discharging. */
- ac_status = CS_DISCHARGING;
+ status = CS_DISCHARGING;
break;
}
(void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
(void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", apm_info.battery_life);
+ if (status == CS_DISCHARGING && low_threshold > 0) {
+ if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0
+ && apm_info.battery_life < low_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0
+ && apm_info.minutes_left < (u_int) low_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ }
+ }
+
/* Can't give a meaningful value for remaining minutes if we're charging. */
- if (ac_status == CS_CHARGING)
- charging = 1;
+ if (status != CS_CHARGING) {
+ (void)snprintf(remainingbuf, sizeof(remainingbuf), "%d", apm_info.minutes_left);
+ } else {
+ (void)snprintf(remainingbuf, sizeof(remainingbuf), "%s", "(CHR)");
+ }
- (void)snprintf(remainingbuf, sizeof(remainingbuf), (charging ? "%s" : "%d"),
- (charging ? "(CHR)" : apm_info.minutes_left));
+ if (colorful_output)
+ END_COLOR;
#endif
+#define EAT_SPACE_FROM_OUTPUT_IF_EMPTY(_buf) \
+ do { \
+ if (strlen(_buf) == 0) { \
+ if (outwalk > buffer && isspace(outwalk[-1])) \
+ outwalk--; \
+ else if (isspace(*(walk+1))) \
+ walk++; \
+ } \
+ } while (0)
+
for (walk = format; *walk != '\0'; walk++) {
if (*walk != '%') {
*(outwalk++) = *walk;
} else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
outwalk += sprintf(outwalk, "%s", remainingbuf);
walk += strlen("remaining");
+ EAT_SPACE_FROM_OUTPUT_IF_EMPTY(remainingbuf);
} else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) {
outwalk += sprintf(outwalk, "%s", emptytimebuf);
walk += strlen("emptytime");
+ EAT_SPACE_FROM_OUTPUT_IF_EMPTY(emptytimebuf);
} else if (strncmp(walk+1, "consumption", strlen("consumption")) == 0) {
outwalk += sprintf(outwalk, "%s", consumptionbuf);
- walk += strlen("consumptionbuf");
+ walk += strlen("consumption");
+ EAT_SPACE_FROM_OUTPUT_IF_EMPTY(consumptionbuf);
}
}
+ if (colorful_output)
+ END_COLOR;
+
OUTPUT_FULL_TEXT(buffer);
}
projects / i3 / i3status / blobdiff