mirror of
https://github.com/wiiu-env/sdcafiine_plugin.git
synced 2024-11-21 19:09:16 +01:00
Fix blackscreen when opening applications while sdcafiine is enabled
This commit is contained in:
Maschell
parent
f9def12be5
commit
9fb13e19c8
@ -19,7 +19,54 @@
|
||||
|
||||
#define TEXT_SEL(x, text1, text2) ((x) ? (text1) : (text2))
|
||||
|
||||
uint8_t *screenBuffer = nullptr;
|
||||
|
||||
bool ScreenInit() {
|
||||
if (screenBuffer != nullptr) {
|
||||
// allocated
|
||||
return true;
|
||||
}
|
||||
// Init screen and screen buffers
|
||||
OSScreenInit();
|
||||
uint32_t screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV);
|
||||
uint32_t screen_buf1_size = OSScreenGetBufferSizeEx(SCREEN_DRC);
|
||||
screenBuffer = (uint8_t *) MEMAllocFromMappedMemoryForGX2Ex(screen_buf0_size + screen_buf1_size, 0x100);
|
||||
if (screenBuffer == nullptr) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to alloc screenBuffer");
|
||||
OSFatal("SDCafiine plugin: Failed to alloc screenBuffer.");
|
||||
return false;
|
||||
}
|
||||
OSScreenSetBufferEx(SCREEN_TV, (void *) screenBuffer);
|
||||
OSScreenSetBufferEx(SCREEN_DRC, (void *) (screenBuffer + screen_buf0_size));
|
||||
|
||||
OSScreenEnableEx(SCREEN_TV, 1);
|
||||
OSScreenEnableEx(SCREEN_DRC, 1);
|
||||
|
||||
// Clear screens
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ScreenDeInit() {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
if (screenBuffer != nullptr) {
|
||||
MEMFreeToMappedMemory(screenBuffer);
|
||||
screenBuffer = nullptr;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandleMultiModPacks(uint64_t titleID) {
|
||||
screenBuffer = nullptr;
|
||||
char TitleIDString[17];
|
||||
snprintf(TitleIDString, 17, "%016llX", titleID);
|
||||
|
||||
@ -45,37 +92,15 @@ void HandleMultiModPacks(uint64_t titleID) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Found %s %s", packageName.c_str(), modTitlePath[packageName].c_str());
|
||||
}
|
||||
|
||||
int selected = 0;
|
||||
int initScreen = 1;
|
||||
int x_offset = -2;
|
||||
|
||||
// Init screen and screen buffers
|
||||
OSScreenInit();
|
||||
uint32_t screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV);
|
||||
uint32_t screen_buf1_size = OSScreenGetBufferSizeEx(SCREEN_DRC);
|
||||
auto *screenBuffer = (uint8_t *) MEMAllocFromMappedMemoryForGX2Ex(screen_buf0_size + screen_buf1_size, 0x100);
|
||||
if (screenBuffer == nullptr) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to alloc screenBuffer");
|
||||
OSFatal("SDCafiine plugin: Failed to alloc screenBuffer.");
|
||||
return;
|
||||
}
|
||||
OSScreenSetBufferEx(SCREEN_TV, (void *) screenBuffer);
|
||||
OSScreenSetBufferEx(SCREEN_DRC, (void *) (screenBuffer + screen_buf0_size));
|
||||
|
||||
OSScreenEnableEx(SCREEN_TV, 1);
|
||||
OSScreenEnableEx(SCREEN_DRC, 1);
|
||||
|
||||
// Clear screens
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
if (modTitlePath.empty()) {
|
||||
DIR *dir = opendir(modTitleIDPathOld.c_str());
|
||||
if (dir) {
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
if (!ScreenInit()) {
|
||||
OSFatal("Please migrate sd:/sdcafiine to sd:/wiiu/sdcafiine.");
|
||||
}
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
console_print_pos(-2, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(-2, 2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||
console_print_pos(-2, 3, "!!! OLD DIRECTORY STRUCTURE DETECTED. !!!");
|
||||
console_print_pos(-2, 4, "!!! Please migrate sd:/sdcafiine to sd:/wiiu/sdcafiine. !!!");
|
||||
@ -87,183 +112,186 @@ void HandleMultiModPacks(uint64_t titleID) {
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
OSSleepTicks(OSMillisecondsToTicks(10000));
|
||||
ScreenDeInit();
|
||||
}
|
||||
} else if (modTitlePath.size() == 1 && gSkipPrepareIfSingleModpack) {
|
||||
return;
|
||||
} else if (modTitlePath.size() == 1 && gAutoApplySingleModpack && gSkipPrepareIfSingleModpack) {
|
||||
ReplaceContent(modTitlePath.begin()->second, modTitlePath.begin()->first);
|
||||
return;
|
||||
}
|
||||
|
||||
} else {
|
||||
int selected = 0;
|
||||
int initScreen = 1;
|
||||
int x_offset = -2;
|
||||
|
||||
uint32_t buttonsTriggered;
|
||||
uint32_t buttonsTriggered;
|
||||
|
||||
VPADStatus vpad_data{};
|
||||
VPADReadError vpad_error;
|
||||
KPADStatus kpad_data{};
|
||||
KPADError kpad_error;
|
||||
VPADStatus vpad_data{};
|
||||
VPADReadError vpad_error;
|
||||
KPADStatus kpad_data{};
|
||||
KPADError kpad_error;
|
||||
|
||||
bool displayAutoSkipOption = modTitlePath.size() == 1;
|
||||
bool displayAutoSkipOption = modTitlePath.size() == 1;
|
||||
|
||||
int wantToExit = 0;
|
||||
int page = 0;
|
||||
int per_page = displayAutoSkipOption ? 11 : 12;
|
||||
int max_pages = (modTitlePath.size() / per_page) + (modTitlePath.size() % per_page != 0 ? 1 : 0);
|
||||
int wantToExit = 0;
|
||||
int page = 0;
|
||||
int per_page = displayAutoSkipOption ? 11 : 12;
|
||||
int max_pages = (modTitlePath.size() / per_page) + (modTitlePath.size() % per_page != 0 ? 1 : 0);
|
||||
|
||||
int curState = 0;
|
||||
if (gAutoApplySingleModpack && modTitlePath.size() == 1) {
|
||||
curState = 1;
|
||||
int curState = 0;
|
||||
if (gAutoApplySingleModpack && modTitlePath.size() == 1) {
|
||||
curState = 1;
|
||||
}
|
||||
|
||||
int durationInFrames = 60;
|
||||
int frameCounter = 0;
|
||||
KPADInit();
|
||||
WPADEnableURCC(true);
|
||||
|
||||
if (!ScreenInit()) {
|
||||
return;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
buttonsTriggered = 0;
|
||||
|
||||
VPADRead(VPAD_CHAN_0, &vpad_data, 1, &vpad_error);
|
||||
if (vpad_error == VPAD_READ_SUCCESS) {
|
||||
buttonsTriggered = vpad_data.trigger;
|
||||
}
|
||||
|
||||
int durationInFrames = 60;
|
||||
int frameCounter = 0;
|
||||
KPADInit();
|
||||
WPADEnableURCC(true);
|
||||
|
||||
while (true) {
|
||||
buttonsTriggered = 0;
|
||||
|
||||
VPADRead(VPAD_CHAN_0, &vpad_data, 1, &vpad_error);
|
||||
if (vpad_error == VPAD_READ_SUCCESS) {
|
||||
buttonsTriggered = vpad_data.trigger;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
memset(&kpad_data, 0, sizeof(kpad_data));
|
||||
if (KPADReadEx((KPADChan) i, &kpad_data, 1, &kpad_error) > 0) {
|
||||
if (kpad_error == KPAD_ERROR_OK && kpad_data.extensionType != 0xFF) {
|
||||
if (kpad_data.extensionType == WPAD_EXT_CORE || kpad_data.extensionType == WPAD_EXT_NUNCHUK) {
|
||||
buttonsTriggered |= remapWiiMoteButtons(kpad_data.trigger);
|
||||
} else {
|
||||
buttonsTriggered |= remapClassicButtons(kpad_data.classic.trigger);
|
||||
}
|
||||
for (int i = 0; i < 4; i++) {
|
||||
memset(&kpad_data, 0, sizeof(kpad_data));
|
||||
if (KPADReadEx((KPADChan) i, &kpad_data, 1, &kpad_error) > 0) {
|
||||
if (kpad_error == KPAD_ERROR_OK && kpad_data.extensionType != 0xFF) {
|
||||
if (kpad_data.extensionType == WPAD_EXT_CORE || kpad_data.extensionType == WPAD_EXT_NUNCHUK) {
|
||||
buttonsTriggered |= remapWiiMoteButtons(kpad_data.trigger);
|
||||
} else {
|
||||
buttonsTriggered |= remapClassicButtons(kpad_data.classic.trigger);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (curState == 1) {
|
||||
if (buttonsTriggered & VPAD_BUTTON_MINUS) {
|
||||
curState = 0;
|
||||
continue;
|
||||
}
|
||||
if (curState == 1) {
|
||||
if (buttonsTriggered & VPAD_BUTTON_MINUS) {
|
||||
curState = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (initScreen) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Preparing modpack \"%s\"...", modTitlePath.begin()->first.c_str());
|
||||
console_print_pos(x_offset, 3, "Press MINUS to open menu");
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
}
|
||||
if (initScreen) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Preparing modpack \"%s\"...", modTitlePath.begin()->first.c_str());
|
||||
console_print_pos(x_offset, 3, "Press MINUS to open menu");
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
}
|
||||
|
||||
if (frameCounter >= durationInFrames) {
|
||||
ReplaceContent(modTitlePath.begin()->second, modTitlePath.begin()->first);
|
||||
break;
|
||||
}
|
||||
if (frameCounter >= durationInFrames) {
|
||||
ReplaceContent(modTitlePath.begin()->second, modTitlePath.begin()->first);
|
||||
break;
|
||||
}
|
||||
|
||||
frameCounter++;
|
||||
} else {
|
||||
if (buttonsTriggered & VPAD_BUTTON_A) {
|
||||
wantToExit = 1;
|
||||
initScreen = 1;
|
||||
} else if (modTitlePath.size() == 1 && (buttonsTriggered & VPAD_BUTTON_MINUS)) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
frameCounter++;
|
||||
} else {
|
||||
if (buttonsTriggered & VPAD_BUTTON_A) {
|
||||
wantToExit = 1;
|
||||
initScreen = 1;
|
||||
} else if (modTitlePath.size() == 1 && (buttonsTriggered & VPAD_BUTTON_MINUS)) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Save settings...");
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Save settings...");
|
||||
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
// We open the storage, so we can persist the configuration the user did.
|
||||
if (WUPS_OpenStorage() == WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
gAutoApplySingleModpack = !gAutoApplySingleModpack;
|
||||
// If the value has changed, we store it in the storage.
|
||||
if (WUPS_StoreInt(nullptr, AUTO_APPLY_SINGLE_MODPACK_STRING, gAutoApplySingleModpack) != WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
}
|
||||
if (WUPS_CloseStorage() != WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to close storage");
|
||||
}
|
||||
// We open the storage, so we can persist the configuration the user did.
|
||||
if (WUPS_OpenStorage() == WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
gAutoApplySingleModpack = !gAutoApplySingleModpack;
|
||||
// If the value has changed, we store it in the storage.
|
||||
if (WUPS_StoreInt(nullptr, AUTO_APPLY_SINGLE_MODPACK_STRING, gAutoApplySingleModpack) != WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
}
|
||||
if (WUPS_CloseStorage() != WUPS_STORAGE_ERROR_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to close storage");
|
||||
}
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_B) {
|
||||
break;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_DOWN) {
|
||||
selected++;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_UP) {
|
||||
selected--;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_L) {
|
||||
selected -= per_page;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_R) {
|
||||
selected += per_page;
|
||||
initScreen = 1;
|
||||
}
|
||||
if (selected < 0) { selected = 0; }
|
||||
if (selected >= modTitlePath.size()) { selected = modTitlePath.size() - 1; }
|
||||
page = selected / per_page;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_B) {
|
||||
break;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_DOWN) {
|
||||
selected++;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_UP) {
|
||||
selected--;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_L) {
|
||||
selected -= per_page;
|
||||
initScreen = 1;
|
||||
} else if (buttonsTriggered & VPAD_BUTTON_R) {
|
||||
selected += per_page;
|
||||
initScreen = 1;
|
||||
}
|
||||
if (selected < 0) { selected = 0; }
|
||||
if (selected >= modTitlePath.size()) { selected = modTitlePath.size() - 1; }
|
||||
page = selected / per_page;
|
||||
|
||||
if (initScreen) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Press A to launch a modpack");
|
||||
console_print_pos(x_offset, 2, "Press B to launch without a modpack");
|
||||
if (modTitlePath.size() == 1) {
|
||||
if (gAutoApplySingleModpack) {
|
||||
console_print_pos(x_offset, 4, "Press MINUS to disable autostart for a single modpack");
|
||||
} else {
|
||||
console_print_pos(x_offset, 4, "Press MINUS to enable autostart for a single modpack");
|
||||
}
|
||||
if (initScreen) {
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
console_print_pos(x_offset, -1, "SDCafiine plugin " VERSION_FULL);
|
||||
console_print_pos(x_offset, 1, "Press A to launch a modpack");
|
||||
console_print_pos(x_offset, 2, "Press B to launch without a modpack");
|
||||
if (modTitlePath.size() == 1) {
|
||||
if (gAutoApplySingleModpack) {
|
||||
console_print_pos(x_offset, 4, "Press MINUS to disable autostart for a single modpack");
|
||||
} else {
|
||||
console_print_pos(x_offset, 4, "Press MINUS to enable autostart for a single modpack");
|
||||
}
|
||||
int y_offset = displayAutoSkipOption ? 6 : 4;
|
||||
int cur_ = 0;
|
||||
}
|
||||
int y_offset = displayAutoSkipOption ? 6 : 4;
|
||||
int cur_ = 0;
|
||||
|
||||
for (auto &it : modTitlePath) {
|
||||
std::string key = it.first;
|
||||
std::string value = it.second;
|
||||
for (auto &it : modTitlePath) {
|
||||
std::string key = it.first;
|
||||
std::string value = it.second;
|
||||
|
||||
if (wantToExit && cur_ == selected) {
|
||||
ReplaceContent(value, key);
|
||||
break;
|
||||
}
|
||||
|
||||
if (cur_ >= (page * per_page) && cur_ < ((page + 1) * per_page)) {
|
||||
console_print_pos(x_offset, y_offset++, "%s %s", TEXT_SEL((selected == cur_), "--->", " "), key.c_str());
|
||||
}
|
||||
cur_++;
|
||||
}
|
||||
|
||||
if (wantToExit) { //just in case.
|
||||
if (wantToExit && cur_ == selected) {
|
||||
ReplaceContent(value, key);
|
||||
break;
|
||||
}
|
||||
|
||||
if (max_pages > 0) {
|
||||
console_print_pos(x_offset, 17, "Page %02d/%02d. Press L/R to change page.", page + 1, max_pages);
|
||||
if (cur_ >= (page * per_page) && cur_ < ((page + 1) * per_page)) {
|
||||
console_print_pos(x_offset, y_offset++, "%s %s", TEXT_SEL((selected == cur_), "--->", " "), key.c_str());
|
||||
}
|
||||
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
initScreen = 0;
|
||||
cur_++;
|
||||
}
|
||||
|
||||
if (wantToExit) { //just in case.
|
||||
break;
|
||||
}
|
||||
|
||||
if (max_pages > 0) {
|
||||
console_print_pos(x_offset, 17, "Page %02d/%02d. Press L/R to change page.", page + 1, max_pages);
|
||||
}
|
||||
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
initScreen = 0;
|
||||
}
|
||||
}
|
||||
|
||||
KPADShutdown();
|
||||
}
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
OSScreenClearBufferEx(SCREEN_DRC, 0);
|
||||
|
||||
// Flip buffers
|
||||
OSScreenFlipBuffersEx(SCREEN_TV);
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
ScreenDeInit();
|
||||
|
||||
MEMFreeToMappedMemory(screenBuffer);
|
||||
KPADShutdown();
|
||||
}
|
||||
extern CRLayerHandle contentLayerHandle;
|
||||
extern CRLayerHandle aocLayerHandle;
|
||||
@ -275,6 +303,11 @@ bool ReplaceContent(const std::string &basePath, const std::string &modpack) {
|
||||
bool aocRes = ReplaceContentInternal(basePath, "aoc", &aocLayerHandle);
|
||||
|
||||
if (!contentRes && !aocRes) {
|
||||
auto screenWasAllocated = screenBuffer != nullptr;
|
||||
|
||||
if (!ScreenInit()) {
|
||||
OSFatal("Failed to apply the modpack.");
|
||||
}
|
||||
uint32_t sleepTime = 3000;
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to apply the modpack. Starting without mods.");
|
||||
OSScreenClearBufferEx(SCREEN_TV, 0);
|
||||
@ -321,6 +354,9 @@ bool ReplaceContent(const std::string &basePath, const std::string &modpack) {
|
||||
OSScreenFlipBuffersEx(SCREEN_DRC);
|
||||
|
||||
OSSleepTicks(OSMillisecondsToTicks(sleepTime));
|
||||
if (!screenWasAllocated) {
|
||||
ScreenDeInit();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user