From 085bb0fa5f477b022b96f3b07cd2a2fb74e70729 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Mon, 17 Feb 2014 02:07:15 +0100
Subject: fix minor bufs + add reset function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 src/__main__.py | 42 +++++++++++++++++++++++++++---------------
 src/monitor.py  |  2 +-
 2 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/__main__.py b/src/__main__.py
index 2c95a34..f327614 100755
--- a/src/__main__.py
+++ b/src/__main__.py
@@ -22,9 +22,9 @@ import datetime
 
 
 ## Set global variables
-global DATADIR, i_size, o_size, r_curve, g_curve, b_curve, clip_result
+global DATADIR, i_size, o_size, r_curve, g_curve, b_curve, clip_result, reset
 global periodically, wait_period, fadein_time, fadeout_time, fadein_steps, fadeout_steps
-global monitor_controller, running, continuous_run
+global monitor_controller, running, continuous_run, panic
 global signal_SIGTERM
 
 
@@ -79,7 +79,7 @@ wait_period = 60
 
 monitor_controller = lambda : randr()
 '''
-:()→void  Function used by Blueshift on exit to apply reset colour curves
+:()→void  Function used by Blueshift on exit to apply reset colour curves, if using preimplemented `reset`
 '''
 
 fadein_time = 2
@@ -107,6 +107,18 @@ running = True
 :bool  `True` while to program has not received a terminate signal
 '''
 
+panic = False
+'''
+:bool  `True` if the program has received two terminate signals
+'''
+
+def reset():
+    '''
+    Invoked to reset the displays
+    '''
+    start_over()
+    monitor_controller()
+
 
 
 def signal_SIGTERM(signum, frame):
@@ -116,13 +128,9 @@ def signal_SIGTERM(signum, frame):
     @param  signum  The signal number, 0 if called from the program itself
     @param  frame   Ignore, it will probably be `None`
     '''
-    global running
+    global running, panic
     if not running:
-        running = False
-        start_over()
-        monitor_controller()
-        close_c_bindings()
-        sys.exit(0)
+        panic = True
     running = False
 
 
@@ -132,8 +140,11 @@ def continuous_run():
     '''
     global running, wait_period, fadein_time, fadeout_time, fadein_steps, fadeout_steps
     def p(t, fade = None):
-        wd = t.isocalendar()[2]
-        periodically(t.year, t.month, t.day, t.hour, t.minute, t.second, wd, fade)
+        try:
+            wd = t.isocalendar()[2]
+            periodically(t.year, t.month, t.day, t.hour, t.minute, t.second, wd, fade)
+        except:
+            signal_SIGTERM(0, None)
     def sleep(seconds):
         try:
             time.sleep(seconds)
@@ -155,6 +166,8 @@ def continuous_run():
                 break
             p(datetime.datetime.now(), ftime)
             sleep(dtime)
+        if ftime <= 1:
+            early_exit = True
     
     ## Run periodically
     if not early_exit:
@@ -167,9 +180,9 @@ def continuous_run():
     if fadeout_time is not None:
         dtime = fadeout_time / fadeout_steps
         df = 1 / fadeout_steps
-        if early_exit:
+        if not early_exit:
             ftime = 1
-        while True:
+        while not panic:
             ftime -= df
             if ftime <= 0:
                 break
@@ -177,8 +190,7 @@ def continuous_run():
             sleep(dtime)
     
     ## Reset
-    start_over()
-    monitor_controller()
+    reset()
 
 
 ## Load extension and configurations via blueshiftrc
diff --git a/src/monitor.py b/src/monitor.py
index 7df4336..595d2b7 100644
--- a/src/monitor.py
+++ b/src/monitor.py
@@ -61,7 +61,7 @@ def randr(*crtcs):
     global randr_opened
     crtcs = sum([1 << i for i in list(crtcs)])
     if crtcs == 0:
-        crtcs = -1;
+        crtcs = (1 << 64) - 1
     
     (R_curve, G_curve, B_curve) = translate_to_integers()
     if not randr_opened:
-- 
cgit v1.2.3-70-g09d2