- added support for libfribidi for languages requiring complex text rendering like Arabic and Hebrew

source/shared_lib/CMakeLists.txt

@@ -17,6 +17,9 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 
 	INCLUDE (CheckIncludeFiles)
 
+#Game options
+option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
+
 	IF(WIN32)
 		SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
 					${PROJECT_SOURCE_DIR}/source/win32_deps/lib
@@ -247,6 +250,18 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		ENDIF()
         ENDIF()
 
+
+	find_package( FriBiDi )
+	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
+	        add_definitions(-DHAVE_FRIBIDI)
+
+        	include_directories( ${FRIBIDI_INCLUDE_DIR} )
+                SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${FRIBIDI_LIBRARIES})
+
+	elseif(ENABLE_FRIBIDI AND NOT FRIBIDI_LIBRARIES)
+		message("Could not find FriBiDi. Disabling FriBiDi support.")
+	endif()
+
 	#########################################################################################
 	# megaglest lib
 

source/shared_lib/include/graphics/font.h

@@ -110,6 +110,8 @@ public:
 	int getSize() const;
 	void setSize(int size);
 
+	static void bidi_cvt(string &str_);
+
 	static void resetToDefaults();
 };
 

source/shared_lib/sources/graphics/font.cpp

@@ -34,6 +34,11 @@ using namespace Shared::Graphics::Gl;
 #include "util.h"
 #include "platform_common.h"
 #include "platform_util.h"
+
+#ifdef	HAVE_FRIBIDI
+#include <fribidi.h>
+#endif
+
 #include "leak_dumper.h"
 
 using namespace std;
@@ -303,6 +308,39 @@ void Font::setSize(int size)	{
 	}
 }
 
+void Font::bidi_cvt(string &str_) {
+#ifdef	HAVE_FRIBIDI
+	char		*c_str = const_cast<char *>(str_.c_str());	// fribidi forgot const...
+	FriBidiStrIndex	len = str_.length();
+	FriBidiChar	*bidi_logical = new FriBidiChar[len + 2];
+	FriBidiChar	*bidi_visual = new FriBidiChar[len + 2];
+	char		*utf8str = new char[4*len + 1];	//assume worst case here (all 4 Byte characters)
+	FriBidiCharType	base_dir = FRIBIDI_TYPE_ON;
+	FriBidiStrIndex n;
+
+
+#ifdef	OLD_FRIBIDI
+	n = fribidi_utf8_to_unicode (c_str, len, bidi_logical);
+#else
+	n = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, c_str, len, bidi_logical);
+#endif
+	fribidi_log2vis(bidi_logical, n, &base_dir, bidi_visual, NULL, NULL, NULL);
+#ifdef	OLD_FRIBIDI
+	fribidi_unicode_to_utf8 (bidi_visual, n, utf8str);
+#else
+	fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, bidi_visual, n, utf8str);
+#endif
+	//is_rtl_ = base_dir == FRIBIDI_TYPE_RTL;
+	//fontIsRightToLeft = base_dir == FRIBIDI_TYPE_RTL;
+	fontIsRightToLeft = false;
+
+	str_ = std::string(utf8str);
+	delete[] bidi_logical;
+	delete[] bidi_visual;
+	delete[] utf8str;
+#endif
+}
+
 // ===============================================
 //	class Font2D
 // ===============================================

source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp

@@ -20,6 +20,7 @@
 #include "string_utils.h"
 #include "utf8.h"
 #include "util.h"
+
 #include "leak_dumper.h"
 
 using namespace Shared::Util;
@@ -58,6 +59,7 @@ void TextRenderer2DGl::render(const string &text, float x, float y, bool centere
 	}
 
 	string renderText			= text;
+	Font::bidi_cvt(renderText);
 	int line					= 0;
 	int size					= font->getSize();
 	const unsigned char *utext	= NULL;
@@ -388,6 +390,8 @@ void TextRenderer3DGl::render(const string &text, float  x, float y, bool center
 
 	if(text.empty() == false) {
 		string renderText = text;
+		Font::bidi_cvt(renderText);
+
 		if(Font::fontIsMultibyte == true) {
 			if(font->getTextHandler() != NULL) {
 				if(Font::fontIsRightToLeft == true) {