diff --git a/src/fenrir-package/commands/onInput/10000-shut_up.py b/src/fenrir-package/commands/onInput/10000-shut_up.py index 26d2420f..d4466512 100644 --- a/src/fenrir-package/commands/onInput/10000-shut_up.py +++ b/src/fenrir-package/commands/onInput/10000-shut_up.py @@ -8,7 +8,6 @@ class command(): environment['screenData']['newDelta'] == environment['screenData']['oldDelta']: return environment environment['runtime']['outputManager'].interruptOutput(environment) - print('10000-shut_up.py') return environment def setCallback(self, callback): pass diff --git a/src/fenrir-package/commands/onInput/54000-read_char_if_cursor_change_horizontal.py b/src/fenrir-package/commands/onInput/54000-read_char_if_cursor_change_horizontal.py index 99ef269b..ab56200a 100644 --- a/src/fenrir-package/commands/onInput/54000-read_char_if_cursor_change_horizontal.py +++ b/src/fenrir-package/commands/onInput/54000-read_char_if_cursor_change_horizontal.py @@ -7,11 +7,10 @@ class command(): if environment['screenData']['newCursor']['y'] != environment['screenData']['oldCursor']['y'] or\ environment['screenData']['newCursor']['x'] == environment['screenData']['oldCursor']['x']: return environment - if environment['screenData']['newDelta'] == environment['screenData']['oldDelta']: - if environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']].replace(" ","").replace("\n","").replace("\t","") == '': - environment['runtime']['outputManager'].presentText(environment, "blank") - else: - environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']]) + if environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']].replace(" ","").replace("\n","").replace("\t","") == '': + environment['runtime']['outputManager'].presentText(environment, "blank",True) + else: + environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']],True) return environment def setCallback(self, callback): diff --git a/src/fenrir-package/commands/onInput/55000-read_line_if_cursor_change_vertical.py b/src/fenrir-package/commands/onInput/55000-read_line_if_cursor_change_vertical.py index e1f9dfb8..4e2c212f 100644 --- a/src/fenrir-package/commands/onInput/55000-read_line_if_cursor_change_vertical.py +++ b/src/fenrir-package/commands/onInput/55000-read_line_if_cursor_change_vertical.py @@ -9,9 +9,9 @@ class command(): if environment['screenData']['newCursor']['y'] == environment['screenData']['oldCursor']['y']: return environment if environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']].replace(" ","").replace("\n","").replace("\t","") == '': - environment['runtime']['outputManager'].presentText(environment, "blank") + environment['runtime']['outputManager'].presentText(environment, "blank", True) else: - environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']]) + environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']], True) return environment def setCallback(self, callback): pass diff --git a/src/fenrir-package/commands/onScreenChanged/70000-speak_incomming.py b/src/fenrir-package/commands/onScreenChanged/70000-speak_incomming.py index 1518e038..2cc8bc6f 100644 --- a/src/fenrir-package/commands/onScreenChanged/70000-speak_incomming.py +++ b/src/fenrir-package/commands/onScreenChanged/70000-speak_incomming.py @@ -7,7 +7,7 @@ class command(): if environment['screenData']['newDelta'] == environment['screenData']['oldDelta'] and \ environment['screenData']['newTTY'] == environment['screenData']['oldTTY']: return environment - environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newDelta'],len(environment['screenData']['newDelta']) == 1) + environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newDelta'],False) return environment def setCallback(self, callback): pass diff --git a/src/fenrir-package/screen/linux.py b/src/fenrir-package/screen/linux.py index 16917d4b..84db93c2 100644 --- a/src/fenrir-package/screen/linux.py +++ b/src/fenrir-package/screen/linux.py @@ -27,9 +27,9 @@ class screen(): except: return environment if trigger != 'onInput' and False: # so we already moved the cursor and is not input -> screenUpdate was faster - if ((newContentBytes[2] != environment['screenData']['oldCursor']['x']) or\ - (newContentBytes[3] != environment['screenData']['oldCursor']['y'])) and\ - (newTTY == environment['screenData']['oldTTY']): + if ((newContentBytes[2] != environment['screenData']['newCursor']['x']) or\ + (newContentBytes[3] != environment['screenData']['newCursor']['y'])) and\ + (newTTY == environment['screenData']['newTTY']): return environment # set new "old" values environment['screenData']['oldContentBytes'] = environment['screenData']['newContentBytes']