[Bf-blender-cvs] [cb63071] master: Cache whether current translation language supports IME or not

[Sergey Sharybin]

Commit: cb6307162b4c12743cee0db6b05f6b3a68f5258e
Author: Sergey Sharybin
Date:   Tue May 3 12:38:21 2016 +0200
Branches: master
https://developer.blender.org/rBcb6307162b4c12743cee0db6b05f6b3a68f5258e

Cache whether current translation language supports IME or not

Solves the weak point mentionedi n previous commit.

===================================================================

M	source/blender/blentranslation/BLT_translation.h
M	source/blender/blentranslation/CMakeLists.txt
M	source/blender/blentranslation/intern/blt_lang.c
M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h
index efd59c3..3838e8c 100644
--- a/source/blender/blentranslation/BLT_translation.h
+++ b/source/blender/blentranslation/BLT_translation.h
@@ -54,6 +54,7 @@ const char *BLT_translate_do_iface(const char *msgctxt, const char *msgid);
 const char *BLT_translate_do_tooltip(const char *msgctxt, const char *msgid);
 const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid);
 
+bool BLT_lang_is_ime_supported(void);
 
 /* The "translation-marker" macro. */
 #define N_(msgid) msgid
diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt
index 59bd7f0..a3e8534 100644
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -53,4 +53,10 @@ if(WITH_PYTHON)
 	)
 endif()
 
+if(WIN32)
+	if(WITH_INPUT_IME)
+		add_definitions(-DWITH_INPUT_IME)
+	endif()
+endif()
+
 blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c
index 1ad62fa..40771b3 100644
--- a/source/blender/blentranslation/intern/blt_lang.c
+++ b/source/blender/blentranslation/intern/blt_lang.c
@@ -64,6 +64,12 @@ static int num_locales = 0;
 static EnumPropertyItem *locales_menu = NULL;
 static int num_locales_menu = 0;
 
+#ifdef WITH_INPUT_IME
+/* Cached IME support flags */
+static bool ime_is_lang_supported = false;
+static void blt_lang_check_ime_supported(void);
+#endif
+
 static void free_locales(void)
 {
 	if (locales) {
@@ -280,6 +286,7 @@ void BLT_lang_set(const char *str)
 #else
 	(void)str;
 #endif
+	blt_lang_check_ime_supported();
 }
 
 /* Get the current locale (short code, e.g. es_ES). */
@@ -355,3 +362,32 @@ void BLT_lang_locale_explode(
 		MEM_freeN(_t);
 	}
 }
+
+/* Test if the translation context allows IME input - used to
+ * avoid weird character drawing if IME inputs non-ascii chars.
+ */
+static void blt_lang_check_ime_supported(void)
+{
+#ifdef WITH_INPUT_IME
+	const char *uilng = BLT_lang_get();
+	if (U.transopts & USER_DOTRANSLATE) {
+		ime_is_lang_supported = STREQ(uilng, "zh_CN") ||
+		                        STREQ(uilng, "zh_TW") ||
+		                        STREQ(uilng, "ja_JP");
+	}
+	else {
+		ime_is_lang_supported = false;
+	}
+#else
+	ime_is_lang_supported = false;
+#endif
+}
+
+bool BLT_lang_is_ime_supported(void)
+{
+#ifdef WITH_INPUT_IME
+	return ime_is_lang_supported;
+#else
+	return false;
+#endif
+}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index c6cd03d..2840be0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2945,19 +2945,6 @@ static bool ui_textedit_copypaste(uiBut *but, uiHandleButtonData *data, const in
 }
 
 #ifdef WITH_INPUT_IME
-/* test if the translation context allows IME input - used to
- * avoid weird character drawing if IME inputs non-ascii chars */
-static bool ui_ime_is_lang_supported(void)
-{
-	const char *uilng = BLT_lang_get();
-	if (U.transopts & USER_DOTRANSLATE) {
-		return STREQ(uilng, "zh_CN") ||
-		       STREQ(uilng, "zh_TW") ||
-		       STREQ(uilng, "ja_JP");
-	}
-	return false;
-}
-
 /* enable ime, and set up uibut ime data */
 static void ui_textedit_ime_begin(wmWindow *win, uiBut *UNUSED(but))
 {
@@ -3079,7 +3066,7 @@ static void ui_textedit_begin(bContext *C, uiBut *but, uiHandleButtonData *data)
 	WM_cursor_modal_set(win, BC_TEXTEDITCURSOR);
 
 #ifdef WITH_INPUT_IME
-	if (is_num_but == false && ui_ime_is_lang_supported()) {
+	if (is_num_but == false && BLT_lang_is_ime_supported()) {
 		ui_textedit_ime_begin(win, but);
 	}
 #endif
@@ -3406,7 +3393,7 @@ static void ui_do_but_textedit(bContext *C, uiBlock *block, uiBut *but, uiHandle
 #ifdef WITH_INPUT_IME
 		    &&
 		    !is_ime_composing &&
-		    (!WM_event_is_ime_switch(event) || !ui_ime_is_lang_supported())
+			(!WM_event_is_ime_switch(event) || !BLT_lang_is_ime_supported())
 #endif
 		    )
 		{