From d6224a8a6e30b4b323cde86ade2f05f75dcdfbec Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sat, 4 Nov 2023 17:50:26 +0100
Subject: [PATCH] Revert "enhanced color switches"

This reverts commit ece9d507d52129cde31cafb0011641c366939d6a.
---
 src/emucore/EventHandler.cxx | 30 +++---------------------------
 src/emucore/EventHandler.hxx |  7 -------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 39417ab7a..1ab4ca0e5 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1654,7 +1654,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
     ////////////////////////////////////////////////////////////////////////
     // Events which relate to switches()
     case Event::ConsoleColor:
-      if(pressed && !repeated && !checkUI())
+      if(pressed && !repeated)
       {
         myEvent.set(Event::ConsoleBlackWhite, 0);
         myEvent.set(Event::ConsoleColor, 1);
@@ -1663,7 +1663,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
       }
       return;
     case Event::ConsoleBlackWhite:
-      if(pressed && !repeated && !checkUI())
+      if(pressed && !repeated)
       {
         myEvent.set(Event::ConsoleBlackWhite, 1);
         myEvent.set(Event::ConsoleColor, 0);
@@ -1672,7 +1672,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
       }
       return;
     case Event::ConsoleColorToggle:
-      if(pressed && !repeated && !checkUI())
+      if(pressed && !repeated)
       {
         if(myOSystem.console().switches().tvColor())
         {
@@ -2822,30 +2822,6 @@ void EventHandler::exitEmulation(bool checkLauncher)
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool EventHandler::checkUI()
-{
-  // Special entries to the UI
-  if(myEvent.get(Event::LeftJoystickFire) || myEvent.get(Event::RightJoystickFire))
-  {
-    if(myEvent.get(Event::LeftJoystickRight) || myEvent.get(Event::RightJoystickRight))
-      changeStateByEvent(Event::OptionsMenuMode);
-    else if(myEvent.get(Event::LeftJoystickLeft) || myEvent.get(Event::RightJoystickLeft))
-      changeStateByEvent(Event::TogglePauseMode);
-    else if(myEvent.get(Event::LeftJoystickUp) || myEvent.get(Event::RightJoystickUp))
-    {
-      myOSystem.createLauncher();
-      setState(EventHandlerState::LAUNCHER);
-    }
-    else if(myEvent.get(Event::LeftJoystickDown) || myEvent.get(Event::RightJoystickDown))
-      changeStateByEvent(Event::DebuggerMode);
-    else
-      changeStateByEvent(Event::CmdMenuMode);
-    return true;
-  }
-  return false;
-}
-
 #if defined(__clang__)
   #pragma clang diagnostic ignored "-Wmissing-field-initializers"
 #elif defined(__GNUC__) || defined(__GNUG__)
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index 0bef9b6f0..c6b4a3c2b 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -481,13 +481,6 @@ class EventHandler
     static int getEmulActionListIndex(int idx, const Event::EventSet& events);
     static int getActionListIndex(int idx, Event::Group group);
 
-    /**
-      Check if UI shall be entered.
-
-      @return  Whether the UI is entered or not
-    */
-    bool checkUI();
-
   private:
     // Structure used for action menu items
     struct ActionList {