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

Update inputManager.py

Browse Source
This commit is contained in:
chrys87 2018-05-23 13:24:29 +02:00 committed by GitHub
parent d3bec267af
commit 5063362dbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fenrirscreenreader/core/inputManager.py
View File

@ -46,10 +46,10 @@ class inputManager():
def handleDeviceGrab(self): def handleDeviceGrab(self):
if not self.executeDeviceGrab: if not self.executeDeviceGrab:
return return
if not self.noKeyPressed():
return
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'): if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
return return
if not self.noKeyPressed():
return
if self.env['runtime']['screenManager'].getCurrScreenIgnored(): if self.env['runtime']['screenManager'].getCurrScreenIgnored():
self.ungrabAllDevices() self.ungrabAllDevices()
self.env['runtime']['outputManager'].interruptOutput() self.env['runtime']['outputManager'].interruptOutput()
@ -59,7 +59,6 @@ class inputManager():
def handleInputEvent(self, eventData): def handleInputEvent(self, eventData):
if not eventData: if not eventData:
return return
self.handleDeviceGrab()
self.env['input']['prevInput'] = self.env['input']['currInput'].copy() self.env['input']['prevInput'] = self.env['input']['currInput'].copy()
if eventData['EventState'] == 0: if eventData['EventState'] == 0:
if eventData['EventName'] in self.env['input']['currInput']: if eventData['EventName'] in self.env['input']['currInput']:
@ -97,9 +96,8 @@ class inputManager():
if self.noKeyPressed(): if self.noKeyPressed():
self.env['input']['prevInput'] = [] self.env['input']['prevInput'] = []
self.setLedState = True self.setLedState = True
else: self.handleDeviceGrab()
self.handleDeviceGrab()
def handleLedStates(self, mEvent): def handleLedStates(self, mEvent):
if not self.setLedState: if not self.setLedState:
return self.setLedState return self.setLedState