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

cellImeJp: add cursor

Browse source
This commit is contained in:
Megamouse 2024-01-20 16:30:19 +01:00
parent 0392830950
commit 16f833a516
2 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

60
rpcs3/Emu/Cell/Modules/cellImeJp.cpp
View file

@ -40,7 +40,7 @@ ime_jp_manager::ime_jp_manager()
bool ime_jp_manager::addChar(u16 c) bool ime_jp_manager::addChar(u16 c)
{ {
if (!c || focus_begin >= (CELL_IMEJP_STRING_MAXLENGTH - 1ULL) || focus_begin > input_string.length()) if (!c || cursor >= (CELL_IMEJP_STRING_MAXLENGTH - 1ULL) || cursor > input_string.length())
return false; return false;
std::u16string tmp; std::u16string tmp;
@ -49,12 +49,28 @@ bool ime_jp_manager::addChar(u16 c)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wrestrict" #pragma GCC diagnostic ignored "-Wrestrict"
#endif #endif
input_string.insert(focus_begin, tmp); input_string.insert(cursor, tmp);
#if defined(__GNUG__) && !defined(__clang__) #if defined(__GNUG__) && !defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
move_focus(1); // TODO: The split into normal cursor and focus cursor const usz cursor_old = cursor;
const bool cursor_was_in_focus = cursor >= focus_begin && cursor <= (focus_begin + focus_length);
move_cursor(1);
if (cursor_was_in_focus)
{
// Add this char to the focus
move_focus_end(1, false);
}
else
{
// Let's just move the focus to the cursor, so that it contains the new char.
focus_begin = cursor_old;
focus_length = 1;
move_focus(0); // Sanitize focus
}
input_state = CELL_IMEJP_BEFORE_CONVERT; input_state = CELL_IMEJP_BEFORE_CONVERT;
return true; return true;
@ -108,6 +124,20 @@ bool ime_jp_manager::deleteWord()
return true; return true;
} }
void ime_jp_manager::clear_input()
{
cursor = 0;
focus_begin = 0;
focus_length = 0;
input_string.clear();
converted_string.clear();
}
void ime_jp_manager::move_cursor(s8 amount)
{
cursor = std::max(0, std::min(static_cast<s32>(cursor) + amount, ::narrow<s32>(input_string.length())));
}
void ime_jp_manager::move_focus(s8 amount) void ime_jp_manager::move_focus(s8 amount)
{ {
focus_begin = std::max(0, std::min(static_cast<s32>(focus_begin) + amount, ::narrow<s32>(input_string.length()))); focus_begin = std::max(0, std::min(static_cast<s32>(focus_begin) + amount, ::narrow<s32>(input_string.length())));
@ -268,11 +298,8 @@ static error_code cellImeJpClose(CellImeJpHandle hImeJpHandle)
} }
manager.input_state = CELL_IMEJP_BEFORE_INPUT; manager.input_state = CELL_IMEJP_BEFORE_INPUT;
manager.input_string.clear(); manager.clear_input();
manager.converted_string.clear();
manager.confirmed_string.clear(); manager.confirmed_string.clear();
manager.focus_begin = 0;
manager.focus_length = 0;
manager.is_initialized = false; manager.is_initialized = false;
return CELL_OK; return CELL_OK;
@ -369,11 +396,8 @@ static error_code cellImeJpReset(CellImeJpHandle hImeJpHandle)
} }
manager.input_state = CELL_IMEJP_BEFORE_INPUT; manager.input_state = CELL_IMEJP_BEFORE_INPUT;
manager.input_string.clear(); manager.clear_input();
manager.converted_string.clear();
manager.confirmed_string.clear(); manager.confirmed_string.clear();
manager.focus_begin = 0;
manager.focus_length = 0;
return CELL_OK; return CELL_OK;
} }
@ -487,7 +511,7 @@ static error_code cellImeJpModeCaretRight(CellImeJpHandle hImeJpHandle)
return CELL_IMEJP_ERROR_ERR; return CELL_IMEJP_ERROR_ERR;
} }
manager.move_focus(1); manager.move_cursor(1);
return CELL_OK; return CELL_OK;
} }
@ -509,7 +533,7 @@ static error_code cellImeJpModeCaretLeft(CellImeJpHandle hImeJpHandle)
return CELL_IMEJP_ERROR_ERR; return CELL_IMEJP_ERROR_ERR;
} }
manager.move_focus(-1); manager.move_cursor(-1);
return CELL_OK; return CELL_OK;
} }
@ -575,10 +599,7 @@ static error_code cellImeJpAllDeleteConvertString(CellImeJpHandle hImeJpHandle)
return CELL_IMEJP_ERROR_ERR; return CELL_IMEJP_ERROR_ERR;
} }
manager.focus_begin = 0; manager.clear_input();
manager.focus_length = 0;
manager.input_string.clear();
manager.converted_string.clear();
manager.input_state = CELL_IMEJP_BEFORE_INPUT; manager.input_state = CELL_IMEJP_BEFORE_INPUT;
return CELL_OK; return CELL_OK;
@ -667,10 +688,7 @@ static error_code cellImeJpAllConfirm(CellImeJpHandle hImeJpHandle)
// Use input_string for now // Use input_string for now
manager.confirmed_string = manager.input_string; manager.confirmed_string = manager.input_string;
manager.focus_begin = 0; manager.clear_input();
manager.focus_length = 0;
manager.input_string.clear();
manager.converted_string.clear();
manager.input_state = CELL_IMEJP_BEFORE_INPUT; manager.input_state = CELL_IMEJP_BEFORE_INPUT;
return CELL_OK; return CELL_OK;

3
rpcs3/Emu/Cell/Modules/cellImeJp.h
View file

@ -118,6 +118,7 @@ struct ime_jp_manager
std::u16string confirmed_string; // Confirmed part of the string (first part of the entire string) std::u16string confirmed_string; // Confirmed part of the string (first part of the entire string)
std::u16string converted_string; // Converted part of the unconfirmed input string std::u16string converted_string; // Converted part of the unconfirmed input string
std::u16string input_string; // Unconfirmed part of the string (second part of the entire string) std::u16string input_string; // Unconfirmed part of the string (second part of the entire string)
usz cursor = 0; // The cursor. Can move across the entire input string.
usz focus_begin = 0; // Begin of the focus string usz focus_begin = 0; // Begin of the focus string
usz focus_length = 0; // Length of the focus string usz focus_length = 0; // Length of the focus string
s16 fix_input_mode = CELL_IMEJP_FIXINMODE_OFF; s16 fix_input_mode = CELL_IMEJP_FIXINMODE_OFF;
@ -131,6 +132,8 @@ struct ime_jp_manager
bool addString(vm::cptr<u16> str); bool addString(vm::cptr<u16> str);
bool backspaceWord(); bool backspaceWord();
bool deleteWord(); bool deleteWord();
void clear_input();
void move_cursor(s8 amount); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
void move_focus(s8 amount); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128 void move_focus(s8 amount); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
void move_focus_end(s8 amount, bool wrap_around); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128 void move_focus_end(s8 amount, bool wrap_around); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
}; };