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

Documentation.

Browse Source
This commit is contained in:
Kris Maglione
2011-06-23 16:21:01 -04:00
parent 9344d0a16c
commit 4a44bf9664
6 changed files with 500 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/content/events.js
View File

@@ -73,6 +73,10 @@ var ProcessorStack = Class("ProcessorStack", {
statusline.inputBuffer = this.processors.length ? this.buffer : "";
if (!processors.some(function (p) !p.extended) && this.actions.length) {
// We have matching actions and no processors other than
// those waiting on further arguments. Execute actions as
// long as they continue to return PASS.
for (var action in values(this.actions)) {
while (callable(action)) {
length = action.eventLength;
@@ -83,11 +87,16 @@ var ProcessorStack = Class("ProcessorStack", {
break;
}
// Result is the result of the last action. Unless it's
// PASS, kill any remaining argument processors.
result = action !== undefined ? action : Events.KILL;
if (action !== Events.PASS)
this.processors.length = 0;
}
else if (this.processors.length) {
// We're still waiting on the longest matching processor.
// Kill the event, set a timeout to give up waiting if applicable.
result = Events.KILL;
if (options["timeout"])
this.timer = services.Timer(this, options["timeoutlen"], services.Timer.TYPE_ONE_SHOT);
@@ -95,12 +104,19 @@ var ProcessorStack = Class("ProcessorStack", {
else if (result !== Events.KILL && !this.actions.length &&
!(this.events[0].isReplay || this.passUnknown
|| this.modes.some(function (m) m.passEvent(this), this.events[0]))) {
// No patching processors, this isn't a fake, pass-through
// event, we're not in pass-through mode, and we're not
// choosing to pass unknown keys. Kill the event and beep.
result = Events.ABORT;
if (!Events.isEscape(this.events.slice(-1)[0]))
dactyl.beep();
events.feedingKeys = false;
}
else if (result === undefined)
// No matching processors, we're willing to pass this event,
// and we don't have a default action from a processor. Just
// pass the event.
result = Events.PASS;
events.dbg("RESULT: " + length + " " + this._result(result));
@@ -155,8 +171,6 @@ var ProcessorStack = Class("ProcessorStack", {
if (res === Events.KILL)
break;
buffer = buffer || input.inputBuffer;
if (callable(res))
actions.push(res);

5
common/content/statusline.js
View File

@@ -27,12 +27,14 @@ var StatusLine = Module("statusline", {
highlight.loadCSS(util.compileMacro(<![CDATA[
!AddonBar;#addon-bar {
/* The Add-on Bar */
padding-left: 0 !important;
min-height: 18px !important;
-moz-appearance: none !important;
<padding>
}
!AddonButton;#addon-bar xul|toolbarbutton {
/* An Add-on Bar button */
-moz-appearance: none !important;
padding: 0 !important;
border-width: 0px !important;
@@ -44,7 +46,8 @@ var StatusLine = Module("statusline", {
if (document.getElementById("appmenu-button"))
highlight.loadCSS(<![CDATA[
AppmenuButton min-width: 0 !important; padding: 0 .5em !important;
AppmenuButton /* The app-menu button */ \
min-width: 0 !important; padding: 0 .5em !important;
]]>);
}