From 02d9f99fe4f3c2b8ee5ed50d823947957e1cc5f1 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 27 Aug 2017 18:46:54 +0200 Subject: [PATCH 1/4] fix forgotten variable --- src/fenrir/commands/onInput/10000-shut_up.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/commands/onInput/10000-shut_up.py b/src/fenrir/commands/onInput/10000-shut_up.py index a12c5ba1..49ed72a8 100644 --- a/src/fenrir/commands/onInput/10000-shut_up.py +++ b/src/fenrir/commands/onInput/10000-shut_up.py @@ -23,7 +23,7 @@ class command(): return if self.env['runtime']['screenManager'].isScreenChange(): return - if len(self.env['input']['prevDeepestInput']) > len(self.env['input']['currInput']): + if len(self.env['runtime']['inputManager'].getLastDeepestInput()) > len(self.env['input']['currInput']): return # if the filter is set if self.env['runtime']['settingsManager'].getSetting('keyboard', 'interruptOnKeyPressFilter').strip() != '': From c41a27c7db19277541e0e85c870d8b3371193f1d Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 27 Aug 2017 19:05:16 +0200 Subject: [PATCH 2/4] deactivate history for now --- .../commands/onScreenUpdate/{ => deactive}/60000-history.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/fenrir/commands/onScreenUpdate/{ => deactive}/60000-history.py (100%) diff --git a/src/fenrir/commands/onScreenUpdate/60000-history.py b/src/fenrir/commands/onScreenUpdate/deactive/60000-history.py similarity index 100% rename from src/fenrir/commands/onScreenUpdate/60000-history.py rename to src/fenrir/commands/onScreenUpdate/deactive/60000-history.py From b850960ab6bf06377659ac31c1bd2d33ff38fe23 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 27 Aug 2017 19:22:38 +0200 Subject: [PATCH 3/4] fix history in combination with incomming messages --- .../onScreenUpdate/{deactive => }/60000-history.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename src/fenrir/commands/onScreenUpdate/{deactive => }/60000-history.py (89%) diff --git a/src/fenrir/commands/onScreenUpdate/deactive/60000-history.py b/src/fenrir/commands/onScreenUpdate/60000-history.py similarity index 89% rename from src/fenrir/commands/onScreenUpdate/deactive/60000-history.py rename to src/fenrir/commands/onScreenUpdate/60000-history.py index efdbe244..0ecea111 100644 --- a/src/fenrir/commands/onScreenUpdate/deactive/60000-history.py +++ b/src/fenrir/commands/onScreenUpdate/60000-history.py @@ -24,9 +24,12 @@ class command(): if self.env['runtime']['cursorManager'].isCursorVerticalMove(): return if not (self.env['runtime']['inputManager'].getLastDeepestInput() in [['KEY_UP'],['KEY_DOWN']]): - return + return prevLine = self.env['screen']['oldContentText'].split('\n')[self.env['screen']['newCursor']['y']] - currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] + currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] + if prevLine == currLine: + if self.env['screen']['newDelta'] != '': + return if not currLine.isspace(): currPrompt = currLine.find('$') rootPrompt = currLine.find('#') From 014e5032aca929b4729df2d1d2bb9876c7b29167 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 27 Aug 2017 22:29:03 +0200 Subject: [PATCH 4/4] fix interrupt while typing --- src/fenrir/commands/onInput/10000-shut_up.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/commands/onInput/10000-shut_up.py b/src/fenrir/commands/onInput/10000-shut_up.py index 49ed72a8..b3a2dea7 100644 --- a/src/fenrir/commands/onInput/10000-shut_up.py +++ b/src/fenrir/commands/onInput/10000-shut_up.py @@ -23,7 +23,7 @@ class command(): return if self.env['runtime']['screenManager'].isScreenChange(): return - if len(self.env['runtime']['inputManager'].getLastDeepestInput()) > len(self.env['input']['currInput']): + if len(self.env['input']['currInput']) <= len(self.env['input']['prevInput']): return # if the filter is set if self.env['runtime']['settingsManager'].getSetting('keyboard', 'interruptOnKeyPressFilter').strip() != '':