Some fixes for Win32 RTL rendering

Fraser J. Gordon · Fraser J. Gordon · commit 7433d1638ac0 · 2014-03-10T16:39:10.000Z
diff --git a/engine/src/font.cpp b/engine/src/font.cpp
@@ -326,7 +326,8 @@ void MCFontBreakText(MCFontRef p_font, MCStringRef p_text, MCRange p_range, MCFo
             t_range = MCRangeMake(t_end - t_offset - t_break_point, t_break_point);
         else
             t_range = MCRangeMake(t_offset, t_break_point);
-        
+
+#if !defined(_WIN32)
         // This is a really ugly hack to get LTR/RTL overrides working correctly -
         // ATSUI and Pango think they know better than us and won't let us suppress
         // the BiDi algorithm they uses for text layout. So instead, we need to add
@@ -343,6 +344,9 @@ void MCFontBreakText(MCFontRef p_font, MCStringRef p_text, MCRange p_range, MCFo
         /* UNCHECKED */ MCStringAppendChar(*t_temp, 0x202C);
         
         p_callback(p_font, *t_temp, MCRangeMake(0, MCStringGetLength(*t_temp)), p_callback_data);
+#else
+        p_callback(p_font, p_text, t_range, p_callback_data);
+#endif
         
         // Explicitly show breaking points
         //p_callback(p_font, MCSTR("|"), MCRangeMake(0, 1), p_callback_data);
diff --git a/libgraphics/src/w32text.cpp b/libgraphics/src/w32text.cpp
@@ -359,7 +359,7 @@ static bool w32_draw_text_to_context_at_device_location(MCGContextRef p_context,
 		SetTextColor(p_gdicontext, 0x00000000);
 		SetBkColor(p_gdicontext, 0x00FFFFFF);
 		SetBkMode(p_gdicontext, OPAQUE);		
-		t_success = TextOutW(p_gdicontext, 0, 0, (LPCWSTR)p_text, p_length >> 1);
+		t_success = ExtTextOutW(p_gdicontext, 0, 0, false ? ETO_RTLREADING : 0, NULL, (LPCWSTR)p_text, p_length >> 1, NULL);
 	}
 	
 	if (t_success)
@@ -459,7 +459,7 @@ static bool w32_draw_opaque_text_to_context_at_device_location(MCGContextRef p_c
 
 		SetBkMode(p_gdicontext, TRANSPARENT);
 		SetTextColor(p_gdicontext, RGB((p_context -> state -> fill_color >> 16) & 0xFF, (p_context -> state -> fill_color >> 8) & 0xFF, (p_context -> state -> fill_color >> 0) & 0xFF));
-		t_success = TextOutW(p_gdicontext, 0, 0, (LPCWSTR)p_text, p_length >> 1);
+		t_success = ExtTextOutW(p_gdicontext, 0, 0, false ? ETO_RTLREADING : 0, NULL, (LPCWSTR)p_text, p_length >> 1, NULL);
 	}	
 
 	if (t_success)

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ static bool w32_draw_text_to_context_at_device_location(MCGContextRef p_context,`
`359`	`359`	`SetTextColor(p_gdicontext, 0x00000000);`
`360`	`360`	`SetBkColor(p_gdicontext, 0x00FFFFFF);`
`361`	`361`	`SetBkMode(p_gdicontext, OPAQUE);`
`362`		`- t_success = TextOutW(p_gdicontext, 0, 0, (LPCWSTR)p_text, p_length >> 1);`
	`362`	`+ t_success = ExtTextOutW(p_gdicontext, 0, 0, false ? ETO_RTLREADING : 0, NULL, (LPCWSTR)p_text, p_length >> 1, NULL);`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`if (t_success)`
`@@ -459,7 +459,7 @@ static bool w32_draw_opaque_text_to_context_at_device_location(MCGContextRef p_c`
`459`	`459`
`460`	`460`	`SetBkMode(p_gdicontext, TRANSPARENT);`
`461`	`461`	`SetTextColor(p_gdicontext, RGB((p_context -> state -> fill_color >> 16) & 0xFF, (p_context -> state -> fill_color >> 8) & 0xFF, (p_context -> state -> fill_color >> 0) & 0xFF));`
`462`		`- t_success = TextOutW(p_gdicontext, 0, 0, (LPCWSTR)p_text, p_length >> 1);`
	`462`	`+ t_success = ExtTextOutW(p_gdicontext, 0, 0, false ? ETO_RTLREADING : 0, NULL, (LPCWSTR)p_text, p_length >> 1, NULL);`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`if (t_success)`