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

more fixes

Browse Source
This commit is contained in:
Chrys 2019-10-18 00:24:20 +02:00
parent a3acf7d9cc
commit 8bed7ce8e2
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fenrirscreenreader/core/fenrirManager.py
View File

@ -98,7 +98,7 @@ class fenrirManager():
self.environment['runtime']['commandManager'].executeDefaultTrigger('onByteInput') self.environment['runtime']['commandManager'].executeDefaultTrigger('onByteInput')
def handleExecuteCommand(self, event): def handleExecuteCommand(self, event):
if not event['Data']: if not event['Data']:
return return
if event['Data'] == '': if event['Data'] == '':
return return
command = event['Data'] command = event['Data']
@ -233,13 +233,14 @@ class fenrirManager():
self.shutdownRequest() self.shutdownRequest()
def shutdown(self): def shutdown(self):
self.environment['runtime']['inputManager'].ungrabAllDevices()
self.environment['runtime']['eventManager'].stopMainEventLoop() self.environment['runtime']['eventManager'].stopMainEventLoop()
self.environment['runtime']['outputManager'].presentText(_("Quit Fenrir"), soundIcon='ScreenReaderOff', interrupt=True) self.environment['runtime']['outputManager'].presentText(_("Quit Fenrir"), soundIcon='ScreenReaderOff', interrupt=True)
self.environment['runtime']['eventManager'].cleanEventQueue() self.environment['runtime']['eventManager'].cleanEventQueue()
time.sleep(0.6) time.sleep(0.6)
for currManager in self.environment['general']['managerList']: for currManager in self.environment['general']['managerList']:
if self.environment['runtime'][currManager]: if self.environment['runtime'][currManager]:
self.environment['runtime'][currManager].shutdown() self.environment['runtime'][currManager].shutdown()
del self.environment['runtime'][currManager] del self.environment['runtime'][currManager]
self.environment = None self.environment = None

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

@ -62,7 +62,7 @@ class inputManager():
print(self.env['runtime']['screenManager'].getCurrScreenIgnored()) print(self.env['runtime']['screenManager'].getCurrScreenIgnored())
if self.env['runtime']['screenManager'].getCurrScreenIgnored(): if self.env['runtime']['screenManager'].getCurrScreenIgnored():
while not self.ungrabAllDevices(): while not self.ungrabAllDevices():
time.sleep(0.1) time.sleep(0.2)
self.env['runtime']['debug'].writeDebugOut("retry ungrabAllDevices " ,debug.debugLevel.WARNING) self.env['runtime']['debug'].writeDebugOut("retry ungrabAllDevices " ,debug.debugLevel.WARNING)
print('try ungrabbing') print('try ungrabbing')
self.env['runtime']['debug'].writeDebugOut("All devices ungrabbed" ,debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut("All devices ungrabbed" ,debug.debugLevel.INFO)
@ -74,7 +74,6 @@ class inputManager():
print('try grabbing') print('try grabbing')
print('grabbed') print('grabbed')
self.env['runtime']['debug'].writeDebugOut("All devices grabbed" ,debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut("All devices grabbed" ,debug.debugLevel.INFO)
self.executeDeviceGrab = False self.executeDeviceGrab = False
def sendKeys(self, keyMacro): def sendKeys(self, keyMacro):
for e in keyMacro: for e in keyMacro:

8
src/fenrirscreenreader/core/remoteManager.py
View File

@ -39,7 +39,7 @@ class remoteManager():
self.resetVmenuConst = 'RESETVMENU' self.resetVmenuConst = 'RESETVMENU'
self.interruptConst = 'INTERRUPT' self.interruptConst = 'INTERRUPT'
self.quitAppConst = 'QUITAPPLICATION' self.quitAppConst = 'QUITAPPLICATION'
self.tempDisableSpeechConst = 'TEMPDISABLESPEECH' self.tempDisableSpeechConst = 'TEMPDISABLESPEECH'
self.defineWindowConst = 'WINDOW ' self.defineWindowConst = 'WINDOW '
self.resetWindowConst = 'RESETWINDOW' self.resetWindowConst = 'RESETWINDOW'
self.setClipboardConst = 'CLIPBOARD ' self.setClipboardConst = 'CLIPBOARD '
@ -47,7 +47,7 @@ class remoteManager():
self.settingConst = 'SETTING ' self.settingConst = 'SETTING '
self.setSettingConst = 'SET ' self.setSettingConst = 'SET '
self.saveAsSettingConst = 'SAVEAS ' self.saveAsSettingConst = 'SAVEAS '
self.saveSettingConst = 'SAVE' self.saveSettingConst = 'SAVE'
self.resetSettingConst = 'RESET' self.resetSettingConst = 'RESET'
def initialize(self, environment): def initialize(self, environment):
self.env = environment self.env = environment
@ -158,15 +158,13 @@ class remoteManager():
self.env['runtime']['settingsManager'].resetSettingArgDict() self.env['runtime']['settingsManager'].resetSettingArgDict()
def setSettings(self, settingsArgs): def setSettings(self, settingsArgs):
self.env['runtime']['settingsManager'].parseSettingArgs(settingsArgs) self.env['runtime']['settingsManager'].parseSettingArgs(settingsArgs)
self.env['runtime']['screenManager'].getCurrScreen()
self.env['runtime']['screenManager'].getSessionInformation()
self.env['runtime']['screenManager'].updateScreenIgnored() self.env['runtime']['screenManager'].updateScreenIgnored()
def handleRemoteIncomming(self, eventData): def handleRemoteIncomming(self, eventData):
if not eventData: if not eventData:
return return
upperEventData = eventData.upper() upperEventData = eventData.upper()
self.env['runtime']['debug'].writeDebugOut('remoteManager:handleRemoteIncomming: event: ' + str(eventData),debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut('remoteManager:handleRemoteIncomming: event: ' + str(eventData),debug.debugLevel.INFO)
if upperEventData.startswith(self.settingConst): if upperEventData.startswith(self.settingConst):
settingsText = eventData[len(self.settingConst):] settingsText = eventData[len(self.settingConst):]
self.handleSettingsChange(settingsText) self.handleSettingsChange(settingsText)