From f570601f847c41da044fc4b862a2ed7c9a6f33e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 Jan 2014 15:16:23 +0100 Subject: [PATCH] Preliminatory support for a fullscreen toggle for SDL platforms. Does not seem to work on Mac. --- Common/KeyMap.cpp | 3 +++ Common/KeyMap.h | 1 + UI/EmuScreen.cpp | 4 ++++ native | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 9be86d1072..f93edd10ea 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -611,6 +611,9 @@ const KeyMap_IntStrPair psp_button_names[] = { #endif {VIRTKEY_SAVE_STATE, "Save State"}, {VIRTKEY_LOAD_STATE, "Load State"}, +#if !defined(_WIN32) && !defined(USING_GLES2) + {VIRTKEY_TOGGLE_FULLSCREEN, "Toggle Fullscreen"}, +#endif {VIRTKEY_AXIS_RIGHT_Y_MAX, "RightAn.Up"}, {VIRTKEY_AXIS_RIGHT_Y_MIN, "RightAn.Down"}, diff --git a/Common/KeyMap.h b/Common/KeyMap.h index 9d69ffedd9..4dbdead983 100644 --- a/Common/KeyMap.h +++ b/Common/KeyMap.h @@ -43,6 +43,7 @@ enum { VIRTKEY_REWIND = 0x1000c, VIRTKEY_SAVE_STATE = 0x1000d, VIRTKEY_LOAD_STATE = 0x1000e, + VIRTKEY_TOGGLE_FULLSCREEN = 0x1000f, VIRTKEY_LAST, VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST }; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 01e5fd031e..07787a4fe1 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -277,6 +277,10 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) { SaveState::LoadSlot(g_Config.iCurrentStateSlot, 0); } break; + case VIRTKEY_TOGGLE_FULLSCREEN: + printf("huly\n"); + System_SendMessage("toggle_fullscreen", ""); + break; } } diff --git a/native b/native index ee34dcbfa6..73f612aaa8 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit ee34dcbfa6059f54d076522ecc398ca0b10d0509 +Subproject commit 73f612aaa8e84d6576f5d85d7a605e6528547a8d