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

Fix S- handling to normalize in the manner of vim

Browse Source 
Instead of treating all key presses as Shifted, it now normalises the
user-input.

Also now treats < as <lt>

Behaviour:

(:map <C-S-a> == :map <C-S-A>) != (:map <C-a> == :map <C-A>)
:map <C-S-@> is meaningless (though no error is produced) c.f. vim
:map <C-S-2> is meaningless (though no error is produced) c.f. vim

Internally, commands are stored with no shift modifiers for alphabetic
characters, i.e. (:map <C-S-a> creates the mapping <C-A>) as in vim.

<CapsLock> <C-a> will cause the <C-A> mapping (mapped with <C-S-a> to be
triggered).

There still seems to be a bug with :map <Space> and :map <CR>
This commit is contained in:
Conrad Irwin
2009-06-07 01:34:42 +01:00
parent 8ac6321a1c
commit 41aed95c05
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
common/content/events.js
View File

@@ -438,7 +438,7 @@ function Events() //{{{
const key_code = {};
for (let [k, v] in Iterator(KeyEvent))
if (/^DOM_VK_/.test(k)) {
if (/^DOM_VK_(?![A-Z0-1]$)/.test(k)) {
k = k.substr(7).toLowerCase();
let names = [k.replace(/(^|_)(.)/g, function (m, n1, n2) n2.toUpperCase())
.replace(/^NUMPAD/, "k")];
@@ -449,6 +449,14 @@ function Events() //{{{
key_code[name.toLowerCase()] = v
}
//HACK: as firefox does not include an event for <, we must add this in manually.
if (! ("<" in key_code))
{
key_code["<"] = 60;
key_code["lt"] = 60;
code_key[60] = "lt";
}
function isFormElemFocused()
{
let elem = liberator.focus;
@@ -857,7 +865,7 @@ function Events() //{{{
},
splitKeys: function(keys) {
let re = RegExp("<.*?>|[^<]", "g");
let re = RegExp("<.*?>|[^<]|<(?!.*>)", "g");
let match;
while (match = re.exec(keys))
yield match[0];
@@ -868,12 +876,25 @@ function Events() //{{{
var res = util.map(events.splitKeys(keys), function (key) {
let keyCode = 0;
if (key == "<")
return "<lt>";
if (key[0] == "<")
{
let [match, modifier, keyname] = key.toLowerCase().match(/^<((?:[csma]-)*)(.+?)>$/) || [];
if (keyname)
{
modifier = modifier.toUpperCase();
if (modifier.length > 0 && keyname.length == 1 && keyname.toUpperCase() != keyname.toLowerCase())
{
if (modifier.indexOf("S-") >= 0)
keyname = keyname.toUpperCase();
else
keyname = keyname.toLowerCase();
modifier = modifier.replace("S-", "");
}
key = [k + "-" for ([i, k] in Iterator("CASM")) if (modifier.indexOf(k + "-") >= 0)];
keyCode = key_code[keyname];
@@ -886,8 +907,6 @@ function Events() //{{{
}
else // a simple key
{
if (key != key.toLowerCase())
return ["<S-", key.toUpperCase(), ">"];
return key;
}
});
@@ -1072,8 +1091,6 @@ function Events() //{{{
modifier += "C-";
if (event.altKey)
modifier += "A-";
if (event.shiftKey)
modifier += "S-";
if (event.metaKey)
modifier += "M-";
@@ -1081,6 +1098,9 @@ function Events() //{{{
{
if (event.charCode == 0)
{
if (event.shiftKey)
modifier += "S-";
if (event.keyCode in code_key)
key = code_key[event.keyCode];
}
@@ -1116,18 +1136,20 @@ function Events() //{{{
// a normal key like a, b, c, 0, etc.
else if (event.charCode > 0)
{
key = String.fromCharCode(event.charCode).toLowerCase();
if (key in key_code)
key = String.fromCharCode(event.charCode);
if (key in key_code) //If a character has a name, use that. Space characters can have S- safely.
{
if (key.match(/^\s$/) && event.shiftKey)
modifier += "S-";
key = code_key[key_code[key]];
}
else if (modifier.length == 0) //Otherwise, we may be able to just return the character
return key;
}
if (key == null)
return;
let k = key.toLowerCase();
if (!(k in key_code) || String.fromCharCode(key_code[k]).toLowerCase() == k)
{
if (modifier.length == 0)
return k;
}
}
else if (event.type == "click" || event.type == "dblclick")
{