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

Use CString

Browse Source
This commit is contained in:
Lander Gallastegi 2024-10-10 17:20:57 +02:00
parent 4e2f16351a
commit 0d9de08194
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/cstring.h
View File

@ -109,6 +109,14 @@ public:
return data + N; return data + N;
} }
constexpr std::size_t capacity() const {
return N;
}
std::size_t size() const {
return std::char_traits<T>::length(data);
}
T& operator[](size_t idx) { T& operator[](size_t idx) {
return data[idx]; return data[idx];
} }

26
src/core/libraries/dialogs/ime_dialog_ui.cpp
View File

@ -72,7 +72,7 @@ ImeDialogState::ImeDialogState(const OrbisImeDialogParam* param,
} }
std::size_t text_len = std::char_traits<char16_t>::length(text_buffer); std::size_t text_len = std::char_traits<char16_t>::length(text_buffer);
if (!ConvertOrbisToUTF8(text_buffer, text_len, current_text, if (!ConvertOrbisToUTF8(text_buffer, text_len, current_text.begin(),
ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4)) { ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4)) {
LOG_ERROR(Lib_ImeDialog, "Failed to convert text to utf8 encoding"); LOG_ERROR(Lib_ImeDialog, "Failed to convert text to utf8 encoding");
} }
@ -83,13 +83,11 @@ ImeDialogState::~ImeDialogState() {
} }
ImeDialogState::ImeDialogState(ImeDialogState&& other) noexcept ImeDialogState::ImeDialogState(ImeDialogState&& other) noexcept
: userId(other.userId), is_multiLine(other.is_multiLine), is_numeric(other.is_numeric), : input_changed(other.input_changed), userId(other.userId), is_multiLine(other.is_multiLine), is_numeric(other.is_numeric),
type(other.type), enter_label(other.enter_label), text_filter(other.text_filter), type(other.type), enter_label(other.enter_label), text_filter(other.text_filter),
keyboard_filter(other.keyboard_filter), max_text_length(other.max_text_length), keyboard_filter(other.keyboard_filter), max_text_length(other.max_text_length),
text_buffer(other.text_buffer), title(std::move(other.title)), placeholder(std::move(other.placeholder)), text_buffer(other.text_buffer), title(std::move(other.title)), placeholder(std::move(other.placeholder)),
input_changed(other.input_changed) { current_text(other.current_text) {
std::memcpy(current_text, other.current_text, sizeof(current_text));
#ifndef _WIN32 #ifndef _WIN32
orbis_to_utf8 = other.orbis_to_utf8; orbis_to_utf8 = other.orbis_to_utf8;
@ -106,6 +104,7 @@ ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) {
if (this != &other) { if (this != &other) {
Free(); Free();
input_changed = other.input_changed;
userId = other.userId; userId = other.userId;
is_multiLine = other.is_multiLine; is_multiLine = other.is_multiLine;
is_numeric = other.is_numeric; is_numeric = other.is_numeric;
@ -117,9 +116,7 @@ ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) {
text_buffer = other.text_buffer; text_buffer = other.text_buffer;
title = std::move(other.title); title = std::move(other.title);
placeholder = std::move(other.placeholder); placeholder = std::move(other.placeholder);
input_changed = other.input_changed; current_text = other.current_text;
std::memcpy(current_text, other.current_text, sizeof(current_text));
#ifndef _WIN32 #ifndef _WIN32
orbis_to_utf8 = other.orbis_to_utf8; orbis_to_utf8 = other.orbis_to_utf8;
@ -140,8 +137,7 @@ bool ImeDialogState::CopyTextToOrbisBuffer() {
return false; return false;
} }
std::size_t text_len = std::char_traits<char>::length(current_text); return ConvertUTF8ToOrbis(current_text.begin(), current_text.capacity(), text_buffer, max_text_length);
return ConvertUTF8ToOrbis(current_text, text_len, text_buffer, max_text_length);
} }
bool ImeDialogState::CallTextFilter() { bool ImeDialogState::CallTextFilter() {
@ -152,11 +148,11 @@ bool ImeDialogState::CallTextFilter() {
input_changed = false; input_changed = false;
char16_t src_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH + 1] = {0}; char16_t src_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH + 1] = {0};
u32 src_text_length = std::strlen(current_text); u32 src_text_length = current_text.size();
char16_t out_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH + 1] = {0}; char16_t out_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH + 1] = {0};
u32 out_text_length = ORBIS_IME_DIALOG_MAX_TEXT_LENGTH; u32 out_text_length = ORBIS_IME_DIALOG_MAX_TEXT_LENGTH;
if (!ConvertUTF8ToOrbis(current_text, src_text_length, src_text, if (!ConvertUTF8ToOrbis(current_text.begin(), src_text_length, src_text,
ORBIS_IME_DIALOG_MAX_TEXT_LENGTH)) { ORBIS_IME_DIALOG_MAX_TEXT_LENGTH)) {
LOG_ERROR(Lib_ImeDialog, "Failed to convert text to orbis encoding"); LOG_ERROR(Lib_ImeDialog, "Failed to convert text to orbis encoding");
return false; return false;
@ -170,7 +166,7 @@ bool ImeDialogState::CallTextFilter() {
return false; return false;
} }
if (!ConvertOrbisToUTF8(out_text, out_text_length, current_text, if (!ConvertOrbisToUTF8(out_text, out_text_length, current_text.begin(),
ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4)) { ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4)) {
LOG_ERROR(Lib_ImeDialog, "Failed to convert text to utf8 encoding"); LOG_ERROR(Lib_ImeDialog, "Failed to convert text to utf8 encoding");
return false; return false;
@ -408,7 +404,7 @@ void ImeDialogUi::DrawInputText() {
SetKeyboardFocusHere(); SetKeyboardFocusHere();
} }
const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data(); const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data();
if (InputTextEx("##ImeDialogInput", placeholder, state->current_text, if (InputTextEx("##ImeDialogInput", placeholder, state->current_text.begin(),
state->max_text_length, input_size, ImGuiInputTextFlags_CallbackCharFilter, state->max_text_length, input_size, ImGuiInputTextFlags_CallbackCharFilter,
InputTextCallback, this)) { InputTextCallback, this)) {
state->input_changed = true; state->input_changed = true;
@ -424,7 +420,7 @@ void ImeDialogUi::DrawMultiLineInputText() {
SetKeyboardFocusHere(); SetKeyboardFocusHere();
} }
const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data(); const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data();
if (InputTextEx("##ImeDialogInput", placeholder, state->current_text, if (InputTextEx("##ImeDialogInput", placeholder, state->current_text.begin(),
state->max_text_length, input_size, flags, InputTextCallback, this)) { state->max_text_length, input_size, flags, InputTextCallback, this)) {
state->input_changed = true; state->input_changed = true;
} }

3
src/core/libraries/dialogs/ime_dialog_ui.h
View File

@ -9,6 +9,7 @@
#include <iconv.h> #include <iconv.h>
#endif #endif
#include <imgui.h> #include <imgui.h>
#include "common/cstring.h"
#include "common/types.h" #include "common/types.h"
#include "core/libraries/dialogs/ime_dialog.h" #include "core/libraries/dialogs/ime_dialog.h"
#include "imgui/imgui_layer.h" #include "imgui/imgui_layer.h"
@ -35,7 +36,7 @@ class ImeDialogState final {
std::vector<char> placeholder; std::vector<char> placeholder;
// A character can hold up to 4 bytes in UTF-8 // A character can hold up to 4 bytes in UTF-8
char current_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4 + 1] = {0}; Common::CString<ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4> current_text;
#ifndef _WIN32 #ifndef _WIN32
iconv_t orbis_to_utf8 = (iconv_t)-1; iconv_t orbis_to_utf8 = (iconv_t)-1;
iconv_t utf8_to_orbis = (iconv_t)-1; iconv_t utf8_to_orbis = (iconv_t)-1;