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

[bootstrap] Merge default.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-26 17:48:20 -05:00
parent 26bd1c1075 acd7ce68c0
commit f75d81c57f
5 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/commands.js
View File

@@ -335,14 +335,14 @@ var Command = Class("Command", {
case "-keys": case "-keys":
let silent = args["-silent"]; let silent = args["-silent"];
rhs = events.canonicalKeys(rhs, true); rhs = events.canonicalKeys(rhs, true);
let macro = util.compileMacro(rhs, true); var action = function action(count) events.feedkeys(action.macro({ count: count || "" }),
var action = function action(count) events.feedkeys(macro({ count: count }),
noremap, silent); noremap, silent);
action.macro = util.compileMacro(rhs, true);
break; break;
case "-ex": case "-ex":
macro = util.compileMacro(rhs, true); action = function action() commands.execute(action.macro, makeParams.apply(this, arguments),
action = function action() commands.execute(macro, makeParams.apply(this, arguments),
false, null, action.sourcing); false, null, action.sourcing);
action.macro = util.compileMacro(rhs, true);
action.sourcing = io.sourcing && update({}, io.sourcing); action.sourcing = io.sourcing && update({}, io.sourcing);
break; break;
case "-javascript": case "-javascript":

2
common/content/dactyl.js
View File

@@ -2101,7 +2101,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
if (!services.commandLineHandler) if (!services.commandLineHandler)
services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name); services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name);
if (services.commandlinehandler) { if (services.commandLineHandler) {
let commandline = services.commandLineHandler.optionValue; let commandline = services.commandLineHandler.optionValue;
if (commandline) { if (commandline) {
let args = dactyl.parseCommandLine(commandline); let args = dactyl.parseCommandLine(commandline);

68
common/content/events.js
View File

@@ -30,6 +30,7 @@ var Events = Module("events", {
this._fullscreen = window.fullScreen; this._fullscreen = window.fullScreen;
this._lastFocus = null; this._lastFocus = null;
this._currentMacro = ""; this._currentMacro = "";
this._macroKeys = [];
this._lastMacro = ""; this._lastMacro = "";
this.sessionListeners = []; this.sessionListeners = [];
@@ -152,19 +153,30 @@ var Events = Module("events", {
dactyl.assert(/[a-zA-Z0-9]/.test(macro), dactyl.assert(/[a-zA-Z0-9]/.test(macro),
"E354: Invalid register name: '" + macro + "'"); "E354: Invalid register name: '" + macro + "'");
modes.isRecording = true; modes.recording = true;
if (/[A-Z]/.test(macro)) { // uppercase (append) if (/[A-Z]/.test(macro)) { // uppercase (append)
this._currentMacro = macro.toLowerCase(); this._currentMacro = macro.toLowerCase();
if (!this._macros.get(this._currentMacro)) this._macroKeys = events.fromString((this._macros.get(this._currentMacro) || { keys: "" }).keys, true)
this._macros.set(this._currentMacro, { keys: "", timeRecorded: Date.now() }); // initialize if it does not yet exist .map(events.closure.toString);
} }
else { else {
this._currentMacro = macro; this._currentMacro = macro;
this._macros.set(this._currentMacro, { keys: "", timeRecorded: Date.now() }); this._macroKeys = [];
} }
}, },
finishRecording: function () {
modes.recording = false;
this._macros.set(this._currentMacro, {
keys: this._macroKeys.join(""),
timeRecorded: Date.now()
});
dactyl.log("Recorded " + this._currentMacro + ": " + this._macroKeys.join(""), 9);
dactyl.echomsg("Recorded macro '" + this._currentMacro + "'");
},
/** /**
* Replays a macro. * Replays a macro.
* *
@@ -195,9 +207,9 @@ var Events = Module("events", {
catch (e) {} catch (e) {}
buffer.loaded = 1; // even if not a full page load, assume it did load correctly before starting the macro buffer.loaded = 1; // even if not a full page load, assume it did load correctly before starting the macro
modes.isReplaying = true; modes.replaying = true;
res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true }); res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
modes.isReplaying = false; modes.replaying = false;
} }
else else
// TODO: ignore this like Vim? // TODO: ignore this like Vim?
@@ -277,7 +289,7 @@ var Events = Module("events", {
break; break;
// Stop feeding keys if page loading failed. // Stop feeding keys if page loading failed.
if (modes.isReplaying && !this.waitForPageLoad()) if (modes.replaying && !this.waitForPageLoad())
break; break;
} }
} }
@@ -836,19 +848,8 @@ var Events = Module("events", {
if (!key) if (!key)
return null; return null;
if (modes.isRecording) { if (modes.recording && (!this._input || !mappings.hasMap(modes.main, this._input.buffer + key)))
if (key == "q" && !modes.main.input) { // TODO: should not be hard-coded events._macroKeys.push(key);
modes.isRecording = false;
dactyl.log("Recorded " + this._currentMacro + ": " + this._macros.get(this._currentMacro, {}).keys, 9);
dactyl.echomsg("Recorded macro '" + this._currentMacro + "'");
return killEvent();
}
else if (this._input && !mappings.hasMap(modes.main, this._input.buffer + key))
this._macros.set(this._currentMacro, {
keys: this._macros.get(this._currentMacro, {}).keys + key,
timeRecorded: Date.now()
});
}
// feedingKeys needs to be separate from interrupted so // feedingKeys needs to be separate from interrupted so
// we can differentiate between a recorded <C-c> // we can differentiate between a recorded <C-c>
@@ -857,8 +858,8 @@ var Events = Module("events", {
if (events.feedingKeys && !event.isMacro) { if (events.feedingKeys && !event.isMacro) {
if (key == "<C-c>") { if (key == "<C-c>") {
events.feedingKeys = false; events.feedingKeys = false;
if (modes.isReplaying) { if (modes.replaying) {
modes.isReplaying = false; modes.replaying = false;
this.timeout(function () { dactyl.echomsg("Canceled playback of macro '" + this._lastMacro + "'"); }, 100); this.timeout(function () { dactyl.echomsg("Canceled playback of macro '" + this._lastMacro + "'"); }, 100);
} }
} }
@@ -881,11 +882,13 @@ var Events = Module("events", {
this._input = null; this._input = null;
if (!input) { if (!input) {
let ignore = false; let ignore = false;
let overrideMode = null;
// menus have their own command handlers // menus have their own command handlers
if (modes.extended & modes.MENU) if (modes.extended & modes.MENU)
ignore = true; overrideMode = modes.MENU;
else if (modes.main == modes.PASS_THROUGH)
if (modes.main == modes.PASS_THROUGH)
ignore = !Events.isEscape(key) && key != "<C-v>"; ignore = !Events.isEscape(key) && key != "<C-v>";
else if (modes.main == modes.QUOTE) { else if (modes.main == modes.QUOTE) {
if (modes.getStack(1).main == modes.PASS_THROUGH) { if (modes.getStack(1).main == modes.PASS_THROUGH) {
@@ -912,7 +915,7 @@ var Events = Module("events", {
if (key in config.ignoreKeys && (config.ignoreKeys[key] & mode.main)) if (key in config.ignoreKeys && (config.ignoreKeys[key] & mode.main))
return null; return null;
input = Events.KeyProcessor(mode.params.mainMode || mode.main, mode.extended); input = Events.KeyProcessor(overrideMode || mode.params.mainMode || mode.main, mode.extended);
if (mode.params.preExecute) if (mode.params.preExecute)
input.preExecute = mode.params.preExecute; input.preExecute = mode.params.preExecute;
if (mode.params.postExecute) if (mode.params.postExecute)
@@ -1103,7 +1106,7 @@ var Events = Module("events", {
else if (this.pendingArgMap) { else if (this.pendingArgMap) {
let map = this.pendingArgMap; let map = this.pendingArgMap;
if (!Events.isEscape(key)) if (!Events.isEscape(key))
if (!modes.isReplaying || this.waitForPageLoad()) if (!modes.replaying || this.waitForPageLoad())
execute(map, null, this.count, key); execute(map, null, this.count, key);
return true; return true;
} }
@@ -1130,7 +1133,7 @@ var Events = Module("events", {
this.pendingMotionMap = map; this.pendingMotionMap = map;
} }
else { else {
if (modes.isReplaying && !this.waitForPageLoad()) if (modes.replaying && !this.waitForPageLoad())
return true; return true;
let ret = execute(map, null, this.count); let ret = execute(map, null, this.count);
@@ -1223,12 +1226,15 @@ var Events = Module("events", {
function () { return; }); function () { return; });
// macros // macros
mappings.add([modes.NORMAL, modes.PLAYER, modes.MESSAGE].filter(util.identity), mappings.add([modes.NORMAL, modes.TEXT_AREA, modes.PLAYER].filter(util.identity),
["q"], "Record a key sequence into a macro", ["q"], "Record a key sequence into a macro",
function (arg) { events.startRecording(arg); }, function (arg) {
{ arg: true }); events._macroKeys.pop();
events[modes.recording ? "finishRecording" : "startRecording"](arg);
},
{ get arg() !modes.recording });
mappings.add([modes.NORMAL, modes.PLAYER, modes.MESSAGE].filter(util.identity), mappings.add([modes.NORMAL, modes.TEXT_AREA, modes.PLAYER].filter(util.identity),
["@"], "Play a macro", ["@"], "Play a macro",
function (count, arg) { function (count, arg) {
count = Math.max(count, 1); count = Math.max(count, 1);

16
common/content/modes.js
View File

@@ -18,8 +18,8 @@ var Modes = Module("modes", {
this._passNextKey = false; this._passNextKey = false;
this._passAllKeys = false; this._passAllKeys = false;
this._isRecording = false; this._recording = false;
this._isReplaying = false; // playing a macro this._replaying = false; // playing a macro
this._modeStack = update([], { this._modeStack = update([], {
pop: function pop() { pop: function pop() {
@@ -119,9 +119,9 @@ var Modes = Module("modes", {
_getModeMessage: function () { _getModeMessage: function () {
// when recording a macro // when recording a macro
let macromode = ""; let macromode = "";
if (modes.isRecording) if (modes.recording)
macromode = "recording"; macromode = "recording";
else if (modes.isReplaying) else if (modes.replaying)
macromode = "replaying"; macromode = "replaying";
let ext = ""; let ext = "";
@@ -323,11 +323,11 @@ var Modes = Module("modes", {
} }
}, },
get isRecording() this._isRecording, get recording() this._recording,
set isRecording(value) { this._isRecording = value; this.show(); }, set recording(value) { this._recording = value; this.show(); },
get isReplaying() this._isReplaying, get replaying() this._replaying,
set isReplaying(value) { this._isReplaying = value; this.show(); }, set replaying(value) { this._replaying = value; this.show(); },
get main() this._main, get main() this._main,
set main(value) { this.set(value); }, set main(value) { this.set(value); },

2
common/modules/util.jsm
View File

@@ -330,7 +330,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
stack.top.elements.push(quote(defaults[name])); stack.top.elements.push(quote(defaults[name]));
else { else {
stack.top.elements.push(update( stack.top.elements.push(update(
function (obj) obj[name] != null ? quote(obj[name]) : unknown(full), function (obj) obj[name] != null ? quote(obj[name]) : set.has(obj, name) ? "" : unknown(full),
{ test: function (obj) obj[name] != null && obj[name] !== false })); { test: function (obj) obj[name] != null && obj[name] !== false }));
for (let elem in array.iterValues(stack)) for (let elem in array.iterValues(stack))