gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-08 02:43:32 +02:00
Code Issues Projects Releases Wiki Activity

'passkeys' fixes and improvements.

Browse Source
This commit is contained in:
Kris Maglione
2010-11-05 10:40:43 -04:00
parent b196b98e9c
commit fde5c046a5
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
common/content/events.js
View File

@@ -474,13 +474,15 @@ const Events = Module("events", {
modifier += "M-"; modifier += "M-";
if (/^key/.test(event.type)) { if (/^key/.test(event.type)) {
let charCode = event.type == "keyup" ? 0 : event.charCode; let charCode = event.type == "keyup" ? 0 : event.charCode; // Why? --Kris
if (charCode == 0) { if (charCode == 0) {
if (event.shiftKey)
modifier += "S-";
if (event.keyCode in this._code_key) if (event.keyCode in this._code_key)
key = this._code_key[event.keyCode]; key = this._code_key[event.keyCode];
if (event.shiftKey && (key.length > 1 || event.ctrlKey || event.altKey || event.metaKey) || event.dactylShift)
modifier += "S-";
if (!modifier && /^[a-z0-9]$/i.test(key))
return key;
} }
// [Ctrl-Bug] special handling of mysterious <C-[>, <C-\\>, <C-]>, <C-^>, <C-_> bugs (OS/X) // [Ctrl-Bug] special handling of mysterious <C-[>, <C-\\>, <C-]>, <C-^>, <C-_> bugs (OS/X)
// (i.e., cntrl codes 27--31) // (i.e., cntrl codes 27--31)
@@ -523,7 +525,7 @@ const Events = Module("events", {
else { else {
// a shift modifier is only allowed if the key is alphabetical and used in a C-A-M- mapping in the uppercase, // a shift modifier is only allowed if the key is alphabetical and used in a C-A-M- mapping in the uppercase,
// or if the shift has been forced for a non-alphabetical character by the user while :map-ping // or if the shift has been forced for a non-alphabetical character by the user while :map-ping
if ((key != key.toLowerCase() && (event.ctrlKey || event.altKey || event.metaKey)) || event.dactylShift) if (key != key.toLowerCase() && (event.ctrlKey || event.altKey || event.metaKey) || event.dactylShift)
modifier += "S-"; modifier += "S-";
if (/^\s$/.test(key)) if (/^\s$/.test(key))
key = let (s = charCode.toString(16)) "U" + "0000".substr(4 - s.length) + s; key = let (s = charCode.toString(16)) "U" + "0000".substr(4 - s.length) + s;
@@ -804,6 +806,10 @@ const Events = Module("events", {
let stop = false; let stop = false;
let mode = modes.getStack(0); let mode = modes.getStack(0);
function shouldPass()
(!dactyl.focus || Events.isContentNode(dactyl.focus)) &&
options.get("passkeys").has(events.toString(event));
// menus have their own command handlers // menus have their own command handlers
if (modes.extended & modes.MENU) if (modes.extended & modes.MENU)
stop = true; stop = true;
@@ -812,14 +818,14 @@ const Events = Module("events", {
stop = !isEscape(key) && key != "<C-v>" stop = !isEscape(key) && key != "<C-v>"
// handle Escape-one-key mode (Ctrl-v) // handle Escape-one-key mode (Ctrl-v)
else if (modes.main == modes.QUOTE) { else if (modes.main == modes.QUOTE) {
stop = modes.getStack(1).main !== modes.PASS_THROUGH || isEscape(key); stop = !shouldPass() && (modes.getStack(1).main !== modes.PASS_THROUGH || isEscape(key));
// We need to preserve QUOTE mode until the escape // We need to preserve QUOTE mode until the escape
// handler to escape the <Esc> key // handler to escape the <Esc> key
if (!stop || !isEscape(key)) if (!stop || !isEscape(key))
modes.pop(); modes.pop();
mode = modes.getStack(1); mode = modes.getStack(1);
} }
else if (!event.isMacro && !event.noremap && options.get("passkeys").has(events.toString(event))) else if (!event.isMacro && !event.noremap && shouldPass())
stop = true; stop = true;
// handle Escape-all-keys mode (Ctrl-q) // handle Escape-all-keys mode (Ctrl-q)
@@ -965,7 +971,19 @@ const Events = Module("events", {
// Prevent certain sites from transferring focus to an input box // Prevent certain sites from transferring focus to an input box
// before we get a chance to process our key bindings on the // before we get a chance to process our key bindings on the
// "keypress" event. // "keypress" event.
if (!Events.isInputElemFocused() && !modes.passThrough && !options.get("passkeys").has(events.toString(event)))
function shouldPass() // FIXME.
(!dactyl.focus || Events.isContentNode(dactyl.focus)) &&
options.get("passkeys").has(events.toString(event));
if (modes.main === modes.PASS_THROUGH ||
modes.main === modes.QUOTE
&& modes.getStack(1).main !== modes.PASS_THROUGH
&& !shouldPass() ||
!modes.passThrough && shouldPass())
return;
if (!Events.isInputElemFocused())
event.stopPropagation(); event.stopPropagation();
}, },
@@ -977,9 +995,8 @@ const Events = Module("events", {
}, },
onPopupShown: function onPopupShown(event) { onPopupShown: function onPopupShown(event) {
if (event.originalTarget.localName == "tooltip" || event.originalTarget.id == "dactyl-visualbell") if (event.originalTarget.localName !== "tooltip" && event.originalTarget.id !== "dactyl-visualbell")
return; modes.add(modes.MENU);
modes.add(modes.MENU);
}, },
onPopupHidden: function onPopupHidden() { onPopupHidden: function onPopupHidden() {