--- a/QTfrontend/SDLs.cpp	Mon Oct 12 13:56:07 2009 +0000
+++ b/QTfrontend/SDLs.cpp	Mon Oct 12 16:44:30 2009 +0000
@@ -21,14 +21,26 @@
 #include "SDL.h"
 #include "hwconsts.h"
 
+#include <QApplication>
+
+extern char sdlkeys[1024][2][128];
+extern char xb360buttons[][128];
+extern char xb360dpad[128];
+extern char xbox360axes[][128];
+
 bool hardware;
 extern char *programname;
 
-SDLInteraction::SDLInteraction(bool hardware_snd)
+SDLInteraction::SDLInteraction()
 {
 	music = -1;
-	hardware = hardware_snd;
-	SDL_Init(SDL_INIT_VIDEO);
+	hardware = false;
+	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK);
+
+
+	if(SDL_NumJoysticks())
+		addGameControllerKeys();
+	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 }
 
 SDLInteraction::~SDLInteraction()
@@ -37,6 +49,11 @@
 	openal_close();
 }
 
+void SDLInteraction::setHardwareSound(bool hardware_snd)
+{
+	hardware = hardware_snd;
+}
+
 QStringList SDLInteraction::getResolutions() const
 {
 	QStringList result;
@@ -58,6 +75,87 @@
 	return result;
 }
 
+void SDLInteraction::addGameControllerKeys() const
+{
+	QStringList result;
+
+	int i = 0;
+	while(i < 1024 && sdlkeys[i][1][0] != '\0')
+		i++;
+
+	// Iterate through all game controllers
+	for(int jid = 0; jid < SDL_NumJoysticks(); jid++)
+	{
+		SDL_Joystick* joy = SDL_JoystickOpen(jid);
+		
+		// Retrieve the game controller's name and strip "Controller (...)" that's added by some drivers (English only)
+		QString joyname = QString(SDL_JoystickName(jid)).replace(QRegExp("^Controller \\((.*)\\)$"), "\\1");
+
+		// Connected Xbox 360 controller? Use specific button names then
+		// Might be interesting to add 'named' buttons for the most often used gamepads
+		bool isxb = joyname.contains("Xbox 360");
+
+		// This part of the string won't change for multiple keys/hats, so keep it
+		QString prefix = QString("%1 (%2): ").arg(joyname).arg(jid + 1);
+
+		// Register entries for missing axes not assigned to sticks of this joystick/gamepad
+		for(int aid = 0; aid < SDL_JoystickNumAxes(joy) && i < 1021; aid++)
+		{
+			// Axis 2 on xbox 360 is left/right trigger but those are used as buttons anyway so skip it
+			if(aid == 2 && isxb)
+				continue;
+
+			// Again store the part of the string not changing for multiple uses
+			QString axis = prefix + QApplication::translate("binds (keys)", "Axis") + QString(" %1 ").arg(aid + 1);
+			
+			// Entry for "Axis Up"
+			sprintf(sdlkeys[i][0], "j%da%du", jid, aid);
+			sprintf(sdlkeys[i++][1], "%s", ((isxb && aid < 5) ? (prefix + QApplication::translate("binds (keys)", xbox360axes[aid * 2])) : axis + QApplication::translate("binds (keys)", "(Up)")).toStdString().c_str());
+
+			// Entry for "Axis Down"
+			sprintf(sdlkeys[i][0], "j%da%dd", jid, aid);
+			sprintf(sdlkeys[i++][1], "%s", ((isxb && aid < 5) ? (prefix + QApplication::translate("binds (keys)", xbox360axes[aid * 2 + 1])) : axis + QApplication::translate("binds (keys)", "(Down)")).toStdString().c_str());
+		}
+
+		// Register entries for all coolie hats of this joystick/gamepad
+		for(int hid = 0; hid < SDL_JoystickNumHats(joy) && i < 1019; hid++)
+		{
+			// Again store the part of the string not changing for multiple uses
+			QString hat = prefix + (isxb ? (QApplication::translate("binds (keys)", xb360dpad) + QString(" ")) : QApplication::translate("binds (keys)", "Hat") + QString(" %1 ").arg(hid + 1));
+
+			// Entry for "Hat Up"
+			sprintf(sdlkeys[i][0], "j%dh%du", jid, hid);			
+			sprintf(sdlkeys[i++][1], "%s", (hat + QApplication::translate("binds (keys)", "(Up)")).toStdString().c_str());
+
+			// Entry for "Hat Down"
+			sprintf(sdlkeys[i][0], "j%dh%dd", jid, hid);			
+			sprintf(sdlkeys[i++][1], "%s", (hat + QApplication::translate("binds (keys)", "(Down)")).toStdString().c_str());
+
+			// Entry for "Hat Left"
+			sprintf(sdlkeys[i][0], "j%dh%dl", jid, hid);			
+			sprintf(sdlkeys[i++][1], "%s", (hat + QApplication::translate("binds (keys)", "(Left)")).toStdString().c_str());
+
+			// Entry for "Hat Right"
+			sprintf(sdlkeys[i][0], "j%dh%dr", jid, hid);			
+			sprintf(sdlkeys[i++][1], "%s", (hat + QApplication::translate("binds (keys)", "(Right)")).toStdString().c_str());
+		}
+		
+		// Register entries for all buttons of this joystick/gamepad
+		for(int bid = 0; bid < SDL_JoystickNumButtons(joy) && i < 1022; bid++)
+		{
+			// Buttons
+			sprintf(sdlkeys[i][0], "j%db%d", jid, bid);			
+			sprintf(sdlkeys[i++][1], "%s", (prefix + ((isxb && bid < 10) ? (QApplication::translate("binds (keys)", xb360buttons[bid]) + QString(" ")) : QApplication::translate("binds (keys)", "Button") + QString(" %1").arg(bid + 1))).toStdString().c_str());
+		}
+		// Close the game controller as we no longer need it
+		SDL_JoystickClose(joy);
+	}
+	
+	// Terminate the list
+	sdlkeys[i][0][0] = '\0';
+	sdlkeys[i][1][0] = '\0';
+}
+
 void SDLInteraction::StartMusic()
 {
 	OpenAL_Init();