From dc244cddeef2cc0171eff8a4d75329e103894e3e Mon Sep 17 00:00:00 2001
From: shinydoofy <shinydoofy@users.sf.net>
Date: Sun, 22 Mar 2009 19:26:28 +0000
Subject: [PATCH] SDL: added --inputdisplay

---
 changelog.txt              | 1 +
 src/drivers/sdl/config.cpp | 4 ++++
 src/drivers/sdl/input.cpp  | 8 ++++++++
 src/drivers/sdl/sdl.cpp    | 8 ++++++++
 4 files changed, 21 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index d6768fa6..f8a5e0e4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+22-mar-2009 - shinydoofy - sdl - added hotkey I and --inputdisplay {0|1|2|4} for toggling input display.
 22-mar-2009 - shinydoofy - sdl - added commandline options for sound channels' volumes
 22-mar-2009 - shinydoofy - sdl - updated window title
 19-mar-2009 - adelikat - Win32 - make Video - windowed mode - disable hardware accel the default setting.  Made high quality sound the default setting.
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index f15eefb4..66529636 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -183,6 +183,9 @@ InitConfig()
     // allow for input configuration
     config->addOption('i', "inputcfg", "SDL.InputCfg", InputCfg);
     
+    // display input
+    config->addOption("inputdisplay", "SDL.InputDisplay", 0);
+    
     // video playback
     config->addOption("playmov", "SDL.Movie", "");
     
@@ -296,6 +299,7 @@ InitConfig()
     config->addOption(prefix + "DecreaseSpeed", SDLK_MINUS);
     config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS);
     config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
+    config->addOption(prefix + "InputDisplay", SDLK_i);
     //config->addOption(prefix + "Power", 0);
     
     
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index f8645266..9e192d07 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -167,6 +167,7 @@ int stateKey[10];
 int movieToggleFrameDisplayKey;
 int lagCounterDisplayKey;
 int SubtitleDisplayKey;
+int InputDisplayKey;
 
 // this function loads the sdl hotkeys from the config file into the
 // global scope.  this elimates the need for accessing the config file
@@ -203,6 +204,7 @@ void setHotKeys()
 	g_config->getOption("SDL.Hotkeys.LagCounterDisplay", &lagCounterDisplayKey);
 	g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey);
 	g_config->getOption("SDL.Hotkeys.SubtitleDisplay", &SubtitleDisplayKey);
+	g_config->getOption("SDL.Hotkeys.InputDisplay", &InputDisplayKey);
 	/*
 	config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
 	config->addOption(prefix + "Power", 0);
@@ -408,6 +410,12 @@ KeyboardCommands()
     if(_keyonly(movieToggleFrameDisplayKey)) {
         FCEUI_MovieToggleFrameDisplay();
     }
+    
+    if(_keyonly(InputDisplayKey)) {
+        FCEUI_ToggleInputDisplay();
+        extern int input_display;
+        g_config->setOption("SDL.InputDisplay", input_display);
+    }
 
     if(_keyonly(pauseKey)) {
         FCEUI_ToggleEmulationPause();
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 630a3fcd..140958e2 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -106,6 +106,7 @@ char *DriverUsage="\
                         Devices: quizking hypershot mahjong toprider ftrainer\n\
                          familykeyboard oekakids arkanoid shadow bworld 4player\n\
 --inputcfg      d      Configures input device d on startup.\n\
+--inputdisplay{0|1|2|4}Displays game input.\n\
 --playmov       f      Plays back a recorded movie from filename f.\n\
 --fcmconvert    f      Converts fcm movie file f to fm2.";
 
@@ -583,6 +584,13 @@ SDL_GL_LoadLibrary(0);
         mutecapture = 0;
     }
     #endif
+
+    {
+    int id;
+    g_config->getOption("SDL.InputDisplay", &id);
+    extern int input_display;
+    input_display = id;
+    }
 	
 	// load the hotkeys from the config life
 	setHotKeys();