From 26e3057ab1824df0e4d4481322654ddee7c1ccec Mon Sep 17 00:00:00 2001 From: chrys Date: Sat, 24 Sep 2016 23:59:23 +0200 Subject: [PATCH] intial working window mode in screenDriver --- config/settings/settings.conf | 2 +- src/fenrir-package/screenDriver/linux.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 89803b74..9c2a8a2d 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -79,7 +79,7 @@ device=all grabDevices=True ignoreShortcuts=False # the current shortcut layout located in /etc/fenrir/keyboard -keyboardLayout=test +keyboardLayout=desktop # echo chars while typing. charEcho=False # echo deleted chars diff --git a/src/fenrir-package/screenDriver/linux.py b/src/fenrir-package/screenDriver/linux.py index 59e02aa2..1a5edf09 100644 --- a/src/fenrir-package/screenDriver/linux.py +++ b/src/fenrir-package/screenDriver/linux.py @@ -124,7 +124,6 @@ class driver(): # changes on the screen oldScreenText = self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screenData']['oldContentText']) newScreenText = self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screenData']['newContentText']) - print(newScreenText) if (self.env['screenData']['oldContentText'] != self.env['screenData']['newContentText']) and \ (self.env['screenData']['newContentText'] != '' ): if oldScreenText == '' and\ @@ -139,10 +138,11 @@ class driver(): diff = difflib.ndiff(self.env['screenData']['oldContentText'][diffStart:diffStart + self.env['screenData']['columns']],\ self.env['screenData']['newContentText'][diffStart:diffStart + self.env['screenData']['columns']]) else: - diff = difflib.ndiff( oldScreenText[diffStart:].split('\n'),\ - newScreenText[diffStart:].split('\n')) - - diffList = list(diff) + diff = difflib.ndiff( oldScreenText[0:].split('\n'),\ + newScreenText[0:].split('\n')) + diffList = list(diff) + self.env['screenData']['newDelta'] = ''.join(x[2:] for x in diffList if x.startswith('+ ')) self.env['screenData']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x.startswith('- ')) + print(self.env['screenData']['newDelta'])