improve vim/emaces

src/fenrir/commands/onInput/55000-present_line_if_cursor_change_vertical.py

@@ -24,8 +24,10 @@ class command():
             return     
         if self.env['runtime']['screenManager'].isScreenChange():
             return
-        if self.env['runtime']['screenManager'].isDelta():
+        # this leads to problems in vim -> status line change -> no announcement
-            return    
+        #if self.env['runtime']['screenManager'].isDelta():
+        #    return
+            
         # is a vertical change?
         if not self.env['runtime']['cursorManager'].isCursorVerticalMove():
             return   

src/fenrir/commands/onInput/72000-history.py

@@ -1,58 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return ''        
-    
-    def run(self):
-        if self.env['runtime']['inputManager'].noKeyPressed():
-            return   
-        if self.env['screenData']['newAttribDelta'] != '':
-            return  
-        if self.env['runtime']['screenManager'].isScreenChange():
-            return
-        if self.env['runtime']['cursorManager'].isCursorVerticalMove():
-            return
-        if len(self.env['input']['currInput']) != 1:              
-            return
-        if not self.env['input']['currInput'][0] in ['KEY_UP','KEY_DOWN']:              
-            return            
-        prevLine = self.env['screenData']['oldContentText'].split('\n')[self.env['screenData']['newCursor']['y']]
-        currLine = self.env['screenData']['newContentText'].split('\n')[self.env['screenData']['newCursor']['y']]
-        if not currLine.isspace():
-            currPrompt = currLine.find('$')
-            rootPrompt = currLine.find('#')
-            if currPrompt <= 0:
-                if rootPrompt > 0:
-                    currPrompt = rootPrompt
-                else:
-                    announce = currLine            
-            if currPrompt > 0:
-                remove_digits = str.maketrans('0123456789', '          ')
-                if prevLine[:currPrompt].translate(remove_digits) == currLine[:currPrompt].translate(remove_digits):
-                    announce = currLine[currPrompt+1:]
-                else:
-                    announce = currLine                      
-
-        if currLine.isspace():
-            self.env['runtime']['outputManager'].presentText("blank", soundIcon='EmptyLine', interrupt=True, flush=False)
-        else:            
-            self.env['runtime']['outputManager'].presentText(announce, interrupt=True, flush=False)
-        self.env['commandsIgnore']['onScreenUpdate']['CHAR_DELETE_ECHO'] = True
-        self.env['commandsIgnore']['onScreenUpdate']['CHAR_ECHO'] = True
-        self.env['commandsIgnore']['onScreenUpdate']['INCOMING_IGNORE'] = True
-    def setCallback(self, callback):
-        pass
-

src/fenrir/commands/onScreenUpdate/70000-incoming.py

@@ -17,17 +17,20 @@ class command():
         return 'No Description found'      
 
     def run(self):
+
         if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'autoReadIncoming'):
             return
         # is there something to read?
-        if self.env['screenData']['newDelta'] == '':
+        if not self.env['runtime']['screenManager'].isDelta():
             return            
 
         # its a cursor movement (experimental) - maybe also check current shortcut string?
+
         if abs(self.env['screenData']['newCursor']['x'] - self.env['screenData']['oldCursor']['x']) >= 1:
             if len(self.env['screenData']['newDelta'].strip(' \n\t')) <= 2:
                 return          
-
+        if abs(self.env['screenData']['newCursor']['y'] - self.env['screenData']['oldCursor']['y']) == 1:
+            return      
         self.env['runtime']['outputManager'].presentText(self.env['screenData']['newDelta'], interrupt=False, flush=False)
 
     def setCallback(self, callback):