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 std::vector for dynamic strings

Browse Source
This commit is contained in:
Lander Gallastegi 2024-10-10 16:35:57 +02:00
parent dfce461908
commit 4e2f16351a
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,20 +52,20 @@ ImeDialogState::ImeDialogState(const OrbisImeDialogParam* param,
if (param->title) { if (param->title) {
std::size_t title_len = std::char_traits<char16_t>::length(param->title); std::size_t title_len = std::char_traits<char16_t>::length(param->title);
title = new char[title_len * 4 + 1]; title.resize(title_len * 4 + 1);
title[title_len * 4] = '\0'; title[title_len * 4] = '\0';
if (!ConvertOrbisToUTF8(param->title, title_len, title, title_len * 4)) { if (!ConvertOrbisToUTF8(param->title, title_len, &title[0], title_len * 4)) {
LOG_ERROR(Lib_ImeDialog, "Failed to convert title to utf8 encoding"); LOG_ERROR(Lib_ImeDialog, "Failed to convert title to utf8 encoding");
} }
} }
if (param->placeholder) { if (param->placeholder) {
std::size_t placeholder_len = std::char_traits<char16_t>::length(param->placeholder); std::size_t placeholder_len = std::char_traits<char16_t>::length(param->placeholder);
placeholder = new char[placeholder_len * 4 + 1]; placeholder.resize(placeholder_len * 4 + 1);
placeholder[placeholder_len * 4] = '\0'; placeholder[placeholder_len * 4] = '\0';
if (!ConvertOrbisToUTF8(param->placeholder, placeholder_len, placeholder, if (!ConvertOrbisToUTF8(param->placeholder, placeholder_len, &placeholder[0],
placeholder_len * 4)) { placeholder_len * 4)) {
LOG_ERROR(Lib_ImeDialog, "Failed to convert placeholder to utf8 encoding"); LOG_ERROR(Lib_ImeDialog, "Failed to convert placeholder to utf8 encoding");
} }
@ -86,7 +86,7 @@ ImeDialogState::ImeDialogState(ImeDialogState&& other) noexcept
: userId(other.userId), is_multiLine(other.is_multiLine), is_numeric(other.is_numeric), : 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(other.title), placeholder(other.placeholder), text_buffer(other.text_buffer), title(std::move(other.title)), placeholder(std::move(other.placeholder)),
input_changed(other.input_changed) { input_changed(other.input_changed) {
std::memcpy(current_text, other.current_text, sizeof(current_text)); std::memcpy(current_text, other.current_text, sizeof(current_text));
@ -100,8 +100,6 @@ ImeDialogState::ImeDialogState(ImeDialogState&& other) noexcept
#endif #endif
other.text_buffer = nullptr; other.text_buffer = nullptr;
other.title = nullptr;
other.placeholder = nullptr;
} }
ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) { ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) {
@ -117,8 +115,8 @@ ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) {
keyboard_filter = other.keyboard_filter; keyboard_filter = other.keyboard_filter;
max_text_length = other.max_text_length; max_text_length = other.max_text_length;
text_buffer = other.text_buffer; text_buffer = other.text_buffer;
title = other.title; title = std::move(other.title);
placeholder = other.placeholder; placeholder = std::move(other.placeholder);
input_changed = other.input_changed; input_changed = other.input_changed;
std::memcpy(current_text, other.current_text, sizeof(current_text)); std::memcpy(current_text, other.current_text, sizeof(current_text));
@ -132,8 +130,6 @@ ImeDialogState& ImeDialogState::operator=(ImeDialogState&& other) {
#endif #endif
other.text_buffer = nullptr; other.text_buffer = nullptr;
other.title = nullptr;
other.placeholder = nullptr;
} }
return *this; return *this;
@ -192,14 +188,6 @@ void ImeDialogState::Free() {
iconv_close(utf8_to_orbis); iconv_close(utf8_to_orbis);
} }
#endif #endif
if (title) {
delete[] title;
}
if (placeholder) {
delete[] placeholder;
}
} }
bool ImeDialogState::CallKeyboardFilter(const OrbisImeKeycode* src_keycode, u16* out_keycode, bool ImeDialogState::CallKeyboardFilter(const OrbisImeKeycode* src_keycode, u16* out_keycode,
@ -358,9 +346,9 @@ void ImeDialogUi::Draw() {
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoSavedSettings)) { ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoSavedSettings)) {
DrawPrettyBackground(); DrawPrettyBackground();
if (state->title) { if (!state->title.empty()) {
SetWindowFontScale(1.7f); SetWindowFontScale(1.7f);
TextUnformatted(state->title); TextUnformatted(state->title.data());
SetWindowFontScale(1.0f); SetWindowFontScale(1.0f);
} }
@ -419,7 +407,8 @@ void ImeDialogUi::DrawInputText() {
if (first_render) { if (first_render) {
SetKeyboardFocusHere(); SetKeyboardFocusHere();
} }
if (InputTextEx("##ImeDialogInput", state->placeholder, state->current_text, const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data();
if (InputTextEx("##ImeDialogInput", placeholder, state->current_text,
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;
@ -434,7 +423,8 @@ void ImeDialogUi::DrawMultiLineInputText() {
if (first_render) { if (first_render) {
SetKeyboardFocusHere(); SetKeyboardFocusHere();
} }
if (InputTextEx("##ImeDialogInput", state->placeholder, state->current_text, const char* placeholder = state->placeholder.empty() ? nullptr : state->placeholder.data();
if (InputTextEx("##ImeDialogInput", placeholder, state->current_text,
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;
} }

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

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <mutex> #include <mutex>
#include <vector>
#ifndef _WIN32 #ifndef _WIN32
#include <iconv.h> #include <iconv.h>
#endif #endif
@ -30,8 +31,8 @@ class ImeDialogState final {
OrbisImeExtKeyboardFilter keyboard_filter{}; OrbisImeExtKeyboardFilter keyboard_filter{};
u32 max_text_length{}; u32 max_text_length{};
char16_t* text_buffer{}; char16_t* text_buffer{};
char* title = nullptr; std::vector<char> title;
char* placeholder = nullptr; 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}; char current_text[ORBIS_IME_DIALOG_MAX_TEXT_LENGTH * 4 + 1] = {0};