From 9e6c9e5f7b76703249a1e3c321160580033943c5 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 5 Aug 2012 18:42:54 +0200
Subject: [PATCH] (Xbox 1) Option for debug info messages

---
 console/rmenu/rmenu.c         | 10 ++++++++++
 console/rmenu/rmenu.h         |  1 +
 console/rmenu/rmenu_entries.h | 10 ++++++++++
 general.h                     |  2 +-
 xbox1/xdk_d3d8.cpp            |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c
index bda2572f81..b8af014e50 100644
--- a/console/rmenu/rmenu.c
+++ b/console/rmenu/rmenu.c
@@ -255,6 +255,10 @@ static void set_setting_label(menu * current_menu, item *items, unsigned current
 		   snprintf(items[currentsetting].setting_text, sizeof(items[currentsetting].setting_text), "%d", g_extern.state_slot);
 		   break;
 		   /* emu-specific */
+	   case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
+         set_setting_label_write_on_or_off(items, g_console.fps_info_msg_enable, currentsetting);
+         set_setting_label_color(items,g_console.fps_info_msg_enable, currentsetting);
+		   break;
 	   case SETTING_EMU_SHOW_INFO_MSG:
          set_setting_label_write_on_or_off(items, g_console.info_msg_enable, currentsetting);
          set_setting_label_color(items,g_console.info_msg_enable, currentsetting);
@@ -1415,6 +1419,12 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch
 		   if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
 			   rarch_settings_default(S_DEF_SAVE_STATE);
 		   break;
+	   case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
+		   if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
+			   g_console.fps_info_msg_enable = !g_console.fps_info_msg_enable;
+		   if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
+			   g_console.fps_info_msg_enable = false;
+		   break;
 	   case SETTING_EMU_SHOW_INFO_MSG:
 		   if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
 			   g_console.info_msg_enable = !g_console.info_msg_enable;
diff --git a/console/rmenu/rmenu.h b/console/rmenu/rmenu.h
index 8cda02b960..9ed18c6ed3 100644
--- a/console/rmenu/rmenu.h
+++ b/console/rmenu/rmenu.h
@@ -162,6 +162,7 @@ enum
    SETTING_ENABLE_CUSTOM_BGM,
    SETTING_DEFAULT_AUDIO_ALL,
    SETTING_EMU_CURRENT_SAVE_STATE_SLOT,
+   SETTING_EMU_SHOW_DEBUG_INFO_MSG,
    SETTING_EMU_SHOW_INFO_MSG,
    SETTING_ZIP_EXTRACT,
    SETTING_RARCH_DEFAULT_EMU,
diff --git a/console/rmenu/rmenu_entries.h b/console/rmenu/rmenu_entries.h
index 2c881a7a8f..d60700b283 100644
--- a/console/rmenu/rmenu_entries.h
+++ b/console/rmenu/rmenu_entries.h
@@ -245,6 +245,16 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] =
       YELLOW,
       "INFO - Set the current savestate slot (can also be configured ingame).",
       WHITE,
+   },
+      {
+      SETTING_EMU_SHOW_DEBUG_INFO_MSG, 
+      "Debug Info messages", 
+      "",
+      0.0f,
+      0.0f,
+      YELLOW,
+      "INFO - Show onscreen debug messages.",
+      WHITE,
    },
    {
       SETTING_EMU_SHOW_INFO_MSG, 
diff --git a/general.h b/general.h
index ec7c118a36..288a806585 100644
--- a/general.h
+++ b/general.h
@@ -207,7 +207,7 @@ struct console_settings
    bool default_sram_dir_enable;
    bool default_savestate_dir_enable;
    bool fbo_enabled;
-   bool fps_info_enable;
+   bool fps_info_msg_enable;
    bool frame_advance_enable;
 #ifdef _XBOX
    bool menus_hd_enable;
diff --git a/xbox1/xdk_d3d8.cpp b/xbox1/xdk_d3d8.cpp
index a1429967c5..462b266153 100644
--- a/xbox1/xdk_d3d8.cpp
+++ b/xbox1/xdk_d3d8.cpp
@@ -368,7 +368,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
 
    xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
    bool menu_enabled = g_console.menu_enable;
-   bool fps_enable = g_console.fps_info_enable;
+   bool fps_enable = g_console.fps_info_msg_enable;
 
    if (d3d->last_width != width || d3d->last_height != height) //240*160
    {