From 110e88e2579c3431d0c9e3df6459ab05f057148d Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Sun, 7 Apr 2013 00:34:46 +1000
Subject: [PATCH] Fix stuck keys on Qt and Blackberry

---
 base/BlackberryMain.cpp | 10 +++++++---
 base/PCMain.cpp         |  4 +++-
 base/QtMain.cpp         |  7 +++----
 base/QtMain.h           | 12 ++++++++----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/base/BlackberryMain.cpp b/base/BlackberryMain.cpp
index 850ddab926..ceac9524f1 100644
--- a/base/BlackberryMain.cpp
+++ b/base/BlackberryMain.cpp
@@ -388,6 +388,7 @@ int main(int argc, char *argv[]) {
 #ifdef BLACKBERRY10
 	vibration_request_events(0);
 #endif
+	static int pad_buttons = 0;
 	BlackberryAudio* audio = new BlackberryAudio();
 	bool running = true;
 	while (running) {
@@ -444,13 +445,13 @@ int main(int argc, char *argv[]) {
 					if (flags & (KEY_DOWN | KEY_SYM_VALID)) {
 						for (int b = 0; b < 14; b++) {
 							if (value == buttonMappings[b])
-								input_state.pad_buttons |= (1<<b);
+								pad_buttons |= (1<<b);
 						}
 					}
 					else {
 						for (int b = 0; b < 14; b++) {
 							if (value == buttonMappings[b])
-								input_state.pad_buttons &= ~(1<<b);
+								pad_buttons &= ~(1<<b);
 						}
 					}
 					break;
@@ -460,7 +461,7 @@ int main(int argc, char *argv[]) {
 				{
 				case NAVIGATOR_BACK:
 				case NAVIGATOR_SWIPE_DOWN:
-					input_state.pad_buttons |= PAD_BUTTON_MENU;
+					pad_buttons |= PAD_BUTTON_MENU;
 					break;
 				case NAVIGATOR_EXIT:
 					running = false;
@@ -468,6 +469,7 @@ int main(int argc, char *argv[]) {
 				}
 			}
 		}
+		input_state.pad_buttons = pad_buttons;
 		// Handle accelerometer
 		double x, y, z;
 		accelerometer_read_forces(&x, &y, &z);
@@ -477,6 +479,8 @@ int main(int argc, char *argv[]) {
 		EndInputState(&input_state);
 		NativeRender();
 		time_update();
+		// TODO: For gestures, clear this where it is handled
+		pad_buttons &= ~PAD_BUTTON_MENU;
 		// On Blackberry, this handles VSync for us
 		eglSwapBuffers(egl_disp, egl_surf);
 	}
diff --git a/base/PCMain.cpp b/base/PCMain.cpp
index 76afe561a8..ae3162cc4b 100644
--- a/base/PCMain.cpp
+++ b/base/PCMain.cpp
@@ -1,4 +1,6 @@
-// PC implementation of the framework.
+// SDL/EGL implementation of the framework.
+// This is quite messy due to platform-specific implementations and #ifdef's.
+// It is suggested to use the Qt implementation instead.
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/base/QtMain.cpp b/base/QtMain.cpp
index 153236dea0..6ac7bccc8e 100644
--- a/base/QtMain.cpp
+++ b/base/QtMain.cpp
@@ -2,8 +2,8 @@
  * Copyright (c) 2012 Sacha Refshauge
  *
  */
-// Qt implementation of the framework.
-// Currently supports: Symbian, Blackberry, Linux
+// Qt 4.7 implementation of the framework.
+// Currently supports: Symbian, Blackberry, Meego, Linux, Windows
 
 #include <QtGui/QApplication>
 #include <QUrl>
@@ -41,7 +41,7 @@ void SimulateGamepad(InputState *input) {
 
 float CalculateDPIScale()
 {
-	// Sane default for Symbian, Blackberry and Meego
+	// Sane default rather than check DPI
 #ifdef __SYMBIAN32__
 	return 1.4f;
 #else
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
 
 #ifndef Q_WS_X11
 	MainUI w(dpi_scale);
-	w.setAttribute(Qt::WA_LockLandscapeOrientation);
 	w.resize(pixel_xres, pixel_yres);
 	w.showFullScreen();
 #endif
diff --git a/base/QtMain.h b/base/QtMain.h
index 34881a0876..fc298504c4 100644
--- a/base/QtMain.h
+++ b/base/QtMain.h
@@ -54,6 +54,8 @@ public:
 		QGLWidget(parent), dpi_scale(scale)
 	{
 		setAttribute(Qt::WA_AcceptTouchEvents);
+		setAttribute(Qt::WA_LockLandscapeOrientation);
+		pad_buttons = 0;
 #ifdef __SYMBIAN32__
 		acc = new QAccelerometer(this);
 		acc->start();
@@ -108,15 +110,15 @@ protected:
 			input_state.pointer_y[0] = ((QMouseEvent*)e)->pos().y() * dpi_scale;
 		break;
 		case QEvent::KeyPress:
-			for (int b = 0; b < 14; b++) {
+			for (int b = 0; b < 18; b++) {
 				if (((QKeyEvent*)e)->key() == buttonMappings[b])
-					input_state.pad_buttons |= (1<<b);
+					pad_buttons |= (1<<b);
 			}
 		break;
 		case QEvent::KeyRelease:
-			for (int b = 0; b < 14; b++) {
+			for (int b = 0; b < 18; b++) {
 				if (((QKeyEvent*)e)->key() == buttonMappings[b])
-					input_state.pad_buttons &= ~(1<<b);
+					pad_buttons &= ~(1<<b);
 			}
 		break;
 		default:
@@ -136,6 +138,7 @@ protected:
 
 	void paintGL()
 	{
+		input_state.pad_buttons = pad_buttons;
 		SimulateGamepad(&input_state);
 		updateAccelerometer();
 		UpdateInputState(&input_state);
@@ -160,6 +163,7 @@ protected:
 	}
 
 private:
+	int pad_buttons;
 	InputState input_state;
 #ifdef __SYMBIAN32__
 	QAccelerometer* acc;