Don't change to failure colour on success

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 407a540..6be8f22 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>

+#include <X11/extensions/Xrandr.h>

 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>


@@ -22,18 +23,29 @@
 #include <bsd_auth.h>
 #endif
 
 #include <bsd_auth.h>
 #endif
 

+enum {
+       INIT,
+       INPUT,
+       FAILED,
+       NUMCOLS
+};
+

 #include "config.h"
 
 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;
 #include "config.h"
 
 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;

-       unsigned long colors[2];
+       unsigned long colors[NUMCOLS];

 } Lock;
 
 static Lock **locks;
 static int nscreens;
 static Bool running = True;
 } Lock;
 
 static Lock **locks;
 static int nscreens;
 static Bool running = True;

+static Bool failure = False;
+static Bool rr;
+static int rrevbase;
+static int rrerrbase;

 
 static void
 die(const char *errstr, ...)
 
 static void
 die(const char *errstr, ...)


@@ -48,16 +60,27 @@ die(const char *errstr, ...)
 
 #ifdef __linux__
 #include <fcntl.h>
 
 #ifdef __linux__
 #include <fcntl.h>

+#include <linux/oom.h>

 
 static void
 dontkillme(void)
 {
        int fd;
 
 static void
 dontkillme(void)
 {
        int fd;

+       int length;
+       char value[64];

 
        fd = open("/proc/self/oom_score_adj", O_WRONLY);
        if (fd < 0 && errno == ENOENT)
                return;
 
        fd = open("/proc/self/oom_score_adj", O_WRONLY);
        if (fd < 0 && errno == ENOENT)
                return;

-       if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
+
+       /* convert OOM_SCORE_ADJ_MIN to string for writing */
+       length = snprintf(value, sizeof(value), "%d\n", OOM_SCORE_ADJ_MIN);
+
+       /* bail on truncation */
+       if (length >= sizeof(value))
+               die("buffer too small\n");
+
+       if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)

                die("cannot disable the out-of-memory killer for this process\n");
 }
 #endif
                die("cannot disable the out-of-memory killer for this process\n");
 }
 #endif


@@ -107,11 +130,12 @@ readpw(Display *dpy, const char *pws)
 {
        char buf[32], passwd[256];
        int num, screen;
 {
        char buf[32], passwd[256];
        int num, screen;

-       unsigned int len, llen;
+       unsigned int len, color;

        KeySym ksym;
        XEvent ev;
        KeySym ksym;
        XEvent ev;

+       static int oldc = INIT;

 
 

-       len = llen = 0;
+       len = 0;

        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings


@@ -121,7 +145,7 @@ readpw(Display *dpy, const char *pws)
        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {
                        buf[0] = 0;
        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {
                        buf[0] = 0;

-                       num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+                       num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);

                        if (IsKeypadKey(ksym)) {
                                if (ksym == XK_KP_Enter)
                                        ksym = XK_Return;
                        if (IsKeypadKey(ksym)) {
                                if (ksym == XK_KP_Enter)
                                        ksym = XK_Return;


@@ -142,8 +166,10 @@ readpw(Display *dpy, const char *pws)
 #else
                                running = !!strcmp(crypt(passwd, pws), pws);
 #endif
 #else
                                running = !!strcmp(crypt(passwd, pws), pws);
 #endif

-                               if (running)
+                               if (running) {

                                        XBell(dpy, 100);
                                        XBell(dpy, 100);

+                                       failure = True;
+                               }

                                len = 0;
                                break;
                        case XK_Escape:
                                len = 0;
                                break;
                        case XK_Escape:


@@ -154,26 +180,29 @@ readpw(Display *dpy, const char *pws)
                                        --len;
                                break;
                        default:
                                        --len;
                                break;
                        default:

-                               if (num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
+                               if (num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))) {

                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                break;
                        }
                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                break;
                        }

-                       if (llen == 0 && len != 0) {
+                       color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
+                       if (running && oldc != color) {

                                for (screen = 0; screen < nscreens; screen++) {
                                for (screen = 0; screen < nscreens; screen++) {

-                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);

                                        XClearWindow(dpy, locks[screen]->win);
                                }
                                        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]);
+                               oldc = color;
+                       }
+               } else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
+                       XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
+                       for (screen = 0; screen < nscreens; screen++) {
+                               if (locks[screen]->win == rre->window) {
+                                       XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height);

                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }

-                       llen = len;
-               }
-               else for (screen = 0; screen < nscreens; screen++)
+               } else for (screen = 0; screen < nscreens; screen++)

                        XRaiseWindow(dpy, locks[screen]->win);
        }
 }
                        XRaiseWindow(dpy, locks[screen]->win);
        }
 }


@@ -185,7 +214,7 @@ unlockscreen(Display *dpy, Lock *lock)
                return;
 
        XUngrabPointer(dpy, CurrentTime);
                return;
 
        XUngrabPointer(dpy, CurrentTime);

-       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
+       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, NUMCOLS, 0);

        XFreePixmap(dpy, lock->pmap);
        XDestroyWindow(dpy, lock->win);
 
        XFreePixmap(dpy, lock->pmap);
        XDestroyWindow(dpy, lock->win);
 


@@ -197,6 +226,7 @@ lockscreen(Display *dpy, int screen)
 {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        unsigned int len;
 {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        unsigned int len;

+       int i;

        Lock *lock;
        XColor color, dummy;
        XSetWindowAttributes wa;
        Lock *lock;
        XColor color, dummy;
        XSetWindowAttributes wa;


@@ -213,20 +243,23 @@ lockscreen(Display *dpy, int screen)
 
        lock->root = RootWindow(dpy, lock->screen);
 
 
        lock->root = RootWindow(dpy, lock->screen);
 

+       for (i = 0; i < NUMCOLS; i++) {
+               XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy);
+               lock->colors[i] = color.pixel;
+       }
+

        /* init */
        wa.override_redirect = 1;
        /* init */
        wa.override_redirect = 1;

-       wa.background_pixel = BlackPixel(dpy, lock->screen);
+       wa.background_pixel = lock->colors[INIT];

        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);
        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), 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, &color, &color, 0, 0);
        XDefineCursor(dpy, lock->win, invisible);
        XMapRaised(dpy, lock->win);
        lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
        invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
        XDefineCursor(dpy, lock->win, invisible);
        XMapRaised(dpy, lock->win);

+       if (rr)
+               XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);

        for (len = 1000; len; len--) {
                if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
                    GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
        for (len = 1000; len; len--) {
                if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
                    GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)


@@ -286,6 +319,7 @@ main(int argc, char **argv) {
 
        if (!(dpy = XOpenDisplay(0)))
                die("slock: cannot open display\n");
 
        if (!(dpy = XOpenDisplay(0)))
                die("slock: cannot open display\n");

+       rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase);

        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);
        locks = malloc(sizeof(Lock *) * nscreens);
        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);
        locks = malloc(sizeof(Lock *) * nscreens);