sync with master

src/fenrir/commands/commands/toggle_highlight_tracking.py

@@ -0,0 +1,29 @@
+#!/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 'enables or disables tracking of highlighted'        
+    
+    def run(self):
+        currMode=self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'highlight')
+
+        self.env['runtime']['settingsManager'].setSetting('focus', 'highlight', str(not currMode))
+        self.env['runtime']['settingsManager'].setSetting('focus', 'cursor', str(currMode))           
+        if self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'highlight'): 
+            self.env['runtime']['outputManager'].presentText("highlight tracking", soundIcon='', interrupt=True)
+        else:
+            self.env['runtime']['outputManager'].presentText("cursor tracking", soundIcon='', interrupt=True)                          
+    
+    def setCallback(self, callback):
+        pass

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

@@ -18,6 +18,8 @@ class command():
         return ''           
     
     def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'):
+            return        
         if self.env['runtime']['screenManager'].isScreenChange():
             return            
         if self.env['runtime']['inputManager'].noKeyPressed():

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

@@ -18,6 +18,8 @@ class command():
         return ''        
     
     def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'):
+            return    
         if self.env['runtime']['inputManager'].noKeyPressed():
             return     
         if self.env['runtime']['screenManager'].isScreenChange():

src/fenrir/commands/onInput/56000-highlight_tracking.py

@@ -0,0 +1,24 @@
+#!/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 '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['screenData']['newAttribDelta'], soundIcon='', interrupt=True)                          
+    
+    def setCallback(self, callback):
+        pass

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

@@ -18,7 +18,9 @@ class command():
     
     def run(self):
         if self.env['runtime']['inputManager'].noKeyPressed():
-            return     
+            return   
+        if self.env['screenData']['newAttribDelta'] != '':
+            return  
         if self.env['runtime']['screenManager'].isScreenChange():
             return
         if self.env['runtime']['cursorManager'].isCursorVerticalMove():
@@ -29,9 +31,7 @@ class command():
             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 currLine.isspace():
-            self.env['runtime']['outputManager'].presentText("blank", soundIcon='EmptyLine', interrupt=True)
-        else:
+        if not currLine.isspace():
             currPrompt = currLine.find('$')
             rootPrompt = currLine.find('#')
             if currPrompt <= 0: