From daa357f1a753fd4c17427f68e0f0c3338e9d668b Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 9 Feb 2016 16:51:20 +0000
Subject: PassNextKey; initial implementation.

This implements a passNextKey command (initially for normal mode only),
as discussed in #1955.
---
 content_scripts/mode_insert.coffee | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'content_scripts/mode_insert.coffee')

diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index 0b040e5d..8dd02530 100644
--- a/content_scripts/mode_insert.coffee
+++ b/content_scripts/mode_insert.coffee
@@ -98,5 +98,32 @@ class InsertMode extends Mode
   @suppressedEvent: null
   @suppressEvent: (event) -> @suppressedEvent = event
 
+# This implements the pasNexKey command.
+class PassNextKeyMode extends Mode
+  constructor: (count = 1) ->
+    seenKeyDown = false
+    keyDownCount = 0
+
+    super
+      name: "pass-next-key"
+      indicator: "Pass next key."
+      # We exit on blur because, once we lose the focus, we can no longer track key events.
+      exitOnBlur: window
+      keypress: =>
+        @stopBubblingAndTrue
+
+      keydown: =>
+        seenKeyDown = true
+        keyDownCount += 1
+        @stopBubblingAndTrue
+
+      keyup: =>
+        if seenKeyDown
+          unless 0 < --keyDownCount
+            unless 0 < --count
+              @exit()
+        @stopBubblingAndTrue
+
 root = exports ? window
 root.InsertMode = InsertMode
+root.PassNextKeyMode = PassNextKeyMode
-- 
cgit v1.2.3


From 02adaa7ad0c7921ebab5752470ff7f773802634c Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 10 Feb 2016 13:44:41 +0000
Subject: PassNextKey; handle pass-next-key in insert mode.

(First "fully" functional version.)
---
 content_scripts/mode_insert.coffee | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'content_scripts/mode_insert.coffee')

diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index 8dd02530..391e8c95 100644
--- a/content_scripts/mode_insert.coffee
+++ b/content_scripts/mode_insert.coffee
@@ -10,6 +10,13 @@ class InsertMode extends Mode
 
     handleKeyEvent = (event) =>
       return @continueBubbling unless @isActive event
+
+      # Check for the pass-next-key key.
+      keyChar = KeyboardUtils.getKeyCharString event
+      if keyChar and keyChar == Settings.get "passNextKeyKey"
+        new PassNextKeyMode
+        return false
+
       return @stopBubblingAndTrue unless event.type == 'keydown' and KeyboardUtils.isEscape event
       DomUtils.suppressKeyupAfterEscape handlerStack
       target = event.srcElement
-- 
cgit v1.2.3


From 201b51e1690bb993aa25a1c11f59afda6eab8747 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 10 Feb 2016 13:52:43 +0000
Subject: PassNextKey; allow multiple mappings.

This allows:
   map a passNextKey
   map b passNextKey

(Previously, we only picked up the first mapping.)
---
 content_scripts/mode_insert.coffee | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'content_scripts/mode_insert.coffee')

diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index 391e8c95..a35633ac 100644
--- a/content_scripts/mode_insert.coffee
+++ b/content_scripts/mode_insert.coffee
@@ -11,9 +11,8 @@ class InsertMode extends Mode
     handleKeyEvent = (event) =>
       return @continueBubbling unless @isActive event
 
-      # Check for the pass-next-key key.
-      keyChar = KeyboardUtils.getKeyCharString event
-      if keyChar and keyChar == Settings.get "passNextKeyKey"
+      # Check for a pass-next-key key.
+      if KeyboardUtils.getKeyCharString(event) in Settings.get "passNextKeyKeys"
         new PassNextKeyMode
         return false
 
-- 
cgit v1.2.3