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

rework

Browse Source
This commit is contained in:
chrys 2016-09-12 23:29:16 +02:00
parent 3296f72a8d
commit 0abd37f3f4
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fenrir-package/core/inputManager.py
View File

@ -12,18 +12,9 @@ class inputManager():
return environment return environment
def proceedInputEvent(self, environment): def proceedInputEvent(self, environment):
timeout = True timeout = True
if not environment['input']['keyForeward']:
self.ignoreKeyRelease = 0
environment, timeout = environment['runtime']['inputDriver'].getInput(environment) environment, timeout = environment['runtime']['inputDriver'].getInput(environment)
environment['input']['currShortcutString'] = self.getShortcutString(environment) return environment, timeout
if not timeout:
environment['input']['lastInputTime'] = time.time()
environment['input']['consumeKey'] = environment['input']['currShortcut'] != {} and environment['input']['consumeKey']
if (environment['input']['keyForeward'] and environment['input']['currShortcut'] == {}):
self.ignoreKeyRelease += 1
if self.ignoreKeyRelease >= 2: # a hack... has to bee done more clean
environment['input']['keyForeward'] = environment['input']['keyForeward'] and not environment['input']['currShortcut'] == {}
return environment, timeout
def grabDevices(self, environment): def grabDevices(self, environment):
environment['runtime']['inputDriver'].grabDevices(environment) environment['runtime']['inputDriver'].grabDevices(environment)
@ -42,6 +33,7 @@ class inputManager():
environment['runtime']['debug'].writeDebugOut(environment,"Error while writeUInput",debug.debugLevel.ERROR) environment['runtime']['debug'].writeDebugOut(environment,"Error while writeUInput",debug.debugLevel.ERROR)
environment['runtime']['debug'].writeDebugOut(environment, str(e),debug.debugLevel.ERROR) environment['runtime']['debug'].writeDebugOut(environment, str(e),debug.debugLevel.ERROR)
return environment return environment
def getShortcutString(self, environment): def getShortcutString(self, environment):
if environment['input']['currShortcut'] == {}: if environment['input']['currShortcut'] == {}:
return '' return ''

2
src/fenrir-package/input/evdev.py
View File

@ -11,8 +11,6 @@ class input():
self.iDevices = {} self.iDevices = {}
self.uDevices = {} self.uDevices = {}
self.getInputDevices() self.getInputDevices()
self.grabDevices()
self.ignoreKeyRelease = 0
def initialize(self, environment): def initialize(self, environment):
return environment return environment
def shutdown(self, environment): def shutdown(self, environment):