From f918191d3cb234158bcfac79e39f16729c8b32fd Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 27 Apr 2013 13:29:01 +0200
Subject: [PATCH] Add basic disk swapping to RGUI.

---
 frontend/menu/menu_common.h |  1 +
 frontend/menu/rgui.c        | 40 +++++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index b387b0e752..0b57e2a903 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -107,6 +107,7 @@ typedef enum
    RGUI_SETTINGS_REWIND_GRANULARITY,
    RGUI_SETTINGS_SAVESTATE_SAVE,
    RGUI_SETTINGS_SAVESTATE_LOAD,
+   RGUI_SETTINGS_DISK_INDEX,
 #ifdef HAVE_SCREENSHOTS
    RGUI_SETTINGS_SCREENSHOT,
 #endif
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 35383940dd..7e339f20a2 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -556,6 +556,17 @@ static void render_text(rgui_handle_t *rgui)
             case RGUI_SETTINGS_DEBUG_TEXT:
                snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF");
                break;
+            case RGUI_SETTINGS_DISK_INDEX:
+            {
+               const struct retro_disk_control_callback *control = &g_extern.system.disk_control;
+               unsigned images = control->get_num_images();
+               unsigned current = control->get_image_index();
+               if (current >= images)
+                  strlcpy(type_str, "No Disk", sizeof(type_str));
+               else
+                  snprintf(type_str, sizeof(type_str), "%u", current + 1);
+               break;
+            }
             case RGUI_SETTINGS_OPEN_FILEBROWSER:
             case RGUI_SETTINGS_CORE_OPTIONS:
             case RGUI_SETTINGS_SHADER_MANAGER:
@@ -966,6 +977,29 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
          else if (action == RGUI_ACTION_RIGHT)
             g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
          break;
+      case RGUI_SETTINGS_DISK_INDEX:
+      {
+         const struct retro_disk_control_callback *control = &g_extern.system.disk_control;
+
+         unsigned num_disks = control->get_num_images();
+         unsigned current   = control->get_image_index();
+
+         int step = 0;
+         if (action == RGUI_ACTION_RIGHT || action == RGUI_ACTION_OK)
+            step = 1;
+         else if (action == RGUI_ACTION_LEFT)
+            step = -1;
+
+         if (step)
+         {
+            unsigned next_index = (current + num_disks + 1 + step) % (num_disks + 1);
+            rarch_disk_control_set_eject(true, false);
+            rarch_disk_control_set_index(next_index);
+            rarch_disk_control_set_eject(false, false);
+         }
+
+         break;
+      }
       case RGUI_SETTINGS_RESTART_EMULATOR:
          if (action == RGUI_ACTION_OK)
          {
@@ -1087,8 +1121,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
 
             case RGUI_ACTION_RIGHT:
             case RGUI_ACTION_OK:
-               current_device =
-                  device_types[(current_index + 1) % ARRAY_SIZE(device_types)];
+               current_device = device_types[(current_index + 1) % ARRAY_SIZE(device_types)];
                break;
 
             default:
@@ -1197,6 +1230,9 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
 #endif
       rgui_list_push(rgui->selection_buf, "Resume Game", RGUI_SETTINGS_RESUME_GAME, 0);
       rgui_list_push(rgui->selection_buf, "Restart Game", RGUI_SETTINGS_RESTART_GAME, 0);
+
+      if (g_extern.system.disk_control.get_num_images)
+         rgui_list_push(rgui->selection_buf, "Disk Index", RGUI_SETTINGS_DISK_INDEX, 0);
    }
 
    rgui_list_push(rgui->selection_buf, "Rewind", RGUI_SETTINGS_REWIND_ENABLE, 0);