--- a/configure.in	Sun Jun 07 06:49:01 2009 +0000
+++ b/configure.in	Sun Jun 07 22:44:59 2009 +0000
@@ -2804,6 +2804,12 @@
             SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
             have_loadso=yes
         fi
+        # Set up files for the system power library
+        if test x$enable_power = xyes; then
+            AC_DEFINE(SDL_POWER_BEOS)
+            SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
+            have_power=yes
+        fi
         # The BeOS platform requires special setup.
         SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"

--- a/include/SDL_config.h.in	Sun Jun 07 06:49:01 2009 +0000
+++ b/include/SDL_config.h.in	Sun Jun 07 22:44:59 2009 +0000
@@ -330,6 +330,7 @@
 #undef SDL_POWER_WINDOWS
 #undef SDL_POWER_MACOSX
 #undef SDL_POWER_OS2
+#undef SDL_POWER_BEOS
 #undef SDL_POWER_NINTENDODS
 #undef SDL_POWER_HARDWIRED
 

--- a/src/power/SDL_power.c	Sun Jun 07 06:49:01 2009 +0000
+++ b/src/power/SDL_power.c	Sun Jun 07 22:44:59 2009 +0000
@@ -35,6 +35,7 @@
 SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_OS2(SDL_PowerState*, int*, int*);
+SDL_bool SDL_GetPowerInfo_BeOS(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_NintendoDS(SDL_PowerState*, int*, int*);
 
 #ifndef SDL_POWER_DISABLED
@@ -71,6 +72,9 @@
 #ifdef SDL_POWER_NINTENDODS  /* handles Nintendo DS. */
     SDL_GetPowerInfo_NintendoDS,
 #endif
+#ifdef SDL_POWER_BEOS  /* handles BeOS, Zeta, with euc.jp apm driver. */
+    SDL_GetPowerInfo_BeOS,
+#endif
 #ifdef SDL_POWER_HARDWIRED
     SDL_GetPowerInfo_Hardwired,
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/power/beos/SDL_syspower.c	Sun Jun 07 22:44:59 2009 +0000
@@ -0,0 +1,126 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef SDL_POWER_DISABLED
+#ifdef SDL_POWER_BEOS
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <drivers/Drivers.h>
+
+/* These values are from apm.h ... */
+#define APM_DEVICE_PATH "/dev/misc/apm"
+#define APM_FUNC_OFFSET 0x5300
+#define APM_FUNC_GET_POWER_STATUS 10
+#define APM_DEVICE_ALL 1
+#define APM_BIOS_CALL (B_DEVICE_OP_CODES_END + 3)
+
+#include "SDL_power.h"
+
+SDL_bool
+SDL_GetPowerInfo_BeOS(SDL_PowerState *state, int *seconds, int *percent)
+{
+    const int fd = open("/dev/misc/apm", O_RDONLY);
+    SDL_bool need_details = SDL_FALSE;
+    uint16 regs[6];
+    uint8 ac_status;
+    uint8 battery_status;
+    uint8 battery_flags;
+    uint8 battery_life;
+    uint32 battery_time;
+
+    if (fd == -1) {
+        return SDL_FALSE;  /* maybe some other method will work? */
+    }
+
+    memset(regs, '\0', sizeof (regs));
+    regs[0] = APM_FUNC_OFFSET + APM_FUNC_GET_POWER_STATUS;
+    regs[1] = APM_DEVICE_ALL;
+    rc = ioctl(fd, APM_BIOS_CALL, regs);
+    close(fd);
+
+    if (rc < 0) {
+        return SDL_FALSE;
+    }
+
+    ac_status = regs[1] >> 8;
+    battery_status = regs[1] & 0xFF;
+    battery_flags = regs[2] >> 8;
+    battery_life = regs[2] & 0xFF;
+    battery_time = (uint32) regs[3];
+
+    /* in theory, _something_ should be set in battery_flags, right? */
+    if (battery_flags == 0x00) {  /* older APM BIOS? Less fields. */
+        battery_time = 0xFFFF;
+        if (battery_status == 0xFF) {
+            battery_flags = 0xFF;
+        } else {
+            battery_flags = (1 << status.battery_status);
+        }
+    }
+
+    if ( (battery_time != 0xFFFF) && (battery_time & (1 << 15)) ) {
+        /* time is in minutes, not seconds */
+        battery_time = (battery_time & 0x7FFF) * 60;
+    }
+
+    if (battery_flags == 0xFF) {  /* unknown state */
+        *state = SDL_POWERSTATE_UNKNOWN;
+    } else if (battery_flags & (1 << 7)) {  /* no battery */
+        *state = SDL_POWERSTATE_NO_BATTERY;
+    } else if (battery_flags & (1 << 3)) {  /* charging */
+        *state = SDL_POWERSTATE_CHARGING;
+        need_details = SDL_TRUE;
+    } else if (ac_status == 1) {
+        *state = SDL_POWERSTATE_CHARGED;  /* on AC, not charging. */
+        need_details = SDL_TRUE;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;  /* not on AC. */
+        need_details = SDL_TRUE;
+    }
+
+    *percent = -1;
+    *seconds = -1;
+    if (need_details) {
+        const int pct = (int) battery_life;
+        const int secs = (int) battery_time;
+
+        if (pct != 255) {  /* 255 == unknown */
+            *percent = (pct > 100) ? 100 : pct;  /* clamp between 0%, 100% */
+        }
+        if (secs != 0xFFFF) {  /* 0xFFFF == unknown */
+            *seconds = secs;
+        }
+    }
+
+    return SDL_TRUE;  /* the definitive answer if APM driver replied. */
+}
+
+#endif /* SDL_POWER_BEOS */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
+