From 8a4f2ac194a353236098b58071aa07374a144040 Mon Sep 17 00:00:00 2001 From: chrys Date: Sat, 24 Mar 2018 02:11:55 +0100 Subject: [PATCH] improve intial PTY emulation --- src/fenrirscreenreader/core/screenManager.py | 4 +--- src/fenrirscreenreader/screenDriver/ptyDriver.py | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py index ffb12e34..4ae269dd 100644 --- a/src/fenrirscreenreader/core/screenManager.py +++ b/src/fenrirscreenreader/core/screenManager.py @@ -56,11 +56,9 @@ class screenManager(): self.env['screen']['newCursor']['x'] = int( eventData['textCursor']['x']) self.env['screen']['newCursor']['y'] = int( eventData['textCursor']['y']) self.env['screen']['newTTY'] = eventData['screen'] - # analyze content - #self.updateCharMap(str(self.env['screen']['newTTY'])) self.env['screen']['newContentText'] = eventData['text'] self.env['screen']['newContentAttrib'] = eventData['attributes'] - + # screen change if self.env['screen']['newTTY'] != self.env['screen']['oldTTY']: self.env['screen']['oldContentBytes'] = b'' self.env['screen']['oldContentAttrib'] = None diff --git a/src/fenrirscreenreader/screenDriver/ptyDriver.py b/src/fenrirscreenreader/screenDriver/ptyDriver.py index 45ccd3f7..18edd816 100644 --- a/src/fenrirscreenreader/screenDriver/ptyDriver.py +++ b/src/fenrirscreenreader/screenDriver/ptyDriver.py @@ -98,7 +98,7 @@ class driver(screenDriver): running = False break if debug: - print('after p_out read') + print('after p_out read',msgBytes) terminal.feed(msgBytes) os.write(sys.stdout.fileno(), msgBytes) if debug: @@ -106,8 +106,6 @@ class driver(screenDriver): eventQueue.put({"Type":fenrirEventType.ScreenUpdate, "Data":self.createScreenEventData(terminal.dump()) }) - #print(terminal.dump()) - #self.createScreenEventData(terminal.dump()) if debug: print('after p_out') # input @@ -143,7 +141,7 @@ class driver(screenDriver): 'x': int( content['cursor'][0]), 'y': int( content['cursor'][1]) }, - 'screen': 1, + 'screen': '1', 'text': '', 'attributes': None, 'screenUpdateTime': time.time(), @@ -154,7 +152,7 @@ class driver(screenDriver): for line in content['lines']: for e in line: eventData['text'] += ''.join(e[0]) - #print(eventData['text']) + print(eventData['text']) #eventData['text'] = '' return eventData.copy()