X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fgamepad.cpp;h=6ca2329a02cf20ab737bdca253cdc37bb7552f43;hb=5c28b6dbf7aa20441c8a51f484f4f64b1966f7e3;hp=ba8a551037b044ec7b0239ab6dd0248ed63fd976;hpb=f63cd569374c4fbcd872bb8a67c94788da29c3a8;p=virtualjaguar

diff --git a/src/gui/gamepad.cpp b/src/gui/gamepad.cpp
index ba8a551..6ca2329 100644
--- a/src/gui/gamepad.cpp
+++ b/src/gui/gamepad.cpp
@@ -12,19 +12,81 @@
 //
 
 #include "gamepad.h"
+#include "log.h"
+
+
+// Class member initialization
+/*static*/ int Gamepad::numJoysticks = 0;
+/*static*/ SDL_Joystick * Gamepad::pad[8];
+/*static*/ int Gamepad::numButtons[8];
+/*static*/ int Gamepad::numHats[8];
+/*static*/ bool Gamepad::button[8][256];
+/*static*/ uint8_t Gamepad::hat[8][32];
+
+
+Gamepad::Gamepad(void)//: numJoysticks(0)
+{
+	AllocateJoysticks();
+}
+
+
+Gamepad::~Gamepad(void)
+{
+	DeallocateJoysticks();
+}
+
+
+void Gamepad::AllocateJoysticks(void)
+{
+//	DeallocateJoysticks();
+	numJoysticks = SDL_NumJoysticks();
+
+	// Sanity check
+	if (numJoysticks > 8)
+		numJoysticks = 8;
+
+	for(int i=0; i<numJoysticks; i++)
+	{
+		pad[i] = SDL_JoystickOpen(i);
+		numButtons[i] = numHats[i] = 0;
+
+		if (pad[i])
+		{
+			numButtons[i] = SDL_JoystickNumButtons(pad[i]);
+			numHats[i] = SDL_JoystickNumHats(pad[i]);
+		}
+	}
+
+	WriteLog("Gamepad: Found %u joystick%s.\n", numJoysticks, (numJoysticks == 1 ? "" : "s"));
+}
+
+
+void Gamepad::DeallocateJoysticks(void)
+{
+	for(int i=0; i<numJoysticks; i++)
+		SDL_JoystickClose(pad[i]);
+}
 
 
 bool Gamepad::GetState(int joystickID, int buttonID)
 {
+	uint8_t hatMask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+
 	if (buttonID & JOY_BUTTON)
 	{
 		// Handle SDL button
+		int buttonNum = (buttonID & JOY_BUTTON_MASK);
+//		SDL_JoystickGetButton(pad[joystickID]);
+		return button[joystickID][buttonNum];
 	}
 	else if (buttonID & JOY_HAT)
 	{
 		// Handle SDL hats
 		int hatNumber = (buttonID & JOY_HATNUM_MASK) >> 3;
-		int hatDirection = hatMask[buttonID & JOY_HATBUT_MASK];
+		uint8_t hatDirection = hatMask[buttonID & JOY_HATBUT_MASK];
+//		uint8 direction = SDL_JoystickGetHat(pad[joystickID], hatNumber);
+//		return (
+		return (hat[joystickID][hatNumber] & hatDirection ? true : false);
 	}
 
 	// Default == failure
@@ -32,14 +94,77 @@ bool Gamepad::GetState(int joystickID, int buttonID)
 }
 
 
+int Gamepad::CheckButtonPressed(void)
+{
+	// This translates the hat direction to a mask index.
+	int hatNum[16] = { -1, 0, 1, -1, 2, -1, -1, -1,
+		3, -1, -1, -1, -1, -1, -1, -1 };
+
+	// Return single button ID being pressed (if any)
+	for(int i=0; i<numJoysticks; i++)
+	{
+		for(int j=0; j<numButtons[i]; j++)
+		{
+			if (button[i][j])
+				return (JOY_BUTTON | j);
+		}
+
+		for(int j=0; j<numHats[i]; j++)
+		{
+			if (hat[i][j])
+				return (JOY_HAT | hatNum[hat[i][j]]);
+		}
+	}
+
+	return -1;
+}
+
+
 int Gamepad::GetButtonID(void)
 {
 	// Return single button ID being pressed (if any)
+	return -1;
 }
 
 
 int Gamepad::GetJoystickID(void)
 {
 	// Return joystick ID of button being pressed (if any)
+	return -1;
+}
+
+
+void Gamepad::Update(void)
+{
+//	SDL_PollEvent(&event);
+	SDL_JoystickUpdate();
+
+	for(int i=0; i<numJoysticks; i++)
+	{
+		for(int j=0; j<numButtons[i]; j++)
+			button[i][j] = SDL_JoystickGetButton(pad[i], j);
+
+		for(int j=0; j<numHats[i]; j++)
+			hat[i][j] = SDL_JoystickGetHat(pad[i], j);
+	}
+}
+
+
+#if 0
+// Need to test this. It may be that the only time joysticks are detected is
+// when the program is first run. That would suck.
+void Gamepad::CheckConsistency(void)
+{
+	int currentNumJoysticks = SDL_NumJoysticks();
+
+	// Check to see if the # of joysticks reported by SDL changed
+	if (currentNumJoysticks == numJoysticks)
+		return;
+
+	// Either one or more joysticks were plugged in, or removed. Fix up our
+	// internal states to reflect this.
+
+	
 }
+#endif