gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-20 09:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Use a different hack to handle the escape key.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-24 23:04:11 -04:00
parent dc38a2208c
commit cbcd5e8749
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/content/dactyl.xul
View File

@@ -26,11 +26,6 @@
<script type="application/x-javascript;version=1.8" src="&dactyl.content;dactyl-overlay.js"/> <script type="application/x-javascript;version=1.8" src="&dactyl.content;dactyl-overlay.js"/>
<window id="&dactyl.mainWindow;"> <window id="&dactyl.mainWindow;">
<keyset id="mainKeyset">
<!-- Why do we need this? ––Kris -->
<key id="key_stop" keycode="VK_ESCAPE" oncommand="&events;.onEscape();"/>
<!-- other keys are handled inside the event loop in events.js -->
</keyset>
<popupset> <popupset>
<panel id="dactyl-visualbell" dactyl:highlight="Bell" <panel id="dactyl-visualbell" dactyl:highlight="Bell"

8
common/content/events.js
View File

@@ -934,6 +934,10 @@ const Events = Module("events", {
let motionMap = (this._input.pendingMotionMap && this._input.pendingMotionMap.names[0]) || ""; let motionMap = (this._input.pendingMotionMap && this._input.pendingMotionMap.names[0]) || "";
if (!(modes.extended & modes.HINTS)) if (!(modes.extended & modes.HINTS))
statusline.updateInputBuffer(motionMap + this._input.buffer); statusline.updateInputBuffer(motionMap + this._input.buffer);
// This is a stupid, silly, and revolting hack.
if (isEscape(key))
this.onEscape();
} }
}, },
@@ -1034,10 +1038,6 @@ const Events = Module("events", {
}; };
}, },
mappings: function () { mappings: function () {
mappings.add(modes.all,
["<Esc>", "<C-[>"], "Focus content",
function () { events.onEscape(); });
// add the ":" mapping in all but insert mode mappings // add the ":" mapping in all but insert mode mappings
mappings.add(modes.matchModes({ extended: false, input: false }), mappings.add(modes.matchModes({ extended: false, input: false }),
[":"], "Enter command line mode", [":"], "Enter command line mode",