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

Revert "tweak line changes"

Browse Source 
This reverts commit 64e29680ce.
This commit is contained in:
chrys 2017-11-10 21:36:04 +01:00
parent 64e29680ce
commit c30fedb0ea
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fenrir/commands/onCursorChange/45000-char_echo.py
View File

@ -26,8 +26,7 @@ class command():
if not self.env['runtime']['screenManager'].isDelta(): if not self.env['runtime']['screenManager'].isDelta():
return return
# big changes are no char (but the value is bigger than one maybe the differ needs longer than you can type, so a little strange random buffer for now) # big changes are no char (but the value is bigger than one maybe the differ needs longer than you can type, so a little strange random buffer for now)
xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) if len(self.env['screen']['newDelta'].strip(' \n\t')) > 1:
if not( (xMove >= 1) and xMove == len(self.env['screen']['newDelta'])):
return return
# filter unneded space on word begin # filter unneded space on word begin
currDelta = self.env['screen']['newDelta'] currDelta = self.env['screen']['newDelta']

3
src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py
View File

@ -33,7 +33,6 @@ class command():
# is it a horizontal change? # is it a horizontal change?
if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): if not self.env['runtime']['cursorManager'].isCursorHorizontalMove():
return return
# echo word insteed of char # echo word insteed of char
if self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): if self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'):
if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) != 1: if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) != 1:
@ -43,7 +42,7 @@ class command():
word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent)
if self.env['screen']['newCursor']['x'] == x: if self.env['screen']['newCursor']['x'] == x:
return return
x, y, currChar = char_utils.getCurrentChar(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText']) x, y, currChar = char_utils.getCurrentChar(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText'])
if not currChar.isspace(): if not currChar.isspace():
self.env['runtime']['outputManager'].presentText(currChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) self.env['runtime']['outputManager'].presentText(currChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
def setCallback(self, callback): def setCallback(self, callback):

18
src/fenrir/commands/onScreenUpdate/70000-incoming.py
View File

@ -20,18 +20,16 @@ class command():
if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'autoReadIncoming'): if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'autoReadIncoming'):
return return
# is there something to read? # is there something to read?
if not self.env['runtime']['screenManager'].isDelta(ignoreSpace=True): if not self.env['runtime']['screenManager'].isDelta():
return return
# this must be a keyecho or something # this must be a keyecho or something
#if len(self.env['screen']['newDelta'].strip(' \n\t')) <= 1: if len(self.env['screen']['newDelta'].strip(' \n\t')) <= 1:
xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) if abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) >= 1:
yMove = abs(self.env['screen']['newCursor']['y'] - self.env['screen']['oldCursor']['y']) # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
if (xMove >= 1) and xMove == len(self.env['screen']['newDelta']): return
# if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2: if abs(self.env['screen']['newCursor']['y'] - self.env['screen']['oldCursor']['y']) == 1:
return # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
#if yMove == 1: return
# if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
# return
self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=False, flush=False) self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=False, flush=False)
def setCallback(self, callback): def setCallback(self, callback):

2
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -337,7 +337,7 @@ class driver(screenDriver):
else: else:
cursorLineStart = self.env['screen']['newCursor']['y'] * self.env['screen']['columns'] + self.env['screen']['newCursor']['y'] cursorLineStart = self.env['screen']['newCursor']['y'] * self.env['screen']['columns'] + self.env['screen']['newCursor']['y']
cursorLineEnd = cursorLineStart + self.env['screen']['columns'] cursorLineEnd = cursorLineStart + self.env['screen']['columns']
if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) >= 1 and \ if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) == 1 and \
self.env['screen']['oldCursor']['y'] == self.env['screen']['newCursor']['y'] and \ self.env['screen']['oldCursor']['y'] == self.env['screen']['newCursor']['y'] and \
self.env['screen']['newContentText'][:cursorLineStart] == self.env['screen']['oldContentText'][:cursorLineStart] and \ self.env['screen']['newContentText'][:cursorLineStart] == self.env['screen']['oldContentText'][:cursorLineStart] and \
self.env['screen']['newContentText'][cursorLineEnd:] == self.env['screen']['oldContentText'][cursorLineEnd:]: self.env['screen']['newContentText'][cursorLineEnd:] == self.env['screen']['oldContentText'][cursorLineEnd:]: