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

Move liberator.input to Events.

Browse Source
This commit is contained in:
Doug Kearns
2009-05-20 22:28:45 +10:00
parent d248f92500
commit 3df0e174ac
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/content/events.js
View File

@@ -333,14 +333,19 @@ function Events() //{{{
////////////////////// PRIVATE SECTION ///////////////////////////////////////// ////////////////////// PRIVATE SECTION /////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
const input = liberator.input; const input = {
buffer: "", // partial command storage
pendingMotionMap: null, // e.g. "d{motion}" if we wait for a motion of the "d" command
pendingArgMap: null, // pending map storage for commands like m{a-z}
count: -1 // parsed count from the input buffer
}
var fullscreen = window.fullScreen; var fullscreen = window.fullScreen;
var lastFocus = null; var lastFocus = null;
var inputBufferLength = 0; // count the number of keys in v.input.buffer (can be different from v.input.buffer.length) var inputBufferLength = 0; // count the number of keys in input.buffer (can be different from input.buffer.length)
var skipMap = false; // while feeding the keys (stored in v.input.buffer | no map found) - ignore mappings var skipMap = false; // while feeding the keys (stored in input.buffer | no map found) - ignore mappings
var macros = storage.newMap("macros", true); var macros = storage.newMap("macros", true);
@@ -1512,7 +1517,7 @@ function Events() //{{{
input.buffer = ""; input.buffer = "";
inputBufferLength = 0; inputBufferLength = 0;
let tmp = input.pendingArgMap; // must be set to null before .execute; if not let tmp = input.pendingArgMap; // must be set to null before .execute; if not
input.pendingArgMap = null; // v.input.pendingArgMap is still 'true' also for new feeded keys input.pendingArgMap = null; // input.pendingArgMap is still 'true' also for new feeded keys
if (key != "<Esc>" && key != "<C-[>") if (key != "<Esc>" && key != "<C-[>")
{ {
if (modes.isReplaying && !waitForPageLoaded()) if (modes.isReplaying && !waitForPageLoaded())
@@ -1578,13 +1583,13 @@ function Events() //{{{
if (input.buffer != "" && !skipMap && (liberator.mode == modes.INSERT || if (input.buffer != "" && !skipMap && (liberator.mode == modes.INSERT ||
liberator.mode == modes.COMMAND_LINE || liberator.mode == modes.TEXTAREA)) liberator.mode == modes.COMMAND_LINE || liberator.mode == modes.TEXTAREA))
{ {
// no map found -> refeed stuff in v.input.buffer (only while in INSERT, CO... modes) // no map found -> refeed stuff in input.buffer (only while in INSERT, CO... modes)
skipMap = true; // ignore maps while doing so skipMap = true; // ignore maps while doing so
events.feedkeys(input.buffer, true); events.feedkeys(input.buffer, true);
} }
if (skipMap) if (skipMap)
{ {
if (--inputBufferLength == 0) // inputBufferLength == 0. v.input.buffer refeeded... if (--inputBufferLength == 0) // inputBufferLength == 0. input.buffer refeeded...
skipMap = false; // done... skipMap = false; // done...
} }

8
common/content/liberator.js
View File

@@ -618,14 +618,6 @@ const liberator = (function () //{{{
// then selectedProfile returns last selected profile! (not current one!) // then selectedProfile returns last selected profile! (not current one!)
profileName: services.get("directory").get("ProfD", Ci.nsIFile).leafName.replace(/^.+?\./, ""), profileName: services.get("directory").get("ProfD", Ci.nsIFile).leafName.replace(/^.+?\./, ""),
// TODO: move to events.js?
input: {
buffer: "", // partial command storage
pendingMotionMap: null, // e.g. "d{motion}" if we wait for a motion of the "d" command
pendingArgMap: null, // pending map storage for commands like m{a-z}
count: -1 // parsed count from the input buffer
},
// @param type can be: // @param type can be:
// "submit": when the user pressed enter in the command line // "submit": when the user pressed enter in the command line
// "change" // "change"