X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_battery_info.c;h=f6f238c8c0da46d61dcb386d97c440df832597aa;hb=10ed9efff45c3d267f0602f1f2310d2a35b18853;hp=3892d359a187b7e1f1871bf184dcfbae3ef7e991;hpb=12b1bfa9b8485de88b0bda82821c021aee197673;p=i3%2Fi3status

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 3892d35..f6f238c 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
@@ -12,13 +13,23 @@
 #include <sys/sysctl.h>
 #endif
 
+#if defined(__OpenBSD__)
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+#include <machine/apmvar.h>
+#endif
+
+#define BATT_STATUS_NAME(status) \
+    (status == CS_CHARGING ? "CHR" : \
+        (status == CS_DISCHARGING ? "BAT" : "FULL"))
 /*
  * Get battery information from /sys. Note that it uses the design capacity to
  * calculate the percentage, not the last full capacity, so you can see how
  * worn off your battery is.
  *
  */
-void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, bool last_full_capacity) {
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int threshold, bool last_full_capacity) {
         time_t empty_time;
         struct tm *empty_tm;
         char buf[1024];
@@ -84,12 +95,12 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 }
         }
 
-        if ((full_design == 1) || (remaining == -1))
+        if ((full_design == -1) || (remaining == -1)) {
+                OUTPUT_FULL_TEXT("No battery");
                 return;
+        }
 
-        (void)snprintf(statusbuf, sizeof(statusbuf), "%s",
-                        (status == CS_CHARGING ? "CHR" :
-                         (status == CS_DISCHARGING ? "BAT" : "FULL")));
+        (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
 
         (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
                        (((float)remaining / (float)full_design) * 100));
@@ -110,6 +121,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 minutes = seconds / 60;
                 seconds -= (minutes * 60);
 
+                if (threshold > 0 && seconds_remaining < 60 * threshold)
+                        START_COLOR("color_bad");
+
                 (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
                         max(hours, 0), max(minutes, 0), max(seconds, 0));
 
@@ -119,6 +133,8 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
 
                 (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d",
                         max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
+
+                END_COLOR;
         }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
         int state;
@@ -126,19 +142,19 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
         size_t sysctl_size = sizeof(sysctl_rslt);
 
         if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
-                printf("No battery");
+                OUTPUT_FULL_TEXT("No battery");
                 return;
         }
 
         present_rate = sysctl_rslt;
         if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
-                printf("No battery");
+                OUTPUT_FULL_TEXT("No battery");
                 return;
         }
 
         remaining = sysctl_rslt;
         if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) {
-                printf("No battery");
+                OUTPUT_FULL_TEXT("No battery");
                 return;
         }
 
@@ -152,9 +168,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
 
         full_design = sysctl_rslt;
 
-        (void)snprintf(statusbuf, sizeof(statusbuf), "%s",
-                        (status == CS_CHARGING ? "CHR" :
-                         (status == CS_DISCHARGING ? "BAT" : "FULL")));
+        (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
 
         (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%",
                        present_rate);
@@ -167,6 +181,54 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d",
                                max(hours, 0), max(minutes, 0));
         }
+#elif defined(__OpenBSD__)
+	/*
+	 * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and
+	 * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and
+	 * probing acpi(4) devices.
+	 */
+	struct apm_power_info apm_info;
+	int apm_fd, ac_status, charging;
+
+	apm_fd = open("/dev/apm", O_RDONLY);
+	if (apm_fd < 0) {
+		OUTPUT_FULL_TEXT("can't open /dev/apm");
+		return;
+	}
+	if (ioctl(apm_fd, APM_IOC_GETPOWER, &apm_info) < 0)
+		OUTPUT_FULL_TEXT("can't read power info");
+
+	close(apm_fd);
+
+	/* Don't bother to go further if there's no battery present. */
+	if ((apm_info.battery_state == APM_BATTERY_ABSENT) ||
+	    (apm_info.battery_state == APM_BATT_UNKNOWN)) {
+		OUTPUT_FULL_TEXT("No battery");
+		return;
+	}
+
+	switch(apm_info.ac_state) {
+	case APM_AC_OFF:
+		ac_status = CS_DISCHARGING;
+		break;
+	case APM_AC_ON:
+		ac_status = CS_CHARGING;
+		break;
+	default:
+		/* If we don't know what's going on, just assume we're discharging. */
+		ac_status = CS_DISCHARGING;
+		break;
+	}
+
+	(void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", apm_info.battery_life);
+
+	/* Can't give a meaningful value for remaining minutes if we're charging. */
+	if (ac_status == CS_CHARGING)
+		charging = 1;
+
+	(void)snprintf(remainingbuf, sizeof(remainingbuf), (charging ? "%s" : "%d"),
+		       (charging ? "(CHR)" : apm_info.minutes_left));
 #endif
 
         for (walk = format; *walk != '\0'; walk++) {