-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement NP Signin Dialog (faked signin)
- Loading branch information
Showing
11 changed files
with
481 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,349 @@ | ||
// Copyright (c) 2012- PPSSPP Project. | ||
|
||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, version 2.0 or later versions. | ||
|
||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License 2.0 for more details. | ||
|
||
// A copy of the GPL 2.0 should have been included with the program. | ||
// If not, see http://www.gnu.org/licenses/ | ||
|
||
// Official git repository and contact information can be found at | ||
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. | ||
|
||
#if defined(_WIN32) | ||
#include "Common/CommonWindows.h" | ||
#endif | ||
#include <TimeUtil.h> | ||
#include "Common/Data/Text/I18n.h" | ||
#include "Common/Serialize/Serializer.h" | ||
#include "Common/Serialize/SerializeFuncs.h" | ||
#include "Core/Config.h" | ||
#include "Core/MemMapHelpers.h" | ||
#include "Core/Util/PPGeDraw.h" | ||
#include "Core/HLE/sceKernelMemory.h" | ||
#include "Core/HLE/sceCtrl.h" | ||
#include "Core/HLE/sceUtility.h" | ||
#include "Core/HLE/sceNet.h" | ||
#include "Core/HLE/sceNetAdhoc.h" | ||
#include "Core/HLE/sceNp.h" | ||
#include "Core/Dialog/PSPNpSigninDialog.h" | ||
#include "Common/Data/Encoding/Utf8.h" | ||
#include "Core/Reporting.h" | ||
|
||
|
||
static const float FONT_SCALE = 0.65f; | ||
|
||
// Needs testing. | ||
const static int NP_INIT_DELAY_US = 200000; | ||
const static int NP_SHUTDOWN_DELAY_US = 501000; | ||
const static int NP_RUNNING_DELAY_US = 1000000; // faked delay to simulate signin process to give chance for players to read the text on the dialog | ||
|
||
PSPNpSigninDialog::PSPNpSigninDialog(UtilityDialogType type) : PSPDialog(type) { | ||
} | ||
|
||
PSPNpSigninDialog::~PSPNpSigninDialog() { | ||
} | ||
|
||
int PSPNpSigninDialog::Init(u32 paramAddr) { | ||
// Already running | ||
if (ReadStatus() != SCE_UTILITY_STATUS_NONE) | ||
return SCE_ERROR_UTILITY_INVALID_STATUS; | ||
|
||
requestAddr = paramAddr; | ||
int size = Memory::Read_U32(paramAddr); | ||
memset(&request, 0, sizeof(request)); | ||
// Only copy the right size to support different request format | ||
Memory::Memcpy(&request, paramAddr, size); | ||
|
||
WARN_LOG_REPORT_ONCE(PSPNpSigninDialogInit, SCENET, "NpSignin Init Params: %08x, %08x, %08x, %08x", request.npSigninStatus, request.unknown1, request.unknown2, request.unknown3); | ||
|
||
ChangeStatusInit(NP_INIT_DELAY_US); | ||
|
||
// Eat any keys pressed before the dialog inited. | ||
UpdateButtons(); | ||
okButtonImg = ImageID("I_CIRCLE"); | ||
cancelButtonImg = ImageID("I_CROSS"); | ||
okButtonFlag = CTRL_CIRCLE; | ||
cancelButtonFlag = CTRL_CROSS; | ||
if (request.common.buttonSwap == 1) | ||
{ | ||
okButtonImg = ImageID("I_CROSS"); | ||
cancelButtonImg = ImageID("I_CIRCLE"); | ||
okButtonFlag = CTRL_CROSS; | ||
cancelButtonFlag = CTRL_CIRCLE; | ||
} | ||
|
||
//npSigninResult = -1; | ||
startTime = (u64)(time_now_d() * 1000000.0); | ||
step = 0; | ||
|
||
StartFade(true); | ||
return 0; | ||
} | ||
|
||
void PSPNpSigninDialog::DrawBanner() { | ||
|
||
PPGeDrawRect(0, 0, 480, 22, CalcFadedColor(0x65636358)); | ||
|
||
PPGeStyle textStyle = FadedStyle(PPGeAlign::BOX_VCENTER, 0.6f); | ||
textStyle.hasShadow = false; | ||
|
||
// TODO: Draw a hexagon icon | ||
PPGeDrawImage(10, 5, 11.0f, 10.0f, 1, 10, 1, 10, 10, 10, FadedImageStyle()); | ||
auto di = GetI18NCategory("Dialog"); | ||
PPGeDrawText(di->T("Sign In"), 31, 10, textStyle); | ||
} | ||
|
||
void PSPNpSigninDialog::DrawIndicator() { | ||
// TODO: Draw animated circle as processing indicator | ||
PPGeDrawImage(456, 248, 20.0f, 20.0f, 1, 10, 1, 10, 10, 10, FadedImageStyle()); | ||
} | ||
|
||
void PSPNpSigninDialog::DrawLogo() { | ||
// TODO: Draw OpenDNAS logo | ||
PPGeDrawImage(416, 22, 64.0f, 64.0f, 1, 10, 1, 10, 64, 64, FadedImageStyle()); | ||
} | ||
|
||
void PSPNpSigninDialog::DisplayMessage(std::string text1, std::string text2a, std::string text2b, std::string text3a, std::string text3b, bool hasYesNo, bool hasOK) { | ||
auto di = GetI18NCategory("Dialog"); | ||
|
||
PPGeStyle buttonStyle = FadedStyle(PPGeAlign::BOX_CENTER, FONT_SCALE); | ||
PPGeStyle messageStyle = FadedStyle(PPGeAlign::BOX_HCENTER, FONT_SCALE); | ||
PPGeStyle messageStyleRight = FadedStyle(PPGeAlign::BOX_RIGHT, FONT_SCALE); | ||
PPGeStyle messageStyleLeft = FadedStyle(PPGeAlign::BOX_LEFT, FONT_SCALE); | ||
|
||
std::string text2 = text2a + " " + text2b; | ||
std::string text3 = text3a + " " + text3b; | ||
|
||
// Without the scrollbar, we have 350 total pixels. | ||
float WRAP_WIDTH = 300.0f; | ||
if (UTF8StringNonASCIICount(text1.c_str()) >= (int)text1.size() / 4) { | ||
WRAP_WIDTH = 336.0f; | ||
if (text1.size() > 12) { | ||
messageStyle.scale = 0.6f; | ||
} | ||
} | ||
|
||
float totalHeight1 = 0.0f; | ||
PPGeMeasureText(nullptr, &totalHeight1, text1.c_str(), FONT_SCALE, PPGE_LINE_WRAP_WORD, WRAP_WIDTH); | ||
float totalHeight2 = 0.0f; | ||
if (text2 != " ") | ||
PPGeMeasureText(nullptr, &totalHeight2, text2.c_str(), FONT_SCALE, PPGE_LINE_USE_ELLIPSIS, WRAP_WIDTH); | ||
float totalHeight3 = 0.0f; | ||
if (text3 != " ") | ||
PPGeMeasureText(nullptr, &totalHeight3, text3.c_str(), FONT_SCALE, PPGE_LINE_USE_ELLIPSIS, WRAP_WIDTH); | ||
float marginTop = 0.0f; | ||
if (text2 != " " || text3 != " ") | ||
marginTop = 11.0f; | ||
float totalHeight = totalHeight1 + totalHeight2 + totalHeight3 + marginTop; | ||
// The PSP normally only shows about 8 lines at a time. | ||
// For improved UX, we intentionally show part of the next line. | ||
float visibleHeight = std::min(totalHeight, 175.0f); | ||
float h2 = visibleHeight / 2.0f; | ||
|
||
float centerY = 135.0f; | ||
float sy = centerY - h2 - 15.0f; | ||
float ey = centerY + h2 + 20.0f; | ||
float buttonY = centerY + h2 + 5.0f; | ||
|
||
auto drawSelectionBoxAndAdjust = [&](float x) { | ||
// Box has a fixed size. | ||
float w = 15.0f; | ||
float h = 8.0f; | ||
PPGeDrawRect(x - w, buttonY - h, x + w, buttonY + h, CalcFadedColor(0x6DCFCFCF)); | ||
|
||
centerY -= h + 5.0f; | ||
sy -= h + 5.0f; | ||
ey = buttonY + h * 2.0f + 5.0f; | ||
}; | ||
|
||
if (hasYesNo) { | ||
if (yesnoChoice == 1) { | ||
drawSelectionBoxAndAdjust(204.0f); | ||
} | ||
else { | ||
drawSelectionBoxAndAdjust(273.0f); | ||
} | ||
|
||
PPGeDrawText(di->T("Yes"), 203.0f, buttonY - 1.0f, buttonStyle); | ||
PPGeDrawText(di->T("No"), 272.0f, buttonY - 1.0f, buttonStyle); | ||
if (IsButtonPressed(CTRL_LEFT) && yesnoChoice == 0) { | ||
yesnoChoice = 1; | ||
} | ||
else if (IsButtonPressed(CTRL_RIGHT) && yesnoChoice == 1) { | ||
yesnoChoice = 0; | ||
} | ||
buttonY += 8.0f + 5.0f; | ||
} | ||
|
||
if (hasOK) { | ||
drawSelectionBoxAndAdjust(240.0f); | ||
|
||
PPGeDrawText(di->T("OK"), 239.0f, buttonY - 1.0f, buttonStyle); | ||
buttonY += 8.0f + 5.0f; | ||
} | ||
|
||
PPGeScissor(0, (int)(centerY - h2 - 2), 480, (int)(centerY + h2 + 2)); | ||
PPGeDrawTextWrapped(text1.c_str(), 240.0f, centerY - h2 - scrollPos_, WRAP_WIDTH, 0, messageStyle); | ||
if (text2a != "") { | ||
if (text2b != "") | ||
PPGeDrawTextWrapped(text2a.c_str(), 240.0f - 5.0f, centerY - h2 - scrollPos_ + totalHeight1 + marginTop, WRAP_WIDTH, 0, messageStyleRight); | ||
else | ||
PPGeDrawTextWrapped(text2a.c_str(), 240.0f, centerY - h2 - scrollPos_ + totalHeight1 + marginTop, WRAP_WIDTH, 0, messageStyle); | ||
} | ||
if (text2b != "") | ||
PPGeDrawTextWrapped(text2b.c_str(), 240.0f + 5.0f, centerY - h2 - scrollPos_ + totalHeight1 + marginTop, WRAP_WIDTH, 0, messageStyleLeft); | ||
if (text3a != "") { | ||
if (text3b != "") | ||
PPGeDrawTextWrapped(text3a.c_str(), 240.0f - 5.0f, centerY - h2 - scrollPos_ + totalHeight1 + totalHeight2 + marginTop, WRAP_WIDTH, 0, messageStyleRight); | ||
else | ||
PPGeDrawTextWrapped(text3a.c_str(), 240.0f, centerY - h2 - scrollPos_ + totalHeight1 + totalHeight2 + marginTop, WRAP_WIDTH, 0, messageStyle); | ||
} | ||
if (text3b != "") | ||
PPGeDrawTextWrapped(text3b.c_str(), 240.0f + 5.0f, centerY - h2 - scrollPos_ + totalHeight1 + totalHeight2 + marginTop, WRAP_WIDTH, 0, messageStyleLeft); | ||
PPGeScissorReset(); | ||
|
||
// Do we need a scrollbar? | ||
if (visibleHeight < totalHeight) { | ||
float scrollSpeed = 5.0f; | ||
float scrollMax = totalHeight - visibleHeight; | ||
|
||
float bobHeight = (visibleHeight / totalHeight) * visibleHeight; | ||
float bobOffset = (scrollPos_ / scrollMax) * (visibleHeight - bobHeight); | ||
float bobY1 = centerY - h2 + bobOffset; | ||
PPGeDrawRect(415.0f, bobY1, 420.0f, bobY1 + bobHeight, CalcFadedColor(0xFFCCCCCC)); | ||
|
||
auto buttonDown = [this](int btn, int& held) { | ||
if (IsButtonPressed(btn)) { | ||
held = 0; | ||
return true; | ||
} | ||
return IsButtonHeld(btn, held, 1, 1); | ||
}; | ||
if (buttonDown(CTRL_DOWN, framesDownHeld_) && scrollPos_ < scrollMax) { | ||
scrollPos_ = std::min(scrollMax, scrollPos_ + scrollSpeed); | ||
} | ||
if (buttonDown(CTRL_UP, framesUpHeld_) && scrollPos_ > 0.0f) { | ||
scrollPos_ = std::max(0.0f, scrollPos_ - scrollSpeed); | ||
} | ||
} | ||
|
||
PPGeDrawRect(60.0f, sy, 420.0f, sy + 1.0f, CalcFadedColor(0xFFFFFFFF)); | ||
PPGeDrawRect(60.0f, ey, 420.0f, ey + 1.0f, CalcFadedColor(0xFFFFFFFF)); | ||
} | ||
|
||
int PSPNpSigninDialog::Update(int animSpeed) { | ||
if (ReadStatus() != SCE_UTILITY_STATUS_RUNNING) { | ||
return SCE_ERROR_UTILITY_INVALID_STATUS; | ||
} | ||
|
||
UpdateButtons(); | ||
auto di = GetI18NCategory("Dialog"); | ||
auto err = GetI18NCategory("Error"); | ||
u64 now = (u64)(time_now_d() * 1000000.0); | ||
|
||
if (request.npSigninStatus == NP_SIGNIN_STATUS_NONE) { | ||
UpdateFade(animSpeed); | ||
StartDraw(); | ||
|
||
PPGeDrawRect(0, 0, 480, 272, CalcFadedColor(0xC0C8B2AC)); | ||
DrawBanner(); | ||
DrawIndicator(); | ||
|
||
// TODO: Not sure what should happen here.. may be something like this https://pastebin.com/1eW48zBb ? but we can do test on Open DNAS Server later https://dnas.hashsploit.net/us-gw/ | ||
// DNAS dialog | ||
if (step >= 2 && now - startTime > NP_RUNNING_DELAY_US) { | ||
DrawLogo(); | ||
DisplayMessage(di->T("PleaseWait", "Please wait...")); | ||
step++; | ||
} | ||
// Signin dialog | ||
else { | ||
// Skipping the Select Connection screen since we only have 1 fake profile | ||
DisplayMessage(di->T("SigninPleaseWait", "Signing in...\nPlease wait.")); | ||
} | ||
DisplayButtons(DS_BUTTON_CANCEL, di->T("Cancel")); | ||
|
||
if (step >= 2 && now - startTime > NP_RUNNING_DELAY_US*2) { | ||
if (pendingStatus != SCE_UTILITY_STATUS_FINISHED) { | ||
StartFade(false); | ||
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, NP_SHUTDOWN_DELAY_US); | ||
step++; | ||
} | ||
} | ||
|
||
else if (step == 1 && now - startTime > NP_RUNNING_DELAY_US) { | ||
// Switch to the next message (with DNAS logo) | ||
StartFade(true); | ||
step++; | ||
} | ||
|
||
else if (step == 0) { | ||
/*if (npAuthResult < 0 && request.NpSigninData.IsValid()) { | ||
npAuthResult = sceNpAuthCreateStartRequest(request.NpSigninData->paramAddr); | ||
}*/ | ||
step++; | ||
} | ||
|
||
if (/*npAuthResult >= 0 &&*/ IsButtonPressed(cancelButtonFlag)) { | ||
StartFade(false); | ||
//sceNpAuthAbortRequest(npAuthResult); | ||
//sceNpAuthDestroyRequest(npAuthResult); | ||
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, NP_SHUTDOWN_DELAY_US); | ||
request.common.result = SCE_UTILITY_DIALOG_RESULT_ABORT; | ||
request.npSigninStatus = NP_SIGNIN_STATUS_CANCELED; | ||
//step = 0; | ||
} | ||
|
||
EndDraw(); | ||
} | ||
|
||
if (ReadStatus() == SCE_UTILITY_STATUS_FINISHED || pendingStatus == SCE_UTILITY_STATUS_FINISHED) { | ||
npSigninState = NP_SIGNIN_STATUS_SUCCESS; | ||
__RtcTimeOfDay(&npSigninTimestamp); | ||
request.npSigninStatus = npSigninState; | ||
} | ||
return 0; | ||
} | ||
|
||
int PSPNpSigninDialog::Shutdown(bool force) { | ||
if (ReadStatus() != SCE_UTILITY_STATUS_FINISHED && !force) | ||
return SCE_ERROR_UTILITY_INVALID_STATUS; | ||
|
||
PSPDialog::Shutdown(force); | ||
if (!force) { | ||
ChangeStatusShutdown(NP_SHUTDOWN_DELAY_US); | ||
} | ||
|
||
// FIXME: This should probably be done within FinishShutdown to prevent some games (ie. UNO) from progressing further while the Dialog is still being faded-out, since we can't override non-virtual method... so here is the closes one to FinishShutdown. | ||
if (Memory::IsValidAddress(requestAddr)) // Need to validate first to prevent Invalid address when the game is being Shutdown/Exited to menu | ||
Memory::Memcpy(requestAddr, &request, request.common.size, "NpSigninDialogParam"); | ||
|
||
return 0; | ||
} | ||
|
||
void PSPNpSigninDialog::DoState(PointerWrap &p) { | ||
PSPDialog::DoState(p); | ||
|
||
auto s = p.Section("PSPNpSigninDialog", 1, 1); | ||
if (!s) | ||
return; | ||
|
||
Do(p, request); | ||
Do(p, step); | ||
//Do(p, npSigninResult); | ||
|
||
if (p.mode == p.MODE_READ) { | ||
startTime = 0; | ||
} | ||
} | ||
|
||
pspUtilityDialogCommon* PSPNpSigninDialog::GetCommonParam() | ||
{ | ||
return &request.common; | ||
} |
Oops, something went wrong.