remove debug

This commit is contained in:
chrys 2016-09-25 21:08:16 +02:00
parent 6ae0cd85fa
commit c3e67168a2
8 changed files with 17 additions and 11 deletions

View File

@ -19,8 +19,6 @@ class command():
def run(self): def run(self):
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'interruptOnKeyPress'): if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'interruptOnKeyPress'):
return return
if self.env['runtime']['inputManager'].noKeyPressed():
return
if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']: if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']:
return return

View File

@ -17,6 +17,8 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['runtime']['inputManager'].noKeyPressed():
return
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charEcho'): if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charEcho'):
return return
# detect deletion or chilling # detect deletion or chilling

View File

@ -17,9 +17,10 @@ class command():
return '' return ''
def run(self): def run(self):
# TTY Change if self.env['runtime']['inputManager'].noKeyPressed():
return
if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']: if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']:
return return
if self.env['runtime']['inputManager'].noKeyPressed(): if self.env['runtime']['inputManager'].noKeyPressed():
return return
# detect an change on the screen, we just want to cursor arround, so no change should appear # detect an change on the screen, we just want to cursor arround, so no change should appear

View File

@ -17,6 +17,8 @@ class command():
return '' return ''
def run(self): def run(self):
if self.env['runtime']['inputManager'].noKeyPressed():
return
if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']: if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']:
return return
if self.env['screenData']['newDelta'] != self.env['screenData']['oldDelta']: if self.env['screenData']['newDelta'] != self.env['screenData']['oldDelta']:

View File

@ -18,6 +18,8 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['runtime']['inputManager'].noKeyPressed():
return
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'):
return return

View File

@ -30,6 +30,8 @@ class command():
self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')
def run(self): def run(self):
if self.env['runtime']['inputManager'].noKeyPressed():
return
if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoSpellCheck'): if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoSpellCheck'):
return return

View File

@ -17,6 +17,8 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['runtime']['inputManager'].noKeyPressed():
return
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charDeleteEcho'): if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charDeleteEcho'):
return return

View File

@ -36,13 +36,9 @@ class fenrir():
def handleProcess(self): def handleProcess(self):
eventReceived = self.environment['runtime']['inputManager'].getInputEvent() eventReceived = self.environment['runtime']['inputManager'].getInputEvent()
startTime = time.time()
if eventReceived: if eventReceived:
self.prepareCommand() self.prepareCommand()
#if not (self.environment['runtime']['inputManager'].isConsumeInput() or \
# self.environment['runtime']['inputManager'].isFenrirKeyPressed()) and \
# not self.environment['runtime']['commandManager'].isCommandQueued():
if not (self.wasCommand or self.environment['runtime']['inputManager'].isFenrirKeyPressed() or self.environment['generalInformation']['tutorialMode']): if not (self.wasCommand or self.environment['runtime']['inputManager'].isFenrirKeyPressed() or self.environment['generalInformation']['tutorialMode']):
self.environment['runtime']['inputManager'].writeEventBuffer() self.environment['runtime']['inputManager'].writeEventBuffer()
if self.environment['runtime']['inputManager'].noKeyPressed(): if self.environment['runtime']['inputManager'].noKeyPressed():
@ -55,7 +51,7 @@ class fenrir():
self.environment['input']['keyForeward'] -=1 self.environment['input']['keyForeward'] -=1
self.environment['input']['prevDeepestInput'] = [] self.environment['input']['prevDeepestInput'] = []
self.environment['runtime']['screenManager'].update() self.environment['runtime']['screenManager'].update()
self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput') self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')
else: else:
self.environment['runtime']['screenManager'].update() self.environment['runtime']['screenManager'].update()
@ -72,12 +68,13 @@ class fenrir():
self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate') self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate')
self.handleCommands() self.handleCommands()
#print(time.time()-startTime)
def prepareCommand(self): def prepareCommand(self):
if self.environment['input']['keyForeward'] > 0: if self.environment['input']['keyForeward'] > 0:
return return
shortcut = self.environment['runtime']['inputManager'].getCurrShortcut() shortcut = self.environment['runtime']['inputManager'].getCurrShortcut()
print(shortcut) #print(shortcut)
command = self.environment['runtime']['inputManager'].getCommandForShortcut(shortcut) command = self.environment['runtime']['inputManager'].getCommandForShortcut(shortcut)
self.environment['runtime']['commandManager'].queueCommand(command) self.environment['runtime']['commandManager'].queueCommand(command)
if len(self.environment['input']['prevDeepestInput']) < len(self.environment['input']['currInput']): if len(self.environment['input']['prevDeepestInput']) < len(self.environment['input']['currInput']):