Add Arabic text shaping support for chat functionality

This commit introduces Arabic text shaping in the chat application by adding `ArabicShaping.cpp` and `ArabicShaping.h` for handling contextual forms and visual reordering.

The rendering logic in `ChatScreen.cpp` is updated to utilize this new functionality, adjusting cursor positions accordingly. Other UI components, including `UIControl_Base.cpp`, `UIControl_Label.cpp`, and `UIControl_SaveList.cpp`, are modified to ensure proper display of Arabic text.

Additionally, `Font.cpp` is enhanced with methods for efficient rendering of pre-shaped text.

Minecraft.Client/ChatScreen.cpp

@@ -6,6 +6,7 @@
 #include "..\Minecraft.World\SharedConstants.h"
 #include "..\Minecraft.World\StringHelpers.h"
 #include "..\Minecraft.World\ChatPacket.h"
+#include "..\Minecraft.World\ArabicShaping.h"
 
 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
 vector<wstring> ChatScreen::s_chatHistory;
@@ -154,14 +155,21 @@ void ChatScreen::render(int xm, int ym, float a)
     int x = 4;
     drawString(font, prefix, x, height - 12, 0xe0e0e0);
     x += font->width(prefix);
-    wstring beforeCursor = message.substr(0, cursorIndex);
-    wstring afterCursor = message.substr(cursorIndex);
-    drawStringLiteral(font, beforeCursor, x, height - 12, 0xe0e0e0);
-    x += font->widthLiteral(beforeCursor);
+
+    // Shape the full message as one unit so letter connections and word order
+    // are correct. Track where the logical cursor maps in the visual string.
+    int visualCursorPos = 0;
+    wstring shaped = shapeArabicText(message, cursorIndex, &visualCursorPos);
+
+    // Render the full shaped message without re-shaping it
+    drawStringPreshaped(font, shaped, x, height - 12, 0xe0e0e0);
+
+    // Place the cursor at the correct visual position
+    wstring beforeCursorVisual = shaped.substr(0, visualCursorPos);
+    int cursorX = x + font->widthPreshaped(beforeCursorVisual);
     if (frame / 6 % 2 == 0)
-        drawString(font, L"_", x, height - 12, 0xe0e0e0);
-    x += font->width(L"_");
-    drawStringLiteral(font, afterCursor, x, height - 12, 0xe0e0e0);
+        drawString(font, L"_", cursorX, height - 12, 0xe0e0e0);
+
     Screen::render(xm, ym, a);
 }
 

Minecraft.Client/Common/UI/UIControl_Base.cpp

@@ -3,6 +3,7 @@
 #include "UIControl.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\..\Minecraft.World\JavaMath.h"
+#include "..\..\..\Minecraft.World\ArabicShaping.h"
 
 UIControl_Base::UIControl_Base()
 {
@@ -32,13 +33,16 @@ void UIControl_Base::tick()
 		//app.DebugPrintf("Calling SetLabel - '%ls'\n", m_label.c_str());
 		m_bLabelChanged = false;
 
+		// Shape the text before sending to Iggy; m_label stays unshaped for future updates
+		wstring shaped = shapeArabicText(m_label.getString());
+
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_string_UTF16;
 		IggyStringUTF16 stringVal;
 
-		stringVal.string = (IggyUTF16*) m_label.c_str();
-		stringVal.length = m_label.length();
+		stringVal.string = (IggyUTF16*) shaped.c_str();
+		stringVal.length = (int)shaped.length();
 		value[0].string16 = stringVal;
 
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setLabelFunc , 1 , value );
@@ -56,13 +60,16 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force)
 	{
 		m_bLabelChanged = false;
 
+		// Shape the text before sending to Iggy; m_label stays unshaped for future updates
+		wstring shaped = shapeArabicText(m_label.getString());
+
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_string_UTF16;
 		IggyStringUTF16 stringVal;
 
-		stringVal.string = (IggyUTF16*)m_label.c_str();
-		stringVal.length = m_label.length();
+		stringVal.string = (IggyUTF16*) shaped.c_str();
+		stringVal.length = (int)shaped.length();
 		value[0].string16 = stringVal;
 
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setLabelFunc , 1 , value );

Minecraft.Client/Common/UI/UIControl_Label.cpp

@@ -2,6 +2,7 @@
 #include "UI.h"
 #include "UIControl_Label.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\ArabicShaping.h"
 
 UIControl_Label::UIControl_Label()
 {
@@ -22,13 +23,15 @@ void UIControl_Label::init(UIString label)
 {
 	m_label = label;
 
+	wstring shaped = shapeArabicText(m_label.getString());
+
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	IggyStringUTF16 stringVal;
 
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = label.length();
+	stringVal.string = (IggyUTF16*)shaped.c_str();
+	stringVal.length = (int)shaped.length();
 	value[0].string16 = stringVal;
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value );
 }

Minecraft.Client/Common/UI/UIControl_SaveList.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_SaveList.h"
+#include "..\..\..\Minecraft.World\ArabicShaping.h"
 
 bool UIControl_SaveList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
 {
@@ -69,12 +70,14 @@ void UIControl_SaveList::addItem(const string &label, const wstring &iconName, i
 
 void UIControl_SaveList::addItem(const wstring &label, const wstring &iconName, int data)
 {
+	wstring shaped = shapeArabicText(label);
+
 	IggyDataValue result;
 	IggyDataValue value[3];
 
 	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = static_cast<S32>(label.length());
+	stringVal.string = (IggyUTF16*)shaped.c_str();
+	stringVal.length = static_cast<S32>(shaped.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 

Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp

@@ -255,7 +255,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 		{
 			wchar_t wSaveName[128];
 			ZeroMemory(wSaveName, sizeof(wSaveName));
-			mbstowcs(wSaveName, params->saveDetails->UTF8SaveName, 127);
+			MultiByteToWideChar(CP_UTF8, 0, params->saveDetails->UTF8SaveName, -1, wSaveName, 127);
 			m_levelName = wstring(wSaveName);
 			m_labelGameName.init(m_levelName);
 		}

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -49,7 +49,7 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath, bool *outHardc
                 if (len > 0)
                 {
                     wchar_t wbuf[128] = {};
-                    mbstowcs(wbuf, buf, 127);
+                    MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, 127);
                     return wstring(wbuf);
                 }
             }
@@ -785,8 +785,11 @@ void UIScene_LoadOrJoinMenu::tick()
                         if (!levelName.empty())
                         {
                             m_buttonListSaves.addItem(levelName, wstring(L""));
-                            wcstombs(m_saveDetails[i].UTF8SaveName, levelName.c_str(), 127);
-                            m_saveDetails[i].UTF8SaveName[127] = '\0';
+                            {
+                                int n = WideCharToMultiByte(CP_UTF8, 0, levelName.c_str(), -1, m_saveDetails[i].UTF8SaveName, 127, nullptr, nullptr);
+                                if (n <= 0) m_saveDetails[i].UTF8SaveName[0] = '\0';
+                                m_saveDetails[i].UTF8SaveName[127] = '\0';
+                            }
                         }
                         else
                         {
@@ -1431,9 +1434,9 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 for (int k = 0; k < 127 && ui16Text[k]; k++)
                     wNewName[k] = static_cast<wchar_t>(ui16Text[k]);
 
-                // Convert to narrow for storage and in-memory update
-                char narrowName[128] = {};
-                wcstombs(narrowName, wNewName, 127);
+                // Convert to narrow for storage and in-memory update (UTF-8 to preserve Unicode)
+                char narrowName[256] = {};
+                WideCharToMultiByte(CP_UTF8, 0, wNewName, -1, narrowName, 255, nullptr, nullptr);
 
                 // Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt
                 wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
@@ -1449,7 +1452,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
 
                 // Update the in-memory display name so the list reflects it immediately
                 strncpy_s(pClass->m_saveDetails[listPos].UTF8SaveName, narrowName, 127);
-                pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0';
+                pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0'; // UTF8SaveName is still 128 bytes; narrowName fits as Arabic is <=2 bytes/char in UTF-8
 
                 // Reuse the existing callback to trigger the list repopulate
                 UIScene_LoadOrJoinMenu::RenameSaveDataReturned(pClass, true);
@@ -2517,7 +2520,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS
             {
                 wchar_t wSaveName[128];
                 ZeroMemory(wSaveName, 128 * sizeof(wchar_t));
-                mbstowcs_s(nullptr, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
+                MultiByteToWideChar(CP_UTF8, 0, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, -1, wSaveName, 127);
                 UIKeyboardInitData kbData;
                 kbData.title       = app.GetString(IDS_RENAME_WORLD_TITLE);
                 kbData.defaultText = wSaveName;

Minecraft.Client/Common/XUI/XUI_Chat.cpp

@@ -2,6 +2,7 @@
 #include "XUI_Chat.h"
 #include "..\..\Minecraft.h"
 #include "..\..\Gui.h"
+#include "..\..\..\Minecraft.World\ArabicShaping.h"
 
 HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
@@ -29,7 +30,8 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled)
 		{
 			m_Backgrounds[i].SetOpacity(opacity);
 			m_Labels[i].SetOpacity(opacity);
-			m_Labels[i].SetText( pGui->getMessage(m_iPad,i).c_str() );
+			wstring shaped = shapeArabicText(pGui->getMessage(m_iPad, i));
+			m_Labels[i].SetText( shaped.c_str() );
 		}
 		else
 		{

Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "XUI_Ctrl_4JList.h"
+#include "..\..\..\Minecraft.World\ArabicShaping.h"
 
 static bool TimeSortFn(const void *a, const void *b);
 
@@ -294,8 +295,16 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
 	if( ( 0 == pGetSourceTextData->iData ) && ( ( pGetSourceTextData->bItemData ) ) )
 	{
 		EnterCriticalSection(&m_AccessListData);
-		pGetSourceTextData->szText =
-			GetData(pGetSourceTextData->iItem).pwszText;
+		LPCWSTR rawText = GetData(pGetSourceTextData->iItem).pwszText;
+		if (rawText)
+		{
+			m_shapedTextCache = shapeArabicText(rawText);
+			pGetSourceTextData->szText = m_shapedTextCache.c_str();
+		}
+		else
+		{
+			pGetSourceTextData->szText = rawText;
+		}
 		LeaveCriticalSection(&m_AccessListData);
 		bHandled = TRUE;
 	}

Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.h

@@ -75,4 +75,5 @@ private:
 	static bool IndexSortFn(const void *a, const void *b);
 
 	HXUIOBJ m_hSelectionChangedHandlerObj;
+	std::wstring m_shapedTextCache; // temp buffer for Arabic-shaped text in OnGetSourceDataText
 };

Minecraft.Client/Font.cpp

@@ -8,6 +8,7 @@
 #include "..\Minecraft.World\net.minecraft.h"
 #include "..\Minecraft.World\StringHelpers.h"
 #include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\ArabicShaping.h"
 
 Font::Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[]/* = nullptr */) : textures(textures)
 {
@@ -289,6 +290,74 @@ void Font::drawLiteral(const wstring& str, int x, int y, int color)
 	}
 }
 
+// Like sanitize() but skips the shapeArabicText() call - for pre-shaped strings.
+wstring Font::sanitizePreshaped(const wstring& str)
+{
+	wstring sb = str;
+	for (unsigned int i = 0; i < sb.length(); i++)
+	{
+		if (CharacterExists(sb[i]))
+			sb[i] = MapCharacter(sb[i]);
+		else if (unicodeWidth[sb[i]] != 0)
+		{
+			// Leave as-is: raw codepoint for glyph page rendering
+		}
+		else
+		{
+			sb[i] = 0;
+		}
+	}
+	return sb;
+}
+
+void Font::drawLiteralPreshaped(const wstring& str, int x, int y, int color)
+{
+	if (str.empty()) return;
+	if ((color & 0xFC000000) == 0) color |= 0xFF000000;
+	textures->bindTexture(m_textureLocation);
+	glColor4f((color >> 16 & 255) / 255.0F, (color >> 8 & 255) / 255.0F, (color & 255) / 255.0F, (color >> 24 & 255) / 255.0F);
+	xPos = static_cast<float>(x);
+	yPos = static_cast<float>(y);
+	wstring cleanStr = sanitizePreshaped(str);
+	for (size_t i = 0; i < cleanStr.length(); ++i)
+	{
+		wchar_t c = cleanStr.at(i);
+		if (isUnicodeGlyphChar(c))
+		{
+			renderUnicodeCharacter(c);
+			textures->bindTexture(m_textureLocation);
+			lastBoundTexture = fontTexture;
+		}
+		else
+		{
+			renderCharacter(c);
+		}
+	}
+}
+
+void Font::drawShadowLiteralPreshaped(const wstring& str, int x, int y, int color)
+{
+	int shadowColor = (color & 0xFCFCFC) >> 2 | (color & 0xFF000000);
+	drawLiteralPreshaped(str, x + 1, y + 1, shadowColor);
+	drawLiteralPreshaped(str, x, y, color);
+}
+
+int Font::widthPreshaped(const wstring& str)
+{
+	wstring cleanStr = sanitizePreshaped(str);
+	if (cleanStr.empty()) return 0;
+	int len = 0;
+	for (size_t i = 0; i < cleanStr.length(); ++i)
+	{
+		wchar_t wc = cleanStr.at(i);
+		if (isUnicodeGlyphChar(wc))
+			len += (int)unicodeCharWidth(wc);
+		else
+			len += charWidths[static_cast<unsigned>(wc)];
+	}
+	return len;
+}
+
 void Font::drawShadowWordWrap(const wstring &str, int x, int y, int w, int color, int h)
 {
 	drawWordWrapInternal(str, x + 1, y + 1, w, color, true, h);
@@ -473,7 +542,7 @@ int Font::widthLiteral(const wstring& str)
 
 wstring Font::sanitize(const wstring& str)
 {
-	wstring sb = str;
+	wstring sb = shapeArabicText(str);
 
     for (unsigned int i = 0; i < sb.length(); i++)
 	{

Minecraft.Client/Font.h

@@ -78,10 +78,14 @@ private:
 	void renderUnicodeCharacter(wchar_t c);
 	float unicodeCharWidth(wchar_t c);
 	bool isUnicodeGlyphChar(wchar_t c);
+	wstring sanitizePreshaped(const wstring& str); // sanitize without re-shaping Arabic
+	void drawLiteralPreshaped(const wstring& str, int x, int y, int color);
 
 public:
     int width(const wstring& str);
 	int widthLiteral(const wstring& str); // width without skipping § codes (for chat input)
+	int widthPreshaped(const wstring& str); // width of already-shaped text, no re-shaping
+	void drawShadowLiteralPreshaped(const wstring& str, int x, int y, int color);
     wstring sanitize(const wstring& str);
 	void drawWordWrap(const wstring &string, int x, int y, int w, int col, int h); // 4J Added h param
 

Minecraft.Client/GuiComponent.cpp

@@ -110,6 +110,11 @@ void GuiComponent::drawStringLiteral(Font *font, const wstring& str, int x, int
 	font->drawShadowLiteral(str, x, y, color);
 }
 
+void GuiComponent::drawStringPreshaped(Font *font, const wstring& str, int x, int y, int color)
+{
+	font->drawShadowLiteralPreshaped(str, x, y, color);
+}
+
 void GuiComponent::blit(int x, int y, int sx, int sy, int w, int h)
 {
     float us = 1 / 256.0f;

Minecraft.Client/GuiComponent.h

@@ -16,5 +16,6 @@ public:
 	void drawCenteredString(Font *font, const wstring& str, int x, int y, int color);
     void drawString(Font *font, const wstring& str, int x, int y, int color);
 	void drawStringLiteral(Font* font, const wstring& str, int x, int y, int color);
+	void drawStringPreshaped(Font* font, const wstring& str, int x, int y, int color);
     void blit(int x, int y, int sx, int sy, int w, int h);
 };