add monitor control without native binding

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

2 files changed, 58 insertions, 15 deletions

diff --git a/src/__main__.py b/src/__main__.py
index a8b15ad..5185e81 100755
--- a/src/__main__.py
+++ b/src/__main__.py
@@ -18,6 +18,7 @@ import os
 
 from colour import *
 from curve import *
+from monitor import *
 
 
 def periodically(year, month, day, hour, minute, second, weekday, fade):
@@ -68,10 +69,10 @@ def periodically(year, month, day, hour, minute, second, weekday, fade):
 
 
 
-## Set globals accessible by rc
+## Set globals variables
 periodically = None
 wait_period = 60
-monitor_controller = None
+monitor_controller = lambda : randr()
 global DATADIR, i_size, o_size, r_curve, g_curve, b_curve, clip_result
 global periodically, wait_period, monitor_controller
 
@@ -97,16 +98,3 @@ for file in ('$XDG_CONFIG_HOME/%/%rc', '$HOME/.config/%/%rc', '$HOME/.%rc', '/et
             exec(code, globals)
             break
 
-
-## Translate curve from float to integer
-for curve in (r_curve, g_curve, b_curve):
-    for i in range(i_size):
-        curve[i] = int(curve[i] * (o_size - 1) + 0.5)
-        if clip_result:
-            curve[i] = min(max(0, curve[i]), (o_size - 1))
-
-print(r_curve)
-print(g_curve)
-print(b_curve)
-
-
diff --git a/src/monitor.py b/src/monitor.py
new file mode 100644
index 0000000..37f6b00
--- /dev/null
+++ b/src/monitor.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+# Copyright © 2014  Mattias Andrée (maandree@member.fsf.org)
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+def translate_to_integers():
+    '''
+    Translate the curves from float to integer
+    
+    @param  :(int, int, int)  The red curve, the green curve and the blue curve, mapped to integers
+    '''
+    R_curve, G_curve, B_curve = [0] * i_size, [0] * i_size, [0] * i_size
+    for i_curve, o_curve in ((r_curve, R_curve), (g_curve, G_curve), (b_curve, B_curve)):
+        for i in range(i_size):
+            o_curve[i] = int(i_curve[i] * (o_size - 1) + 0.5)
+            if clip_result:
+                o_curve[i] = min(max(0, o_curve[i]), (o_size - 1))
+    return (R_curve, G_curve, B_curve)    
+
+
+def randr(*crtcs):
+    '''
+    Applies colour curves using the X11 extension randr
+    
+    @param  *crtcs  The CRT controllers to use, all are used if none are specified
+    '''
+    crtcs = sum([1 << i for i in list(crtcs)])
+    if crtcs == 0:
+        crtcs = -1;
+    
+    (R_curve, G_curve, B_curve) = translate_to_integers()
+
+
+def print_curves(*crtcs):
+    '''
+    Prints the curves to stdout
+    '''
+    (R_curve, G_curve, B_curve) = translate_to_integers()
+    print(R_curve)
+    print(G_curve)
+    print(B_curve)
+