From 2cd432861323100b1e9a605fe1f04cc911173b53 Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Sun, 14 Aug 2016 00:11:37 +0200
Subject: [PATCH] make key forewarding work

---
 config/keyboard/test.conf               |  2 +-
 src/fenrir-package/core/inputManager.py | 47 ++++++++++++++-----------
 src/fenrir-package/fenrir.py            |  7 ++--
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf
index 11b19d9a..491e2506 100644
--- a/config/keyboard/test.conf
+++ b/config/keyboard/test.conf
@@ -18,4 +18,4 @@
 #=toggle_output
 #=toggle_autoRead
 #=quit_fenrir
-#=foreward_keypress
+1-FENRIR,1-KEY_A=foreward_keypress
diff --git a/src/fenrir-package/core/inputManager.py b/src/fenrir-package/core/inputManager.py
index ce403474..4a3ae45d 100644
--- a/src/fenrir-package/core/inputManager.py
+++ b/src/fenrir-package/core/inputManager.py
@@ -10,9 +10,12 @@ class inputManager():
         self.iDevices = {}
         self.uDevices = {}
         self.getDevices()
+        self.ignoreKeyRelease = 0
 
     def getKeyPressed(self, environment):
         timeout = True
+        if not environment['input']['keyForeward']:
+            self.ignoreKeyRelease = 0
         try:
             r, w, x = select(self.iDevices, [], [], environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'screen', 'screenUpdateDelay'))
             if r != []:
@@ -24,28 +27,32 @@ class inputManager():
                         if not environment['input']['consumeKey'] or environment['input']['keyForeward']:   
                             self.uDevices[fd].write_event(event)
                             self.uDevices[fd].syn()
+                        keyString = ''
+                        if self.isFenrirKey(environment, event):
+                            keyString = 'FENRIR'
                         else:
-                            keyString = ''
-                            if self.isFenrirKey(environment, event):
-                                keyString = 'FENRIR'
+                            keyString = str(event.code) 
+                        if event.type == evdev.ecodes.EV_KEY:
+                            if event.value != 0:
+                                environment['input']['currShortcut'][keyString] = 1 #event.value
                             else:
-                                keyString = str(event.code) 
-                            if event.type == evdev.ecodes.EV_KEY:
-                                if event.value != 0:
-                                    environment['input']['currShortcut'][keyString] = 1 #event.value
-                                else:
-                                    try:
-                                        del(environment['input']['currShortcut'][keyString])
-                                    except:
-                                        pass
+                                try:
+                                    del(environment['input']['currShortcut'][keyString])
+                                except:
+                                    pass
         except Exception as e:
             self.freeDevices()
         time.sleep(0.01)        
         environment['input']['currShortcutString'] = self.getShortcutString(environment)
-        environment['input']['consumeKey'] = environment['input']['currShortcut'] != {} and environment['input']['consumeKey']
-        environment['input']['keyForeward'] = environment['input']['keyForeward'] and environment['input']['currShortcut'] == {}
+        if not timeout:
+            environment['input']['consumeKey'] = environment['input']['currShortcut'] != {} and environment['input']['consumeKey']
+            if (environment['input']['keyForeward'] and environment['input']['currShortcut'] == {}):
+                self.ignoreKeyRelease += 1
+            if self.ignoreKeyRelease >= 2: # a hack... has to bee done more clean
+                environment['input']['keyForeward'] = environment['input']['keyForeward'] and not environment['input']['currShortcut'] == {}
+   
         return environment, timeout
-
+	
     def getShortcutString(self, environment):
         if environment['input']['currShortcut'] == {}:
             return '' 
@@ -68,11 +75,11 @@ class inputManager():
             self.uDevices[fd] = UInput(
               cap,
               dev.name,
-              dev.info.vendor
-        #      dev.info.product,
-        #      dev.version,
-        #      dev.info.bustype,
-         #     '/dev/uinput'
+              #dev.info.vendor,
+              #dev.info.product,
+              #dev.version,
+              #dev.info.bustype,
+              #'/dev/uinput'
               )
             dev.grab()
 
diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py
index c27d93aa..6563e9ef 100755
--- a/src/fenrir-package/fenrir.py
+++ b/src/fenrir-package/fenrir.py
@@ -30,13 +30,14 @@ class fenrir():
 
     def onInput(self):
         self.environment, timeout = self.environment['runtime']['inputManager'].getKeyPressed(self.environment)
-        self.environment = self.environment['runtime']['commandManager'].getCommandForShortcut(self.environment)
         self.environment = self.environment['runtime']['screenDriver'].analyzeScreen(self.environment, 'onInput')
         if not timeout:
             self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')            
         self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged')        
-        if self.environment['commandInfo']['currCommand'] != '':
-            self.handleCommands()
+        if not self.environment['input']['keyForeward']:        
+            self.environment = self.environment['runtime']['commandManager'].getCommandForShortcut(self.environment)        
+            if self.environment['commandInfo']['currCommand'] != '':
+                self.handleCommands()
 
     def updateScreen(self):
             return