metin-server/m2dev-client-src
3
0
Fork 1
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix: Better BiDi logic for formatting

Browse Source
This commit is contained in:
rtw1x1
2025-12-30 22:20:04 +00:00
parent 18073e7193
commit e7a113885a
4 changed files with 563 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/UserInterface/PythonChat.cpp
View File

@@ -499,9 +499,27 @@ void CPythonChat::AppendChat(int iType, const char * c_szChat)
SChatLine * pChatLine = SChatLine::New();
pChatLine->iType = iType;
// Pass chat text as-is to BiDi algorithm
// BuildVisualBidiText_Tagless will detect chat format and handle reordering
pChatLine->Instance.SetValue(c_szChat);
// Parse chat format "name : message" for proper BiDi handling
// This avoids issues with usernames containing " : "
const char* colonPos = strstr(c_szChat, " : ");
if (colonPos && colonPos != c_szChat) // Make sure " : " is not at the start
{
// Extract name and message
size_t nameLen = colonPos - c_szChat;
const char* msgStart = colonPos + 3; // Skip " : "
// Create temporary buffers
std::string name(c_szChat, nameLen);
std::string message(msgStart);
// Use new SetChatValue API for proper BiDi handling
pChatLine->Instance.SetChatValue(name.c_str(), message.c_str());
}
else
{
// Fallback: Not in chat format (INFO, NOTICE, etc.)
pChatLine->Instance.SetValue(c_szChat);
}
if (IsRTL())
{
@@ -768,9 +786,23 @@ void CWhisper::AppendChat(int iType, const char * c_szChat)
SChatLine * pChatLine = SChatLine::New();
// Pass chat text as-is to BiDi algorithm
// BuildVisualBidiText_Tagless will detect chat format and handle reordering
pChatLine->Instance.SetValue(c_szChat);
// Parse chat format "name : message" for proper BiDi handling
const char* colonPos = strstr(c_szChat, " : ");
if (colonPos && colonPos != c_szChat)
{
// Extract name and message
size_t nameLen = colonPos - c_szChat;
const char* msgStart = colonPos + 3;
std::string name(c_szChat, nameLen);
std::string message(msgStart);
pChatLine->Instance.SetChatValue(name.c_str(), message.c_str());
}
else
{
pChatLine->Instance.SetValue(c_szChat);
}
if (IsRTL())
{