X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fkeygrabber.cpp;h=b9b285c5248574f47355dfbfd14bbdb5942ddeb7;hb=0d7e70c5e34e691b15365901951700f43242065f;hp=0bea66f33ae636846745f29d5fcd3ba5b220f9b5;hpb=0c6ed444bbb07e5cc0513a7d3075fb24d06e61eb;p=virtualjaguar

diff --git a/src/gui/keygrabber.cpp b/src/gui/keygrabber.cpp
index 0bea66f..b9b285c 100644
--- a/src/gui/keygrabber.cpp
+++ b/src/gui/keygrabber.cpp
@@ -1,10 +1,10 @@
 //
 // keygrabber.cpp - Widget to grab a key and dismiss itself
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2011 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -12,22 +12,32 @@
 //
 
 #include "keygrabber.h"
+#include "gamepad.h"
 
 
-KeyGrabber::KeyGrabber(QWidget * parent/*= 0*/): QDialog(parent)
+KeyGrabber::KeyGrabber(QWidget * parent/*= 0*/): QDialog(parent),
+	label(new QLabel), timer(new QTimer), buttonDown(false)
 {
-	label = new QLabel(this);
+//	label = new QLabel(this);
 	QVBoxLayout * mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(label);
 	setLayout(mainLayout);
 	setWindowTitle(tr("Grab"));
+	connect(timer, SIGNAL(timeout()), this, SLOT(CheckGamepad()));
+	timer->setInterval(100);
+	timer->start();
+
+	// Will this make Mac OSX work???
+	setFocusPolicy(Qt::StrongFocus);
 }
 
+
 KeyGrabber::~KeyGrabber()
 {
+	timer->stop();
 }
 
-//void KeyGrabber::SetText(QString keyText)
+
 void KeyGrabber::SetKeyText(int keyNum)
 {
 	char jagButtonName[21][10] = { "Up", "Down", "Left", "Right",
@@ -39,8 +49,40 @@ void KeyGrabber::SetKeyText(int keyNum)
 	label->setText(text);
 }
 
+
 void KeyGrabber::keyPressEvent(QKeyEvent * e)
 {
 	key = e->key();
-	accept();
+
+	// Since this is problematic, we don't allow this key...
+	if (key != Qt::Key_Alt)
+		accept();
+}
+
+
+void KeyGrabber::CheckGamepad(void)
+{
+	// How do we determine which joystick it is, if more than one?
+	// Possibly by a combobox selecting the stick you want to configure...
+	Gamepad::Update();
+
+	if (!buttonDown)
+	{
+		button = Gamepad::CheckButtonPressed();
+
+		if (button == -1)
+			return;
+
+		buttonDown = true;
+	}
+	else
+	{
+		if (Gamepad::CheckButtonPressed() == button)
+			return;
+
+		key = button;
+		accept();
+		buttonDown = false;
+	}
 }
+