wait for input, move many scripts to input trigger

config/settings/settings.conf

@@ -58,7 +58,7 @@ voice=
 language=english-us
 
 # Read new text as it happens?
-autoReadIncoming=True
+autoReadIncomming=True
 
 [braille]
 #braille is not implemented yet
@@ -69,7 +69,7 @@ layout=en
 driver=linux
 encoding=cp850
 screenUpdateDelay=0.4
-suspendingScreen=1,2
+suspendingScreen=
 autodetectSuspendingScreen=False
 
 [keyboard]
@@ -79,13 +79,13 @@ device=all
 grabDevices=True
 ignoreShortcuts=False
 # the current shortcut layout located in /etc/fenrir/keyboard
-keyboardLayout=desktop
+keyboardLayout=test
 # echo chars while typing.
-charEcho=False
+charEcho=True
 # echo deleted chars
 charDeleteEcho=True
 # echo word after pressing space
-wordEcho=False
+wordEcho=True
 # interrupt speech on any keypress
 interruptOnKeyPress=False
 # timeout for double tap in sec
@@ -96,7 +96,7 @@ debugLevel=0
 punctuationLevel=1
 numberOfClipboards=10
 # define the current fenrir key
-fenrirKeys=KEY_KP0,KEY_META
+fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
 dateFormat=%A, %B %d, %Y
 autoSpellCheck=True

src/fenrir-package/commands/onInput/45000-present_char_if_cursor_change_horizontal.py

@@ -17,24 +17,27 @@ class command():
         return ''           
     
     def run(self):
- 
+        currChar = self.env['screenData']['newContentText'].split('\n')[self.env['screenData']['newCursor']['y']][self.env['screenData']['newCursor']['x']] 
         if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']:
             return            
-        if self.env['runtime']['inputManager'].noKeyPressed():
-            return            
+        #if self.env['runtime']['inputManager'].noKeyPressed():
+        #    return            
         # detect an change on the screen, we just want to cursor arround, so no change should appear
         if self.env['screenData']['newDelta'] != '':
+            print('0',currChar )
             return
         if self.env['screenData']['newNegativeDelta'] != '':
+            print('1',currChar)
             return            
         # is it a horizontal change?
         if self.env['screenData']['newCursor']['y'] != self.env['screenData']['oldCursor']['y'] or\
           self.env['screenData']['newCursor']['x'] == self.env['screenData']['oldCursor']['x']:
+            print('2',currChar, self.env['screenData']['newCursor']['x'],self.env['screenData']['oldCursor']['x'],self.env['screenData']['newCursor']['y'] , self.env['screenData']['oldCursor']['y'])
             return
         currChar = self.env['screenData']['newContentText'].split('\n')[self.env['screenData']['newCursor']['y']][self.env['screenData']['newCursor']['x']]
         if not currChar.strip(" \t\n") == '':
             self.env['runtime']['outputManager'].presentText(currChar, interrupt=True, ignorePunctuation=True)
- 
+        print(currChar)
     def setCallback(self, callback):
         pass
 

src/fenrir-package/core/screenManager.py

@@ -23,7 +23,6 @@ class screenManager():
 
     def update(self, trigger = 'onUpdate'):
         self.env['runtime']['screenDriver'].getCurrScreen()    
-
         if not self.isSuspendingScreen():
             if trigger == 'onUpdate':
                 self.env['runtime']['applicationManager'].getCurrentApplication()        

src/fenrir-package/fenrir.py

@@ -37,11 +37,12 @@ class fenrir():
     def handleProcess(self):
         #startTime = time.time()      
         eventReceived = self.environment['runtime']['inputManager'].getInputEvent()
+        print(eventReceived)
         if eventReceived:  
             self.prepareCommand()
             if not (self.wasCommand or self.environment['runtime']['inputManager'].isFenrirKeyPressed() or self.environment['generalInformation']['tutorialMode']) or  self.environment['runtime']['screenManager'].isSuspendingScreen():
                 self.environment['runtime']['inputManager'].writeEventBuffer()
-
+                time.sleep(0.005)
             if self.environment['runtime']['inputManager'].noKeyPressed():
                 if self.wasCommand:
                         self.wasCommand = False   
@@ -50,9 +51,8 @@ class fenrir():
                     self.environment['runtime']['inputManager'].clearEventBuffer()
                 if self.environment['input']['keyForeward'] > 0:
                     self.environment['input']['keyForeward'] -=1
-            else:
-                self.environment['runtime']['screenManager'].update('onInput')                            
-            self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')    
+            self.environment['runtime']['screenManager'].update('onInput')                            
+            self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')
         else:
             self.environment['runtime']['screenManager'].update('onUpdate')
         if self.environment['runtime']['applicationManager'].isApplicationChange():