64 lines
2.5 KiB
C
64 lines
2.5 KiB
C
|
$NetBSD: patch-panel-plugin_battery.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $
|
||
|
|
|
||
|
|
Fix for NetBSD.
|
||
|
|
--- panel-plugin/battery.c.orig 2012-06-17 20:05:17.000000000 +0000
|
||
|
|
+++ panel-plugin/battery.c
|
||
|
|
@@ -30,8 +30,16 @@
|
||
|
|
#elif (defined(__OpenBSD__) || defined(__NetBSD__))
|
||
|
|
#include <sys/param.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
+#if defined(__sparc64__)
|
||
|
|
+#include <sparc/apmvar.h>
|
||
|
|
+#elif defined(__x86_64__)
|
||
|
|
+#include <dev/apm/apmbios.h>
|
||
|
|
+#include <dev/apm/apmio.h>
|
||
|
|
+#else
|
||
|
|
#include <machine/apmvar.h>
|
||
|
|
+#endif
|
||
|
|
#define APMDEVICE "/dev/apm"
|
||
|
|
+#define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/acpi/acpi_apm.c */
|
||
|
|
#elif __linux__
|
||
|
|
#include <libapm.h>
|
||
|
|
#endif
|
||
|
|
@@ -172,7 +180,7 @@ init_options(t_battmon_options *options)
|
||
|
|
gboolean
|
||
|
|
detect_battery_info(t_battmon *battmon)
|
||
|
|
{
|
||
|
|
-#ifdef __FreeBSD__
|
||
|
|
+#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||
|
|
/* This is how I read the information from the APM subsystem under
|
||
|
|
FreeBSD. Each time this functions is called (once every second)
|
||
|
|
the APM device is opened, read from and then closed.
|
||
|
|
@@ -411,7 +419,7 @@ update_apm_status(t_battmon *battmon)
|
||
|
|
acline = apm.ac_line_status ? TRUE : FALSE;
|
||
|
|
|
||
|
|
}
|
||
|
|
-#elif __FreeBSD__
|
||
|
|
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
||
|
|
else {
|
||
|
|
/* This is how I read the information from the APM subsystem under
|
||
|
|
FreeBSD. Each time this functions is called (once every second)
|
||
|
|
@@ -510,6 +518,11 @@ battmon.c:241: for each function it appe
|
||
|
|
if(battmon->options.display_percentage && charge > 0 && !(battmon->options.hide_when_full && acline && charge >= 99)){
|
||
|
|
gtk_widget_show(GTK_WIDGET(battmon->charge));
|
||
|
|
gtk_widget_show(GTK_WIDGET(battmon->timechargealignment));
|
||
|
|
+#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||
|
|
+ if (apm.battery_state == APM_BATT_ABSENT)
|
||
|
|
+ g_snprintf(buffer, sizeof(buffer), "--%%");
|
||
|
|
+ else
|
||
|
|
+#endif
|
||
|
|
g_snprintf(buffer, sizeof(buffer),"%d%% ", charge);
|
||
|
|
gtk_label_set_text(battmon->charge,buffer);
|
||
|
|
} else {
|
||
|
|
@@ -519,6 +532,10 @@ battmon.c:241: for each function it appe
|
||
|
|
if (battmon->options.display_time && time_remaining > 0 && !(battmon->options.hide_when_full && acline && charge >= 99 )){
|
||
|
|
gtk_widget_show(GTK_WIDGET(battmon->rtime));
|
||
|
|
gtk_widget_show(GTK_WIDGET(battmon->timechargealignment));
|
||
|
|
+#if defined(__NetBSD__)
|
||
|
|
+ if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN)
|
||
|
|
+ g_snprintf(buffer, sizeof(buffer), "--:--");
|
||
|
|
+#endif
|
||
|
|
g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60);
|
||
|
|
gtk_label_set_text(battmon->rtime,buffer);
|
||
|
|
|