RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add OSK GUI (#2275)

Browse source 
* Initial commit of OSK GUI

Also handles character encoding, you can for instance input in Chinese.

* Fixes for osk gui
This commit is contained in:
al0xf 2017-01-23 18:14:12 +01:00 • committed by Ivan
parent 78ecb115f3
commit aa357b9ae8
5 changed files with 101 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View file

@ -2,13 +2,46 @@
#include "Emu/Cell/PPUModule.h"
#include "cellSysutil.h"
#include "cellOskDialog.h"
#include "cellMsgDialog.h"
#include <thread>
#include "Emu/System.h"
logs::channel cellOskDialog("cellOskDialog", logs::level::notice);
char16_t* osk_text;
s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogParam, vm::ptr<CellOskDialogInputFieldInfo> inputFieldInfo)
{
cellOskDialog.warning("cellOskDialogLoadAsync(container=0x%x, dialogParam=*0x%x, inputFieldInfo=*0x%x)", container, dialogParam, inputFieldInfo);
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0); //Immediately signal that input is finished. TODO: Get actual input.
osk_text = new char16_t[CELL_OSKDIALOG_STRING_SIZE];
std::memset(osk_text, 0, sizeof(osk_text));
const auto osk = Emu.GetCallbacks().get_msg_dialog();
bool result = false;
osk->on_close = [&](s32 status)
{
if (status == 1) {
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
}
else {
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
}
result = true;
};
Emu.CallAfter([&]()
{
osk->CreateOsk("On Screen Keyboard", osk_text);
});
while (!result)
{
CHECK_EMU_STATUS;
std::this_thread::sleep_for(1ms);
}
return CELL_OSKDIALOG_OK;
}
@ -17,8 +50,9 @@ s32 cellOskDialogUnloadAsync(vm::ptr<CellOskDialogCallbackReturnParam> OutputInf
cellOskDialog.warning("cellOskDialogUnloadAsync(OutputInfo=*0x%x)", OutputInfo);
OutputInfo->result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
be_t<u16> input[6] = { 'r', 'p', 'c', 's', '3', 0x0 }; //TODO: Get actual input instead.
std::memcpy(OutputInfo->pResultString.get_ptr(), input, sizeof(input));
for (int i = 0; i < OutputInfo->numCharsResultString; i++) {
*(OutputInfo->pResultString + i) = (be_t<u16>)*(osk_text + i);
}
return CELL_OSKDIALOG_OK;
}
@ -33,7 +67,8 @@ s32 cellOskDialogGetSize(vm::ptr<u16> width, vm::ptr<u16> height, vm::ptr<CellOs
s32 cellOskDialogAbort()
{
cellOskDialog.todo("cellOskDialogAbort()");
cellOskDialog.warning("cellOskDialogAbort()");
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
return CELL_OSKDIALOG_OK;
}