Skip to content

Commit

Permalink
Updated C++ files as well
Browse files Browse the repository at this point in the history
  • Loading branch information
@krazynez
krazynez committed Jan 31, 2025
1 parent 2b8896d commit d832613
Show file tree
Hide file tree
Showing 23 changed files with 373 additions and 373 deletions.
4 changes: 2 additions & 2 deletions contrib/PC/tabs2spaces/tabs2spaces.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

if [ "$1" != "" ]; then
find "$1" -iname "*.c" -or -iname "*.h" -exec sed -i "s/\t/ /" {} \;
find "$1" -iname "*.c" -or -iname "*.h" -or -name "*.cpp" -exec sed -i "s/\t/ /" {} \;
else
find . -iname "*.c" -or -iname "*.h" -exec sed -i "s/\t/ /" {} \;
find . -iname "*.c" -or -iname "*.h" -or -name "*.cpp" -exec sed -i "s/\t/ /" {} \;
fi
2 changes: 1 addition & 1 deletion extras/menus/arkMenu/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ int main(int argc, char** argv){
settings_menu->setCallbacks(NULL, loadSettings, cleanupSettings);
settings_menu->setName("CFW Settings");
settings_menu->setInfo("ARK Custom Firmware Settings");
settings_menu->setFooter("[] to Reset Settings");
settings_menu->setFooter("[] to Reset Settings");
settings_menu->readConf();
entries[n_entries++] = settings_menu;

Expand Down
182 changes: 91 additions & 91 deletions extras/menus/arkMenu/src/browser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Browser::Browser(){
else sceIoDclose(ef0);

if (ark_config->exec_mode == PS_VITA)
pEntries[USB_DEV] = NULL;
pEntries[USB_DEV] = NULL;

}

Expand Down Expand Up @@ -164,8 +164,8 @@ void Browser::update(Entry* ent, bool skip_prompt){
this->refreshDirs();
}
else if (Entry::isARK(e->getPath().c_str())) {
installTheme();
}
installTheme();
}
else if (Entry::isVideo(e->getPath().c_str())){
GameManager::updateGameList(NULL);
SystemMgr::pauseDraw();
Expand Down Expand Up @@ -224,7 +224,7 @@ void Browser::update(Entry* ent, bool skip_prompt){
delete aux;
}
else if (e->getFileType() == FILE_PICTURE){
sceKernelDelayThread(100000);
sceKernelDelayThread(100000);
optionsmenu = new ImageViewer(e->getPath());
optionsmenu->control();
ImageViewer* aux = (ImageViewer*)optionsmenu;
Expand Down Expand Up @@ -255,27 +255,27 @@ void Browser::update(Entry* ent, bool skip_prompt){
}

void Browser::installTheme() {
Entry* e = this->get();
t_options_entry options_entries[] = {
{OPTIONS_CANCELLED, "Cancel"},
{0, "Preview"},
{1, "Install"},
};
Entry* e = this->get();
t_options_entry options_entries[] = {
{OPTIONS_CANCELLED, "Cancel"},
{0, "Preview"},
{1, "Install"},
};

// Sanity checks
if(e->getName() != "THEME.ARK" || e->getPath().substr(2) == "0:/PSP/SAVEDATA/ARK_01234/THEME.ARK") return;
// Sanity checks
if(e->getName() != "THEME.ARK" || e->getPath().substr(2) == "0:/PSP/SAVEDATA/ARK_01234/THEME.ARK") return;

optionsmenu = new OptionsMenu("Install Theme", sizeof(options_entries)/sizeof(t_options_entry), options_entries);
int ret = optionsmenu->control();
OptionsMenu* aux = optionsmenu;
optionsmenu = NULL;
delete aux;
optionsmenu = new OptionsMenu("Install Theme", sizeof(options_entries)/sizeof(t_options_entry), options_entries);
int ret = optionsmenu->control();
OptionsMenu* aux = optionsmenu;
optionsmenu = NULL;
delete aux;

if (ret == OPTIONS_CANCELLED) return;
if (ret == OPTIONS_CANCELLED) return;

// load new theme
GameManager::updateGameList(NULL);
SystemMgr::pauseDraw();
SystemMgr::pauseDraw();
printf("deleting current theme resources\n");
common::deleteTheme();
printf("set new theme path to: %s\n", e->getPath().c_str());
Expand All @@ -286,8 +286,8 @@ void Browser::installTheme() {
SystemMgr::resumeDraw();
printf("done\n");

// Ask before overwriting theme
if (ret == 0) {
// Ask before overwriting theme
if (ret == 0) {
t_options_entry options_entries[] = {
{OPTIONS_CANCELLED, "Cancel"},
{0, "Accept Install"},
Expand Down Expand Up @@ -643,7 +643,7 @@ void Browser::drawScreen(){
if (common::getConf()->browser_icon0){
Image* icon = e->getIcon();
if (icon && e->getName().c_str()[0] != '.'){ // Prevent ../ from displaying ICON0
icon->draw(320, 21);
icon->draw(320, 21);
}
}
}
Expand Down Expand Up @@ -776,23 +776,23 @@ Entry* Browser::get(){
}

void Browser::left() {
if (this->entries->size() == 2) return;
if (this->index == 0) return;
if (this->entries->size() == 2) return;
if (this->index == 0) return;

if (common::getConf()->browser_icon0){
SystemMgr::pauseDraw();
this->get()->freeIcon();
SystemMgr::resumeDraw();
}

if (this->index > 0) {
this->index = 1 * (this->index - PAGE_SIZE);
this->start = 1 * (this->start - PAGE_SIZE);
}
if(this->index < 0 || this->start < 0) {
this->index = 0;
this->start = 0;
}
if (this->index > 0) {
this->index = 1 * (this->index - PAGE_SIZE);
this->start = 1 * (this->start - PAGE_SIZE);
}
if(this->index < 0 || this->start < 0) {
this->index = 0;
this->start = 0;
}
this->animating = true;
common::playMenuSound();

Expand All @@ -801,35 +801,35 @@ void Browser::left() {
}

void Browser::right() {
if (this->entries->size() == 2) return;
if (this->entries->size() == 2) return;

if (common::getConf()->browser_icon0){
SystemMgr::pauseDraw();
this->get()->freeIcon();
SystemMgr::resumeDraw();
}

if (this->index + PAGE_SIZE >= entries->size()) {
if (this->index + PAGE_SIZE >= entries->size()) {
this->index = (entries->size()-1)-PAGE_SIZE+1;
this->start = this->start-PAGE_SIZE+1;
if(this->index > this->start+PAGE_SIZE)
this->start = this->start+PAGE_SIZE;
}

//return;
if (this->index == 0) {
this->index = PAGE_SIZE-1;
this->start = PAGE_SIZE-1;
}
else if (this->index < PAGE_SIZE-1){
this->start = this->start-PAGE_SIZE+1;
if(this->index > this->start+PAGE_SIZE)
this->start = this->start+PAGE_SIZE;
}

//return;
if (this->index == 0) {
this->index = PAGE_SIZE-1;
this->start = PAGE_SIZE-1;
}
else if (this->index < PAGE_SIZE-1){
this->index = this->index + PAGE_SIZE-1;
this->start = this->start + PAGE_SIZE-1;
this->start = this->start + PAGE_SIZE-1;
}
else {
this->index = this->index + PAGE_SIZE-1;
this->start = this->start + PAGE_SIZE-1;
}
else {
this->index = this->index + PAGE_SIZE-1;
this->start = this->start + PAGE_SIZE-1;
}


this->animating = true;
common::playMenuSound();

Expand Down Expand Up @@ -1207,9 +1207,9 @@ void Browser::copyFolder(string path){
string destination = checkDestExists(path, this->cwd, f->getName().substr(0, f->getName().length()-1));

if (destination.size() == 0) return; // copy cancelled
if (destination[destination.size() - 1] == '/')
destination.resize(destination.length() - 1);
if (destination[destination.size() - 1] == '/')
destination.resize(destination.length() - 1);

copy_folder_recursive(path.substr(0, path.length()-1).c_str(), destination.c_str());
}
Expand Down Expand Up @@ -1279,7 +1279,7 @@ void Browser::fillClipboard(){
BrowserFile* e = (File*)entries->at(i);
if (e->isSelected()) {
this->clipboard->push_back(e->getPath());
}
}
}
}

Expand Down Expand Up @@ -1461,12 +1461,12 @@ void Browser::createNew(){


void Browser::toggleUSB() {
if (USB::is_enabled) {
USB::disable();
}
else {
USB::enable();
}
if (USB::is_enabled) {
USB::disable();
}
else {
USB::enable();
}
}

void Browser::drawOptionsMenu(){
Expand Down Expand Up @@ -1539,7 +1539,7 @@ void Browser::optionsMenu(){

if (pEntries[USB_DEV]){
static string usb_dev;
usb_dev = "USB - " + TR( (USB::is_enabled)? "Enabled":"Disabled" );
usb_dev = "USB - " + TR( (USB::is_enabled)? "Enabled":"Disabled" );
pEntries[USB_DEV] = (char*)usb_dev.c_str();
}

Expand All @@ -1553,47 +1553,47 @@ void Browser::optionsMenu(){
common::playMenuSound();
do {
if (pEntryIndex < MAX_OPTIONS-1){
if(this->clipboard->size()<1 && pEntryIndex == 2) pEntryIndex += 2;
else pEntryIndex++;
if(this->clipboard->size()<1 && pEntryIndex == 2) pEntryIndex += 2;
else pEntryIndex++;
}
else{
pEntryIndex = 0;
}
} while (pEntries[pEntryIndex] == NULL);
}
// Up
// Up
else if (pad->up()){
common::playMenuSound();
do {
if (pEntryIndex > 0){
if(this->clipboard->size()<1 && pEntryIndex == 4) pEntryIndex -= 2;
else pEntryIndex--;
if(this->clipboard->size()<1 && pEntryIndex == 4) pEntryIndex -= 2;
else pEntryIndex--;
}
else{
pEntryIndex = MAX_OPTIONS-1;
}
} while (pEntries[pEntryIndex] == NULL);
}
// Right
else if (pad->right()) {
common::playMenuSound();
do {
if(pEntryIndex >= (int)((MAX_OPTIONS-1)/2))
pEntryIndex = MAX_OPTIONS-1;
else if(pEntryIndex <= 0)
pEntryIndex = (int)((MAX_OPTIONS-1)/2);
} while (pEntries[pEntryIndex] == NULL);
}
// Left
else if (pad->left()) {
common::playMenuSound();
do {
if(pEntryIndex <= (int)((MAX_OPTIONS-1)/2))
pEntryIndex = 0;
else if(pEntryIndex <= MAX_OPTIONS-1)
pEntryIndex = (int)((MAX_OPTIONS-1)/2);
} while (pEntries[pEntryIndex] == NULL);
}
// Right
else if (pad->right()) {
common::playMenuSound();
do {
if(pEntryIndex >= (int)((MAX_OPTIONS-1)/2))
pEntryIndex = MAX_OPTIONS-1;
else if(pEntryIndex <= 0)
pEntryIndex = (int)((MAX_OPTIONS-1)/2);
} while (pEntries[pEntryIndex] == NULL);
}
// Left
else if (pad->left()) {
common::playMenuSound();
do {
if(pEntryIndex <= (int)((MAX_OPTIONS-1)/2))
pEntryIndex = 0;
else if(pEntryIndex <= MAX_OPTIONS-1)
pEntryIndex = (int)((MAX_OPTIONS-1)/2);
} while (pEntries[pEntryIndex] == NULL);
}
else if (pad->decline() || pad->LT()){
pEntryIndex = 0;
break;
Expand Down Expand Up @@ -1643,10 +1643,10 @@ void Browser::control(Controller* pad){
this->up();
else if (pad->down())
this->down();
else if (pad->right())
this->right();
else if (pad->left())
this->left();
else if (pad->right())
this->right();
else if (pad->left())
this->left();
else if (pad->accept())
this->update(this->get(), common::getConf()->fast_gameboot);
else if (pad->decline()){
Expand Down
2 changes: 1 addition & 1 deletion extras/menus/arkMenu/src/browser_entries.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void BrowserFile::changeSelection(){
}

string BrowserFile::getPath(){
return path;
return path;
//return (shortname.size() > 0) ? parent+shortname : path + '/';
}

Expand Down
26 changes: 13 additions & 13 deletions extras/menus/arkMenu/src/common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,9 @@ void common::stopLoadingThread(){
}

void common::loadTheme(){
SceIoStat stat;
string path = string(ark_config.arkpath) + "BG.PNG";
images[IMAGE_BG] = (sceIoGetstat(path.c_str(), &stat) >= 0) ? new Image(path.c_str()) : new Image(theme_path, RESOURCES_LOAD_PLACE, findPkgOffset("DEFBG.PNG"));
SceIoStat stat;
string path = string(ark_config.arkpath) + "BG.PNG";
images[IMAGE_BG] = (sceIoGetstat(path.c_str(), &stat) >= 0) ? new Image(path.c_str()) : new Image(theme_path, RESOURCES_LOAD_PLACE, findPkgOffset("DEFBG.PNG"));
images[IMAGE_WAITICON] = new Image(theme_path, RESOURCES_LOAD_PLACE, findPkgOffset("WAIT.PNG"));

images[0]->swizzle();
Expand Down Expand Up @@ -654,17 +654,17 @@ void common::printText(float x, float y, const char* text, u32 color, float size
u32 arg5 = INTRAFONT_WIDTH_VAR;

if (glow && config.text_glow){
int val = 0;
int val = 0;
float t = (float)((float)(clock() % CLOCKS_PER_SEC)) / ((float)CLOCKS_PER_SEC);
if(config.text_glow == 1) {
val = (t < 0.5f) ? t*311 : (1.0f-t)*311;
}
else if(config.text_glow == 2) {
val = (t < 0.5f) ? t*411 : (1.0f-t)*411;
}
else {
val = (t < 0.5f) ? t*511 : (1.0f-t)*511;
}
if(config.text_glow == 1) {
val = (t < 0.5f) ? t*311 : (1.0f-t)*311;
}
else if(config.text_glow == 2) {
val = (t < 0.5f) ? t*411 : (1.0f-t)*411;
}
else {
val = (t < 0.5f) ? t*511 : (1.0f-t)*511;
}
secondColor = (0xFF<<24)+(val<<16)+(val<<8)+(val);
}
if (scroll){
Expand Down
2 changes: 1 addition & 1 deletion extras/menus/arkMenu/src/controller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ bool Controller::volume(){
}

bool Controller::mute(){
return (newpad & PSP_CTRL_NOTE);
return (newpad & PSP_CTRL_NOTE);
}

Loading

0 comments on commit d832613

Please sign in to comment.