*add* use ACPI api for freebsd (thx to yamagi.burmeister)

[chaz/tint2] / src / battery / battery.c

diff --git a/src/battery/battery.c b/src/battery/battery.c
index ff8e0a6d99a96b6294b9c0e8bfa6faf446f86473..b20b7d3193b911eaee818cf8f9a86c5fb893628f 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -24,6 +24,18 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <machine/apmvar.h>
+#include <err.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#endif
+
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 #include "window.h"
 #include "server.h"
 #include "area.h"
@@ -32,6 +44,7 @@
 #include "battery.h"
 #include "clock.h"
 #include "timer.h"
+#include "common.h"
 
 PangoFontDescription *bat1_font_desc;
 PangoFontDescription *bat2_font_desc;
@@ -51,6 +64,10 @@ char *path_energy_full;
 char *path_current_now;
 char *path_status;
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+int apm_fd;
+#endif
+
 void update_batterys(void* arg)
 {
        int i;
@@ -90,11 +107,13 @@ void default_battery()
        path_energy_full = 0;
        path_current_now = 0;
        path_status = 0;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+       apm_fd = -1;
+#endif
 }
 
 void cleanup_battery()
 {
-       printf("*** cleanup_battery()\n");
        if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
        if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
        if (path_energy_now) g_free(path_energy_now);
@@ -102,19 +121,33 @@ void cleanup_battery()
        if (path_current_now) g_free(path_current_now);
        if (path_status) g_free(path_status);
        if (battery_low_cmd) g_free(battery_low_cmd);
+
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+       if ((apm_fd != -1) && (close(apm_fd) == -1))
+               warn("cannot close /dev/apm");
+#endif
 }
 
 
 void init_battery()
 {
+       if (!battery_enabled) return;
+
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+       apm_fd = open("/dev/apm", O_RDONLY);
+       if (apm_fd < 0) {
+               warn("init_battery: failed to open /dev/apm.");
+               battery_enabled = 0;
+               return;
+       }
+
+#elif !defined(__FreeBSD__)
        // check battery
        GDir *directory = 0;
        GError *error = NULL;
        const char *entryname;
        char *battery_dir = 0;
 
-       if (!battery_enabled) return;
-
        directory = g_dir_open("/sys/class/power_supply", 0, &error);
        if (error)
                g_error_free(error);
@@ -135,6 +168,7 @@ void init_battery()
                g_dir_close(directory);
        if (!battery_dir) {
                fprintf(stderr, "ERROR: battery applet can't found power_supply\n");
+               default_battery();
                return;
        }
 
@@ -177,6 +211,7 @@ void init_battery()
 
        g_free(path1);
        g_free(battery_dir);
+#endif
 
        if (battery_enabled && battery_timeout==0)
                battery_timeout = add_timeout(10, 10000, update_batterys, 0);
@@ -227,12 +262,90 @@ void init_battery_panel(void *p)
 
 
 void update_battery() {
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+       // unused on OpenBSD, silence compiler warnings
        FILE *fp;
        char tmp[25];
-       int64_t energy_now = 0, energy_full = 0, current_now = 0;
+       int64_t current_now = 0;
+#endif
+#if defined(__FreeBSD__)
+       int sysctl_out =  0;
+       size_t len = 0;
+#endif
+       int64_t energy_now = 0, energy_full = 0;
        int seconds = 0;
        int8_t new_percentage = 0;
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+       struct apm_power_info info;
+       if (ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) < 0)
+               warn("power update: APM_IOC_GETPOWER");
+
+       // best attempt at mapping to linux battery states
+       battery_state.state = BATTERY_UNKNOWN;
+       switch (info.battery_state) {
+               case APM_BATT_CHARGING:
+                       battery_state.state = BATTERY_CHARGING;
+                       break;
+               default:
+                       battery_state.state = BATTERY_DISCHARGING;
+                       break;
+       }
+
+       if (info.battery_life == 100)
+               battery_state.state = BATTERY_FULL;
+
+       // no mapping for openbsd really
+       energy_full = 0;
+       energy_now = 0;
+
+       if (info.minutes_left != -1)
+               seconds = info.minutes_left * 60;
+       else
+               seconds = -1;
+
+       new_percentage = info.battery_life;
+
+#elif defined(__FreeBSD__)
+       len = sizeof(sysctl_out);
+
+       if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) != 0)
+               fprintf(stderr, "power update: no such sysctl");
+
+       // attemp to map the battery state to linux
+       battery_state.state = BATTERY_UNKNOWN;
+
+       switch(sysctl_out) {
+               case 1:
+                       battery_state.state = BATTERY_DISCHARGING;
+                       break;
+               case 2:
+                       battery_state.state = BATTERY_CHARGING;
+                       break;
+               default:
+                       battery_state.state = BATTERY_FULL;
+                       break;
+       }
+
+       // no mapping for freebsd
+       energy_full = 0;
+       energy_now = 0;
+
+       if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) != 0)
+               seconds = -1;
+       else
+               seconds = sysctl_out * 60;
+
+       // charging or error
+       if (seconds < 0)
+               seconds = 0;
+
+       if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) != 0)
+               new_percentage = -1;
+       else
+               new_percentage = sysctl_out;
+
+#else
        fp = fopen(path_status, "r");
        if(fp != NULL) {
                if (fgets(tmp, sizeof tmp, fp)) {
@@ -275,6 +388,7 @@ void update_battery() {
                                break;
                }
        } else seconds = 0;
+#endif
 
        battery_state.time.hours = seconds / 3600;
        seconds -= 3600 * battery_state.time.hours;
@@ -286,8 +400,8 @@ void update_battery() {
                new_percentage = (energy_now*100)/energy_full;
 
        if(battery_low_status > new_percentage && battery_state.state == BATTERY_DISCHARGING && !battery_low_cmd_send) {
-                       system(battery_low_cmd);  // return value == -1, since we've set SIGCHLD to SIGIGN
-                       battery_low_cmd_send = 1;
+               tint_exec(battery_low_cmd);
+               battery_low_cmd_send = 1;
        }
        if(battery_low_status < new_percentage && battery_state.state == BATTERY_CHARGING && battery_low_cmd_send) {
                battery_low_cmd_send = 0;