Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Start making the osk an osk

Browse source
This commit is contained in:
TMaul 2012-12-22 14:09:14 +00:00
parent 154d3aaf6a
commit 2b177e9b6d
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Core/Dialog/PSPOskDialog.cpp
View file

@ -141,10 +141,8 @@ SceUtilityOskData oskData;
std::string oskDesc;
std::string oskIntext;
std::string oskOuttext;
int oskParamsAddr;
PSPOskDialog::PSPOskDialog() : PSPDialog() {
}
@ -152,7 +150,6 @@ PSPOskDialog::PSPOskDialog() : PSPDialog() {
PSPOskDialog::~PSPOskDialog() {
}
// Same as get string but read out 16bit
void PSPOskDialog::HackyGetStringWide(std::string& _string, const u32 em_address)
{
@ -201,6 +198,17 @@ int PSPOskDialog::Init(u32 oskPtr)
return 0;
}
void PSPOskDialog::RenderKeyboard()
{
//First render the characters
for (int i=0; i<oskData.outtextlimit; i++)
{
PPGeDrawText("_", 20 + (i*16), 20, NULL , 0.5f, 0xFFFFFFFF);
}
}
void PSPOskDialog::Update()
{
buttons = __CtrlPeekButtons();
@ -214,6 +222,7 @@ void PSPOskDialog::Update()
StartDraw();
DisplayMessage(oskDesc);
RenderKeyboard();
PPGeDrawImage(I_CROSS, 200, 220, 20, 20, 0, 0xFFFFFFFF);
PPGeDrawText("Ignore", 230, 220, PPGE_ALIGN_LEFT, 0.5f, 0xFFFFFFFF);
// TODO : Dialogs should take control over input and not send them to the game while displaying
@ -228,14 +237,12 @@ void PSPOskDialog::Update()
status = SCE_UTILITY_STATUS_SHUTDOWN;
}
// just fake the return values to be "000000" as this will work for most cases e.g. when restricted to entering just numbers
Memory::Write_U16(0x0030,oskData.outtextPtr);
Memory::Write_U16(0x0030,oskData.outtextPtr+2);
Memory::Write_U16(0x0030,oskData.outtextPtr+4);
Memory::Write_U16(0x0030,oskData.outtextPtr+6);
Memory::Write_U16(0x0030,oskData.outtextPtr+8);
Memory::Write_U16(0x0030,oskData.outtextPtr+10);
Memory::Write_U16(0x0030,oskData.outtextPtr+12);
oskData.outtextlength = 6;
for (int i=0; i<oskData.outtextlimit; i++)
{
Memory::Write_U16(0x0030,oskData.outtextPtr + (2*i));
}
oskData.outtextlength = oskData.outtextlimit;
oskParams.base.result= 0;
oskData.result = PSP_UTILITY_OSK_RESULT_CHANGED;
Memory::WriteStruct(oskParams.SceUtilityOskDataPtr, &oskData);

3
Core/Dialog/PSPOskDialog.h
View file

@ -28,5 +28,8 @@ public:
virtual void Update();
private:
void HackyGetStringWide(std::string& _string, const u32 em_address);
void RenderKeyboard();
};

1
Core/HLE/sceFont.cpp
View file

@ -237,7 +237,6 @@ int sceFontGetFontInfo(u32 fontHandle, u32 fontInfoPtr)
{
fi.BPP = 4;
fi.charMapLength = 255;
// fi.fontStyle =1;
fi.maxGlyphAdvanceXF = 2.0;
fi.maxGlyphAdvanceXI = 2;
fi.maxGlyphAdvanceYF = 2.0;