From 27542901c8c07d5718864c88fab2d10f2d73ffdb Mon Sep 17 00:00:00 2001
From: lightningterror <18107717+lightningterror@users.noreply.github.com>
Date: Thu, 3 Sep 2020 02:41:47 +0200
Subject: [PATCH] lilypad: Remove escapeFullscreenHack fully.

---
 plugins/LilyPad/Config.cpp       |  1 -
 plugins/LilyPad/Config.h         |  1 -
 plugins/LilyPad/LilyPad.cpp      | 20 --------------------
 plugins/LilyPad/Linux/Config.cpp |  1 -
 4 files changed, 23 deletions(-)

diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index b0c70fe250..2ae653ebde 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -45,7 +45,6 @@ const wchar_t *padTypes[] = {
 // Hacks or configurations which PCSX2 needs with a specific value
 void PCSX2_overrideConfig(GeneralConfig &config_in_out)
 {
-    config_in_out.escapeFullscreenHack = 0; // Not required - handled internally by PCSX2
     config_in_out.saveStateTitle = 0;       // Not required - handled internally by PCSX2
 }
 
diff --git a/plugins/LilyPad/Config.h b/plugins/LilyPad/Config.h
index 2bc5447732..d6fcb3617c 100644
--- a/plugins/LilyPad/Config.h
+++ b/plugins/LilyPad/Config.h
@@ -59,7 +59,6 @@ public:
 
             u8 multitap[2];
 
-            u8 escapeFullscreenHack;
             u8 debug;
 
             u8 saveStateTitle;
diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp
index 96cb7ef218..5dee960f7f 100644
--- a/plugins/LilyPad/LilyPad.cpp
+++ b/plugins/LilyPad/LilyPad.cpp
@@ -1572,26 +1572,6 @@ keyEvent *CALLBACK PADkeyEvent()
         PrepareActivityState(false);
     }
 
-    if ((ev.key == VK_ESCAPE || (int)ev.key == -2) && ev.evt == KEYPRESS && config.escapeFullscreenHack) {
-        static int t;
-        if ((int)ev.key != -2 && IsWindowMaximized(hWndTop)) {
-            t = timeGetTime();
-            QueueKeyEvent(-2, KEYPRESS);
-            HANDLE hThread = CreateThread(0, 0, MaximizeWindowThreadProc, 0, 0, 0);
-            if (hThread)
-                CloseHandle(hThread);
-            restoreFullScreen = 1;
-            return 0;
-        }
-        if (ev.key != VK_ESCAPE) {
-            if (timeGetTime() - t < 1000) {
-                QueueKeyEvent(-2, KEYPRESS);
-                return 0;
-            }
-        }
-        ev.key = VK_ESCAPE;
-    }
-
     if (ev.key == VK_F2 && ev.evt == KEYPRESS) {
         saveStateIndex += 1 - 2 * shiftDown;
         saveStateIndex = (saveStateIndex + 10) % 10;
diff --git a/plugins/LilyPad/Linux/Config.cpp b/plugins/LilyPad/Linux/Config.cpp
index b0726c8c8b..e289ab6ae4 100644
--- a/plugins/LilyPad/Linux/Config.cpp
+++ b/plugins/LilyPad/Linux/Config.cpp
@@ -207,7 +207,6 @@ const GeneralSettingsBool BoolOptionsInfo[] = {
     {L"Multitap 1", 0 /*IDC_MULTITAP1*/, 0},
     {L"Multitap 2", 0 /*IDC_MULTITAP2*/, 0},
 
-    {L"Escape Fullscreen Hack", 0 /*IDC_ESCAPE_FULLSCREEN_HACK*/, 1},
     {L"Disable Screen Saver", 0 /*IDC_DISABLE_SCREENSAVER*/, 1},
     {L"Logging", 0 /*IDC_DEBUG_FILE*/, 0},