X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=086b6d0dd7180910f6780857026d87137e35438d;hb=9daa525aab5dfb62788865e4cbe4d92ddf055e93;hp=f0498b728e689e8aaa7b74295aacc6887a9598e9;hpb=1488f5525f69428d66b0cb2da6e610edae2ebf55;p=chaz%2Ftint2 diff --git a/src/battery/battery.c b/src/battery/battery.c index f0498b7..086b6d0 100644 --- a/src/battery/battery.c +++ b/src/battery/battery.c @@ -24,49 +24,126 @@ #include #include +#if defined(__OpenBSD__) || defined(__NetBSD__) +#include +#include +#include +#include +#endif + +#if defined(__FreeBSD__) +#include +#include +#endif + #include "window.h" #include "server.h" -#include "area.h" #include "panel.h" -#include "taskbar.h" #include "battery.h" -#include "clock.h" #include "timer.h" +#include "common.h" -PangoFontDescription *bat1_font_desc=0; -PangoFontDescription *bat2_font_desc=0; +PangoFontDescription *bat1_font_desc; +PangoFontDescription *bat2_font_desc; struct batstate battery_state; int battery_enabled; +int percentage_hide; +static timeout* battery_timeout; static char buf_bat_percentage[10]; static char buf_bat_time[20]; int8_t battery_low_status; -char *battery_low_cmd=0; -char *path_energy_now=0; -char *path_energy_full=0; -char *path_current_now=0; -char *path_status=0; - -void update_batterys() +unsigned char battery_low_cmd_send; +char *battery_low_cmd; +char *path_energy_now; +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; update_battery(); - for (i=0 ; i < nb_panel ; i++) - panel1[i].battery.area.resize = 1; + for (i=0 ; i < nb_panel ; i++) { + if (battery_state.percentage >= percentage_hide) { + if (panel1[i].battery.area.on_screen == 1) { + panel1[i].battery.area.on_screen = 0; + panel1[i].area.resize = 1; + panel_refresh = 1; + } + } + else { + if (panel1[i].battery.area.on_screen == 0) { + panel1[i].battery.area.on_screen = 1; + panel1[i].area.resize = 1; + } + } + if (panel1[i].battery.area.on_screen == 1) { + panel1[i].battery.area.resize = 1; + panel_refresh = 1; + } + } +} + +void default_battery() +{ + battery_enabled = 0; + percentage_hide = 101; + battery_low_cmd_send = 0; + battery_timeout = 0; + bat1_font_desc = 0; + bat2_font_desc = 0; + battery_low_cmd = 0; + path_energy_now = 0; + path_energy_full = 0; + path_current_now = 0; + path_status = 0; +#if defined(__OpenBSD__) || defined(__NetBSD__) + apm_fd = -1; +#endif +} + +void cleanup_battery() +{ + 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); + if (path_energy_full) g_free(path_energy_full); + 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); @@ -86,8 +163,8 @@ void init_battery() if (directory) g_dir_close(directory); if (!battery_dir) { - cleanup_battery(); fprintf(stderr, "ERROR: battery applet can't found power_supply\n"); + default_battery(); return; } @@ -119,6 +196,7 @@ void init_battery() fp4 = fopen(path_status, "r"); if (fp1 == NULL || fp2 == NULL || fp3 == NULL || fp4 == NULL) { cleanup_battery(); + default_battery(); fprintf(stderr, "ERROR: battery applet can't open energy_now\n"); } fclose(fp1); @@ -129,32 +207,10 @@ void init_battery() g_free(path1); g_free(battery_dir); +#endif - if (battery_enabled) - install_timer(0, 1000000, 3, 0, update_batterys); -} - - -void cleanup_battery() -{ - battery_enabled = 0; - 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); - if (path_energy_full) - g_free(path_energy_full); - 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); - - battery_low_cmd = path_energy_now = path_energy_full = path_current_now = path_status = 0; - bat1_font_desc = bat2_font_desc = 0; + if (battery_enabled && battery_timeout==0) + battery_timeout = add_timeout(10, 10000, update_batterys, 0); } @@ -170,6 +226,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; @@ -184,15 +241,13 @@ void init_battery_panel(void *p) if (panel_horizontal) { // panel horizonal => fixed height and posy - battery->area.posy = panel->area.pix.border.width + panel->area.paddingy; + battery->area.posy = panel->area.bg->border.width + panel->area.paddingy; battery->area.height = panel->area.height - (2 * battery->area.posy); } else { // panel vertical => fixed width, height, posy and posx - battery->area.posy = panel->clock.area.posy + panel->clock.area.height + panel->area.paddingx; - battery->area.height = (2 * battery->area.paddingxlr) + (bat_time_height + bat_percentage_height); - battery->area.posx = panel->area.pix.border.width + panel->area.paddingy; - battery->area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy); + battery->area.posx = panel->area.bg->border.width + panel->area.paddingy; + battery->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy); } battery->bat1_posy = (battery->area.height - bat_percentage_height) / 2; @@ -202,44 +257,116 @@ 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; - fp = fopen(path_status, "r"); - if(fp != NULL) { - fgets(tmp, sizeof tmp, fp); - fclose(fp); +#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; - if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING; - if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING; - if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL; - if (battery_state.state == BATTERY_DISCHARGING) { + + 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; } - else { + + // 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)) { + battery_state.state = BATTERY_UNKNOWN; + if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING; + if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING; + if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL; + } + fclose(fp); } fp = fopen(path_energy_now, "r"); if(fp != NULL) { - fgets(tmp, sizeof tmp, fp); - energy_now = atoi(tmp); + if (fgets(tmp, sizeof tmp, fp)) energy_now = atoi(tmp); fclose(fp); } fp = fopen(path_energy_full, "r"); if(fp != NULL) { - fgets(tmp, sizeof tmp, fp); - energy_full = atoi(tmp); + if (fgets(tmp, sizeof tmp, fp)) energy_full = atoi(tmp); fclose(fp); } fp = fopen(path_current_now, "r"); if(fp != NULL) { - fgets(tmp, sizeof tmp, fp); - current_now = atoi(tmp); + if (fgets(tmp, sizeof tmp, fp)) current_now = atoi(tmp); fclose(fp); } @@ -256,6 +383,7 @@ void update_battery() { break; } } else seconds = 0; +#endif battery_state.time.hours = seconds / 3600; seconds -= 3600 * battery_state.time.hours; @@ -266,9 +394,12 @@ void update_battery() { if(energy_full > 0) new_percentage = (energy_now*100)/energy_full; - if(battery_low_status != 0 && battery_low_status == new_percentage && battery_state.percentage > new_percentage) { - //printf("battery low, executing: %s\n", battery_low_cmd); - if (battery_low_cmd) system(battery_low_cmd); + if(battery_low_status > new_percentage && battery_state.state == BATTERY_DISCHARGING && !battery_low_cmd_send) { + 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; } battery_state.percentage = new_percentage; @@ -280,7 +411,7 @@ void update_battery() { } -void draw_battery (void *obj, cairo_t *c, int active) +void draw_battery (void *obj, cairo_t *c) { Battery *battery = obj; PangoLayout *layout; @@ -312,15 +443,14 @@ void draw_battery (void *obj, cairo_t *c, int active) } -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; - snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage); if(battery_state.state == BATTERY_FULL) { strcpy(buf_bat_time, "Full"); @@ -328,7 +458,11 @@ 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) { +// battery->area.posy = panel->clock.area.posy + panel->clock.area.height + panel->area.paddingx; +// battery->area.height = (2 * battery->area.paddingxlr) + (bat_time_height + bat_percentage_height); + return ret; + } cairo_surface_t *cs; cairo_t *c; @@ -353,28 +487,22 @@ void resize_battery(void *obj) if(percentage_width > time_width) new_width = percentage_width; else new_width = time_width; - new_width += (2*battery->area.paddingxlr) + (2*battery->area.pix.border.width); - int old_width = battery->area.width; - - Panel *panel = ((Area*)obj)->panel; + + new_width += (2*battery->area.paddingxlr) + (2*battery->area.bg->border.width); battery->area.width = new_width + 1; - battery->area.posx = panel->area.width - battery->area.width - panel->area.paddingxlr - panel->area.pix.border.width; - 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; }