mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cellOskDialog: cellOskDialogExtRegisterConfirmWordFilterCallback

Browse source
This commit is contained in:
Megamouse 2019-01-05 01:32:45 +01:00
parent e0ac244fed
commit 4a8b30c625
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,11 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
return CELL_OSKDIALOG_ERROR_PARAM;
}
const auto osk = fxm::import<OskDialogBase>(Emu.GetCallbacks().get_osk_dialog);
auto osk = fxm::get<OskDialogBase>();
if (!osk)
{
osk = fxm::import<OskDialogBase>(Emu.GetCallbacks().get_osk_dialog);
}
// Can't open another dialog if this one is already open.
if (!osk || osk->state.load() == OskDialogState::Open)
@ -80,7 +84,7 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
bool result = false;
osk->on_close = [wptr = std::weak_ptr<OskDialogBase>(osk)](s32 status)
osk->on_close = [&maxLength, wptr = std::weak_ptr<OskDialogBase>(osk)](s32 status)
{
const auto osk = wptr.lock();
osk->state = OskDialogState::Close;
@ -101,6 +105,42 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
cellOskDialog.warning("cellOskDialogLoadAsync: input result is CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT");
osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT;
}
if (osk->osk_confirm_callback)
{
vm::ptr<u16> string_to_send = vm::cast(vm::alloc(CELL_OSKDIALOG_STRING_SIZE * 2, vm::main));
atomic_t<bool> done = false;
u32 return_value;
u32 i = 0;
for (i; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
{
string_to_send[i] = osk->osk_text[i];
if (osk->osk_text[i] == 0) break;
}
sysutil_register_cb([&, length = i](ppu_thread& cb_ppu) -> s32
{
return_value = osk->osk_confirm_callback(cb_ppu, string_to_send, (s32)length);
cellOskDialog.warning("osk_confirm_callback return_value=%d", return_value);
for (u32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
{
osk->osk_text[i] = string_to_send[i];
}
done = true;
return 0;
});
while (done == false)
{
// wait for check callback
}
// reset this here (just to make sure it's null)
osk->osk_confirm_callback = vm::null;
}
}
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
@ -358,6 +398,14 @@ error_code cellOskDialogExtSetBaseColor(f32 red, f32 blue, f32 green, f32 alpha)
error_code cellOskDialogExtRegisterConfirmWordFilterCallback(vm::ptr<cellOskDialogConfirmWordFilterCallback> pCallback)
{
cellOskDialog.warning("cellOskDialogExtRegisterConfirmWordFilterCallback(pCallback=*0x%x)", pCallback);
auto osk = fxm::get<OskDialogBase>();
if (!osk)
{
osk = fxm::import<OskDialogBase>(Emu.GetCallbacks().get_osk_dialog);
}
osk->osk_confirm_callback = pCallback;
return CELL_OK;
}

2
rpcs3/Emu/Cell/Modules/cellOskDialog.h
View file

@ -254,4 +254,6 @@ public:
CellOskDialogInputFieldResult osk_input_result;
char16_t osk_text[CELL_OSKDIALOG_STRING_SIZE];
char16_t osk_text_old[CELL_OSKDIALOG_STRING_SIZE];
vm::ptr<cellOskDialogConfirmWordFilterCallback> osk_confirm_callback;
};