From 9c571ba0325ff90f773f0410bafc9b921643a9f1 Mon Sep 17 00:00:00 2001 From: chrys Date: Wed, 21 Sep 2016 18:07:28 +0200 Subject: [PATCH] fix typos --- src/fenrir-package/core/inputManager.py | 58 +++++++++++++------------ src/fenrir-package/inputDriver/evdev.py | 2 +- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/fenrir-package/core/inputManager.py b/src/fenrir-package/core/inputManager.py index 2ebfc579..8db2eba3 100644 --- a/src/fenrir-package/core/inputManager.py +++ b/src/fenrir-package/core/inputManager.py @@ -13,48 +13,48 @@ class inputManager(): pass def initialize(self, environment): environment['runtime']['settingsManager'].loadDriver(environment,\ - environment['runtime']['settingsManager'].getSetting(environment,'keyboard', 'driver'), 'inputDriver') + environment['runtime']['settingsManager'].getSetting(environment,'keyboard', 'driver'), 'inputDriver') # init LEDs with current state - environment['input']['newNumLock'] = environment['runtime']['inputDriver'].getNumlock(environment) + environment['input']['newNumLock'] = environment['runtime']['inputDriver'].getNumlock(environment) environment['input']['oldNumLock'] = environment['input']['newNumLock'] - environment['input']['newCapsLock'] = environment['runtime']['inputDriver'].getCapslock(environment) - environment['input']['oldCapsLock'] = environment['input']['newCapsLock'] - environment['input']['newScrollLock'] = environment['runtime']['inputDriver'].getScrollLock(environment) - environment['input']['oldScrollLock'] = environment['input']['newScrollLock'] + environment['input']['newCapsLock'] = environment['runtime']['inputDriver'].getCapslock(environment) + environment['input']['oldCapsLock'] = environment['input']['newCapsLock'] + environment['input']['newScrollLock'] = environment['runtime']['inputDriver'].getScrollLock(environment) + environment['input']['oldScrollLock'] = environment['input']['newScrollLock'] self.grabDevices(environment) def shutdown(self, environment): - environment['runtime']['inputManager'].releaseDevices(environment) + environment['runtime']['inputManager'].releaseDevices(environment) if environment['runtime']['inputDriver']: environment['runtime']['inputDriver'].shutdown(environment) del environment['runtime']['inputDriver'] - + def getInputEvent(self, environment): - eventReceived = False - mEvent = environment['runtime']['inputDriver'].getInput(environment) - mEvent['EventName'] = self.convertEventName(mEvent['EventName']) + eventReceived = False + mEvent = environment['runtime']['inputDriver'].getInputEvent(environment) if mEvent: + mEvent['EventName'] = self.convertEventName(environment, mEvent['EventName']) if mEvent['EventValue'] == 0: return False eventReceived = True if mEvent['EventState'] == 0: if mEvent['EventName'] in environment['input']['currInput']: environment['input']['currInput'].remove(mEvent['EventName']) - environment['input']['currInput'] = sorted(environment['input']['currInput']) + environment['input']['currInput'] = sorted(environment['input']['currInput']) elif mEvent['EventState'] == 1: - if not mEvent['EventName'] in environment['input']['currInput']: - environment['input']['currInput'].append(mEvent['EventName']) + if not mEvent['EventName'] in environment['input']['currInput']: + environment['input']['currInput'].append(mEvent['EventName']) environment['input']['currInput'] = sorted(environment['input']['currInput']) elif mEvent['EventState'] == 2: pass else: pass environment['input']['oldNumLock'] = environment['input']['newNumLock'] - environment['input']['newNumLock'] = environment['runtime']['inputDriver'].getNumlock(environment) + environment['input']['newNumLock'] = environment['runtime']['inputDriver'].getNumlock(environment) environment['input']['oldCapsLock'] = environment['input']['newCapsLock'] - environment['input']['newCapsLock'] = environment['runtime']['inputDriver'].getCapslock(environment) + environment['input']['newCapsLock'] = environment['runtime']['inputDriver'].getCapslock(environment) environment['input']['oldScrollLock'] = environment['input']['newScrollLock'] - environment['input']['newScrollLock'] = environment['runtime']['inputDriver'].getScrollLock(environment) + environment['input']['newScrollLock'] = environment['runtime']['inputDriver'].getScrollLock(environment) environment['input']['lastInputTime'] = time.time() environment['input']['shortcutRepeat'] = 1 return eventReceived @@ -66,7 +66,9 @@ class inputManager(): def releaseDevices(self, environment): environment['runtime']['inputDriver'].releaseDevices(environment) - def convertEventName(self, eventName): + def convertEventName(self, environment, eventName): + if not eventName: + return '' if eventName == 'KEY_LEFTCTRL': eventName == 'KEY_CTRL' elif eventName == 'KEY_RIGHTCTRL': @@ -80,18 +82,18 @@ class inputManager(): elif eventName == 'KEY_RIGHTALT': eventName = 'KEY_ALT' if self.isFenrirKey(environment, eventName): - eventName = 'KEY_FENRIR' - return eventName - + eventName = 'KEY_FENRIR' + return eventName + def isConsumeInput(self, environment): - return environment['runtime']['commandManager'].isCommandQueued(environment) and \ - not environment['input']['keyForeward'] - #and - # not (environment['input']['keyForeward'] or \ + return environment['runtime']['commandManager'].isCommandQueued(environment) and \ + not environment['input']['keyForeward'] + #and + # not (environment['input']['keyForeward'] or \ # environment['runtime']['settingsManager'].getSettingAsBool(environment, 'keyboard', 'grabDevices')) def clearEventBuffer(self, environment): - environment['runtime']['inputDriver'].clearEventBuffer(environment) + environment['runtime']['inputDriver'].clearEventBuffer(environment) def writeEventBuffer(self, environment): try: @@ -99,7 +101,8 @@ class inputManager(): except Exception as e: print(e) 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) + def isFenrirKeyPressed(self, environment): return 'KEY_FENRIR' in environment['input']['currInput'] @@ -133,4 +136,3 @@ class inputManager(): def shortcutExists(self, environment, shortcut): return( str(shortcut).upper() in environment['bindings']) - diff --git a/src/fenrir-package/inputDriver/evdev.py b/src/fenrir-package/inputDriver/evdev.py index 7feec2b0..943a7537 100644 --- a/src/fenrir-package/inputDriver/evdev.py +++ b/src/fenrir-package/inputDriver/evdev.py @@ -22,7 +22,7 @@ class driver(): self.getInputDevices(environment) def shutdown(self, environment): pass - def getInput(self, environment): + def getInputEvent(self, environment): event = None r, w, x = select(self.iDevices, [], [], environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'screen', 'screenUpdateDelay')) if r != []: