From 6ae0cd85fa8a15020319a8f451f94ebf5ed58a89 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 25 Sep 2016 20:30:50 +0200 Subject: [PATCH] add initial keyforwart for new input handling --- config/keyboard/desktop.conf | 2 +- config/keyboard/test.conf | 2 +- src/fenrir-package/commands/commands/forward_keypress.py | 2 +- src/fenrir-package/fenrir.py | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf index bfa1a6a7..232c37cb 100644 --- a/config/keyboard/desktop.conf +++ b/config/keyboard/desktop.conf @@ -39,7 +39,7 @@ KEY_FENRIR,KEY_T=time KEY_FENRIR,KEY_S=spell_check 2,KEY_FENRIR,KEY_S=add_word_to_spell_check KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check -KEY_FENRIR,KEY_BACKSPACE=foreward_keypress +KEY_FENRIR,KEY_BACKSPACE=forward_keypress KEY_FENRIR,KEY_UP=inc_speech_volume KEY_FENRIR,KEY_DOWN=dec_speech_volume KEY_FENRIR,KEY_RIGHT=inc_speech_rate diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 2a2bb147..73b69da0 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -39,7 +39,7 @@ KEY_FENRIR,KEY_T=time KEY_FENRIR,KEY_S=spell_check 2,KEY_FENRIR,KEY_S=add_word_to_spell_check KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check -KEY_FENRIR,KEY_BACKSPACE=foreward_keypress +KEY_FENRIR,KEY_BACKSPACE=forward_keypress KEY_FENRIR,KEY_UP=inc_speech_volume KEY_FENRIR,KEY_DOWN=dec_speech_volume KEY_FENRIR,KEY_RIGHT=inc_speech_rate diff --git a/src/fenrir-package/commands/commands/forward_keypress.py b/src/fenrir-package/commands/commands/forward_keypress.py index 21ab302b..6aed1d65 100644 --- a/src/fenrir-package/commands/commands/forward_keypress.py +++ b/src/fenrir-package/commands/commands/forward_keypress.py @@ -17,7 +17,7 @@ class command(): return 'sends the following keypress to the terminal' def run(self): - self.env['input']['keyForeward'] = 2 + self.env['input']['keyForeward'] = 3 self.env['runtime']['outputManager'].presentText('Foreward next keypress', interrupt=True) def setCallback(self, callback): diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py index fa8bbf2a..813232b4 100755 --- a/src/fenrir-package/fenrir.py +++ b/src/fenrir-package/fenrir.py @@ -51,6 +51,8 @@ class fenrir(): self.environment['runtime']['inputManager'].clearEventBuffer() if self.environment['generalInformation']['tutorialMode']: self.environment['runtime']['inputManager'].clearEventBuffer() + if self.environment['input']['keyForeward'] > 0: + self.environment['input']['keyForeward'] -=1 self.environment['input']['prevDeepestInput'] = [] self.environment['runtime']['screenManager'].update() @@ -72,7 +74,7 @@ class fenrir(): self.handleCommands() def prepareCommand(self): - if self.environment['input']['keyForeward']: + if self.environment['input']['keyForeward'] > 0: return shortcut = self.environment['runtime']['inputManager'].getCurrShortcut() print(shortcut)