applied Eckehard Bern's dualcolor patch to slock

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 28cb4f9391fd9eb8acc2a94f064398db2770ba6b..12b8d4dd49fe31ba1678e0680873b457cbbf39af 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -26,6 +26,7 @@ typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;
+       unsigned long colors[2];
 } Lock;
 
 static Lock **locks;
@@ -81,11 +82,11 @@ readpw(Display *dpy, const char *pws)
 {
        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,9 +133,21 @@ readpw(Display *dpy, const char *pws)
                                }
                                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++)
-                       XMapRaised(dpy, locks[screen]->win);
+                       XRaiseWindow(dpy, locks[screen]->win);
        }
 }
 
@@ -144,6 +157,7 @@ unlockscreen(Display *dpy, Lock *lock) {
                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 @@ lockscreen(Display *dpy, int screen) {
        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 @@ lockscreen(Display *dpy, int screen) {
        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--) {
@@ -201,13 +218,15 @@ lockscreen(Display *dpy, int screen) {
                unlockscreen(dpy, lock);
                lock = NULL;
        }
+       else 
+               XSelectInput(dpy, lock->root, SubstructureNotifyMask);
 
        return lock;
 }
 
 static void
 usage(void) {
-       fprintf(stderr, "usage: slock [-v]");
+       fprintf(stderr, "usage: slock [-v]\n");
        exit(EXIT_FAILURE);
 }
 
@@ -220,7 +239,7 @@ main(int argc, char **argv) {
        int screen;
 
        if((argc == 2) && !strcmp("-v", argv[1]))
-               die("slock-%s, © 2006-2012 Anselm R Garbe", VERSION);
+               die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
        else if(argc != 1)
                usage();