livecodealice
diff --git a/‎engine/src/eventqueue.cpp
Copy file name to clipboardExpand all lines: engine/src/eventqueue.cpp
+6-4Lines changed: 6 additions & 4 deletions b/‎engine/src/eventqueue.cpp
Copy file name to clipboardExpand all lines: engine/src/eventqueue.cpp
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎engine/src/mbliphoneappview.mm
Copy file name to clipboardExpand all lines: engine/src/mbliphoneappview.mm
+51-18Lines changed: 51 additions & 18 deletions b/‎engine/src/mbliphoneappview.mm
Copy file name to clipboardExpand all lines: engine/src/mbliphoneappview.mm
+51-18Lines changed: 51 additions & 18 deletions
@@ -496,13 +496,15 @@ static void MCEventQueueDispatchEvent(MCEvent *p_event)
 			}
 
 			// Otherwise 'char_code' is the unicode codepoint, so first map to
-			// UTF-16 (not done properly yet...)
-			unichar_t t_unichar;
-			t_unichar = (unichar_t)t_event -> key . press . char_code;
+			// UTF-16 codeunits
+			unichar_t t_unichars[2];
+            uindex_t t_length = 1;
+            if (MCUnicodeCodepointToSurrogates(t_event->key.press.char_code, t_unichars))
+                t_length = 2;
 
 			// Now the string is created with the appropriate unicode-capable function
 			MCAutoStringRef t_buffer;
-            MCStringCreateWithChars(&t_unichar, 1, &t_buffer);
+            MCStringCreateWithChars(t_unichars, t_length, &t_buffer);
 			t_target -> kdown(*t_buffer, t_event -> key . press . key_code);
 			t_target -> kup(*t_buffer, t_event -> key . press . key_code);
 		}
 
@@ -254,26 +254,59 @@ - (void)textViewDidEndEditing: (UITextView *)textView
 
 - (BOOL)textView: (UITextView *)textView shouldChangeTextInRange: (NSRange)range replacementText: (NSString*)text
 {
-	uint32_t t_key_code, t_char_code;
-    // PM-2015-01-16: Prevent crash when deleting accented characters
-	if (range . location == 0 || [text length] == 0)
+    // Handle deletion
+    if (range . location == 0 || [text length] == 0)
 	{
-		t_key_code = 0xff08;
-		t_char_code = 0;
+        MCIPhoneHandleProcessTextInput(0, 0xff08);
+        return NO;
 	}
-	else
-	{
-		t_key_code = 0;
-        t_char_code = [text characterAtIndex: 0];
-	}
-	
-	if (t_char_code == 10)
-	{
-		t_key_code = 0xff0d;
-		t_char_code = 0;
-	}
-	
-	MCIPhoneHandleProcessTextInput(t_char_code, t_key_code);
+    
+    // Handle newlines
+    if ([text characterAtIndex:0] == 0x0a)
+    {
+        MCIPhoneHandleProcessTextInput(0, 0xff0d);
+        return NO;
+    }
+
+    // Loop over the UTF-16 codeunits and insert them as codepoints
+    bool t_is_surrogate = false;
+    unichar_t t_surrogate = 0;
+    for (NSUInteger i = 0; i < [text length]; i++)
+    {
+        // Get the next character
+        unichar_t t_char = [text characterAtIndex:i];
+        
+        // Process based on whether we are dealing with a surrogate or not
+        codepoint_t t_codepoint;
+        if (t_is_surrogate)
+        {
+            // We're expecting a trailing surrogate
+            if (!MCUnicodeCodepointIsTrailingSurrogate(t_char))
+            {
+                // Something has gone wrong... abort processing of this text
+                return NO;
+            }
+            
+            // Re-combine the surrogate
+            t_codepoint = MCUnicodeCombineSurrogates(t_surrogate, t_char);
+            t_is_surrogate = false;
+            
+        }
+        else if (MCUnicodeCodepointIsLeadingSurrogate(t_char))
+        {
+            // Wait for the second half of the pair
+            t_is_surrogate = true;
+            t_surrogate = t_char;
+            continue;
+        }
+        else
+        {
+            // Not a surrogate - use directly as a codepoint
+            t_codepoint = t_char;
+        }
+        
+        MCIPhoneHandleProcessTextInput(t_codepoint, 0);
+    }
 
 	return NO;
 }