X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fgamepad.h;h=902dae128b2694ec888c83355a6ccd6948039046;hb=32f569e1bd09f5d7f07005d119f6408805106381;hp=350a91393c1b26b7035ad9d931cf2f120509bd54;hpb=f63cd569374c4fbcd872bb8a67c94788da29c3a8;p=virtualjaguar

diff --git a/src/gui/gamepad.h b/src/gui/gamepad.h
index 350a913..902dae1 100644
--- a/src/gui/gamepad.h
+++ b/src/gui/gamepad.h
@@ -8,16 +8,20 @@
 #ifndef __GAMEPAD_H__
 #define __GAMEPAD_H__
 
-#define JOY_BUTTON		0x0100
-#define JOY_HAT			0x0200
-
-#define	JOY_TYPE_MASK	0xFF00
-#define JOY_HATNUM_MASK	0x00F8
-#define JOY_HATBUT_MASK	0x0007
+#define JOY_KEY			0x000000
+#define JOY_BUTTON		0x010000
+#define JOY_HAT			0x020000
+#define JOY_AXIS		0x040000
+
+#define	JOY_TYPE_MASK		0xFF0000
+#define JOY_BUTTON_MASK		0x00FFFF
+#define JOY_HATNUM_MASK		0x0000F8
+#define JOY_HATBUT_MASK		0x000007
+#define JOY_AXISNUM_MASK	0x00FFFE
+#define JOY_AXISDIR_MASK	0x000001
 
 #include <stdint.h>
-
-uint8_t hatMask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+#include "SDL.h"
 
 // buttonID is the combination of the type (BUTTON, HAT) and the button #
 // (0-255 for buttons, 0-31 for hats). Hats also have 0-7 for a button #
@@ -26,14 +30,32 @@ uint8_t hatMask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
 class Gamepad
 {
 // really should make all methods and members be static so that we can
-// call this stuff without instantiating one. :-)
+// call this stuff without instantiating one. :-) [DONE]
 	public:
 		Gamepad();
 		~Gamepad();
 
-		bool GetState(int joystickID, int buttonID);
-		int GetButtonID(void);
-		int GetJoystickID(void);
+		// Class methods...
+		static void AllocateJoysticks(void);
+		static void DeallocateJoysticks(void);
+		static const char * GetJoystickName(int joystickID);
+		static bool GetState(int joystickID, int buttonID);
+		static int CheckButtonPressed(void);
+		static int GetButtonID(void);
+		static int GetJoystickID(void);
+		static void Update(void);
+		static void DumpJoystickStatesToLog(void);
+
+		// Support up to 8 gamepads
+		static int numJoysticks;
+		static SDL_Joystick * pad[8];
+		static char padName[8][128];
+		static int numButtons[8];
+		static int numAxes[8];
+		static int numHats[8];
+		static bool button[8][256];
+		static uint8_t hat[8][32];
+		static int32_t axis[8][32];
 };
 
 #endif	// __GAMEPAD_H__