From f9f55d1af3f2570529d7c0b5159c034aa2507bc7 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 29 Aug 2016 19:37:05 +0200
Subject: ANDROIDSDL: Fix menu button

---
 backends/events/androidsdl/androidsdl-events.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'backends/events/androidsdl/androidsdl-events.cpp')

diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp
index bd8045ec62..7ea8ff1dc1 100644
--- a/backends/events/androidsdl/androidsdl-events.cpp
+++ b/backends/events/androidsdl/androidsdl-events.cpp
@@ -43,17 +43,16 @@ bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &
 	else if (ev.button.button == SDL_BUTTON_MIDDLE) {
 		event.type = Common::EVENT_MBUTTONDOWN;
 
-		static int show_onscreen=0;
-		if (show_onscreen==0) {
-		    SDL_ANDROID_SetScreenKeyboardShown(0);
-		    show_onscreen++;
+		static int show_onscreen = 0;
+		if (show_onscreen == 0) {
+			SDL_ANDROID_SetScreenKeyboardShown(0);
+			show_onscreen++;
+		} else if (show_onscreen==1) {
+			SDL_ANDROID_SetScreenKeyboardShown(1);
+			show_onscreen++;
 		}
-		else if (show_onscreen==1) {
-		    SDL_ANDROID_SetScreenKeyboardShown(1);
-		    show_onscreen++;
-		}
-		if (show_onscreen==2)
-		    show_onscreen=0;
+		if (show_onscreen == 2)
+			show_onscreen = 0;
 	}
 #endif
 	else
@@ -68,7 +67,9 @@ bool AndroidSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (false) {}
 
 	if (ev.key.keysym.sym == SDLK_LCTRL) {
-		ev.key.keysym.sym = SDLK_F5;
+		event.type = Common::EVENT_KEYDOWN;
+		event.kbd.keycode = Common::KEYCODE_F5;
+		return true;
 	} else {
 		// Let the events fall through if we didn't change them, this may not be the best way to
 		// set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though.
-- 
cgit v1.2.3