gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-03 23:05:50 +01:00
Code Issues Projects Releases Wiki Activity

Some 'passunknown' enhancements.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-13 16:32:07 -04:00
parent 308f1b86dc
commit fdc37532d7
3 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/content/editor.js
View File

@@ -653,11 +653,16 @@ var Editor = Module("editor", {
modes.push(modes.TEXT_EDIT);
});
mappings.add([modes.INPUT],
["<BS>", "<Del>", "<Left>", "<Right>", "<Up>", "<Down>",
// Ugh.
mappings.add([modes.INPUT, modes.CARET],
["<CR>", "<BS>", "<Del>", "<Left>", "<Right>", "<Up>", "<Down>",
"<Home>", "<End>", "<PageUp>", "<PageDown>",
"<C-BS>", "<C-Del>", "<C-Left>", "<C-Right>", "<C-Up>", "<C-Down>",
"<C-Home>", "<C-End>", "<C-PageUp>", "<C-PageDown>"],
"<C-CR>", "<C-BS>", "<C-Del>", "<C-Left>", "<C-Right>", "<C-Up>", "<C-Down>",
"<C-Home>", "<C-End>", "<C-PageUp>", "<C-PageDown>",
"<S-CR>", "<S-BS>", "<S-Del>", "<S-Left>", "<S-Right>", "<S-Up>", "<S-Down>",
"<S-Home>", "<S-End>", "<S-PageUp>", "<S-PageDown>",
"<C-S-CR>", "<C-S-BS>", "<C-S-Del>", "<C-S-Left>", "<C-S-Right>", "<C-S-Up>", "<C-S-Down>",
"<C-S-Home>", "<C-S-End>", "<C-S-PageUp>", "<C-S-PageDown>"],
"Handled by " + config.host,
function () Events.PASS);

2
common/content/events.js
View File

@@ -44,7 +44,7 @@ var ProcessorStack = Class("ProcessorStack", {
this.processors.unshift(KeyProcessor(modes.BASE, hive));
},
passUnknown: Class.memoize(function () this.modes.some(function (m) m.passUnknown)),
passUnknown: Class.memoize(function () options.get("passunknown").getKey(this.modes)),
notify: function () {
events.keyEvents = [];

46
common/content/modes.js
View File

@@ -100,6 +100,17 @@ var Modes = Module("modes", {
bases: [this.COMMAND],
input: true,
ownsFocus: true
}, {
onKeyPress: function (eventList) {
const KILL = false, PASS = true;
// Hack, really.
if (eventList[0].charCode || /^<(?:.-)*(?:BS|Del|C-h|C-w|C-u|C-k)>$/.test(events.toString(eventList[0]))) {
dactyl.beep();
return KILL;
}
return PASS;
}
});
this.addMode("OUTPUT_MULTILINE", {
description: "Active when the multi-line output buffer is open",
@@ -472,7 +483,7 @@ var Modes = Module("modes", {
passEvent: function passEvent(event) this.input && event.charCode && !(event.ctrlKey || event.altKey || event.metaKey),
passUnknown: Class.memoize(function () options.get("passunknown").has(this.name)),
passUnknown: Class.memoize(function () options.get("passunknown").getKey(this.name)),
get mask() this,
@@ -547,14 +558,35 @@ var Modes = Module("modes", {
"Pass through unknown keys in these modes",
"stringlist", "",
{
has: function (val) this.value.indexOf(val.toLowerCase()) >= 0,
setter: function (val) {
modes.all.forEach(function (m) { delete m.passUnknown });
return val.map(String.toLowerCase);
completer: function completer(context, extra) {
if (extra.value && context.filter[0] == "!")
context.advance(1);
return completer.superapply(this, arguments);
},
get values() [[m.name.toLowerCase(), m.description] for (m in values(modes._modes)) if (!m.hidden)]
getKey: function getKey(val, default_) {
if (isArray(val))
return (array.nth(this.value, function (v) val.some(function (m) m.name === v.mode), 0)
|| { result: default_ }).result;
return set.has(this.valueMap, val) ? this.valueMap[val] : default_;
},
setter: function (vals) {
modes.all.forEach(function (m) { delete m.passUnknown });
vals = vals.map(function (v) update(new String(v.toLowerCase()), {
mode: v.replace(/^!/, "").toUpperCase(),
result: v[0] !== "!"
}));
this.valueMap = values(vals).map(function (v) [v.mode, v.result]).toObject();
return vals;
},
validator: function validator(vals) vals.map(function (v) v.replace(/^!/, "")).every(set.has(this.values)),
get values() array.toObject([[m.name.toLowerCase(), m.description] for (m in values(modes._modes)) if (!m.hidden)])
});
options.add(["showmode", "smd"],