#include <cairo-xlib.h>
#include <pango/pangocairo.h>
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#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"
#include "panel.h"
-#include "taskbar.h"
#include "battery.h"
-#include "clock.h"
#include "timer.h"
#include "common.h"
char *path_current_now;
char *path_status;
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
int apm_fd;
#endif
-
void update_batterys(void* arg)
{
int i;
if (battery_state.percentage >= percentage_hide) {
if (panel1[i].battery.area.on_screen == 1) {
panel1[i].battery.area.on_screen = 0;
- // force resize on panel
panel1[i].area.resize = 1;
panel_refresh = 1;
}
- continue;
}
else {
if (panel1[i].battery.area.on_screen == 0) {
panel1[i].battery.area.on_screen = 1;
- // force resize on panel
panel1[i].area.resize = 1;
- panel_refresh = 1;
}
}
- panel1[i].battery.area.resize = 1;
+ if (panel1[i].battery.area.on_screen == 1) {
+ panel1[i].battery.area.resize = 1;
+ panel_refresh = 1;
+ }
}
}
path_energy_full = 0;
path_current_now = 0;
path_status = 0;
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
apm_fd = -1;
#endif
}
if (path_status) g_free(path_status);
if (battery_low_cmd) g_free(battery_low_cmd);
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
if ((apm_fd != -1) && (close(apm_fd) == -1))
warn("cannot close /dev/apm");
#endif
{
if (!battery_enabled) return;
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd < 0) {
warn("init_battery: failed to open /dev/apm.");
return;
}
-#else
+#elif !defined(__FreeBSD__)
// check battery
GDir *directory = 0;
GError *error = NULL;
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;
}
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.bg->border.width + panel->area.paddingy;
battery->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
}
void update_battery() {
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#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__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#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");
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) {
}
-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");
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;
if(percentage_width > time_width) new_width = percentage_width;
else new_width = time_width;
- new_width += (2*battery->area.paddingxlr) + (2*battery->area.bg->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.bg->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;
}
projects / chaz / tint2 / blobdiff