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

Allow chained keys after <C-v> in PASS THROUGH mode, and always treat <C-v><C-v> as PASS THROUGH <C-v>.

Browse Source
This commit is contained in:
Kris Maglione
2010-11-19 19:44:05 -05:00
parent 2df24c410d
commit 6e4e3162c9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/content/events.js
View File

@@ -826,6 +826,7 @@ const Events = Module("events", {
try { try {
let stop = false; let stop = false;
let mode = modes.getStack(0); let mode = modes.getStack(0);
var main = mode.main;
function shouldPass() function shouldPass()
(!dactyl.focus || Events.isContentNode(dactyl.focus)) && (!dactyl.focus || Events.isContentNode(dactyl.focus)) &&
@@ -852,6 +853,7 @@ const Events = Module("events", {
if (stop) { if (stop) {
this._input.buffer = ""; this._input.buffer = "";
main = null;
return null; return null;
} }
@@ -899,6 +901,7 @@ const Events = Module("events", {
this._input.buffer = inputStr; this._input.buffer = inputStr;
} }
else if (this._input.pendingArgMap) { else if (this._input.pendingArgMap) {
main = null;
this._input.buffer = ""; this._input.buffer = "";
let map = this._input.pendingArgMap; let map = this._input.pendingArgMap;
this._input.pendingArgMap = null; this._input.pendingArgMap = null;
@@ -932,12 +935,18 @@ const Events = Module("events", {
this._input.pendingMotionMap = map; this._input.pendingMotionMap = map;
} }
else { else {
if (modes.isReplaying && !this.waitForPageLoad()) // Hack.
return killEvent(); if (map.name == "<C-v>" && main === modes.QUOTE)
let ret = map.execute(null, this._input.count);
if (map.route && ret)
stop = false; stop = false;
else {
if (modes.isReplaying && !this.waitForPageLoad())
return killEvent();
let ret = map.execute(null, this._input.count);
if (map.route && ret)
stop = false;
}
main = null;
} }
} }
else if (mappings.getCandidates(mode.main, candidateCommand).length > 0 && !event.skipmap) { else if (mappings.getCandidates(mode.main, candidateCommand).length > 0 && !event.skipmap) {
@@ -946,6 +955,7 @@ const Events = Module("events", {
} }
else { // if the key is neither a mapping nor the start of one else { // if the key is neither a mapping nor the start of one
// the mode checking is necessary so that things like g<esc> do not beep // the mode checking is necessary so that things like g<esc> do not beep
main = null;
if (this._input.buffer != "" && !event.skipmap && if (this._input.buffer != "" && !event.skipmap &&
(mode.main & (modes.INSERT | modes.COMMAND_LINE | modes.TEXT_EDIT))) (mode.main & (modes.INSERT | modes.COMMAND_LINE | modes.TEXT_EDIT)))
events.feedkeys(this._input.buffer, { noremap: true, skipmap: true }); events.feedkeys(this._input.buffer, { noremap: true, skipmap: true });
@@ -985,6 +995,8 @@ const Events = Module("events", {
// This is a stupid, silly, and revolting hack. // This is a stupid, silly, and revolting hack.
if (isEscape(key)) if (isEscape(key))
this.onEscape(); this.onEscape();
if (main === modes.QUOTE)
modes.push(main);
} }
}, },