From e8963dec40111046f69a6402301660a67872fb03 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 29 Jul 2014 12:25:43 -0700 Subject: [PATCH] shorter wav file. remove trailing newline. potentially use a single color. --- slock.c | 1 + slocked | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/slock.c b/slock.c index 5f01b8b..2649377 100644 --- a/slock.c +++ b/slock.c @@ -254,6 +254,7 @@ lockscreen(Display *dpy, int screen) { 0, DefaultDepth(dpy, lock->screen), CopyFromParent, DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa); XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy); + // XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy); lock->colors[1] = color.pixel; XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy); lock->colors[0] = color.pixel; diff --git a/slocked b/slocked index 26f1049..16be08d 100755 --- a/slocked +++ b/slocked @@ -16,6 +16,6 @@ fi exec 2> /dev/null pw=$1 if test -z "$pw"; then - pw=$(cat ~/.slock_passwd) + pw=$(cat ~/.slock_passwd | xargs printf '%s') fi exec slock -p "$pw"