Merge branch 'master' into inputHandlingRework

This commit is contained in:
chrys 2016-09-02 23:39:26 +02:00
commit 063ab4917c
3 changed files with 8 additions and 8 deletions

1
TODO
View File

@ -1,7 +1,6 @@
ToDos in Priority order: ToDos in Priority order:
- Known Bugs - Known Bugs
sometimes the screen is spoken from the beginning without need to
gstreamer sounddriver doesnt work gstreamer sounddriver doesnt work
- try to consume shortcuts - try to consume shortcuts

View File

@ -30,7 +30,9 @@ class command():
# No deletion # No deletion
if environment['screenData']['newNegativeDelta'] == '': if environment['screenData']['newNegativeDelta'] == '':
return environment return environment
# too much for a single backspace...
if len(environment['screenData']['newNegativeDelta']) >= 5:
return environment
environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newNegativeDelta'], interrupt=True) environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newNegativeDelta'], interrupt=True)
return environment return environment
def setCallback(self, callback): def setCallback(self, callback):

View File

@ -73,10 +73,10 @@ class screen():
environment['screenData']['oldCursor']['x'] = 0 environment['screenData']['oldCursor']['x'] = 0
environment['screenData']['oldCursor']['y'] = 0 environment['screenData']['oldCursor']['y'] = 0
environment['screenData']['oldDelta'] = '' environment['screenData']['oldDelta'] = ''
environment['screenData']['newDelta'] = ''
environment['screenData']['oldNegativeDelta'] = '' environment['screenData']['oldNegativeDelta'] = ''
environment['screenData']['newNegativeDelta'] = '' # always clear current deltas
environment['screenData']['newNegativeDelta'] = ''
environment['screenData']['newDelta'] = ''
# changes on the screen # changes on the screen
if (environment['screenData']['oldContentText'] != environment['screenData']['newContentText']) and \ if (environment['screenData']['oldContentText'] != environment['screenData']['newContentText']) and \
(environment['screenData']['newContentText'] != '' ): (environment['screenData']['newContentText'] != '' ):
@ -99,7 +99,6 @@ class screen():
environment['screenData']['newDelta'] = ''.join(x[2:] for x in diffList if x.startswith('+ ')) environment['screenData']['newDelta'] = ''.join(x[2:] for x in diffList if x.startswith('+ '))
environment['screenData']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x.startswith('- ')) environment['screenData']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x.startswith('- '))
else:
environment['screenData']['newNegativeDelta'] = ''
environment['screenData']['newDelta'] = ''
return environment return environment