storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanups

Browse Source
This commit is contained in:
chrys 2017-07-20 23:28:53 +02:00
parent 9e84859326
commit 96215607d8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fenrir/core/inputManager.py
View File

@ -39,7 +39,7 @@ class inputManager():
self.env['input']['currInput'].remove(mEvent['EventName']) self.env['input']['currInput'].remove(mEvent['EventName'])
if len(self.env['input']['currInput']) > 1: if len(self.env['input']['currInput']) > 1:
self.env['input']['currInput'] = sorted(self.env['input']['currInput']) self.env['input']['currInput'] = sorted(self.env['input']['currInput'])
if len(self.env['input']['currInput']) == 0: elif len(self.env['input']['currInput']) == 0:
self.env['input']['prevDeepestInput'] = [] self.env['input']['prevDeepestInput'] = []
self.env['input']['shortcutRepeat'] = 1 self.env['input']['shortcutRepeat'] = 1
self.setLedState = self.handleLedStates(mEvent) self.setLedState = self.handleLedStates(mEvent)
@ -153,11 +153,13 @@ class inputManager():
self.env['runtime']['debug'].writeDebugOut("Error while writeUInput",debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut("Error while writeUInput",debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
def isFenrirKeyPressed(self): #def isFenrirKeyPressed(self):
return 'KEY_FENRIR' in self.env['input']['prevDeepestInput'] # print('isFenrirKeyPressed')
# return 'KEY_FENRIR' in self.env['input']['prevDeepestInput']
def isScriptKeyPressed(self): #def isScriptKeyPressed(self):
return 'KEY_SCRIPT' in self.env['input']['prevDeepestInput'] # print('isScriptKeyPressed')
# return 'KEY_SCRIPT' in self.env['input']['prevDeepestInput']
def noKeyPressed(self): def noKeyPressed(self):
return self.env['input']['currInput'] == [] return self.env['input']['currInput'] == []
@ -195,10 +197,13 @@ class inputManager():
if len(self.env['input']['prevDeepestInput']) != 1: if len(self.env['input']['prevDeepestInput']) != 1:
return False return False
return (self.env['input']['currInput'][0] =='KEY_FENRIR') or (self.env['input']['currInput'][0] == 'KEY_SCRIPT') return (self.env['input']['currInput'][0] =='KEY_FENRIR') or (self.env['input']['currInput'][0] == 'KEY_SCRIPT')
def isFenrirKey(self, eventName): def isFenrirKey(self, eventName):
return eventName in self.env['input']['fenrirKey'] return eventName in self.env['input']['fenrirKey']
def isScriptKey(self, eventName): def isScriptKey(self, eventName):
return eventName in self.env['input']['scriptKey'] return eventName in self.env['input']['scriptKey']
def getCommandForShortcut(self, shortcut): def getCommandForShortcut(self, shortcut):
if not self.shortcutExists(shortcut): if not self.shortcutExists(shortcut):
return '' return ''