storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add scrollOnCell

Browse Source
This commit is contained in:
chrys
2017-01-30 19:55:48 +01:00
parent 04459e8eb7
commit fe885c3e31
7 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fenrir/core/outputManager.py
View File

@ -5,7 +5,8 @@
# By Chrys, Storm Dragon, and contributers.
from core import debug
import string
from utils import line_utils
import string, time
class outputManager():
def __init__(self):
@ -38,7 +39,8 @@ class outputManager():
toAnnounceCapital = False
self.speakText(text, interrupt, ignorePunctuation,toAnnounceCapital)
self.brailleText(text, interrupt)
if flush:
self.brailleText(text, flush)
def speakText(self, text, interrupt=True, ignorePunctuation=False, announceCapital=False):
if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'enabled'):
@ -98,7 +100,7 @@ class outputManager():
self.env['runtime']['debug'].writeDebugOut("\"speak\" in outputManager.speakText ",debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
def brailleText(self, text, flush=False):
def brailleText(self, text='', flush=False):
if not self.env['runtime']['settingsManager'].getSettingAsBool('braille', 'enabled'):
return
if self.env['runtime']['brailleDriver'] == None:
@ -107,7 +109,7 @@ class outputManager():
if flush:
self.env['output']['nextFlush'] = time.time() + 5.0
self.env['output']['messageText'] = text
self.env['runtime']['brailleDriver'].writeText(self.env['output']['messageText'] [self.env['output']['messageOffset']['x']: \
self.env['runtime']['brailleDriver'].writeText('flush'+self.env['output']['messageText'] [self.env['output']['messageOffset']['x']: \
self.env['output']['messageOffset']['x']+size[0]])
else:
if self.env['output']['nextFlush'] < time.time():
@ -118,9 +120,9 @@ class outputManager():
cursor = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
x, y, currLine = \
line_utils.getCurrentLine(cursor['x'], cursor['y'], self.env['screenData']['newContentText'])
self.env['runtime']['brailleDriver'].writeText(currLine[cursor['x']:cursor['x'] + size[0]])
self.env['runtime']['brailleDriver'].writeText('notflush<>' + currLine +'<>'+currLine[cursor['x']:cursor['x'] + size[0]])
else:
self.env['runtime']['brailleDriver'].writeText(self.env['output']['messageText'] [self.env['output']['messageOffset']['x']: \
self.env['runtime']['brailleDriver'].writeText('flush'+self.env['output']['messageText'] [self.env['output']['messageOffset']['x']: \
self.env['output']['messageOffset']['x']+size[0]])
def interruptOutput(self):

1
src/fenrir/core/settings.py
View File

@ -33,6 +33,7 @@ settings = {
'layout': 'en',
'flushMode': 'word',
'flushTimeout': 3,
'scrollOnCell': -1,
},
'screen':{
'driver': 'vcsaDriver',

2
src/fenrir/fenrir.py
View File

@ -64,7 +64,7 @@ class fenrir():
self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged')
else:
self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate')
self.environment['runtime']['outputManager'].brailleText()
self.handleCommands()
#print(time.time()-startTime)