[[ Bug 15305 ]] Send appropriate keyDown message for Option-<key>

livecodesebastien · livecodesebastien · commit 1878a1281978 · 2015-05-05T18:12:30.000+01:00
Use better way to find out when keys are IME entries
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -965,8 +965,8 @@ void MCPlatformHandleTextInputInsertText(MCPlatformWindowRef p_window, unichar_t
         //  of the whole word are individual Kanji as well, and Unicode valid alphanum.
         //  (they would be appended to the in-process IME string).
         // SN-2015-05-05: [[ Bug 15305 ]] Check that s_pending_key_down is not
-        //  nil before trying to use it.
-        if (s_pending_key_down && *p_chars > 127 && p_char_count == 1 && MCUnicodeMapToNative(p_chars, 1, t_char[0]))
+        //  nil before trying to use it, and use IME only if p_mark says so.
+        if (s_pending_key_down && !p_mark)
         {
             MCAutoStringRef t_mapped_char;
             MCPlatformKeyCode t_mapped_key_code;
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -527,9 +527,11 @@ Boolean MCObject::kdown(MCStringRef p_string, KeySym key)
 		// Special keys as their number converted to a string, the rest by value
         // SN-2014-12-08: [[ Bug 12681 ]] Avoid to print the keycode in case we have a
         // numeric keypad keycode.
-        if (key > 0x7F && (key & XK_Class_mask) == XK_Class_compat && (key < XK_KP_Space || key > XK_KP_Equal))
-			/* UNCHECKED */ MCStringFormat(&t_string, "%ld", key);
-            else if (MCmodifierstate & MS_CONTROL)
+        // SN-2015-05-05: [[ Bug 15305 ]] Ensure that the keys are not printing
+        //  their numeric value, if not wanted.
+        if (key > 0xFF && (key & XK_Class_mask) == XK_Class_compat && (key < XK_KP_Space || key > XK_KP_Equal))
+            /* UNCHECKED */ MCStringFormat(&t_string, "%ld", key);
+        else if (MCmodifierstate & MS_CONTROL)
             /* UNCHECKED */ MCStringFormat(&t_string, "%c", (char)key);
 		else
 			t_string = p_string;
