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

load ignore screen again

Browse Source
This commit is contained in:
chrys 2017-01-16 23:09:05 +01:00
parent 346cb78d56
commit 56e19eacb9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fenrir/core/screenManager.py
View File

@ -16,7 +16,7 @@ class screenManager():
self.env['runtime']['settingsManager'].loadDriver(\ self.env['runtime']['settingsManager'].loadDriver(\
self.env['runtime']['settingsManager'].getSetting('screen', 'driver'), 'screenDriver') self.env['runtime']['settingsManager'].getSetting('screen', 'driver'), 'screenDriver')
if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'):
self.autoIgnoreScreens = self.env['runtime']['screenDriver'].getIgnoreScreens() self.updateAutoIgnoreScreens()
def shutdown(self): def shutdown(self):
self.env['runtime']['settingsManager'].shutdownDriver('screenDriver') self.env['runtime']['settingsManager'].shutdownDriver('screenDriver')
@ -25,7 +25,7 @@ class screenManager():
self.env['runtime']['screenDriver'].getCurrScreen() self.env['runtime']['screenDriver'].getCurrScreen()
self.env['screenData']['oldApplication'] = self.env['screenData']['newApplication'] self.env['screenData']['oldApplication'] = self.env['screenData']['newApplication']
if self.isScreenChange(): if self.isScreenChange():
self.autoIgnoreScreens = self.env['runtime']['screenDriver'].getIgnoreScreens() self.updateAutoIgnoreScreens()
self.changeBrailleScreen() self.changeBrailleScreen()
if not self.isSuspendingScreen(self.env['screenData']['newTTY']): if not self.isSuspendingScreen(self.env['screenData']['newTTY']):
self.env['runtime']['screenDriver'].update(trigger) self.env['runtime']['screenDriver'].update(trigger)
@ -40,7 +40,8 @@ class screenManager():
return ((screen in \ return ((screen in \
self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen').split(',')) or self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen').split(',')) or
(screen in self.autoIgnoreScreens)) (screen in self.autoIgnoreScreens))
def updateAutoIgnoreScreens(self):
self.autoIgnoreScreens = self.env['runtime']['screenDriver'].getIgnoreScreens()
def isScreenChange(self): def isScreenChange(self):
if not self.env['screenData']['oldTTY']: if not self.env['screenData']['oldTTY']:
return False return False

3
src/fenrir/fenrir.py
View File

@ -57,7 +57,8 @@ class fenrir():
self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange') self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange')
self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \ self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \
self.environment['runtime']['applicationManager'].getPrevApplication(), \ self.environment['runtime']['applicationManager'].getPrevApplication(), \
self.environment['runtime']['applicationManager'].getCurrentApplication()) self.environment['runtime']['applicationManager'].getCurrentApplication())
self.environment['runtime']['screenManager'].updateAutoIgnoreScreens()
if self.environment['runtime']['screenManager'].isScreenChange(): if self.environment['runtime']['screenManager'].isScreenChange():
self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged') self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged')