switch to light-locker

8 files changed, 6 insertions, 33 deletions

diff --git a/bin/watch_lock b/bin/watch_lock
deleted file mode 100755
index 6de654f..0000000
--- a/bin/watch_lock
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-my $pid = open my $in, '-|', 'xscreensaver-command -watch'
-    or die "Couldn't spawn process: $!";
-$SIG{TERM} = sub { kill TERM => $pid; exit };
-while (<$in>) {
-    if (/^LOCK/) {
-        system "$ENV{HOME}/.bin/on_lock";
-        if ($? == -1) {
-            warn "Couldn't exec on_lock: $!";
-        }
-        elsif ($? != 0) {
-            warn "on_lock exited with value " . ($? >> 8);
-        }
-    } elsif (/^UNBLANK/) {
-        #system "on_unlock"
-    }
-}
diff --git a/services/light-locker/log/run b/services/light-locker/log/run
new file mode 100755
index 0000000..d92a97c
--- /dev/null
+++ b/services/light-locker/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec multilog t s16777215 $HOME/.log/light-locker
diff --git a/services/light-locker/run b/services/light-locker/run
new file mode 100755
index 0000000..6cf1077
--- /dev/null
+++ b/services/light-locker/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec light-locker
diff --git a/services/watch_lock/log/run b/services/watch_lock/log/run
deleted file mode 100755
index 4305b6b..0000000
--- a/services/watch_lock/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec multilog t s16777215 $HOME/.log/watch_lock
diff --git a/services/watch_lock/run b/services/watch_lock/run
deleted file mode 100755
index bc243e8..0000000
--- a/services/watch_lock/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec watch_lock 2>&1
diff --git a/services/xscreensaver/log/run b/services/xscreensaver/log/run
deleted file mode 100755
index 71effaf..0000000
--- a/services/xscreensaver/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec multilog t s16777215 $HOME/.log/xscreensaver
diff --git a/services/xscreensaver/run b/services/xscreensaver/run
deleted file mode 100755
index 8d8db07..0000000
--- a/services/xscreensaver/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec xscreensaver -no-splash 2>&1
diff --git a/xbindkeysrc b/xbindkeysrc
index e881019..0c7ad06 100644
--- a/xbindkeysrc
+++ b/xbindkeysrc
@@ -16,7 +16,7 @@
 "dmenu_run -fn '7x14'"
   Mod4 + r
 
-"xscreensaver-command -lock"
+"light-locker-command -l"
   Mod4 + d
 
 "numkeys toggle"