add comment

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

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 0e7e7f047cd6db764d45cdfe0167f15a30553ae9..3ad28996af88b0321656b5a4241e5f4f93dfca94 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -24,13 +24,18 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 
-#if defined(__OpenBSD__)
+#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"
@@ -39,6 +44,7 @@
 #include "battery.h"
 #include "clock.h"
 #include "timer.h"
+#include "common.h"
 
 PangoFontDescription *bat1_font_desc;
 PangoFontDescription *bat2_font_desc;
@@ -58,11 +64,10 @@ char *path_energy_full;
 char *path_current_now;
 char *path_status;
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
 int apm_fd;
 #endif
 
-
 void update_batterys(void* arg)
 {
        int i;
@@ -102,7 +107,7 @@ void default_battery()
        path_energy_full = 0;
        path_current_now = 0;
        path_status = 0;
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
        apm_fd = -1;
 #endif
 }
@@ -117,7 +122,7 @@ void cleanup_battery()
        if (path_status) g_free(path_status);
        if (battery_low_cmd) g_free(battery_low_cmd);
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
        if ((apm_fd != -1) && (close(apm_fd) == -1))
                warn("cannot close /dev/apm");
 #endif
@@ -128,7 +133,7 @@ void init_battery()
 {
        if (!battery_enabled) return;
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
        apm_fd = open("/dev/apm", O_RDONLY);
        if (apm_fd < 0) {
                warn("init_battery: failed to open /dev/apm.");
@@ -136,7 +141,7 @@ void init_battery()
                return;
        }
 
-#else
+#elif !defined(__FreeBSD__)
        // check battery
        GDir *directory = 0;
        GError *error = NULL;
@@ -225,6 +230,7 @@ void init_battery_panel(void *p)
        battery->area.parent = p;
        battery->area.panel = p;
        battery->area._draw_foreground = draw_battery;
+       battery->area.size_mode = SIZE_BY_CONTENT;
        battery->area._resize = resize_battery;
        battery->area.resize = 1;
        battery->area.redraw = 1;
@@ -257,17 +263,21 @@ void init_battery_panel(void *p)
 
 
 void update_battery() {
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
        // unused on OpenBSD, silence compiler warnings
        FILE *fp;
        char tmp[25];
        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__)
+#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");
@@ -297,6 +307,45 @@ void update_battery() {
 
        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) {
@@ -352,8 +401,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;
@@ -400,11 +449,11 @@ void draw_battery (void *obj, cairo_t *c)
 }
 
 
-void resize_battery(void *obj)
+int resize_battery(void *obj)
 {
        Battery *battery = obj;
        PangoLayout *layout;
-       int percentage_width, time_width, new_width;
+       int percentage_width, time_width, new_width, ret = 0;
 
        percentage_width = time_width = 0;
        battery->area.redraw = 1;
@@ -416,7 +465,7 @@ void resize_battery(void *obj)
                snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
        }
        // vertical panel doen't adjust width
-       if (!panel_horizontal) return;
+       if (!panel_horizontal) return ret;
 
        cairo_surface_t *cs;
        cairo_t *c;
@@ -451,18 +500,17 @@ void resize_battery(void *obj)
        if (panel->clock.area.on_screen)
                battery->area.posx -= (panel->clock.area.width + panel->area.paddingx);
 
-       if(new_width > old_width || new_width < (old_width-6)) {
+       if (new_width > old_width || new_width < (old_width-6)) {
                // refresh and resize other objects on panel
                // we try to limit the number of refresh
                // printf("battery_width %d, new_width %d\n", battery->area.width, new_width);
-               panel->area.resize = 1;
-               systray.area.resize = 1;
-               panel_refresh = 1;
+               ret = 1;
        }
 
        g_object_unref (layout);
        cairo_destroy (c);
        cairo_surface_destroy (cs);
        XFreePixmap (server.dsp, pmap);
+       return ret;
 }