mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 00:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare existing enums

Browse Source
This commit is contained in:
Lander Gallastegi 2024-10-01 23:31:34 +02:00
parent 8d930b4e88
commit 5d1e11af85
2 changed files with 110 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/libraries/dialogs/ime_dialog.cpp
View File

@ -8,7 +8,7 @@
namespace Libraries::ImeDialog { namespace Libraries::ImeDialog {
static OrbisImeDialogStatus g_ime_dlg_status = OrbisImeDialogStatus::ORBIS_IME_DIALOG_STATUS_NONE; static OrbisImeDialogStatus g_ime_dlg_status = OrbisImeDialogStatus::NONE;
int PS4_SYSV_ABI sceImeDialogAbort() { int PS4_SYSV_ABI sceImeDialogAbort() {
LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); LOG_ERROR(Lib_ImeDialog, "(STUBBED) called");
@ -46,14 +46,14 @@ int PS4_SYSV_ABI sceImeDialogGetPanelSizeExtended() {
} }
int PS4_SYSV_ABI sceImeDialogGetResult(OrbisImeDialogResult* result) { int PS4_SYSV_ABI sceImeDialogGetResult(OrbisImeDialogResult* result) {
result->endstatus = OrbisImeDialogEndStatus::ORBIS_IME_DIALOG_END_STATUS_OK; result->endstatus = OrbisImeDialogEndStatus::OK;
LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); LOG_ERROR(Lib_ImeDialog, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
} }
int PS4_SYSV_ABI sceImeDialogGetStatus() { OrbisImeDialogStatus PS4_SYSV_ABI sceImeDialogGetStatus() {
if (g_ime_dlg_status == OrbisImeDialogStatus::ORBIS_IME_DIALOG_STATUS_RUNNING) { if (g_ime_dlg_status == OrbisImeDialogStatus::RUNNING) {
return OrbisImeDialogStatus::ORBIS_IME_DIALOG_STATUS_FINISHED; return OrbisImeDialogStatus::FINISHED;
} }
return g_ime_dlg_status; return g_ime_dlg_status;
} }
@ -63,7 +63,7 @@ int PS4_SYSV_ABI sceImeDialogInit(OrbisImeDialogParam* param, OrbisImeParamExten
const std::wstring_view text = L"shadPS4"; const std::wstring_view text = L"shadPS4";
param->maxTextLength = text.size(); param->maxTextLength = text.size();
std::memcpy(param->inputTextBuffer, text.data(), text.size() * sizeof(wchar_t)); std::memcpy(param->inputTextBuffer, text.data(), text.size() * sizeof(wchar_t));
g_ime_dlg_status = OrbisImeDialogStatus::ORBIS_IME_DIALOG_STATUS_RUNNING; g_ime_dlg_status = OrbisImeDialogStatus::RUNNING;
return ORBIS_OK; return ORBIS_OK;
} }
@ -89,7 +89,7 @@ int PS4_SYSV_ABI sceImeDialogSetPanelPosition() {
int PS4_SYSV_ABI sceImeDialogTerm() { int PS4_SYSV_ABI sceImeDialogTerm() {
LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); LOG_ERROR(Lib_ImeDialog, "(STUBBED) called");
g_ime_dlg_status = OrbisImeDialogStatus::ORBIS_IME_DIALOG_STATUS_NONE; g_ime_dlg_status = OrbisImeDialogStatus::NONE;
return ORBIS_OK; return ORBIS_OK;
} }

203
src/core/libraries/dialogs/ime_dialog.h
View File

@ -11,71 +11,95 @@ class SymbolsResolver;
namespace Libraries::ImeDialog { namespace Libraries::ImeDialog {
enum OrbisImeDialogStatus { enum class OrbisImeDialogStatus : s32 {
ORBIS_IME_DIALOG_STATUS_NONE = 0, NONE = 0,
ORBIS_IME_DIALOG_STATUS_RUNNING = 1, RUNNING = 1,
ORBIS_IME_DIALOG_STATUS_FINISHED = 2 FINISHED = 2
}; };
enum OrbisImeDialogEndStatus { enum class OrbisImeDialogEndStatus : s32 {
ORBIS_IME_DIALOG_END_STATUS_OK = 0, OK = 0,
ORBIS_IME_DIALOG_END_STATUS_USER_CANCELED = 1, USER_CANCELED = 1,
ORBIS_IME_DIALOG_END_STATUS_ABORTED = 2 ABORTED = 2
}; };
struct OrbisImeDialogResult { enum class OrbisImeType : s32 {
OrbisImeDialogEndStatus endstatus; DEFAULT = 0,
s32 reserved[12]; BASIC_LATIN = 1,
URL = 2,
MAIL = 3,
NUMBER = 4
}; };
enum OrbisImeType { enum class OrbisImeEnterLabel : s32 {
ORBIS_IME_TYPE_DEFAULT = 0, DEFAULT = 0,
ORBIS_IME_TYPE_BASIC_LATIN = 1, SEND = 1,
ORBIS_IME_TYPE_URL = 2, SEARCH = 2,
ORBIS_IME_TYPE_MAIL = 3, GO = 3
ORBIS_IME_TYPE_NUMBER = 4
}; };
enum OrbisImeEnterLabel { enum class OrbisImeInputMethod : s32 {
ORBIS_IME_ENTER_LABEL_DEFAULT = 0, DEFAULT = 0
ORBIS_IME_ENTER_LABEL_SEND = 1,
ORBIS_IME_ENTER_LABEL_SEARCH = 2,
ORBIS_IME_ENTER_LABEL_GO = 3
};
enum OrbiImeInputMethod { ORBIS_IME_INPUT_METHOD_DEFAULT = 0 };
typedef int (*OrbisImeTextFilter)(wchar_t* outText, u32* outTextLength, const wchar_t* srcText,
u32 srcTextLength);
enum OrbisImeHorizontalAlignment {
ORBIS_IME_HALIGN_LEFT = 0,
ORBIS_IME_HALIGN_CENTER = 1,
ORBIS_IME_HALIGN_RIGHT = 2
}; };
enum OrbisImeVerticalAlignment { enum class OrbisImeHorizontalAlignment : s32 {
ORBIS_IME_VALIGN_TOP = 0, LEFT = 0,
ORBIS_IME_VALIGN_CENTER = 1, CENTER = 1,
ORBIS_IME_VALIGN_BOTTOM = 2 RIGHT = 2
}; };
struct OrbisImeDialogParam { enum class OrbisImeVerticalAlignment : s32 {
s32 userId; TOP = 0,
OrbisImeType type; CENTER = 1,
u64 supportedLanguages; BOTTOM = 2
OrbisImeEnterLabel enterLabel; };
OrbiImeInputMethod inputMethod;
OrbisImeTextFilter filter; enum class OrbisImePanelPriority : s32 {
u32 option; DEFAULT = 0,
u32 maxTextLength; ALPHABET = 1,
wchar_t* inputTextBuffer; SYMBOL = 2,
float posx; ACCENT = 3
float posy; };
OrbisImeHorizontalAlignment horizontalAlignment;
OrbisImeVerticalAlignment verticalAlignment; enum class OrbisImeKeyboardType : s32 {
const wchar_t* placeholder; NONE = 0,
const wchar_t* title; DANISH = 1,
s8 reserved[16]; GERMAN = 2,
GERMAN_SW = 3,
ENGLISH_US = 4,
ENGLISH_GB = 5,
SPANISH = 6,
SPANISH_LA = 7,
FINNISH = 8,
FRENCH = 9,
FRENCH_BR = 10,
FRENCH_CA = 11,
FRENCH_SW = 12,
ITALIAN = 13,
DUTCH = 14,
NORWEGIAN = 15,
POLISH = 16,
PORTUGUESE_BR = 17,
PORTUGUESE_PT = 18,
RUSSIAN = 19,
SWEDISH = 20,
TURKISH = 21,
JAPANESE_ROMAN = 22,
JAPANESE_KANA = 23,
KOREAN = 24,
SM_CHINESE = 25,
TR_CHINESE_ZY = 26,
TR_CHINESE_PY_HK = 27,
TR_CHINESE_PY_TW = 28,
TR_CHINESE_CG = 29,
ARABIC_AR = 30,
THAI = 31,
CZECH = 32,
GREEK = 33,
INDONESIAN = 34,
VIETNAMESE = 35,
ROMANIAN = 36,
HUNGARIAN = 37
}; };
struct OrbisImeColor { struct OrbisImeColor {
@ -85,52 +109,9 @@ struct OrbisImeColor {
u8 a; u8 a;
}; };
enum OrbisImePanelPriority { struct OrbisImeDialogResult {
ORBIS_IME_PANEL_PRIORITY_DEFAULT = 0, OrbisImeDialogEndStatus endstatus;
ORBIS_IME_PANEL_PRIORITY_ALPHABET = 1, s32 reserved[12];
ORBIS_IME_PANEL_PRIORITY_SYMBOL = 2,
ORBIS_IME_PANEL_PRIORITY_ACCENT = 3
};
enum OrbisImeKeyboardType {
ORBIS_IME_KEYBOARD_TYPE_NONE = 0,
ORBIS_IME_KEYBOARD_TYPE_DANISH = 1,
ORBIS_IME_KEYBOARD_TYPE_GERMAN = 2,
ORBIS_IME_KEYBOARD_TYPE_GERMAN_SW = 3,
ORBIS_IME_KEYBOARD_TYPE_ENGLISH_US = 4,
ORBIS_IME_KEYBOARD_TYPE_ENGLISH_GB = 5,
ORBIS_IME_KEYBOARD_TYPE_SPANISH = 6,
ORBIS_IME_KEYBOARD_TYPE_SPANISH_LA = 7,
ORBIS_IME_KEYBOARD_TYPE_FINNISH = 8,
ORBIS_IME_KEYBOARD_TYPE_FRENCH = 9,
ORBIS_IME_KEYBOARD_TYPE_FRENCH_BR = 10,
ORBIS_IME_KEYBOARD_TYPE_FRENCH_CA = 11,
ORBIS_IME_KEYBOARD_TYPE_FRENCH_SW = 12,
ORBIS_IME_KEYBOARD_TYPE_ITALIAN = 13,
ORBIS_IME_KEYBOARD_TYPE_DUTCH = 14,
ORBIS_IME_KEYBOARD_TYPE_NORWEGIAN = 15,
ORBIS_IME_KEYBOARD_TYPE_POLISH = 16,
ORBIS_IME_KEYBOARD_TYPE_PORTUGUESE_BR = 17,
ORBIS_IME_KEYBOARD_TYPE_PORTUGUESE_PT = 18,
ORBIS_IME_KEYBOARD_TYPE_RUSSIAN = 19,
ORBIS_IME_KEYBOARD_TYPE_SWEDISH = 20,
ORBIS_IME_KEYBOARD_TYPE_TURKISH = 21,
ORBIS_IME_KEYBOARD_TYPE_JAPANESE_ROMAN = 22,
ORBIS_IME_KEYBOARD_TYPE_JAPANESE_KANA = 23,
ORBIS_IME_KEYBOARD_TYPE_KOREAN = 24,
ORBIS_IME_KEYBOARD_TYPE_SM_CHINESE = 25,
ORBIS_IME_KEYBOARD_TYPE_TR_CHINESE_ZY = 26,
ORBIS_IME_KEYBOARD_TYPE_TR_CHINESE_PY_HK = 27,
ORBIS_IME_KEYBOARD_TYPE_TR_CHINESE_PY_TW = 28,
ORBIS_IME_KEYBOARD_TYPE_TR_CHINESE_CG = 29,
ORBIS_IME_KEYBOARD_TYPE_ARABIC_AR = 30,
ORBIS_IME_KEYBOARD_TYPE_THAI = 31,
ORBIS_IME_KEYBOARD_TYPE_CZECH = 32,
ORBIS_IME_KEYBOARD_TYPE_GREEK = 33,
ORBIS_IME_KEYBOARD_TYPE_INDONESIAN = 34,
ORBIS_IME_KEYBOARD_TYPE_VIETNAMESE = 35,
ORBIS_IME_KEYBOARD_TYPE_ROMANIAN = 36,
ORBIS_IME_KEYBOARD_TYPE_HUNGARIAN = 37
}; };
struct OrbisImeKeycode { struct OrbisImeKeycode {
@ -143,9 +124,31 @@ struct OrbisImeKeycode {
u64 timestamp; u64 timestamp;
}; };
typedef int (*OrbisImeTextFilter)(wchar_t* outText, u32* outTextLength, const wchar_t* srcText,
u32 srcTextLength);
typedef int (*OrbisImeExtKeyboardFilter)(const OrbisImeKeycode* srcKeycode, u16* outKeycode, typedef int (*OrbisImeExtKeyboardFilter)(const OrbisImeKeycode* srcKeycode, u16* outKeycode,
u32* outStatus, void* reserved); u32* outStatus, void* reserved);
struct OrbisImeDialogParam {
s32 userId;
OrbisImeType type;
u64 supportedLanguages;
OrbisImeEnterLabel enterLabel;
OrbisImeInputMethod inputMethod;
OrbisImeTextFilter filter;
u32 option;
u32 maxTextLength;
wchar_t* inputTextBuffer;
float posx;
float posy;
OrbisImeHorizontalAlignment horizontalAlignment;
OrbisImeVerticalAlignment verticalAlignment;
const wchar_t* placeholder;
const wchar_t* title;
s8 reserved[16];
};
struct OrbisImeParamExtended { struct OrbisImeParamExtended {
u32 option; u32 option;
OrbisImeColor colorBase; OrbisImeColor colorBase;
@ -173,7 +176,7 @@ int PS4_SYSV_ABI sceImeDialogGetPanelPositionAndForm();
int PS4_SYSV_ABI sceImeDialogGetPanelSize(); int PS4_SYSV_ABI sceImeDialogGetPanelSize();
int PS4_SYSV_ABI sceImeDialogGetPanelSizeExtended(); int PS4_SYSV_ABI sceImeDialogGetPanelSizeExtended();
int PS4_SYSV_ABI sceImeDialogGetResult(OrbisImeDialogResult* result); int PS4_SYSV_ABI sceImeDialogGetResult(OrbisImeDialogResult* result);
/*OrbisImeDialogStatus*/ int PS4_SYSV_ABI sceImeDialogGetStatus(); OrbisImeDialogStatus PS4_SYSV_ABI sceImeDialogGetStatus();
int PS4_SYSV_ABI sceImeDialogInit(OrbisImeDialogParam* param, OrbisImeParamExtended* extended); int PS4_SYSV_ABI sceImeDialogInit(OrbisImeDialogParam* param, OrbisImeParamExtended* extended);
int PS4_SYSV_ABI sceImeDialogInitInternal(); int PS4_SYSV_ABI sceImeDialogInitInternal();
int PS4_SYSV_ABI sceImeDialogInitInternal2(); int PS4_SYSV_ABI sceImeDialogInitInternal2();