diff --git a/setup.py b/setup.py index a1629837..5050d899 100755 --- a/setup.py +++ b/setup.py @@ -26,8 +26,10 @@ for directory in directories: destDir = '/etc/fenrirscreenreader/keyboard' elif 'config/settings' in directory: destDir = '/etc/fenrirscreenreader/settings' + print(forceSettings) if not forceSettings: try: + print('delete') del(files[files.index('config/settings/settings.conf')]) except: pass diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py index 5d5d2d0b..dd97d9b2 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py @@ -22,6 +22,9 @@ class command(): return if self.env['runtime']['cursorManager'].isCursorVerticalMove(): return + if self.env['screen']['newCursor']['x'] == == self.env['runtime']['screenManager'].getColums() - 1 and\ + self.env['screen']['newCursor']['y'] == self.env['runtime']['screenManager'].getRows() - 1): + return if self.env['runtime']['inputManager'].getShortcutType() in ['KEY']: if not (self.env['runtime']['inputManager'].getLastDeepestInput() in [['KEY_UP'],['KEY_DOWN']]): return diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py index 6c5d6aa9..28a97774 100644 --- a/src/fenrirscreenreader/core/screenManager.py +++ b/src/fenrirscreenreader/core/screenManager.py @@ -15,6 +15,12 @@ class screenManager(): self.prevScreenIgnored = False self.prevScreenText = '' self.currScreenText = '' + self.colums = None + self.rows = None + def getRows(self): + return self.rows + def getColumns(self): + return self.colums def initialize(self, environment): self.env = environment self.env['runtime']['settingsManager'].loadDriver(\ @@ -97,6 +103,8 @@ class screenManager(): # get metadata like cursor or screensize self.env['screen']['lines'] = int( eventData['lines']) self.env['screen']['columns'] = int( eventData['columns']) + self.colums = int( eventData['columns']) + self.rows = int( eventData['lines']) self.env['screen']['newCursor']['x'] = int( eventData['textCursor']['x']) self.env['screen']['newCursor']['y'] = int( eventData['textCursor']['y']) self.env['screen']['newTTY'] = eventData['screen']