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

Add real mappings for most HINT mode keys. Lazily expand leader, and keep in sync with 'mapleader'.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-28 14:33:57 -05:00
parent 83aa5e4857
commit 9655d741b8
8 changed files with 166 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common/content/events.js
View File

@@ -47,19 +47,29 @@ var Events = Module("events", {
this._keyTable = {
add: ["Plus", "Add"],
back_space: ["BS"],
count: ["count"],
delete: ["Del"],
escape: ["Esc", "Escape"],
insert: ["Insert", "Ins"],
leader: ["Leader"],
left_shift: ["LT", "<"],
nop: ["Nop"],
return: ["Return", "CR", "Enter"],
right_shift: [">"],
space: ["Space", " "],
subtract: ["Minus", "Subtract"]
};
this._pseudoKeys = set(["count", "leader", "nop"]);
this._key_key = {};
this._code_key = {};
this._key_code = {};
for (let list in values(this._keyTable))
for (let v in values(list))
this._key_key[v.toLowerCase()] = v;
for (let [k, v] in Iterator(KeyEvent)) {
k = k.substr(7).toLowerCase();
let names = [k.replace(/(^|_)(.)/g, function (m, n1, n2) n2.toUpperCase())
@@ -67,8 +77,10 @@ var Events = Module("events", {
if (k in this._keyTable)
names = this._keyTable[k];
this._code_key[v] = names[0];
for (let [, name] in Iterator(names))
for (let [, name] in Iterator(names)) {
this._key_key[name.toLowerCase()] = name;
this._key_code[name.toLowerCase()] = v;
}
}
// HACK: as Gecko does not include an event for <, we must add this in manually.
@@ -436,7 +448,7 @@ var Events = Module("events", {
keyname = String.fromCharCode(parseInt(keyname.substr(1), 16));
if (keyname && (unknownOk || keyname.length == 1 || /mouse$/.test(keyname) ||
this._key_code[keyname] || keyname == "nop")) {
this._key_code[keyname] || set.has(this._pseudoKeys, keyname))) {
evt_obj.ctrlKey = /C-/.test(modifier);
evt_obj.altKey = /A-/.test(modifier);
evt_obj.shiftKey = /S-/.test(modifier);
@@ -451,8 +463,8 @@ var Events = Module("events", {
evt_obj.charCode = keyname.charCodeAt(0);
}
else if (keyname == "nop") {
evt_obj.dactylString = "<Nop>";
else if (set.has(this._pseudoKeys)) {
evt_obj.dactylString = "<" + this._key_key[keyname] + ">";
}
else if (/mouse$/.test(keyname)) { // mouse events
evt_obj.type = (/2-/.test(modifier) ? "dblclick" : "click");
@@ -576,7 +588,7 @@ var Events = Module("events", {
}
}
if (key == null)
key = event.dactylKeyname;
key = this._key_key[event.dactylKeyname] || event.dactylKeyname;
if (key == null)
return null;
}
@@ -1070,9 +1082,9 @@ var Events = Module("events", {
const self = this;
let key = events.toString(event);
let [, countStr, candidateCommand] = /^((?:[1-9][0-9]*)?)(.*)/.exec(this.buffer + key);
let [, countStr, command] = /^((?:[1-9][0-9]*)?)(.*)/.exec(this.buffer + key);
let map = mappings[event.noremap ? "getDefault" : "get"](this.main, candidateCommand);
let map = mappings[event.noremap ? "getDefault" : "get"](this.main, command);
function execute(map) {
if (self.preExecute)
@@ -1083,7 +1095,7 @@ var Events = Module("events", {
return res;
}
let candidates = mappings.getCandidates(this.main, candidateCommand);
let candidates = mappings.getCandidates(this.main, command);
if (candidates.length == 0 && !map) {
map = this.pendingMap;
this.pendingMap = null;
@@ -1092,7 +1104,7 @@ var Events = Module("events", {
}
// counts must be at the start of a complete mapping (10j -> go 10 lines down)
if (countStr && !candidateCommand) {
if (countStr && !command) {
// no count for insert mode mappings
if (!this.main.count)
return this.append(event);
@@ -1102,9 +1114,9 @@ var Events = Module("events", {
this.append(event);
}
else if (this.pendingArgMap) {
let map = this.pendingArgMap;
let [map, command] = this.pendingArgMap;
if (!Events.isEscape(key))
execute(map, null, this.count, key);
execute(map, null, this.count, key, command);
return true;
}
else if (map && !event.skipmap && candidates.length == 0) {
@@ -1118,27 +1130,28 @@ var Events = Module("events", {
if (map.arg) {
this.append(event);
this.pendingArgMap = map;
this.pendingArgMap = [map, command];
}
else if (this.pendingMotionMap) {
let [map, command] = this.pendingMotionMap;
if (!Events.isEscape(key))
execute(this.pendingMotionMap, candidateCommand, this.motionCount || this.count, null);
execute(map, command, this.motionCount || this.count, null, command);
return true;
}
else if (map.motion) {
this.buffer = "";
this.pendingMotionMap = map;
this.pendingMotionMap = [map, command];
}
else {
if (modes.replaying && !this.waitForPageLoad())
return true;
return !execute(map, null, this.count) || !map.route
return !execute(map, null, this.count, null, command) || !map.route
}
}
else if (mappings.getCandidates(this.main, candidateCommand).length > 0 && !event.skipmap) {
else if (mappings.getCandidates(this.main, command).length > 0 && !event.skipmap) {
this.append(event);
this.pendingMap = map;
this.pendingMap = [map, command];
}
else {
this.append(event);