initial working input command chain

src/fenrir-package/core/environment.py

@@ -5,7 +5,7 @@ from core import runtime
 from core import screenData
 from core import generalInformation
 from core import commands
-from core import input
+from core import inputEvent
 
 environment = {
 'screenData': screenData.screenData,
@@ -15,7 +15,7 @@ environment = {
 'commands': commands.commands,
 'commandInfo': commands.commandInfo,
 'commandBuffer': commands.commandBuffer,
-'input': input.input,
+'input': inputEvent.input,
 'soundIcons': {},
 'bindings': {},
 }

src/fenrir-package/core/input.py

@@ -6,9 +6,9 @@ input = {
 'prevInput': [], 
 'prevDeepestInput': [], 
 'currEvent': None, 
-'firstEvent': None,
+'eventBuffer': None,
-'shortcutRepeat': 0,
+'shortcutRepeat': 1,
-'fenrirKey': ['82'],
+'fenrirKey': ['KEY_KP0'],
 'keyForeward': False,
 'lastInputTime':time.time(),
 'oldNumLock': True,
@@ -20,6 +20,7 @@ input = {
 inputEvent = {
 'EventName': '',
 'EventValue': '',
-'EventTime': time.time(),
+'EventSec': 0,
+'EventUsec': 0,
 'EventState': 0,
 }

src/fenrir-package/core/inputManager.py

@@ -2,6 +2,7 @@
 
 import time
 from utils import debug
+from core import inputEvent
 
 class inputManager():
     def __init__(self):
@@ -18,13 +19,30 @@ class inputManager():
     def proceedInputEvent(self, environment):
         timeout = True    	
         event = environment['runtime']['inputDriver'].getInput(environment)
-        if event:
+        mEvent = environment['runtime']['inputDriver'].mapEvent(environment, event)
+        if mEvent and event:
+            if mEvent['EventValue'] == 0:
+                return True        
             timeout = False
-            environment['input']['firstEvent'] = event
+            if mEvent['EventState'] == 0:
-            environment['input']['currEvent'] = event
+                if self.isFenrirKey(environment, mEvent):
-            #if not 
+                    environment['input']['currInput'].remove('KEY_FENRIR')
-            #print(event)
+                else:
-       
+                    environment['input']['currInput'].remove(mEvent['EventName'])
+                environment['input']['currInput'] = sorted(environment['input']['currInput'])                    
+            elif mEvent['EventState'] == 1:
+                if self.isFenrirKey(environment, mEvent):
+                    environment['input']['currInput'].append('KEY_FENRIR')
+                else:                
+                    environment['input']['currInput'].append(mEvent['EventName'])            
+                environment['input']['currInput'] = sorted(environment['input']['currInput'])
+            elif mEvent['EventState'] == 2:
+                pass
+            else:
+                pass
+            print(environment['input']['currInput'])    
+            environment['input']['lastInputTime'] = time.time()
+            environment['input']['shortcutRepeat'] = 1
         return timeout
     
     def grabDevices(self, environment):
@@ -55,14 +73,16 @@ class inputManager():
         shortcut = []
         shortcut.append(environment['input']['shortcutRepeat'])
         shortcut.append(sorted(environment['input']['prevInput']))
+        return str(shortcut)
 
-    def getPrevShortcut(self, environment):
+    def getCurrShortcut(self, environment):
         shortcut = []
         shortcut.append(environment['input']['shortcutRepeat'])
-        shortcut.append(sorted(environment['input']['prevInput']))
+        shortcut.append(sorted(environment['input']['currInput']))
+        return str(shortcut)
         
-    def isFenrirKey(self,environment, event):
+    def isFenrirKey(self,environment, mEvent):
-        return str(event.code) in environment['input']['fenrirKey']
+        return str(mEvent['EventName']) in environment['input']['fenrirKey']
 
     def getCommandForShortcut(self, environment, shortcut):
         shortcut = shortcut.upper()

src/fenrir-package/fenrir.py

@@ -34,25 +34,28 @@ class fenrir():
 
     def handleProcess(self):
         timeout = self.environment['runtime']['inputManager'].proceedInputEvent(self.environment)
-        timeout = True
         try:
             self.environment['runtime']['screenManager'].update(self.environment)
         except Exception as e:
             print(e)
             self.environment['runtime']['debug'].writeDebugOut(self.environment, str(e),debug.debugLevel.ERROR)                
-        if not (self.environment['input']['keyForeward'] or timeout):  
+        if not timeout:  
-            #currShortcut = self.environment['runtime']['inputManager'].getCurrShortcut(self.environment)        
+            self.prepareCommand()
-            shortcut = "[1, ['KEY_FENRIR', 'KEY_T']]"
-            command = self.environment['runtime']['inputManager'].getCommandForShortcut(self.environment, shortcut)        
-            print(command)
-            #self.environment['runtime']['commandManager'].queueCommand(self.environment, command)        
-        if not timeout:
             self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')            
         self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged')        
-        if not self.environment['input']['keyForeward']:
+        self.handleCommands()
-            self.handleCommands()
 
+    def prepareCommand(self):
+        if self.environment['input']['keyForeward']:
+            return
+        shortcut = self.environment['runtime']['inputManager'].getCurrShortcut(self.environment)        
+        command = self.environment['runtime']['inputManager'].getCommandForShortcut(self.environment, shortcut)        
+        print(command)
+        self.environment['runtime']['commandManager'].queueCommand(self.environment, command)           
+    
     def handleCommands(self):
+        if self.environment['input']['keyForeward']:
+            return
         if self.environment['runtime']['commandManager'].isCommandQueued(self.environment):
             self.environment['runtime']['commandManager'].executeCommand(self.environment, self.environment['commandInfo']['currCommand'], 'commands')
 

src/fenrir-package/inputDriver/evdev.py

@@ -2,8 +2,10 @@
 
 import evdev
 from evdev import InputDevice, UInput
-from select import select
 import time
+from select import select
+
+from core import inputEvent
 from utils import debug
 
 class driver():
@@ -32,11 +34,20 @@ class driver():
         self.iDevices = map(evdev.InputDevice, (evdev.list_devices()))
         self.iDevices = {dev.fd: dev for dev in self.iDevices if 1 in dev.capabilities()}
 
-    def mapEvent(self, event):
+    def mapEvent(self,environment, event):
+        if not event:
+            return None
+        mEvent = inputEvent.inputEvent
         try:
-            return evdev.ecodes.ecodes[keyID.upper()]
+            mEvent['EventName'] = evdev.ecodes.keys[event.code].upper()
-        except:
+            mEvent['EventValue'] = event.code
-            return 0
+            mEvent['EventSec'] = event.sec
+            mEvent['EventUsec'] = event.usec                
+            mEvent['EventState'] = event.value
+            return mEvent
+        except Exception as e:
+            print(e)
+            return None
             
     def grabDevices(self):
         for fd in self.iDevices: