From bc92cbc40aa3f5b56c3b94f4b516dfc601b7ae59 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Fri, 3 Aug 2012 19:36:11 +0200
Subject: [PATCH] (Xbox 1/PS3) more menu compatibility tweaks

---
 ps3/frontend/menu.c   | 24 +++++++++++++++++++++---
 xbox1/frontend/menu.c |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ps3/frontend/menu.c b/ps3/frontend/menu.c
index 92d6e5d812..182d69b1c7 100644
--- a/ps3/frontend/menu.c
+++ b/ps3/frontend/menu.c
@@ -51,6 +51,8 @@
 
 #if defined(__CELLOS_LV2__)
 #include "../../gfx/context/ps3_ctx.h"
+#elif defined(_XBOX)
+#include "../../gfx/context/xdk_ctx.h"
 #endif
 
 #if defined(HAVE_CG)
@@ -607,6 +609,7 @@ static void display_menubar(menu *current_menu)
 
    float x_position = POSITION_X;
 #ifdef _XBOX1
+   float current_y_position = m_menuMainRomListPos_y;
    float font_size = m_menuMainRomListPos_y;
 #else
    float font_size = HARDCODE_FONT_SIZE;
@@ -2298,6 +2301,7 @@ void menu_loop(void)
 
    do
    {
+      RARCH_LOG("reaches here #0\n");
       //first button input frame
       uint64_t input_state_first_frame = 0;
       uint64_t input_state = 0;
@@ -2406,6 +2410,8 @@ void menu_loop(void)
             trig_state = input_state; //second input frame set as current frame
          }
       }
+      
+      RARCH_LOG("reaches here #1\n");
 
       gfx_ctx_clear();
 
@@ -2471,6 +2477,8 @@ void menu_loop(void)
 		      break;
       }
 
+      RARCH_LOG("reaches here #1.1\n");
+
       float x_position = POSITION_X;
       float starting_y_position = POSITION_Y_START;
       float y_position_increment = POSITION_Y_INCREMENT;
@@ -2487,6 +2495,8 @@ void menu_loop(void)
       }
 
       old_state = input_state_first_frame;
+      
+      RARCH_LOG("reaches here #1.2\n");
 
       if(IS_TIMER_EXPIRED(device_ptr))
       {
@@ -2516,6 +2526,7 @@ void menu_loop(void)
          SET_TIMER_EXPIRATION(device_ptr, 30);
       }
 
+#ifndef _XBOX1
       const char * message = msg_queue_pull(g_extern.msg_queue);
       float message_y_position = 0.75f;
       float message_scale = 1.05f;
@@ -2525,19 +2536,26 @@ void menu_loop(void)
          render_msg_place_func(g_settings.video.msg_pos_x, message_y_position, message_scale, WHITE, message);
          render_msg_post_func();
       }
+#endif
+
+      RARCH_LOG("reaches here #1.3\n");
 
       gfx_ctx_swap_buffers();
 #ifdef HAVE_SYSUTILS
       cellSysutilCheckCallback();
 #endif
-#ifdef _XBOX1
-      device_ptr->frame_count++;
-#endif
+      RARCH_LOG("reaches here #1.4\n");
 
+#ifndef _XBOX1
       if(current_menu->enum_id == INGAME_MENU_RESIZE && (old_state & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) || current_menu->enum_id == INGAME_MENU_SCREENSHOT)
       { }
       else
          gfx_ctx_set_blend(false);
+#endif
+      
+      RARCH_LOG("reaches here #1.5\n");
+
+      RARCH_LOG("reaches here #2\n");
    }while(g_console.menu_enable);
 
 #ifdef __CELLOS_LV2__
diff --git a/xbox1/frontend/menu.c b/xbox1/frontend/menu.c
index b7bbe1476c..090b11be0c 100644
--- a/xbox1/frontend/menu.c
+++ b/xbox1/frontend/menu.c
@@ -657,7 +657,7 @@ static void browser_render(filebrowser_t *b, float current_x, float current_y, f
    DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
 
    unsigned file_count = b->current_dir.list->size;
-   unsigned current_index, page_number, page_base, i;
+   unsigned int current_index, page_number, page_base, i;
    float currentX, currentY, ySpacing;
 
    current_index = b->current_dir.ptr;