[dev] slock 1.0 color patch

[Eckehard Berns]

I implemented a color patch for slock similar to Joseph Iacobucci's
patch but for slock 1.0.

You can configure the two colors in config.mk in the CPPFLAGS.

-- 
Eckehard Berns

diff -r e0d42e127656 config.mk
--- a/config.mk Sat Feb 11 10:51:31 2012 +0100
+++ b/config.mk Fri Mar 09 17:42:15 2012 +0100
@@ -14,7 +14,7 @@
 LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" 
-DCOLOR2=\"\#005577\"
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 
diff -r e0d42e127656 slock.c
--- a/slock.c   Sat Feb 11 10:51:31 2012 +0100
+++ b/slock.c   Fri Mar 09 17:42:15 2012 +0100
@@ -26,6 +26,7 @@
        int screen;
        Window root, win;
        Pixmap pmap;
+       unsigned long colors[2];
 } Lock;
 
 static Lock **locks;
@@ -81,11 +82,11 @@
 {
        char buf[32], passwd[256];
        int num, screen;
-       unsigned int len;
+       unsigned int len, llen;
        KeySym ksym;
        XEvent ev;
 
-       len = 0;
+       len = llen = 0;
        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
@@ -132,6 +133,18 @@
                                }
                                break;
                        }
+                       if(llen == 0 && len != 0) {
+                               for(screen = 0; screen < nscreens; screen++) {
+                                       XSetWindowBackground(dpy, 
locks[screen]->win, locks[screen]->colors[1]);
+                                       XClearWindow(dpy, locks[screen]->win);
+                               }
+                       } else if(llen != 0 && len == 0) {
+                               for(screen = 0; screen < nscreens; screen++) {
+                                       XSetWindowBackground(dpy, 
locks[screen]->win, locks[screen]->colors[0]);
+                                       XClearWindow(dpy, locks[screen]->win);
+                               }
+                       }
+                       llen = len;
                }
                else for(screen = 0; screen < nscreens; screen++)
                        XRaiseWindow(dpy, locks[screen]->win);
@@ -144,6 +157,7 @@
                return;
 
        XUngrabPointer(dpy, CurrentTime);
+       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 
0);
        XFreePixmap(dpy, lock->pmap);
        XDestroyWindow(dpy, lock->win);
 
@@ -155,7 +169,7 @@
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        unsigned int len;
        Lock *lock;
-       XColor black, dummy;
+       XColor color, dummy;
        XSetWindowAttributes wa;
        Cursor invisible;
 
@@ -176,9 +190,12 @@
        lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, 
lock->screen), DisplayHeight(dpy, lock->screen),
                        0, DefaultDepth(dpy, lock->screen), CopyFromParent,
                        DefaultVisual(dpy, lock->screen), CWOverrideRedirect | 
CWBackPixel, &wa);
-       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), "black", 
&black, &dummy);
+       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, 
&color, &dummy);
+       lock->colors[1] = color.pixel;
+       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, 
&color, &dummy);
+       lock->colors[0] = color.pixel;
        lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
-       invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &black, 
&black, 0, 0);
+       invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, 
&color, 0, 0);
        XDefineCursor(dpy, lock->win, invisible);
        XMapRaised(dpy, lock->win);
        for(len = 1000; len; len--) {