Initial work on power subsystem for SDL 1.3.

include/SDL.h

@@ -84,6 +84,7 @@ Enjoy!
 #include "SDL_events.h"
 #include "SDL_loadso.h"
 #include "SDL_mutex.h"
+#include "SDL_power.h"
 #include "SDL_rwops.h"
 #include "SDL_thread.h"
 #include "SDL_timer.h"

include/SDL_config.h.in

@@ -166,6 +166,7 @@
 #undef SDL_THREADS_DISABLED
 #undef SDL_TIMERS_DISABLED
 #undef SDL_VIDEO_DISABLED
+#undef SDL_POWER_DISABLED
 
 /* Enable various audio drivers */
 #undef SDL_AUDIO_DRIVER_ALSA
@@ -324,6 +325,14 @@
 #undef SDL_VIDEO_OPENGL_OSMESA
 #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
 
+/* Enable system power support */
+#undef SDL_POWER_LINUX
+#undef SDL_POWER_WINDOWS
+#undef SDL_POWER_MACOSX
+#undef SDL_POWER_OS2
+#undef SDL_POWER_NINTENDODS
+#undef SDL_POWER_HARDWIRED
+
 /* Enable assembly routines */
 #undef SDL_ASSEMBLY_ROUTINES
 #undef SDL_ALTIVEC_BLITTERS

include/SDL_config_dreamcast.h

@@ -104,4 +104,6 @@ typedef unsigned long uintptr_t;
 #define SDL_VIDEO_DRIVER_DC	1
 #define SDL_VIDEO_DRIVER_DUMMY	1
 
+#define SDL_POWER_HARDWIRED 1
+
 #endif /* _SDL_config_dreamcast_h */

include/SDL_config_iphoneos.h

@@ -131,6 +131,9 @@ typedef unsigned long uintptr_t;
 #define SDL_VIDEO_OPENGL_ES	1
 #define SDL_VIDEO_RENDER_OGL_ES	1
 
+/* Enable system power support */
+#define SDL_POWER_MACOSX 1
+
 /* enable iPhone keyboard support */
 #define SDL_IPHONE_KEYBOARD 1
 

include/SDL_config_macosx.h

@@ -137,6 +137,9 @@
 #define SDL_VIDEO_OPENGL_CGL	1
 #define SDL_VIDEO_RENDER_OGL	1
 
+/* Enable system power support */
+#define SDL_POWER_MACOSX 1
+
 /* Enable assembly routines */
 #define SDL_ASSEMBLY_ROUTINES	1
 #ifdef __ppc__

include/SDL_config_nintendods.h

@@ -116,4 +116,7 @@ typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
 #define SDL_VIDEO_DRIVER_NDS	1
 /*#define SDL_VIDEO_DRIVER_DUMMY	1 TODO: uncomment this later*/
 
+/* Enable system power support */
+#define SDL_POWER_NINTENDODS 1
+
 #endif /* _SDL_config_nintendods_h */

include/SDL_config_os2.h

@@ -136,6 +136,9 @@ typedef unsigned long long uint64_t;
 /* Enable OpenGL support */
 /* Nothing here yet for OS/2... :( */
 
+/* Enable system power support */
+#define SDL_POWER_OS2 1
+
 /* Enable assembly routines where available */
 #define SDL_ASSEMBLY_ROUTINES	1
 

include/SDL_config_win32.h

@@ -185,6 +185,9 @@ typedef unsigned int uintptr_t;
 #define SDL_VIDEO_RENDER_OGL	1
 #endif
 
+/* Enable system power support */
+#define SDL_POWER_WINDOWS 1
+
 /* Enable assembly routines (Win64 doesn't have inline asm) */
 #ifndef _WIN64
 #define SDL_ASSEMBLY_ROUTINES	1

include/SDL_power.h

@@ -0,0 +1,84 @@
+/*
+    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
+*/
+
+#ifndef _SDL_power_h
+#define _SDL_power_h
+
+/**
+ * \file SDL_power.h
+ *
+ * Header for the SDL power management routines
+ */
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+/**
+ * \enum SDL_PowerState
+ *
+ * \brief The basic state for the system's power supply.
+ */
+typedef enum
+{
+    SDL_POWERSTATE_UNKNOWN,      /**< cannot determine power status */
+    SDL_POWERSTATE_ON_BATTERY,   /**< Not plugged in, running on the battery */
+    SDL_POWERSTATE_NO_BATTERY,   /**< Plugged in, no battery available */
+    SDL_POWERSTATE_CHARGING,     /**< Plugged in, charging battery */
+    SDL_POWERSTATE_CHARGED,      /**< Plugged in, battery charged */
+} SDL_PowerState;
+
+
+/**
+ * \fn int SDL_GetPowerInfo(void)
+ *
+ * \brief Get the current power supply details.
+ *
+ * \param secs Seconds of battery life left. You can pass a NULL here if
+ *                you don't care. Will return -1 if we can't determine a
+ *                value, or we're not running on a battery.
+ *
+ * \param pct Percentage of battery life left, between 0 and 100. You can
+ *                pass a NULL here if you don't care. Will return -1 if we
+ *                can't determine a value, or we're not running on a battery.
+ *
+ * \return The state of the battery (if any).
+ */
+extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_power_h */
+
+/* vi: set ts=4 sw=4 expandtab: */