From 6358a21cecf966a761ad45a34daf4a79a40d4821 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 20 Nov 2010 14:45:00 -0500
Subject: [PATCH] feedkeys magic.

---
 common/content/events.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 86ee6d26..0fc6432f 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -235,8 +235,6 @@ const Events = Module("events", {
      * @returns {boolean}
      */
     feedkeys: function (keys, noremap, quiet) {
-        let doc = window.document;
-        let view = window.document.defaultView;
 
         let wasFeeding = this.feedingKeys;
         this.feedingKeys = true;
@@ -258,15 +256,11 @@ const Events = Module("events", {
                         evt.noremap = !!noremap;
                     evt.isMacro = true;
 
+                    let event = events.create(document.commandDispatcher.focusedWindow.document, type, evt);
                     if (!evt_obj.dactylString && !evt_obj.dactylShift)
-                        window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
-                              .sendKeyEvent(type, evt.keyCode, evt.charCode, evt.modifiers);
-                    else { // A special hack for dactyl-specific key names.
-                        evt.dactylString = evt_obj.dactylString; // for key-less keypress events e.g. <Nop>
-                        evt.dactylShift = evt_obj.dactylShift; // for untypeable shift keys e.g. <S-1>
-                        events.onKeyPress(evt);
-                        break;
-                    }
+                        events.dispatch(dactyl.focus || buffer.focusedFrame, event);
+                    else
+                        events.onKeyPress(event);
                 }
 
                 if (!this.feedingKeys)