From 0301b924ca5dc545c651c780fe49f4de88d81e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Thu, 11 Sep 2014 00:09:53 +0200
Subject: [PATCH] (Lakka) Savestate switching

---
 frontend/menu/backend/menu_lakka_backend.c | 14 ++++++++++++++
 frontend/menu/disp/lakka.c                 | 17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c
index dd26aae125..404bad6d55 100644
--- a/frontend/menu/backend/menu_lakka_backend.c
+++ b/frontend/menu/backend/menu_lakka_backend.c
@@ -297,6 +297,13 @@ static int menu_lakka_iterate(unsigned action)
             menu_active_category--;
             lakka_switch_categories();
          }
+         else if (depth == 1 && menu_active_category > 0 
+            && (active_item->active_subitem == 1 
+            || active_item->active_subitem == 2)
+            && g_settings.state_slot > -1)
+         {
+            g_settings.state_slot--;
+         }
          break;
 
       case MENU_ACTION_RIGHT:
@@ -305,6 +312,13 @@ static int menu_lakka_iterate(unsigned action)
             menu_active_category++;
             lakka_switch_categories();
          }
+         else if (depth == 1 && menu_active_category > 0 
+            && (active_item->active_subitem == 1
+            || active_item->active_subitem == 2)
+            && g_settings.state_slot < 255)
+         {
+            g_settings.state_slot++;
+         }
          break;
 
       case MENU_ACTION_DOWN:
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 720df3ffba..3e65870f4d 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -500,7 +500,7 @@ static void lakka_draw_subitems(int i, int j)
             1, 
             subitem->alpha);
       }
-      else if(k == 0 ||
+      else if (k == 0 ||
             menu_active_category == 0 ||
             (g_extern.main_is_init && 
             !g_extern.libretro_dummy &&
@@ -519,6 +519,21 @@ static void lakka_draw_subitems(int i, int j)
                margin_top + subitem->y + label_margin_top, 
                1, 
                subitem->alpha);
+
+         if (i && (k == 1 || k == 2))
+         {
+            char slot[256];
+            if (g_settings.state_slot == -1)
+               snprintf(slot, sizeof(slot), "%d (auto)", g_settings.state_slot);
+            else
+               snprintf(slot, sizeof(slot), "%d", g_settings.state_slot);
+            lakka_draw_text(slot, 
+                  margin_left + hspacing * (i+2.25) +
+                  all_categories_x + label_margin_left + 400, 
+                  margin_top + subitem->y + label_margin_top, 
+                  1, 
+                  subitem->alpha);
+         }
       }
 
       if (subitem->value)