initial say prev,curr,next line

config/keyboard/desktop.kb

@@ -1,3 +1,8 @@
-2-KEY_LEFTCTRL,1-KEY_LEFTSHIFT=curr_line
+#2-KEY_LEFTCTRL,1-KEY_LEFTSHIFT=curr_line
-2-KEY_LEFTCTRL,1-KEY_A=shut_up
+#2-KEY_LEFTCTRL,1-KEY_S=next_line
+#2-KEY_LEFTCTRL,1-KEY_W=prev_line
+2-KEY_LEFTCTRL,1-KEY_E=shut_up
+1-KEY_KP8=curr_line
+1-KEY_KP7=prev_line
+1-KEY_KP9=next_line
 

src/fenrir-package/commands/commands/curr_line.py

@@ -5,10 +5,15 @@ class command():
         pass
     def run(self, environment):
         environment['runtime']['speechDriver'].cancel()
+        environment['screenData']['oldCursorReview'] = environment['screenData']['newCursorReview']
+        if environment['screenData']['newCursorReview']['y'] == -1:
+            environment['screenData']['newCursorReview'] = environment['screenData']['newCursor'].copy()
+                 
         if environment['screenData']['newContentText'].replace(" ","") == '':
-            environment['runtime']['speechDriver'].speak("empty screen")
+            environment['runtime']['speechDriver'].speak("empty line")
         else:
-            environment['runtime']['speechDriver'].speak(environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']])
+            environment['runtime']['speechDriver'].speak(environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursorReview']['y']])
+        return environment
     def setCallback(self, callback):
         pass
     def shutdown(self):

src/fenrir-package/core/commandManager.py

@@ -29,6 +29,7 @@ class commandManager():
         for cmd in sorted(environment['commands'][trigger]):
             environment = environment['commands'][trigger][cmd].run(environment)
         return environment
+
     def executeCommand(self, environment, currCommand, section = 'commands'):
         if self.isCommandDefined(environment):
             try:

src/fenrir-package/core/inputManager.py

@@ -11,19 +11,22 @@ class inputManager():
         #for dev in self.devices.values(): print(dev)
 
     def getKeyPressed(self, environment):
-        r, w, x = select(self.devices, [], [])
+        try:
-        currShortcut = environment['input']['currShortcut']
+            r, w, x = select(self.devices, [], [])
-        if r != []:
+            currShortcut = environment['input']['currShortcut']
-            for fd in r:
+            if r != []:
-                for event in self.devices[fd].read():
+                for fd in r:
-                    if event.type == evdev.ecodes.EV_KEY:
+                    for event in self.devices[fd].read():
-                        if event.value != 0:
+                        if event.type == evdev.ecodes.EV_KEY:
-                            currShortcut[str(event.code)] = event.value
+                            if event.value != 0:
-                        else:
+                                currShortcut[str(event.code)] = event.value
-                            try:
+                            else:
-                                del(currShortcut[str(event.code)])
+                                try:
-                            except:
+                                    del(currShortcut[str(event.code)])
-                                pass
+                                except:
+                                    pass
+        except:
+            pass
         environment['input']['currShortcut'] = currShortcut
         environment['input']['currShortcutString'] = self.getShortcutString(environment)
         return environment

src/fenrir-package/core/screenData.py

@@ -4,13 +4,13 @@ screenData = {
 'columns': 0,
 'lines': 0,
 'oldDelta': '',
-'oldCursorReview':{'x':0,'y':0},
+'oldCursorReview':{'x':-1,'y':-1},
 'oldCursor':{'x':0,'y':0},
 'oldContentBytes': b'',
 'oldContentText': '',
 'oldContentAttrib': b'',
 'newDelta': '',
-'newCursorReview':{'x':0,'y':0},
+'newCursorReview':{'x':-1,'y':-1},
 'newCursor':{'x':0,'y':0},
 'newContentBytes': b'',
 'newContentText': '',

src/fenrir-package/fenrir.py

@@ -41,6 +41,7 @@ class fenrir():
     def proceed(self):
         self.threadHandleInput = Thread(target=self.handleInput, args=())
         self.threadHandleInput.start()
+        self.updateScreen()
         while(self.environment['generalInformation']['running']):
             self.updateScreen()
         self.shutdown()