archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

overlays/osk: move pointer variables to fxo

Browse source
This commit is contained in:
Megamouse 2023-01-20 22:43:24 +01:00
parent 11c42eb8d4
commit ac2b2d82d2
4 changed files with 134 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,6 @@
#include "cellMsgDialog.h" #include "cellMsgDialog.h"
#include "cellImeJp.h" #include "cellImeJp.h"
#include "util/init_mutex.hpp"
#include <thread> #include <thread>
LOG_CHANNEL(cellOskDialog); LOG_CHANNEL(cellOskDialog);
@ -52,137 +50,73 @@ void fmt_class_string<CellOskDialogContinuousMode>::format(std::string& out, u64
}); });
} }
atomic_t<bool> g_osk_pointer_enabled = false; void osk_info::reset()
atomic_t<f32> g_osk_pointer_x = 0.0f;
atomic_t<f32> g_osk_pointer_y = 0.0f;
OskDialogBase::~OskDialogBase()
{ {
std::lock_guard lock(text_mtx);
dlg.reset();
valid_text = {};
use_separate_windows = false;
lock_ext_input = false;
device_mask = 0;
input_field_window_width = 0;
input_field_background_transparency = 0.0f;
input_field_layout_info = {};
input_panel_layout_info = {};
key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM;
initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD;
clipboard_enabled = false;
half_byte_kana_enabled = false;
supported_languages = 0;
dimmer_enabled = true;
base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
pointer_enabled = false;
pointer_x = 0.0f;
pointer_y = 0.0f;
initial_scale = 1.0f;
layout = {};
osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED;
osk_confirm_callback.store({});
osk_force_finish_callback.store({});
osk_hardware_keyboard_event_hook_callback.store({});
hook_event_mode.store(0);
} }
struct osk_window_layout // Align horizontally
u32 osk_info::get_aligned_x(u32 layout_mode)
{ {
u32 layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP; // Let's prefer a centered alignment.
u32 x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT; if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER)
u32 y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
f32 x_offset = 0.0f;
f32 y_offset = 0.0f;
std::string to_string() const
{ {
return fmt::format("{ layout_mode=0x%x, x_align=0x%x, y_align=0x%x, x_offset=%.2f, y_offset=%.2f }", layout_mode, x_align, y_align, x_offset, y_offset); return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER;
} }
};
struct osk_info if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT)
{
return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
}
return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT;
}
// Align vertically
u32 osk_info::get_aligned_y(u32 layout_mode)
{ {
std::shared_ptr<OskDialogBase> dlg; // Let's prefer a centered alignment.
if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER)
std::array<char16_t, CELL_OSKDIALOG_STRING_SIZE> valid_text{};
shared_mutex text_mtx;
atomic_t<bool> use_separate_windows = false;
atomic_t<bool> lock_ext_input = false;
atomic_t<u32> device_mask = 0; // OSK ignores input from the specified devices. 0 means all devices can influence the OSK
atomic_t<u32> input_field_window_width = 0;
atomic_t<f32> input_field_background_transparency = 0.0f;
osk_window_layout input_field_layout_info{};
osk_window_layout input_panel_layout_info{};
atomic_t<u32> key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
atomic_t<CellOskDialogInitialKeyLayout> initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM; // TODO: use
atomic_t<CellOskDialogInputDevice> initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD; // OSK at first only receives input from the initial device
atomic_t<bool> clipboard_enabled = false; // For copy and paste
atomic_t<bool> half_byte_kana_enabled = false;
atomic_t<u32> supported_languages = 0; // Used to enable non-default languages in the OSK
atomic_t<bool> dimmer_enabled = true;
atomic_t<OskDialogBase::color> base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
atomic_t<bool> pointer_enabled = false;
CellOskDialogPoint pointer_pos{0.0f, 0.0f};
atomic_t<f32> initial_scale = 1.0f;
osk_window_layout layout = {};
atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
atomic_t<u32> last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; // Used for continuous seperate window dialog
atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{};
atomic_t<vm::ptr<cellOskDialogForceFinishCallback>> osk_force_finish_callback{};
atomic_t<vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback>> osk_hardware_keyboard_event_hook_callback{};
atomic_t<u16> hook_event_mode{0};
stx::init_mutex init;
void reset()
{ {
std::lock_guard lock(text_mtx); return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER;
dlg.reset();
valid_text = {};
use_separate_windows = false;
lock_ext_input = false;
device_mask = 0;
input_field_window_width = 0;
input_field_background_transparency = 0.0f;
input_field_layout_info = {};
input_panel_layout_info = {};
key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM;
initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD;
clipboard_enabled = false;
half_byte_kana_enabled = false;
supported_languages = 0;
dimmer_enabled = true;
base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
pointer_enabled = false;
pointer_pos = {0.0f, 0.0f};
initial_scale = 1.0f;
layout = {};
osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED;
osk_confirm_callback.store({});
osk_force_finish_callback.store({});
osk_hardware_keyboard_event_hook_callback.store({});
hook_event_mode.store(0);
} }
// Align horizontally if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP)
static u32 get_aligned_x(u32 layout_mode)
{ {
// Let's prefer a centered alignment. return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER)
{
return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER;
}
if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT)
{
return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
}
return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT;
} }
// Align vertically return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM;
static u32 get_aligned_y(u32 layout_mode) }
{
// Let's prefer a centered alignment.
if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER)
{
return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER;
}
if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP)
{
return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
}
return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM;
}
};
// TODO: don't use this function // TODO: don't use this function
std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create) std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create)
@ -597,11 +531,6 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
Emu.BlockingCallFromMainThread([=, &info]() Emu.BlockingCallFromMainThread([=, &info]()
{ {
// Make sure to always have the latest pointer params
g_osk_pointer_enabled = info.pointer_enabled.load();
g_osk_pointer_x = info.pointer_pos.x;
g_osk_pointer_y = info.pointer_pos.y;
osk->Create({ osk->Create({
.title = get_localized_string(localized_string_id::CELL_OSK_DIALOG_TITLE), .title = get_localized_string(localized_string_id::CELL_OSK_DIALOG_TITLE),
.message = message, .message = message,
@ -1197,20 +1126,19 @@ error_code cellOskDialogExtSetPointerEnable(b8 enable)
cellOskDialog.warning("cellOskDialogExtSetPointerEnable(enable=%d)", enable); cellOskDialog.warning("cellOskDialogExtSetPointerEnable(enable=%d)", enable);
g_fxo->get<osk_info>().pointer_enabled = enable; g_fxo->get<osk_info>().pointer_enabled = enable;
g_osk_pointer_enabled = enable;
return CELL_OK; return CELL_OK;
} }
error_code cellOskDialogExtUpdatePointerDisplayPos(vm::cptr<CellOskDialogPoint> pos) error_code cellOskDialogExtUpdatePointerDisplayPos(vm::cptr<CellOskDialogPoint> pos)
{ {
cellOskDialog.warning("cellOskDialogExtUpdatePointerDisplayPos(pos=0x%x, posX=%f, posY=%f)", pos->x, pos->y); cellOskDialog.warning("cellOskDialogExtUpdatePointerDisplayPos(pos=0x%x, posX=%f, posY=%f)", pos, pos->x, pos->y);
if (pos) if (pos)
{ {
g_fxo->get<osk_info>().pointer_pos = *pos; osk_info& osk = g_fxo->get<osk_info>();
g_osk_pointer_x = pos->x; osk.pointer_x = pos->x;
g_osk_pointer_y = pos->y; osk.pointer_y = pos->y;
} }
return CELL_OK; return CELL_OK;

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

@ -2,6 +2,8 @@
#include "util/types.hpp" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/init_mutex.hpp"
#include "Utilities/mutex.h"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include <string> #include <string>
#include <functional> #include <functional>
@ -242,6 +244,20 @@ using cellOskDialogConfirmWordFilterCallback = int(vm::ptr<u16> pConfirmString,
using cellOskDialogHardwareKeyboardEventHookCallback = class b8(vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo); using cellOskDialogHardwareKeyboardEventHookCallback = class b8(vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo);
using cellOskDialogForceFinishCallback = class b8(); using cellOskDialogForceFinishCallback = class b8();
struct osk_window_layout
{
u32 layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
u32 x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
u32 y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
f32 x_offset = 0.0f;
f32 y_offset = 0.0f;
std::string to_string() const
{
return fmt::format("{ layout_mode=0x%x, x_align=0x%x, y_align=0x%x, x_offset=%.2f, y_offset=%.2f }", layout_mode, x_align, y_align, x_offset, y_offset);
}
};
enum class OskDialogState enum class OskDialogState
{ {
Unloaded, Unloaded,
@ -287,7 +303,7 @@ public:
// Set status to CELL_OSKDIALOG_CLOSE_CONFIRM or CELL_OSKDIALOG_CLOSE_CANCEL for user input. // Set status to CELL_OSKDIALOG_CLOSE_CONFIRM or CELL_OSKDIALOG_CLOSE_CANCEL for user input.
// Set status to -1 if closed by the game or system. // Set status to -1 if closed by the game or system.
virtual void Close(s32 status) = 0; virtual void Close(s32 status) = 0;
virtual ~OskDialogBase(); virtual ~OskDialogBase() {};
std::function<void(s32 status)> on_osk_close; std::function<void(s32 status)> on_osk_close;
std::function<void(CellOskDialogKeyMessage key_message)> on_osk_key_input_entered; std::function<void(CellOskDialogKeyMessage key_message)> on_osk_key_input_entered;
@ -301,3 +317,55 @@ public:
atomic_t<CellOskDialogInputFieldResult> osk_input_result{ CellOskDialogInputFieldResult::CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK }; atomic_t<CellOskDialogInputFieldResult> osk_input_result{ CellOskDialogInputFieldResult::CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK };
char16_t osk_text[CELL_OSKDIALOG_STRING_SIZE]{}; char16_t osk_text[CELL_OSKDIALOG_STRING_SIZE]{};
}; };
struct osk_info
{
std::shared_ptr<OskDialogBase> dlg;
std::array<char16_t, CELL_OSKDIALOG_STRING_SIZE> valid_text{};
shared_mutex text_mtx;
atomic_t<bool> use_separate_windows = false;
atomic_t<bool> lock_ext_input = false;
atomic_t<u32> device_mask = 0; // OSK ignores input from the specified devices. 0 means all devices can influence the OSK
atomic_t<u32> input_field_window_width = 0;
atomic_t<f32> input_field_background_transparency = 0.0f;
osk_window_layout input_field_layout_info{};
osk_window_layout input_panel_layout_info{};
atomic_t<u32> key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
atomic_t<CellOskDialogInitialKeyLayout> initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM; // TODO: use
atomic_t<CellOskDialogInputDevice> initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD; // OSK at first only receives input from the initial device
atomic_t<bool> clipboard_enabled = false; // For copy and paste
atomic_t<bool> half_byte_kana_enabled = false;
atomic_t<u32> supported_languages = 0; // Used to enable non-default languages in the OSK
atomic_t<bool> dimmer_enabled = true;
atomic_t<OskDialogBase::color> base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
atomic_t<bool> pointer_enabled = false;
atomic_t<f32> pointer_x = 0.0f;
atomic_t<f32> pointer_y = 0.0f;
atomic_t<f32> initial_scale = 1.0f;
osk_window_layout layout = {};
atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
atomic_t<u32> last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; // Used for continuous seperate window dialog
atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{};
atomic_t<vm::ptr<cellOskDialogForceFinishCallback>> osk_force_finish_callback{};
atomic_t<vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback>> osk_hardware_keyboard_event_hook_callback{};
atomic_t<u16> hook_event_mode{0};
stx::init_mutex init;
void reset();
// Align horizontally
static u32 get_aligned_x(u32 layout_mode);
// Align vertically
static u32 get_aligned_y(u32 layout_mode);
};

6
rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
View file

@ -45,12 +45,12 @@ namespace rsx
if (convert_ratio > 1.0f) if (convert_ratio > 1.0f)
{ {
const u16 new_padding = (target_height - target_height / convert_ratio) / 2; const u16 new_padding = static_cast<u16>(target_height - target_height / convert_ratio) / 2;
image->set_padding(image->padding_left, image->padding_right, new_padding + image->padding_top, new_padding + image->padding_bottom); image->set_padding(image->padding_left, image->padding_right, new_padding + image->padding_top, new_padding + image->padding_bottom);
} }
else if (convert_ratio < 1.0f) else if (convert_ratio < 1.0f)
{ {
const u16 new_padding = (target_width - target_width * convert_ratio) / 2; const u16 new_padding = static_cast<u16>(target_width - target_width * convert_ratio) / 2;
image->set_padding(image->padding_left + new_padding, image->padding_right + new_padding, image->padding_top, image->padding_bottom); image->set_padding(image->padding_left + new_padding, image->padding_right + new_padding, image->padding_top, image->padding_bottom);
} }
} }
@ -329,7 +329,7 @@ namespace rsx
if (new_entry.type != media_list_dialog::media_type::invalid) if (new_entry.type != media_list_dialog::media_type::invalid)
{ {
new_entry.parent = &current_entry; new_entry.parent = &current_entry;
new_entry.index = current_entry.children.size(); new_entry.index = ::narrow<u32>(current_entry.children.size());
current_entry.children.emplace_back(std::move(new_entry)); current_entry.children.emplace_back(std::move(new_entry));
} }
} }

12
rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
View file

@ -7,10 +7,6 @@
LOG_CHANNEL(osk, "OSK"); LOG_CHANNEL(osk, "OSK");
extern atomic_t<bool> g_osk_pointer_enabled;
extern atomic_t<f32> g_osk_pointer_x;
extern atomic_t<f32> g_osk_pointer_y;
namespace rsx namespace rsx
{ {
namespace overlays namespace overlays
@ -937,14 +933,16 @@ namespace rsx
m_update = true; m_update = true;
} }
if (g_osk_pointer_enabled != m_pointer.visible()) osk_info& info = g_fxo->get<osk_info>();
if (const bool pointer_enabled = info.pointer_enabled; pointer_enabled != m_pointer.visible())
{ {
m_pointer.set_expiration(g_osk_pointer_enabled ? u64{umax} : 0); m_pointer.set_expiration(pointer_enabled ? u64{umax} : 0);
m_pointer.update_visibility(get_system_time()); m_pointer.update_visibility(get_system_time());
m_update = true; m_update = true;
} }
if (m_pointer.visible() && m_pointer.set_position(static_cast<u16>(g_osk_pointer_x), static_cast<u16>(g_osk_pointer_y))) if (m_pointer.visible() && m_pointer.set_position(static_cast<u16>(info.pointer_x), static_cast<u16>(info.pointer_y)))
{ {
m_update = true; m_update = true;
} }