make i runable again and make autodetecto of X working

This commit is contained in:
chrys
2016-09-14 23:06:56 +02:00
parent a886357481
commit cb1feb35ae
5 changed files with 17 additions and 113 deletions

View File

@ -16,7 +16,7 @@ commandBuffer = {
# used by the commandManager
commandInfo = {
'currCommand': '',
'lastCommandExecutionTime': time.time()
'lastCommandExecutionTime': time.time(),
'lastCommandRequestTime': time.time()
}

View File

@ -4,11 +4,12 @@ from utils import debug
class screenManager():
def __init__(self):
pass
def initialize(self, environment):
self.autoIgnoreScreens = []
if environment['runtime']['settingsManager'].getSettingAsBool(environment,'screen', 'autodetectSuspendingScreen'):
self.autoIgnoreScreens = environment['runtime']['screenDriver'].getIgnoreScreens()
return environment
def shutdown(self, environment):
return environment
@ -21,7 +22,7 @@ class screenManager():
def isSuspendingScreen(self, environment):
currScreen = environment['runtime']['screenDriver'].getCurrScreen()
return (currScreen in \
return ((currScreen in \
environment['runtime']['settingsManager'].getSetting(environment,'screen', 'suspendingScreen').split(',')) or
(currScreen in self.autoIgnoreScreens)
(currScreen in self.autoIgnoreScreens))

View File

@ -238,7 +238,8 @@ class settingsManager():
environment = environment['runtime']['outputManager'].initialize(environment)
if environment['runtime']['commandManager'] == None:
environment['runtime']['commandManager'] = commandManager.commandManager()
environment = environment['runtime']['commandManager'].initialize(environment)
environment = environment['runtime']['commandManager'].initialize(environment)
if environment['runtime']['screenManager'] == None:
environment['runtime']['screenManager'] = screenManager.screenManager()
environment = environment['runtime']['screenManager'].initialize(environment)