From 45ad72568fdc59e2498006893cfee2834c722343 Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Mon, 26 Mar 2018 21:34:15 +0200
Subject: [PATCH] fix sticky modes

---
 src/fenrirscreenreader/core/fenrirManager.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/fenrirscreenreader/core/fenrirManager.py b/src/fenrirscreenreader/core/fenrirManager.py
index 40c87dcb..a46b3926 100644
--- a/src/fenrirscreenreader/core/fenrirManager.py
+++ b/src/fenrirscreenreader/core/fenrirManager.py
@@ -91,16 +91,24 @@ class fenrirManager():
         if event['Data'] == b'':
             return
         self.environment['runtime']['commandManager'].executeDefaultTrigger('onByteInput')                   
-        isCommand = False
+       
+        if self.switchCtrlModeOnce > 0:
+            self.switchCtrlModeOnce -= 1       
+       
+        isControlMode = False
+        if self.controlMode and not self.switchCtrlModeOnce == 1 or\
+          not self.controlMode:
+            isControlMode = self.handleControlMode(event['Data'])
+        
+        isCommand = False                
         if self.controlMode and not self.switchCtrlModeOnce == 1 or\
           not self.controlMode and self.switchCtrlModeOnce == 1:
             isCommand = self.detectByteCommand(event['Data'])
-        if not isCommand:
+        if not (isCommand or isControlMode):
             self.environment['runtime']['screenManager'].injectTextToScreen(event['Data'])
     def handleControlMode(self, escapeSequence): 
         convertedEscapeSequence = self.environment['runtime']['byteManager'].unifyEscapeSeq(escapeSequence)
-        if self.switchCtrlModeOnce > 0:
-            self.switchCtrlModeOnce -= 1
+        
         if convertedEscapeSequence == b'^[R':
             self.controlMode = not self.controlMode
             self.switchCtrlModeOnce = 0
@@ -165,8 +173,7 @@ class fenrirManager():
 
     def detectByteCommand(self, escapeSequence):
         convertedEscapeSequence = self.environment['runtime']['byteManager'].unifyEscapeSeq(escapeSequence)
-        if self.handleControlMode(convertedEscapeSequence):
-            return True
+
         self.command = self.environment['runtime']['inputManager'].getCommandForShortcut(convertedEscapeSequence)
         self.environment['runtime']['eventManager'].putToEventQueue(fenrirEventType.ExecuteCommand, self.command)
         if self.command != '':