Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-04-26 01:59:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Terminate by process ID

Browse Source
This commit is contained in:
J-D-K 2018-12-06 21:52:19 -05:00
parent 581db1ea59
commit cc8f91dee3
5 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/uiupdate.h
View File

@ -13,7 +13,7 @@ namespace ui
//needed here since it uses static menu
void folderMenuPrepare(data::user& usr, data::titledata& dat);
void advCopyMenuPrep();
void advModePrep();
void advModePrep(const std::string& svDev);
}
#endif // USRSEL_H

2
src/ui.cpp
View File

@ -183,7 +183,7 @@ namespace ui
void setupNavButtons()
{
//User Select
int startX = 878;
int startX = 754;
ui::button sel("", startX, 656, 110, 64);
ui::button dmp("", startX += 110, 656, 134, 64);
ui::button cls("", startX += 134, 656, 110, 64);

10
src/ui/advmode.cpp
View File

@ -12,7 +12,7 @@
static ui::menu saveMenu, sdMenu, copyMenu;
//Paths + wrapped string paths
static std::string savePath, sdPath;
static std::string savePath, sdPath, dev;
//Adv Ctrl mode
static int advMenuCtrl, advPrev;
@ -321,13 +321,13 @@ namespace ui
copyMenu.addOpt("Back");
}
void advModePrep()
void advModePrep(const std::string& svDev)
{
saveMenu.setParams(30, 98, 602);
sdMenu.setParams(648, 98, 602);
copyMenu.setParams(472, 278, 304);
savePath = "sv:/";
savePath = svDev, dev = svDev;
sdPath = "sdmc:/";
saveList.reassign(savePath);
@ -372,7 +372,7 @@ namespace ui
case 0:
{
int saveSel = saveMenu.getSelected();
if(saveSel == 1 && savePath != "sv:/")
if(saveSel == 1 && savePath != dev)
{
util::removeLastFolderFromString(savePath);
@ -419,7 +419,7 @@ namespace ui
else if(down & KEY_B)
{
//save
if(advMenuCtrl == 0 && savePath != "sv:/")
if(advMenuCtrl == 0 && savePath != dev)
{
util::removeLastFolderFromString(savePath);

112
src/ui/clsui.cpp
View File

@ -1,6 +1,7 @@
#include <string>
#include <fstream>
#include <vector>
#include <cstdlib>
#include <switch.h>
#include <sys/stat.h>
@ -215,7 +216,7 @@ namespace ui
}
else if(down & KEY_MINUS)
{
advModePrep();
advModePrep("sv:/");
mstate = ADV_MDE;
}
else if(down & KEY_B || fldNav[3].getEvent() == BUTTON_RELEASED)
@ -229,6 +230,7 @@ namespace ui
{
devMenu.reset();
devMenu.setParams(42, 98, 424);
devMenu.addOpt("SD to SD Browser");
devMenu.addOpt("Bis: PRODINFOF");
devMenu.addOpt("Bis: SAFE");
devMenu.addOpt("Bis: SYSTEM");
@ -236,6 +238,8 @@ namespace ui
devMenu.addOpt("NAND Backup (exFat)");
devMenu.addOpt("NAND Backup (FAT32)");
devMenu.addOpt("Remove Downloaded Update");
devMenu.addOpt("Terminate Process ID");
devMenu.addOpt("Mount System Save ID");
}
void updateExMenu(const uint64_t& down, const uint64_t& held, const touchPosition& p)
@ -249,46 +253,54 @@ namespace ui
switch(devMenu.getSelected())
{
case 0:
data::curData.setType(FsSaveDataType_SaveData);
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 28, "");
fsdevMountDevice("sv", sv);
advModePrep();
advModePrep("sdmc:/");
mstate = ADV_MDE;
prevState = EX_MNU;
break;
case 1:
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 29, "");
fsdevMountDevice("sv", sv);
fsOpenBisFileSystem(&sv, 28, "");
fsdevMountDevice("prodInfo-f", sv);
advModePrep();
advModePrep("profInfo-f:/");
mstate = ADV_MDE;
prevState = EX_MNU;
break;
case 2:
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 31, "");
fsdevMountDevice("sv", sv);
fsOpenBisFileSystem(&sv, 29, "");
fsdevMountDevice("safe", sv);
advModePrep();
advModePrep("safe:/");
mstate = ADV_MDE;
prevState = EX_MNU;
break;
case 3:
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 30, "");
fsdevMountDevice("sv", sv);
fsOpenBisFileSystem(&sv, 31, "");
fsdevMountDevice("sys", sv);
advModePrep();
advModePrep("sys:/");
mstate = ADV_MDE;
prevState = EX_MNU;
break;
case 4:
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 30, "");
fsdevMountDevice("user", sv);
advModePrep("user:/");
mstate = ADV_MDE;
prevState = EX_MNU;
break;
case 5:
{
fsdevUnmountDevice("sv");
@ -334,7 +346,7 @@ namespace ui
}
break;
case 5:
case 6:
{
unsigned fcount = 1;
fsdevUnmountDevice("sv");
@ -388,28 +400,60 @@ namespace ui
}
break;
case 6:
{
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 31, "");
fsdevMountDevice("sv", sv);
std::string delPath = "sv:/Contents/placehld/";
fs::dirList plcHld(delPath);
for(unsigned i = 0; i < plcHld.getCount(); i++)
case 7:
{
std::string fullPath = delPath + plcHld.getItem(i);
std::remove(fullPath.c_str());
}
fsdevUnmountDevice("sv");
fsdevUnmountDevice("sv");
fsOpenBisFileSystem(&sv, 31, "");
fsdevMountDevice("sv", sv);
std::string delPath = "sv:/Contents/placehld/";
if(ui::confirm("System needs to be restarted for nag to go away. Reboot now?"))
{
bpcInitialize();
bpcRebootSystem();
fs::dirList plcHld(delPath);
for(unsigned i = 0; i < plcHld.getCount(); i++)
{
std::string fullPath = delPath + plcHld.getItem(i);
std::remove(fullPath.c_str());
}
fsdevUnmountDevice("sv");
if(ui::confirm("System needs to be restarted for nag to go away. Reboot now?"))
{
bpcInitialize();
bpcRebootSystem();
}
}
}
break;
break;
case 8:
{
fsdevUnmountDevice("sv");
ui::keyboard getID;
std::string idStr = getID.getString("0100000000000000");
if(!idStr.empty())
{
uint64_t termID = std::strtoull(idStr.c_str(), NULL, 16);
pmshellInitialize();
if(R_SUCCEEDED(pmshellTerminateProcessByTitleId(termID)))
ui::showMessage("Process " + idStr + " successfully shutdown.");
pmshellExit();
}
}
break;
case 9:
{
fsdevUnmountDevice("sv");
ui::keyboard getID;
std::string idStr = getID.getString("8000000000000000");
uint64_t mountID = std::strtoull(idStr.c_str(), NULL, 16);
if(R_SUCCEEDED(fsMount_SystemSaveData(&sv, mountID)))
{
fsdevMountDevice("sv", sv);
advModePrep("sv:/");
prevState = EX_MNU;
mstate = ADV_MDE;
}
}
break;
}
}
else if(down & KEY_B)

2
src/ui/fldrsel.cpp
View File

@ -129,7 +129,7 @@ namespace ui
}
else if(down & KEY_MINUS)
{
advModePrep();
advModePrep("sv:/");
mstate = ADV_MDE;
}
else if(down & KEY_B || fldNav[3].getEvent() == BUTTON_RELEASED)