bugfix: don’t use TOPDIR (Thanks loblik)

[i3/i3status] / src / print_battery_info.c

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 36de3c842021d9805f902fe21ecbc02810c56720..29d703cdffab5d6117293f930d943e4abeedad37 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -3,6 +3,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
@@ -11,13 +13,20 @@
 #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
+
 /*
  * 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(int number, 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, bool last_full_capacity) {
         time_t empty_time;
         struct tm *empty_tm;
         char buf[1024];
@@ -26,6 +35,7 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
         char remainingbuf[256];
         char emptytimebuf[256];
         const char *walk, *last;
+        char *outwalk = buffer;
         int full_design = -1,
             remaining = -1,
             present_rate = -1;
@@ -36,11 +46,13 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
         memset(remainingbuf, '\0', sizeof(remainingbuf));
         memset(emptytimebuf, '\0', sizeof(emptytimebuf));
 
+        INSTANCE(path);
+
 #if defined(LINUX)
         static char batpath[512];
-        sprintf(batpath, "/sys/class/power_supply/BAT%d/uevent", number);
+        sprintf(batpath, path, number);
         if (!slurp(batpath, buf, sizeof(buf))) {
-                printf("No battery");
+                OUTPUT_FULL_TEXT("No battery");
                 return;
         }
 
@@ -163,26 +175,79 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
                 (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",
+                      (ac_status == CS_CHARGING ? "CHR" :
+                       (ac_status == CS_DISCHARGING ? "BAT" : "FULL")));
+
+        (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++) {
                 if (*walk != '%') {
-                        putchar(*walk);
+                        *(outwalk++) = *walk;
                         continue;
                 }
 
                 if (strncmp(walk+1, "status", strlen("status")) == 0) {
-                        printf("%s", statusbuf);
+                        outwalk += sprintf(outwalk, "%s", statusbuf);
                         walk += strlen("status");
                 } else if (strncmp(walk+1, "percentage", strlen("percentage")) == 0) {
-                        printf("%s", percentagebuf);
+                        outwalk += sprintf(outwalk, "%s", percentagebuf);
                         walk += strlen("percentage");
                 } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
-                        printf("%s", remainingbuf);
+                        outwalk += sprintf(outwalk, "%s", remainingbuf);
                         walk += strlen("remaining");
                 } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) {
-                        printf("%s", emptytimebuf);
+                        outwalk += sprintf(outwalk, "%s", emptytimebuf);
                         walk += strlen("emptytime");
                 }
         }
+
+        OUTPUT_FULL_TEXT(buffer);
 }