From d1a17dee91fccf748c6fa86999f0ecee2c0bb370 Mon Sep 17 00:00:00 2001 From: Chrys Date: Wed, 19 May 2021 15:23:28 +0200 Subject: [PATCH] ignore lineshift --- .../commands/onScreenUpdate/70000-incoming.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py index e790b2dc..7b8f185c 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py @@ -27,12 +27,23 @@ class command(): #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']) - - if (xMove >= 1) and xMove == len(self.env['screen']['newDelta']): + #print('-----') + #print(self.env['screen']['newDelta']) + #print(xMove, yMove, len(self.env['screen']['newNegativeDelta']), self.env['screen']['newNegativeDelta']) + #print(xMove, yMove, len(self.env['screen']['newDelta']), self.env['screen']['newDelta']) + if (xMove >= 1) and abs(xMove) == len(self.env['screen']['newDelta']): # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2: if not '\n' in self.env['screen']['newDelta']: + print('out') return - #print(xMove, yMove, len(self.env['screen']['newDelta']), len(self.env['screen']['newNegativeDelta'])) + # shift line + if (xMove != 0) and len(self.env['screen']['newNegativeDelta']) == 0: + return + # filter out delete + if (xMove == 0) and (yMove == 0): + if len(self.env['screen']['newNegativeDelta']) - len(self.env['screen']['newDelta']) in [1,2,3]: + return + self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=False, flush=False) def setCallback(self, callback):