fix merge

src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py

@@ -0,0 +1,24 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('enables or disables tracking of highlighted')        
+    
+    def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'highlight'):
+            return
+        self.env['runtime']['outputManager'].presentText(self.env['screen']['newAttribDelta'], soundIcon='', interrupt=True, flush=False)                          
+    
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py

@@ -0,0 +1,57 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.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['screen']['newAttribDelta'] != '':
+            return  
+        if self.env['runtime']['screenManager'].isScreenChange():
+            return
+        if self.env['runtime']['cursorManager'].isCursorVerticalMove():
+            return
+        if not (self.env['runtime']['inputManager'].getLastDeepestInput() in [['KEY_UP'],['KEY_DOWN']]):
+            return 
+        prevLine = self.env['screen']['oldContentText'].split('\n')[self.env['screen']['newCursor']['y']]
+        currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]            
+        if prevLine == currLine:
+            if self.env['screen']['newDelta'] != '':
+                return         
+        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/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py

@@ -0,0 +1,45 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No Description found'      
+
+    def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'autoReadIncoming'):
+            return
+        # is there something to read?
+        if not self.env['runtime']['screenManager'].isDelta(ignoreSpace=True):
+            return      
+        # this must be a keyecho or something      
+        #if len(self.env['screen']['newDelta'].strip(' \n\t')) <= 1:
+        xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x'])
+        yMove = abs(self.env['screen']['newCursor']['y'] - self.env['screen']['oldCursor']['y'])
+        #self.env['runtime']['debug'].writeDebugOut('newX:' + str(self.env['screen']['newCursor']['x']) + 'oldX:' + str(self.env['screen']['oldCursor']['x']),debug.debugLevel.INFO)         
+        #self.env['runtime']['debug'].writeDebugOut('newY:' + str(self.env['screen']['newCursor']['y']) + 'oldY:' + str(self.env['screen']['oldCursor']['y']),debug.debugLevel.INFO)                 
+        #self.env['runtime']['debug'].writeDebugOut('xMove:'+ str(xMove)+' yMove:'+str(yMove),debug.debugLevel.INFO)                 
+        #self.env['runtime']['debug'].writeDebugOut('NewDeltaLen:'+str(len(self.env['screen']['newDelta'])),debug.debugLevel.INFO)                         
+        #self.env['runtime']['debug'].writeDebugOut(str(self.env['screen']),debug.debugLevel.INFO)                         
+        self.env['runtime']['debug'].writeDebugOut('NewDelta:'+str(self.env['screen']['newDelta']),debug.debugLevel.INFO)        
+        if (xMove >= 1) and xMove == len(self.env['screen']['newDelta']):
+        # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
+            return          
+        #if yMove == 1:
+        #   if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
+        #    return                        
+        self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=False, flush=False)
+
+    def setCallback(self, callback):
+        pass
+

src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py

@@ -0,0 +1,37 @@
+#!/bin/python
+import time
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No Description found'     
+
+    def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('promote', 'enabled'):
+            return
+        if self.env['runtime']['settingsManager'].getSetting('promote', 'list').strip(" \t\n") == '':
+            return
+        if int(time.time() - self.env['input']['lastInputTime']) < self.env['runtime']['settingsManager'].getSettingAsInt('promote', 'inactiveTimeoutSec'):
+            return
+        if len(self.env['runtime']['settingsManager'].getSetting('promote', 'list')) == 0:
+            return       
+        for promote in self.env['runtime']['settingsManager'].getSetting('promote', 'list').split(','):
+            if promote in self.env['screen']['newDelta']:    
+                self.env['runtime']['outputManager'].playSoundIcon('PromotedText')        
+                self.env['input']['lastInputTime'] = time.time()
+                return
+
+    def setCallback(self, callback):
+        pass
+