From: Ralf Jung Date: Wed, 17 Aug 2016 18:57:25 +0000 (+0200) Subject: allow overriding where we get the xrandr info from X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/7f7312acf4942364d6a5bb0b63e7f7a823c11d9b allow overriding where we get the xrandr info from --- diff --git a/screen.py b/screen.py index 160efec..133e333 100644 --- a/screen.py +++ b/screen.py @@ -198,11 +198,11 @@ class ScreenSituation: previousSetup = None # None or the ScreenSetup used the last time this external screen was connected '''Represents the "screen situation" a machine can be in: Which connectors exist, which resolutions do they have, what are the names for the internal and external screen''' - def __init__(self, internalConnectorNames, externalConnectorNames = None): + def __init__(self, internalConnectorNames, externalConnectorNames = None, xrandrSource = None): '''Both arguments are lists of connector names. The first one which exists and has a screen attached is chosen for that class. can be None to just choose any remaining connector.''' # which connectors are there? - self._getXrandrInformation() + self._getXrandrInformation(xrandrSource) # figure out which is the internal connector self.internalConnector = self._findAvailableConnector(internalConnectorNames) if self.internalConnector is None: @@ -218,9 +218,11 @@ class ScreenSituation: print("Detected external connector:",self.externalConnector) # Run xrandr and fill the dict of connector names mapped to lists of available resolutions. - def _getXrandrInformation(self): + def _getXrandrInformation(self, xrandrSource = None): connector = None # current connector readingEdid = False + if xrandrSource is None: + xrandrSource = processOutputGen("xrandr", "-q", "--verbose") for line in processOutputGen("xrandr", "-q", "--verbose"): if readingEdid: m = re.match(r'^\s*([0-9a-f]+)\s*$', line)