add EDID support

Signed-off-by: Mattias Andrée <maandree@operamail.com>

4 files changed, 35 insertions, 8 deletions

diff --git a/examples/crtc-detection b/examples/crtc-detection
index 5f60d6c..2da0e9d 100644
--- a/examples/crtc-detection
+++ b/examples/crtc-detection
@@ -10,24 +10,34 @@ temp = 6500
 # List all connected outputs.
 outputs = list_screens().find_by_connected(True)
 
+# EDID of the primary monitors
+edid_0 = '00ffffffffffff0010ac00504d5730372f0c01030e281e962b0cc9a057479b2712484ca44380a959a94f615971594559c28f31590101863d00c05100304040a013006c231100001e000000fd0030aa1e821d000a202020202020000000fc0044454c4c2050313133300a2020000000ff00364432353232424c3730574d0a00ea'
+
+# EDID of the secondary monitor
+edid_1 = '00ffffffffffff0010ac005045413035320c01030e281e962b0cc9a057479b2712484ca44380a959a94f615971594559c28f31590101863d00c05100304040a013006c231100001e000000fd0030aa1e821d000a202020202020000000fc0044454c4c2050313133300a2020000000ff003644323532324339353041450a0039'
+
+# Gamma of the monitors
+gammas = [(1.16, 1.15, 1.11), (1.10, 1.16, 1.10)]
+
 # Configure each monitor.
 for output in outputs:
     # Data that identifies the monitor.
-    monitor = (output.name, output.widthmm, output.heightmm)
+    edid = output.edid
+    monitor = (output.name, output.widthmm, output.heightmm, edid is not None)
     
     # Default gamma settings.
-    r_gamma, g_gamma, b_gamma = 1, 1, 1
+    monitor_gamma = (1, 1, 1)
     
     # Get the correct gamma settings for the monitor.
-    if   monitor == ('DVI-0', 364, 291):  r_gamma, g_gamma, b_gamma = 1.16, 1.15, 1.11
-    elif monitor == ('VGA-0', 364, 291):  r_gamma, g_gamma, b_gamma = 1.10, 1.16, 1.10
+    if   (monitor == ('DVI-0', 364, 291, False)) or (edid == edid_0):  monitor_gamma = gammas[0]
+    elif (monitor == ('VGA-0', 364, 291, False)) or (edid == edid_1):  monitor_gamma = gammas[1]
     else:
-        print('Warning: unknown monitor at %s at size of %i mm by %i mm' % monitor)
+        print('Warning: unknown monitor at %s at size of %i mm by %i mm' % monitor[:3])
     
     # Perform adjustments.
     start_over()
     temperature(temp, lambda t : divide_by_maximum(cmf_10deg(t)))
-    gamma(r_gamma, g_gamma, b_gamma)
+    gamma(*monitor_gamma)
     
     # Apply adjustments.
     randr(output.crtc, screen = output.screen)
diff --git a/examples/crtc-searching b/examples/crtc-searching
index 9633b2a..521ffc5 100644
--- a/examples/crtc-searching
+++ b/examples/crtc-searching
@@ -40,6 +40,7 @@ parser = ArgParser('Colour temputare controller',
 
 parser.add_argumentless(['-h', '-?', '--help'], 0, 'Print this help information')
 parser.add_argumented(['-n', '--name'], 0, 'NAME', 'Select output by name')
+parser.add_argumented(['-e', '--edid'], 0, 'EDID', 'Select output by monitor extended display information data')
 parser.add_argumented(['-s', '--size'], 0, 'WIDTH_MM:HEIGHT_MM', 'Select output by monitor size')
 
 parser.parse(conf_opts)
@@ -59,6 +60,11 @@ if parser.opts['--name'] is not None:
     for name in parser.opts['--name']:
         outputs += screens.find_by_name(name)
 
+# Find CRTC:s by monitor extended display infomation data.
+if parser.opts['--edid'] is not None:
+    for edid in parser.opts['--edid']:
+        outputs += screens.find_by_edid(edid)
+
 # Find CRTC:s by monitor size.
 if parser.opts['--size'] is not None:
     for size in parser.opts['--size']:
diff --git a/examples/lisp-esque b/examples/lisp-esque
index 72af2bc..53fd63a 100644
--- a/examples/lisp-esque
+++ b/examples/lisp-esque
@@ -167,6 +167,16 @@ def _size(mods, args):
     '''
     pass
 
+def _edid(mods, args):
+    '''
+    Find monitors by extended display information data
+    
+    @param   mods:[]|[str]   Optionally the number of monitors to list
+    @param   args:list<str>  EDID of outputs' monitors
+    @return  :list<str>      <screen>:<output> encoding of found monitors
+    '''
+    pass
+
 def _coordinates(mods, args):
     '''
     Specify geographical location by coordinates
diff --git a/examples/lisp-esque.conf b/examples/lisp-esque.conf
index 30ae4fb..cd9116f 100644
--- a/examples/lisp-esque.conf
+++ b/examples/lisp-esque.conf
@@ -26,9 +26,10 @@
 	;    For monitors with output name DVI-0:           (monitors :crtc "DVI-0")
 	;    For monitors with output name DVI-0 or VGA-0:  (monitors :crtc ("DVI-0" "VGA-0"))
 	;    For monitors with size 364 mm × 291 mm:        (monitors :size (364 291))
-	;    If you want :crtc or :size to add an exact number of monitors
+	;    For monitors with EDID xyz:                    (monitors :edid xyz)
+	;    If you want :crtc, :size or :edid to add an exact number of monitors
 	;    (non-found will monitors be skipped when it is time to use them)
-	;    you can use :crtc:n or :size:n, where n is the number of monitors.
+	;    you can use :crtc:n, :size:n and :edid, where n is the number of monitors.
 	
 	
 	; Geographical coodinates: latitude longitude (northwards and eastwards in degrees)