Don't change to failure colour on success

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 68e813f..6be8f22 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -60,16 +60,27 @@ die(const char *errstr, ...)
 
 #ifdef __linux__
 #include <fcntl.h>
+#include <linux/oom.h>
 
 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;
-       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
@@ -119,11 +130,12 @@ readpw(Display *dpy, const char *pws)
 {
        char buf[32], passwd[256];
        int num, screen;
-       unsigned int len, llen;
+       unsigned int len, color;
        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
@@ -174,18 +186,14 @@ 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[INPUT]);
-                                       XClearWindow(dpy, locks[screen]->win);
-                               }
-                       } else if (llen != 0 && len == 0) {
+                       color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
+                       if (running && oldc != color) {
                                for (screen = 0; screen < nscreens; screen++) {
-                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]);
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
                                        XClearWindow(dpy, locks[screen]->win);
                                }
+                               oldc = color;
                        }
-                       llen = len;
                } else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
                        XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
                        for (screen = 0; screen < nscreens; screen++) {