Pass the char code all the way to the textinput component

components/script/dom/document.rs

@@ -1093,7 +1093,7 @@ impl Document {
                                           alt,
                                           shift,
                                           meta,
-                                          None,
+                                          props.char_code,
                                           props.key_code);
         let event = keyevent.upcast::<Event>();
         event.fire(target);
@@ -1120,7 +1120,7 @@ impl Document {
                                            shift,
                                            meta,
                                            props.char_code,
-                                           0);
+                                           props.key_code);
             let ev = event.upcast::<Event>();
             ev.fire(target);
             prevented = ev.DefaultPrevented();

components/script/dom/keyboardevent.rs

@@ -19,6 +19,7 @@ use msg::constellation_msg;
 use msg::constellation_msg::{Key, KeyModifiers};
 use std::borrow::Cow;
 use std::cell::Cell;
+use std::char;
 
 no_jsmanaged_fields!(Key);
 
@@ -125,6 +126,10 @@ impl KeyboardEvent {
                 key_code: key_keycode(key),
             }
     }
+
+    pub fn char(&self) -> Option<char> {
+        self.char_code.get().map(|code| char::from_u32(code).unwrap())
+    }
 }
 
 

components/script/textinput.rs

@@ -486,12 +486,17 @@ impl<T: ClipboardProvider> TextInput<T> {
     /// Process a given `KeyboardEvent` and return an action for the caller to execute.
     pub fn handle_keydown(&mut self, event: &KeyboardEvent) -> KeyReaction {
         if let Some(key) = event.get_key() {
-            self.handle_keydown_aux(key, event.get_key_modifiers())
+            self.handle_keydown_aux(event.char(), key, event.get_key_modifiers())
         } else {
             KeyReaction::Nothing
         }
     }
-    pub fn handle_keydown_aux(&mut self, key: Key, mods: KeyModifiers) -> KeyReaction {
+
+    pub fn handle_keydown_aux(&mut self, ch: Option<char>, key: Key, mods: KeyModifiers) -> KeyReaction {
+        if let Some(ch) = ch {
+            self.insert_char(ch);
+            return KeyReaction::DispatchInput;
+        }
         let maybe_select = if mods.contains(SHIFT) { Selection::Selected } else { Selection::NotSelected };
         match key {
             Key::A if is_control_key(mods) => {

tests/unit/script/textinput.rs

@@ -401,7 +401,7 @@ fn test_clipboard_paste() {
                                        SelectionDirection::None);
     assert_eq!(textinput.get_content(), "defg");
     assert_eq!(textinput.edit_point.index, 0);
-    textinput.handle_keydown_aux(Key::V, MODIFIERS);
+    textinput.handle_keydown_aux(None, Key::V, MODIFIERS);
     assert_eq!(textinput.get_content(), "abcdefg");
 }