From 73f4ef7d934080788c78d0bba3a5d9f65ac3a69f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 1 Sep 2014 20:26:30 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/libgamma_method.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libgamma_method.py b/src/libgamma_method.py index c319441..8e7ebdd 100644 --- a/src/libgamma_method.py +++ b/src/libgamma_method.py @@ -515,25 +515,27 @@ The number of `LIBGAMMA_CRTC_INFO_*` values defined. +LIBGAMMA_CRTC_INFO_MACRO_EDID_VIEWPORT = LIBGAMMA_CRTC_INFO_WIDTH_MM_EDID | + LIBGAMMA_CRTC_INFO_HEIGHT_MM_EDID ''' Macro for both `CRTCInformation` fields that can specify the size of the monitor's viewport as specified in the monitor's Extended Display Information Data. ''' -LIBGAMMA_CRTC_INFO_MACRO_EDID_VIEWPORT = LIBGAMMA_CRTC_INFO_WIDTH_MM_EDID | - LIBGAMMA_CRTC_INFO_HEIGHT_MM_EDID +LIBGAMMA_CRTC_INFO_MACRO_EDID = LIBGAMMA_CRTC_INFO_EDID | + LIBGAMMA_CRTC_INFO_MACRO_EDID_VIEWPORT | + LIBGAMMA_CRTC_INFO_GAMMA ''' Macro for all `CRTCInformation` fields that can be filled if the adjustment method have support for reading the monitors' Extended Display Information Data. ''' -LIBGAMMA_CRTC_INFO_MACRO_EDID = LIBGAMMA_CRTC_INFO_EDID | - LIBGAMMA_CRTC_INFO_MACRO_EDID_VIEWPORT | - LIBGAMMA_CRTC_INFO_GAMMA +LIBGAMMA_CRTC_INFO_MACRO_VIEWPORT = LIBGAMMA_CRTC_INFO_WIDTH_MM | + LIBGAMMA_CRTC_INFO_HEIGHT_MM ''' Macro for both `CRTCInformation` fields that can specify the size of the monitor's viewport @@ -541,32 +543,30 @@ as provided by the adjustment method without this library having to parse the monitor's Extended Display Information Data. ''' -LIBGAMMA_CRTC_INFO_MACRO_VIEWPORT = LIBGAMMA_CRTC_INFO_WIDTH_MM | - LIBGAMMA_CRTC_INFO_HEIGHT_MM +LIBGAMMA_CRTC_INFO_MACRO_RAMP = LIBGAMMA_CRTC_INFO_GAMMA_SIZE | + LIBGAMMA_CRTC_INFO_GAMMA_DEPTH ''' Macro for the `CRTCInformation` fields that specifies the CRTC's gamma ramp sizes and gamma ramp depth. ''' -LIBGAMMA_CRTC_INFO_MACRO_RAMP = LIBGAMMA_CRTC_INFO_GAMMA_SIZE | - LIBGAMMA_CRTC_INFO_GAMMA_DEPTH +LIBGAMMA_CRTC_INFO_MACRO_CONNECTOR = LIBGAMMA_CRTC_INFO_CONNECTOR_NAME | + LIBGAMMA_CRTC_INFO_CONNECTOR_TYPE ''' Macro for the `CRTCInformation` fields that specifies the CRTC's connector type and the partition unique name of the connector. ''' -LIBGAMMA_CRTC_INFO_MACRO_CONNECTOR = LIBGAMMA_CRTC_INFO_CONNECTOR_NAME | - LIBGAMMA_CRTC_INFO_CONNECTOR_TYPE +LIBGAMMA_CRTC_INFO_MACRO_ACTIVE = LIBGAMMA_CRTC_INFO_MACRO_EDID | + LIBGAMMA_CRTC_INFO_MACRO_VIEWPORT | + LIBGAMMA_CRTC_INFO_SUBPIXEL_ORDER | + LIBGAMMA_CRTC_INFO_ACTIVE ''' Macro for the `CRTCInformation` fields that required there is a monitor attached to the connector, and that status itself. ''' -LIBGAMMA_CRTC_INFO_MACRO_ACTIVE = LIBGAMMA_CRTC_INFO_MACRO_EDID | - LIBGAMMA_CRTC_INFO_MACRO_VIEWPORT | - LIBGAMMA_CRTC_INFO_SUBPIXEL_ORDER | - LIBGAMMA_CRTC_INFO_ACTIVE -- cgit v1.2.3-70-g09d2