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

when a map got not found, refeed the so far collected keys in v.input.buffer (and don't try to find maps while doing so, preventing an eternal loop)

Browse Source
This commit is contained in:
Marco Candrian
2007-12-16 01:32:09 +00:00
parent 8b1b17a84f
commit cbaca2dc3e
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
content/events.js
View File

@@ -245,6 +245,9 @@ vimperator.Events = function () //{{{
}
}
var inputBufferLength = 0; // counts the keys in v.input.buffer
var skipMap = false; // while feeding the keys (stored in v.input.buffer | no map found) - ignore mappings
var macros = {};
var isRecording = false;
var currentMacro;
@@ -706,18 +709,22 @@ vimperator.Events = function () //{{{
if (vimperator.mode == vimperator.modes.INSERT || vimperator.mode == vimperator.modes.COMMAND_LINE)
stop = false;
else
{
vimperator.input.buffer += key;
inputBufferLength++;
}
}
else if (vimperator.input.pendingArgMap)
{
vimperator.input.buffer = "";
inputBufferLength = 0;
var tmp = vimperator.input.pendingArgMap; // must be set to null before .execute; if not
vimperator.input.pendingArgMap = null; // v.inputpendingArgMap is still 'true' also for new feeded keys
if (key != "<Esc>" && key != "<C-[>")
tmp.execute(null, vimperator.input.count, key);
}
else if (map)
else if (map && !skipMap)
{
vimperator.input.count = parseInt(countStr, 10);
if (isNaN(vimperator.input.count))
@@ -726,6 +733,7 @@ vimperator.Events = function () //{{{
{
vimperator.input.pendingArgMap = map;
vimperator.input.buffer += key;
inputBufferLength++;
}
else if (vimperator.input.pendingMotionMap)
{
@@ -735,27 +743,41 @@ vimperator.Events = function () //{{{
}
vimperator.input.pendingMotionMap = null;
vimperator.input.buffer = "";
inputBufferLength = 0;
}
// no count support for these commands yet
else if (map.flags & vimperator.Mappings.flags.MOTION)
{
vimperator.input.pendingMotionMap = map;
vimperator.input.buffer = "";
inputBufferLength = 0;
}
else
{
vimperator.input.buffer = "";
inputBufferLength = 0;
var ret = map.execute(null, vimperator.input.count);
if (map.flags & vimperator.Mappings.flags.ALLOW_EVENT_ROUTING && ret)
stop = false;
}
}
else if (vimperator.mappings.getCandidates(vimperator.mode, candidateCommand).length > 0)
else if (vimperator.mappings.getCandidates(vimperator.mode, candidateCommand).length > 0 && !skipMap)
{
vimperator.input.buffer += key;
inputBufferLength++;
}
else
{
if (vimperator.input.buffer != "" && !skipMap) // no map found -> refeed stuff in v.input.buffer
{
skipMap = true; // ignore maps while doing so
vimperator.events.feedkeys(vimperator.input.buffer, true);
}
if (skipMap)
{
if (--inputBufferLength == 0) // inputBufferLenght == 0. v.input.buffer refeeded...
skipMap = false; // done...
}
vimperator.input.buffer = "";
vimperator.input.pendingArgMap = null;
vimperator.input.pendingMotionMap = null;