rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate the selection and the clipboard like GM9 (#81)

Browse Source 
* Separate the selection and the clipboard like GM9

* Add selecting while holding L

* Print the first 5 paths that will be deleted

By @unresolvedsymbol, but with limit added by me
This commit is contained in:
Pk11 2021-01-27 16:46:47 -06:00 committed by GitHub
parent 81108bc4ed
commit a9e5767e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 142 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
arm9/source/file_browse.cpp
View File

@ -47,7 +47,6 @@
#define ENTRIES_START_ROW 1 #define ENTRIES_START_ROW 1
#define OPTIONS_ENTRIES_START_ROW 2 #define OPTIONS_ENTRIES_START_ROW 2
#define ENTRY_PAGE_LENGTH 10 #define ENTRY_PAGE_LENGTH 10
bool bigJump = false;
extern PrintConsole topConsole, bottomConsole; extern PrintConsole topConsole, bottomConsole;
extern void printBorderTop(void); extern void printBorderTop(void);
@ -163,6 +162,8 @@ void showDirectoryContents (const std::vector<DirEntry>& dirContents, int fileOf
iprintf ("\x1b[%d;0H", i + ENTRIES_START_ROW); iprintf ("\x1b[%d;0H", i + ENTRIES_START_ROW);
if ((fileOffset - startRow) == i) { if ((fileOffset - startRow) == i) {
printf ("\x1B[47m"); // Print foreground white color printf ("\x1B[47m"); // Print foreground white color
} else if (entry->selected) {
printf ("\x1B[33m"); // Print custom yellow color
} else if (entry->isDirectory) { } else if (entry->isDirectory) {
printf ("\x1B[37m"); // Print custom blue color printf ("\x1B[37m"); // Print custom blue color
} else { } else {
@ -210,10 +211,10 @@ FileOperation fileBrowse_A(DirEntry* entry, char path[PATH_MAX]) {
iprintf ("\x1b[%d;0H", cursorScreenPos + OPTIONS_ENTRIES_START_ROW); iprintf ("\x1b[%d;0H", cursorScreenPos + OPTIONS_ENTRIES_START_ROW);
if (!entry->isDirectory) { if (!entry->isDirectory) {
if (entry->isApp) { if (entry->isApp) {
assignedOp[++maxCursors] = FileOperation::bootstrapFile;
printf(" Bootstrap file\n");
assignedOp[++maxCursors] = FileOperation::bootFile; assignedOp[++maxCursors] = FileOperation::bootFile;
printf(" Boot file (Direct)\n"); printf(" Boot file (Direct)\n");
assignedOp[++maxCursors] = FileOperation::bootstrapFile;
printf(" Bootstrap file\n");
} }
if(extension(entry->name, {"nds", "dsi", "ids", "app"})) if(extension(entry->name, {"nds", "dsi", "ids", "app"}))
{ {
@ -469,12 +470,12 @@ bool fileBrowse_paste(char dest[256]) {
fcopy(file.path.c_str(), destPath.c_str()); // Copy file to destination, since renaming won't work fcopy(file.path.c_str(), destPath.c_str()); // Copy file to destination, since renaming won't work
remove(file.path.c_str()); // Delete source file after copying remove(file.path.c_str()); // Delete source file after copying
} }
clipboardUsed = false; // Disable clipboard restore
} else { } else {
remove(destPath.c_str()); remove(destPath.c_str());
fcopy(file.path.c_str(), destPath.c_str()); fcopy(file.path.c_str(), destPath.c_str());
} }
} }
clipboardUsed = true; // Disable clipboard restore
clipboardOn = false; // Clear clipboard after copying or moving clipboardOn = false; // Clear clipboard after copying or moving
return true; return true;
} }
@ -512,18 +513,8 @@ void fileBrowse_drawBottomScreen(DirEntry* entry) {
printf ("\x1b[22;0H"); printf ("\x1b[22;0H");
printf ("%s\n", titleName); printf ("%s\n", titleName);
printf ("X - DELETE/[+R] RENAME file\n"); printf ("X - DELETE/[+R] RENAME file\n");
bool inClipboard = false; printf ("L - %s files (with \x18\x19\x1A\x1B)\n", entry->selected ? "DESELECT" : "SELECT");
if(clipboardOn) { printf ("Y - %s file/[+R] CREATE entry%s", clipboardOn ? "PASTE" : "COPY", clipboardOn ? "" : "\n");
std::string fullPath(path + entry->name);
for (const auto &file : clipboard) {
if(file.path == fullPath) {
inClipboard = true;
break;
}
}
}
printf ("L - %s file\n", inClipboard ? "DESELECT" : "SELECT");
printf ("Y - PASTE file/[+R] CREATE entry");
printf ("R+A - Directory options\n"); printf ("R+A - Directory options\n");
if (sdMounted || flashcardMounted) { if (sdMounted || flashcardMounted) {
printf ("%s\n", SCREENSHOTTEXT); printf ("%s\n", SCREENSHOTTEXT);
@ -536,8 +527,7 @@ void fileBrowse_drawBottomScreen(DirEntry* entry) {
} else { } else {
printf (POWERTEXT); printf (POWERTEXT);
} }
printf (entry->selected ? "\x1B[33m" : (entry->isDirectory ? "\x1B[37m" : "\x1B[40m")); // Print custom blue color or foreground black color
printf (entry->isDirectory ? "\x1B[37m" : "\x1B[40m"); // Print custom blue color or foreground black color
printf ("\x1b[0;0H"); printf ("\x1b[0;0H");
printf ("%s\n", entry->name.c_str()); printf ("%s\n", entry->name.c_str());
if (entry->name != "..") { if (entry->name != "..") {
@ -622,15 +612,23 @@ std::string browseForFile (void) {
return "null"; return "null";
} }
if (pressed & KEY_UP) { fileOffset -= 1; bigJump = false; } if (pressed & KEY_UP) {
if (pressed & KEY_DOWN) { fileOffset += 1; bigJump = false; } fileOffset--;
if (pressed & KEY_LEFT) { fileOffset -= ENTRY_PAGE_LENGTH; bigJump = true; } if(fileOffset < 0)
if (pressed & KEY_RIGHT) { fileOffset += ENTRY_PAGE_LENGTH; bigJump = true; } fileOffset = dirContents.size() - 1;
} else if (pressed & KEY_DOWN) {
if ((fileOffset < 0) & (bigJump == false)) fileOffset = dirContents.size() - 1; // Wrap around to bottom of list (UP press) fileOffset++;
else if ((fileOffset < 0) & (bigJump == true)) fileOffset = 0; // Move to bottom of list (RIGHT press) if(fileOffset > (int)dirContents.size() - 1)
if ((fileOffset > ((int)dirContents.size() - 1)) & (bigJump == false)) fileOffset = 0; // Wrap around to top of list (DOWN press) fileOffset = 0;
else if ((fileOffset > ((int)dirContents.size() - 1)) & (bigJump == true)) fileOffset = dirContents.size() - 1; // Move to top of list (LEFT press) } else if (pressed & KEY_LEFT) {
fileOffset -= ENTRY_PAGE_LENGTH;
if(fileOffset < 0)
fileOffset = 0;
} else if (pressed & KEY_RIGHT) {
fileOffset += ENTRY_PAGE_LENGTH;
if(fileOffset > (int)dirContents.size() - 1)
fileOffset = dirContents.size() - 1;
}
// Scroll screen if needed // Scroll screen if needed
@ -745,15 +743,26 @@ std::string browseForFile (void) {
} }
} }
// Delete file/folder // Delete action
if ((pressed & KEY_X) && (entry->name != ".." && strncmp(path, "nitro:/", 7) != 0)) { if ((pressed & KEY_X) && (entry->name != ".." && strncmp(path, "nitro:/", 7) != 0)) {
consoleSelect(&bottomConsole); consoleSelect(&bottomConsole);
consoleClear(); consoleClear();
printf ("\x1B[47m"); // Print foreground white color printf ("\x1B[47m"); // Print foreground white color
if (clipboardOn) int selections = std::count_if(dirContents.begin(), dirContents.end(), [](const DirEntry &x){ return x.selected; });
iprintf("Delete %d files?\n", clipboard.size()); if (entry->selected && selections > 1) {
else iprintf("Delete %d paths?\n", selections);
for (uint i = 0, printed = 0; i < dirContents.size() && printed < 5; i++) {
if (dirContents[i].selected) {
iprintf("\x1B[41m- %s\n", dirContents[i].name.c_str());
printed++;
}
}
if(selections > 5)
iprintf("\x1B[41m- and %d more...\n", selections - 5);
iprintf("\x1B[47m");
} else {
iprintf("Delete \"%s\"?\n", entry->name.c_str()); iprintf("Delete \"%s\"?\n", entry->name.c_str());
}
printf ("(<A> yes, <B> no)"); printf ("(<A> yes, <B> no)");
consoleSelect(&topConsole); consoleSelect(&topConsole);
printf ("\x1B[30m"); // Print black color for time text printf ("\x1B[30m"); // Print black color for time text
@ -770,20 +779,20 @@ std::string browseForFile (void) {
consoleSelect(&bottomConsole); consoleSelect(&bottomConsole);
consoleClear(); consoleClear();
printf ("\x1B[47m"); // Print foreground white color printf ("\x1B[47m"); // Print foreground white color
if (clipboardOn) { if (entry->selected) {
printf ("Deleting files, please wait..."); printf ("Deleting files, please wait...");
struct stat st; struct stat st;
for (auto &file : clipboard) { for (auto &item : dirContents) {
if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) if(item.selected) {
continue; if (FAT_getAttr(item.name.c_str()) & ATTR_READONLY)
stat(file.path.c_str(), &st); continue;
if (st.st_mode & S_IFDIR) stat(item.name.c_str(), &st);
recRemove(file.path.c_str(), dirContents); if (st.st_mode & S_IFDIR)
else recRemove(item.name.c_str(), dirContents);
remove(file.path.c_str()); else
remove(item.name.c_str());
}
} }
clipboard.clear();
clipboardOn = clipboardUsed = false;
fileOffset = 0; fileOffset = 0;
} else if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) { } else if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) {
printf ("Failed deleting:\n"); printf ("Failed deleting:\n");
@ -867,32 +876,94 @@ std::string browseForFile (void) {
} }
} }
// Add to clipboard // Add to selection
if (pressed & KEY_L && entry->name != "..") { if (pressed & KEY_L && entry->name != "..") {
if (!clipboardOn) bool select = !entry->selected;
clipboard.clear(); entry->selected = select;
std::string fullPath(path + entry->name); while(held & KEY_L) {
auto it = clipboard.begin(); do {
for (; it != clipboard.end(); ++it) { // Move to right side of screen
if(it->path == fullPath) printf ("\x1b[0;26H");
break; // Print black color for time text
} printf ("\x1B[30m");
if (it == clipboard.end()) { // Print time
clipboard.emplace_back(fullPath, entry->name, entry->isDirectory, currentDrive, !strncmp(path, "nitro:/", 7)); printf (" %s" ,RetTime().c_str());
clipboardOn = clipboardUsed = true;
} else { scanKeys();
clipboard.erase(it); pressed = keysDownRepeat();
if(clipboard.size() == 0) held = keysHeld();
clipboardOn = clipboardUsed = false; swiWaitForVBlank();
} while ((held & KEY_L) && !(pressed & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT)));
if(pressed & (KEY_UP | KEY_DOWN)) {
if (pressed & KEY_UP) {
fileOffset--;
if(fileOffset < 0) {
fileOffset = dirContents.size() - 1;
} else {
entry = &dirContents[fileOffset];
entry->selected = select;
}
} else if (pressed & KEY_DOWN) {
fileOffset++;
if(fileOffset > (int)dirContents.size() - 1) {
fileOffset = 0;
} else {
entry = &dirContents[fileOffset];
entry->selected = select;
}
}
// Scroll screen if needed
if (fileOffset < screenOffset) {
screenOffset = fileOffset;
} else if (fileOffset > screenOffset + ENTRIES_PER_SCREEN - 1) {
screenOffset = fileOffset - ENTRIES_PER_SCREEN + 1;
}
}
if(pressed & KEY_LEFT) {
for(auto &item : dirContents) {
item.selected = false;
}
} else if(pressed & KEY_RIGHT) {
for(auto &item : dirContents) {
item.selected = true;
}
}
consoleSelect(&bottomConsole);
fileBrowse_drawBottomScreen(entry);
consoleSelect(&topConsole);
showDirectoryContents (dirContents, fileOffset, screenOffset);
} }
} }
// Paste if (pressed & KEY_Y) {
if (pressed & KEY_Y && clipboardOn && strncmp(path, "nitro:/", 7) != 0 && fileBrowse_paste(path)) { // Copy
getDirectoryContents (dirContents); if (!clipboardOn) {
if (entry->name != "..") {
clipboardOn = true;
clipboardUsed = false;
clipboard.clear();
if (entry->selected) {
for (auto &item : dirContents) {
if(item.selected) {
clipboard.emplace_back(path + item.name, item.name, item.isDirectory, currentDrive, !strncmp(path, "nitro:/", 7));
item.selected = false;
}
}
} else {
clipboard.emplace_back(path + entry->name, entry->name, entry->isDirectory, currentDrive, !strncmp(path, "nitro:/", 7));
}
}
// Paste
} else if (strncmp(path, "nitro:/", 7) != 0 && fileBrowse_paste(path)) {
getDirectoryContents (dirContents);
}
} }
if ((pressed & KEY_SELECT) && clipboardUsed) { if ((pressed & KEY_SELECT) && !clipboardUsed) {
clipboardOn = !clipboardOn; clipboardOn = !clipboardOn;
} }

1
arm9/source/file_browse.h
View File

@ -30,6 +30,7 @@ struct DirEntry {
size_t size; size_t size;
bool isDirectory; bool isDirectory;
bool isApp; bool isApp;
bool selected = false;
}; };
enum class FileOperation { enum class FileOperation {

8
arm9/source/main.cpp
View File

@ -112,6 +112,10 @@ void reinitConsoles(void) {
BG_PALETTE[15+(7*16)] = 0x656A; BG_PALETTE[15+(7*16)] = 0x656A;
BG_PALETTE_SUB[15+(7*16)] = 0x656A; BG_PALETTE_SUB[15+(7*16)] = 0x656A;
// Custom yellow color
BG_PALETTE[15+(3*16)] = 0x3339;
BG_PALETTE_SUB[15+(3*16)] = 0x3339;
// Overwrite 2nd smiley face with filled tile // Overwrite 2nd smiley face with filled tile
dmaFillWords(0xFFFFFFFF, (void*)0x6000040, 8*8); // Top screen dmaFillWords(0xFFFFFFFF, (void*)0x6000040, 8*8); // Top screen
dmaFillWords(0xFFFFFFFF, (void*)0x6200040, 8*8); // Bottom screen dmaFillWords(0xFFFFFFFF, (void*)0x6200040, 8*8); // Bottom screen
@ -248,6 +252,10 @@ int main(int argc, char **argv) {
BG_PALETTE[15+(7*16)] = 0x656A; BG_PALETTE[15+(7*16)] = 0x656A;
BG_PALETTE_SUB[15+(7*16)] = 0x656A; BG_PALETTE_SUB[15+(7*16)] = 0x656A;
// Custom yellow color
BG_PALETTE[15+(3*16)] = 0x3339;
BG_PALETTE_SUB[15+(3*16)] = 0x3339;
// Overwrite 2nd smiley face with filled tile // Overwrite 2nd smiley face with filled tile
dmaFillWords(0xFFFFFFFF, (void*)0x6000040, 8*8); // Top screen dmaFillWords(0xFFFFFFFF, (void*)0x6000040, 8*8); // Top screen
dmaFillWords(0xFFFFFFFF, (void*)0x6200040, 8*8); // Bottom screen dmaFillWords(0xFFFFFFFF, (void*)0x6200040, 8*8); // Bottom screen