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

make key forewarding work

Browse Source
This commit is contained in:
chrys 2016-08-14 00:11:37 +02:00
parent f974b48b1e
commit 2cd4328613
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/keyboard/test.conf
View File

@ -18,4 +18,4 @@
#=toggle_output #=toggle_output
#=toggle_autoRead #=toggle_autoRead
#=quit_fenrir #=quit_fenrir
#=foreward_keypress 1-FENRIR,1-KEY_A=foreward_keypress

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

@ -10,9 +10,12 @@ class inputManager():
self.iDevices = {} self.iDevices = {}
self.uDevices = {} self.uDevices = {}
self.getDevices() self.getDevices()
self.ignoreKeyRelease = 0
def getKeyPressed(self, environment): def getKeyPressed(self, environment):
timeout = True timeout = True
if not environment['input']['keyForeward']:
self.ignoreKeyRelease = 0
try: try:
r, w, x = select(self.iDevices, [], [], environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'screen', 'screenUpdateDelay')) r, w, x = select(self.iDevices, [], [], environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'screen', 'screenUpdateDelay'))
if r != []: if r != []:
@ -24,28 +27,32 @@ class inputManager():
if not environment['input']['consumeKey'] or environment['input']['keyForeward']: if not environment['input']['consumeKey'] or environment['input']['keyForeward']:
self.uDevices[fd].write_event(event) self.uDevices[fd].write_event(event)
self.uDevices[fd].syn() self.uDevices[fd].syn()
keyString = ''
if self.isFenrirKey(environment, event):
keyString = 'FENRIR'
else: else:
keyString = '' keyString = str(event.code)
if self.isFenrirKey(environment, event): if event.type == evdev.ecodes.EV_KEY:
keyString = 'FENRIR' if event.value != 0:
environment['input']['currShortcut'][keyString] = 1 #event.value
else: else:
keyString = str(event.code) try:
if event.type == evdev.ecodes.EV_KEY: del(environment['input']['currShortcut'][keyString])
if event.value != 0: except:
environment['input']['currShortcut'][keyString] = 1 #event.value pass
else:
try:
del(environment['input']['currShortcut'][keyString])
except:
pass
except Exception as e: except Exception as e:
self.freeDevices() self.freeDevices()
time.sleep(0.01) time.sleep(0.01)
environment['input']['currShortcutString'] = self.getShortcutString(environment) environment['input']['currShortcutString'] = self.getShortcutString(environment)
environment['input']['consumeKey'] = environment['input']['currShortcut'] != {} and environment['input']['consumeKey'] if not timeout:
environment['input']['keyForeward'] = environment['input']['keyForeward'] and environment['input']['currShortcut'] == {} 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 return environment, timeout
def getShortcutString(self, environment): def getShortcutString(self, environment):
if environment['input']['currShortcut'] == {}: if environment['input']['currShortcut'] == {}:
return '' return ''
@ -68,11 +75,11 @@ class inputManager():
self.uDevices[fd] = UInput( self.uDevices[fd] = UInput(
cap, cap,
dev.name, dev.name,
dev.info.vendor #dev.info.vendor,
# dev.info.product, #dev.info.product,
# dev.version, #dev.version,
# dev.info.bustype, #dev.info.bustype,
# '/dev/uinput' #'/dev/uinput'
) )
dev.grab() dev.grab()

7
src/fenrir-package/fenrir.py
View File

@ -30,13 +30,14 @@ class fenrir():
def onInput(self): def onInput(self):
self.environment, timeout = self.environment['runtime']['inputManager'].getKeyPressed(self.environment) self.environment, timeout = self.environment['runtime']['inputManager'].getKeyPressed(self.environment)
self.environment = self.environment['runtime']['commandManager'].getCommandForShortcut(self.environment)
self.environment = self.environment['runtime']['screenDriver'].analyzeScreen(self.environment, 'onInput') self.environment = self.environment['runtime']['screenDriver'].analyzeScreen(self.environment, 'onInput')
if not timeout: if not timeout:
self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput') self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')
self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged') self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged')
if self.environment['commandInfo']['currCommand'] != '': if not self.environment['input']['keyForeward']:
self.handleCommands() self.environment = self.environment['runtime']['commandManager'].getCommandForShortcut(self.environment)
if self.environment['commandInfo']['currCommand'] != '':
self.handleCommands()
def updateScreen(self): def updateScreen(self):
return return