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

fix static screen ignore

Browse Source
This commit is contained in:
chrys 2017-02-27 23:30:43 +01:00
parent dd4e2868c3
commit 291e6865d0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ class screenManager():
ignoreScreens = [] ignoreScreens = []
fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen') fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen')
if fixIgnoreScreens != '': if fixIgnoreScreens != '':
ignoreScreens.append(fixIgnoreScreens.split(',')) ignoreScreens.extend(fixIgnoreScreens.split(','))
if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'):
ignoreScreens.extend(self.env['screenData']['autoIgnoreScreens']) ignoreScreens.extend(self.env['screenData']['autoIgnoreScreens'])
return (screen in ignoreScreens) return (screen in ignoreScreens)

9
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -77,11 +77,9 @@ class driver():
obj = bus.get_object('org.freedesktop.login1', session[4]) obj = bus.get_object('org.freedesktop.login1', session[4])
inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
sessionType = inf.Get('org.freedesktop.login1.Session', 'Type') sessionType = inf.Get('org.freedesktop.login1.Session', 'Type')
screen = str(inf.Get('org.freedesktop.login1.Session', 'VTNr')) screen = str(inf.Get('org.freedesktop.login1.Session', 'VTNr'))
self.env['runtime']['debug'].writeDebugOut('VTNr:' + screen + ' ' +sessionType,debug.debugLevel.ERROR)
if screen == '': if screen == '':
screen = str(inf.Get('org.freedesktop.login1.Session', 'TTY')) screen = str(inf.Get('org.freedesktop.login1.Session', 'TTY'))
self.env['runtime']['debug'].writeDebugOut('TTY:' + screen + ' ' +sessionType,debug.debugLevel.ERROR)
screen = screen[screen.upper().find('TTY') + 3:] screen = screen[screen.upper().find('TTY') + 3:]
if screen == '': if screen == '':
self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR)
@ -91,8 +89,7 @@ class driver():
if screen == self.env['screenData']['newTTY'] : if screen == self.env['screenData']['newTTY'] :
if self.env['generalInformation']['currUser'] != session[2]: if self.env['generalInformation']['currUser'] != session[2]:
self.env['generalInformation']['prevUser'] = self.env['generalInformation']['currUser'] self.env['generalInformation']['prevUser'] = self.env['generalInformation']['currUser']
self.env['generalInformation']['currUser'] = session[2] self.env['generalInformation']['currUser'] = session[2]
self.env['runtime']['debug'].writeDebugOut('autoignore:' + str(self.env['screenData']['autoIgnoreScreens']),debug.debugLevel.ERROR)
def update(self, trigger='onUpdate'): def update(self, trigger='onUpdate'):
newContentBytes = b'' newContentBytes = b''