From 1f852472c98aec322cc67616a01e2d94e13e4e64 Mon Sep 17 00:00:00 2001
From: d0k3 <tore.anon@gmail.com>
Date: Mon, 29 Feb 2016 16:14:39 +0100
Subject: [PATCH] Misc code reorganization

---
 source/fs.c      | 19 +++++++------------
 source/fs.h      |  2 +-
 source/godmode.c | 31 ++++++++++++++++++-------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/source/fs.c b/source/fs.c
index bbc733c..e8ba963 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -5,9 +5,6 @@
 // don't use this area for anything else!
 static FATFS* fs = (FATFS*)0x20316000; 
 
-// reserve one MB for this, just to be safe -> 512kb is more than enough!
-static DirStruct* curdir_contents = (DirStruct*)0x21000000;
-
 // this is the main buffer
 static u8* main_buffer = (u8*)0x21100000;
 // this is the main buffer size
@@ -317,20 +314,18 @@ bool GetDirContentsWorker(DirStruct* contents, char* fpath, int fsize, bool recu
     return ret;
 }
 
-DirStruct* GetDirContents(const char* path) {
-    curdir_contents->n_entries = 0;
+void GetDirContents(DirStruct* contents, const char* path) {
+    contents->n_entries = 0;
     if (strncmp(path, "", 256) == 0) { // root directory
-        if (!GetRootDirContentsWorker(curdir_contents))
-            curdir_contents->n_entries = 0; // not required, but so what?
+        if (!GetRootDirContentsWorker(contents))
+            contents->n_entries = 0; // not required, but so what?
     } else {
         char fpath[256]; // 256 is the maximum length of a full path
         strncpy(fpath, path, 256);
-        if (!GetDirContentsWorker(curdir_contents, fpath, 256, false))
-            curdir_contents->n_entries = 0;
-        SortDirStruct(curdir_contents);
+        if (!GetDirContentsWorker(contents, fpath, 256, false))
+            contents->n_entries = 0;
+        SortDirStruct(contents);
     }
-    
-    return curdir_contents;
 }
 
 uint64_t GetFreeSpace(const char* path)
diff --git a/source/fs.h b/source/fs.h
index 2b158ab..0cc056c 100644
--- a/source/fs.h
+++ b/source/fs.h
@@ -39,7 +39,7 @@ bool PathDelete(const char* path);
 void CreateScreenshot();
 
 /** Get directory content under a given path **/
-DirStruct* GetDirContents(const char* path);
+void GetDirContents(DirStruct* contents, const char* path);
 
 /** Gets remaining space in filesystem in bytes */
 uint64_t GetFreeSpace(const char* path);
diff --git a/source/godmode.c b/source/godmode.c
index c64211f..8096cab 100644
--- a/source/godmode.c
+++ b/source/godmode.c
@@ -97,42 +97,47 @@ void DrawDirContents(DirStruct* contents, u32 cursor) {
 u32 GodMode() {
     static const u32 quick_stp = 20;
     u32 exit_mode = GODMODE_EXIT_REBOOT;
+    
+    // reserve 512kB for each, just to be safe
+    static DirStruct* current_dir = (DirStruct*)0x21000000;
+    static DirStruct* clipboard   = (DirStruct*)0x21080000;
     char current_path[256] = { 0x00 };
-    DirStruct* contents;
+    
     u32 cursor = 0;
     
     ClearScreenF(true, true, COLOR_BLACK);
     if (!InitFS()) return exit_mode;
     
-    contents = GetDirContents("");
+    GetDirContents(current_dir, "");
+    clipboard->n_entries = 0;
     while (true) { // this is the main loop
-        DrawUserInterface(current_path, &contents->entry[cursor]); // no need to fully do this everytime!
-        DrawDirContents(contents, cursor);
+        DrawUserInterface(current_path, &current_dir->entry[cursor]); // no need to fully do this everytime!
+        DrawDirContents(current_dir, cursor);
         u32 pad_state = InputWait();
         if (pad_state & BUTTON_DOWN) {
             cursor++;
-            if (cursor >= contents->n_entries)
-                cursor = contents->n_entries - 1;
+            if (cursor >= current_dir->n_entries)
+                cursor = current_dir->n_entries - 1;
         } else if ((pad_state & BUTTON_UP) && cursor) {
             cursor--;
         } else if (pad_state & BUTTON_RIGHT) {
             cursor += quick_stp;
-            if (cursor >= contents->n_entries)
-                cursor = contents->n_entries - 1;
+            if (cursor >= current_dir->n_entries)
+                cursor = current_dir->n_entries - 1;
         } else if (pad_state & BUTTON_LEFT) {
             cursor = (cursor >= quick_stp) ? cursor - quick_stp : 0;
         } else if ((pad_state & BUTTON_L1) && *current_path) {
-            contents->entry[cursor].marked ^= 0x1;
-        } else if ((pad_state & BUTTON_A) && (contents->entry[cursor].type != T_FAT_FILE)) {
-            strncpy(current_path, contents->entry[cursor].path, 256);
-            contents = GetDirContents(current_path);
+            current_dir->entry[cursor].marked ^= 0x1;
+        } else if ((pad_state & BUTTON_A) && (current_dir->entry[cursor].type != T_FAT_FILE)) {
+            strncpy(current_path, current_dir->entry[cursor].path, 256);
+            GetDirContents(current_dir, current_path);
             cursor = 0;
             ClearScreenF(true, true, COLOR_STD_BG); // not really required
         } else if (pad_state & BUTTON_B) {
             char* last_slash = strrchr(current_path, '/');
             if (last_slash) *last_slash = '\0'; 
             else *current_path = '\0';
-            contents = GetDirContents(current_path);
+            GetDirContents(current_dir, current_path);
             cursor = 0;
             ClearScreenF(true, true, COLOR_STD_BG); // not really required
         } else if (pad_state & BUTTON_X) {