applied Dimitris' style patch from Dec'14, with some minor modifications

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 28cb4f9..407a540 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -22,10 +22,13 @@
 #include <bsd_auth.h>
 #endif
 
 #include <bsd_auth.h>
 #endif
 

+#include "config.h"
+

 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;
 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;

+       unsigned long colors[2];

 } Lock;
 
 static Lock **locks;
 } Lock;
 
 static Lock **locks;


@@ -33,41 +36,64 @@ static int nscreens;
 static Bool running = True;
 
 static void
 static Bool running = True;
 
 static void

-die(const char *errstr, ...) {
+die(const char *errstr, ...)
+{

        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);
        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);

-       exit(EXIT_FAILURE);
+       exit(1);

 }
 
 }
 

+#ifdef __linux__
+#include <fcntl.h>
+
+static void
+dontkillme(void)
+{
+       int fd;
+
+       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)
+               die("cannot disable the out-of-memory killer for this process\n");
+}
+#endif
+

 #ifndef HAVE_BSD_AUTH
 #ifndef HAVE_BSD_AUTH

+/* only run as root */

 static const char *
 static const char *

-getpw(void) { /* only run as root */
+getpw(void)
+{

        const char *rval;
        struct passwd *pw;
 
        const char *rval;
        struct passwd *pw;
 

+       errno = 0;

        pw = getpwuid(getuid());
        pw = getpwuid(getuid());

-       if(!pw)
-               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
-       endpwent();
+       if (!pw) {
+               if (errno)
+                       die("slock: getpwuid: %s\n", strerror(errno));
+               else
+                       die("slock: cannot retrieve password entry\n");
+       }

        rval =  pw->pw_passwd;
 
 #if HAVE_SHADOW_H
        rval =  pw->pw_passwd;
 
 #if HAVE_SHADOW_H

-       {
+       if (rval[0] == 'x' && rval[1] == '\0') {

                struct spwd *sp;
                sp = getspnam(getenv("USER"));
                struct spwd *sp;
                sp = getspnam(getenv("USER"));

-               if(!sp)
+               if (!sp)

                        die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                        die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");

-               endspent();

                rval = sp->sp_pwdp;
        }
 #endif
 
        /* drop privileges */
                rval = sp->sp_pwdp;
        }
 #endif
 
        /* drop privileges */

-       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
-               die("slock: cannot drop privileges");
+       if (geteuid() == 0 &&
+           ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
+               die("slock: cannot drop privileges\n");

        return rval;
 }
 #endif
        return rval;
 }
 #endif


@@ -81,40 +107,42 @@ 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;
+       unsigned int len, llen;

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

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

        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
         * had been removed and you can set it with "xset" or some other
         * utility. This way the user can easily set a customized DPMS
         * timeout. */
        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
         * had been removed and you can set it with "xset" or some other
         * utility. This way the user can easily set a customized DPMS
         * timeout. */

-       while(running && !XNextEvent(dpy, &ev)) {
-               if(ev.type == KeyPress) {
+       while (running && !XNextEvent(dpy, &ev)) {
+               if (ev.type == KeyPress) {

                        buf[0] = 0;
                        num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
                        buf[0] = 0;
                        num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);

-                       if(IsKeypadKey(ksym)) {
-                               if(ksym == XK_KP_Enter)
+                       if (IsKeypadKey(ksym)) {
+                               if (ksym == XK_KP_Enter)

                                        ksym = XK_Return;
                                        ksym = XK_Return;

-                               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+                               else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)

                                        ksym = (ksym - XK_KP_0) + XK_0;
                        }
                                        ksym = (ksym - XK_KP_0) + XK_0;
                        }

-                       if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                                       || IsPrivateKeypadKey(ksym))
+                       if (IsFunctionKey(ksym) ||
+                           IsKeypadKey(ksym) ||
+                           IsMiscFunctionKey(ksym) ||
+                           IsPFKey(ksym) ||
+                           IsPrivateKeypadKey(ksym))

                                continue;
                                continue;

-                       switch(ksym) {
+                       switch (ksym) {

                        case XK_Return:
                                passwd[len] = 0;
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
                        case XK_Return:
                                passwd[len] = 0;
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else

-                               running = strcmp(crypt(passwd, pws), pws);
+                               running = !!strcmp(crypt(passwd, pws), pws);

 #endif
 #endif

-                               if(running != False)
+                               if (running)

                                        XBell(dpy, 100);
                                len = 0;
                                break;
                                        XBell(dpy, 100);
                                len = 0;
                                break;


@@ -122,28 +150,42 @@ readpw(Display *dpy, const char *pws)
                                len = 0;
                                break;
                        case XK_BackSpace:
                                len = 0;
                                break;
                        case XK_BackSpace:

-                               if(len)
+                               if (len)

                                        --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) {
+                               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);
+               else for (screen = 0; screen < nscreens; screen++)
+                       XRaiseWindow(dpy, locks[screen]->win);

        }
 }
 
 static void
        }
 }
 
 static void

-unlockscreen(Display *dpy, Lock *lock) {
+unlockscreen(Display *dpy, Lock *lock)
+{

        if(dpy == NULL || lock == NULL)
                return;
 
        XUngrabPointer(dpy, CurrentTime);
        if(dpy == NULL || lock == NULL)
                return;
 
        XUngrabPointer(dpy, CurrentTime);

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

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


@@ -151,19 +193,20 @@ unlockscreen(Display *dpy, Lock *lock) {
 }
 
 static Lock *
 }
 
 static Lock *

-lockscreen(Display *dpy, int screen) {
+lockscreen(Display *dpy, int screen)
+{

        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        unsigned int len;
        Lock *lock;
        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;
 
        XSetWindowAttributes wa;
        Cursor invisible;
 

-       if(dpy == NULL || screen < 0)
+       if (dpy == NULL || screen < 0)

                return NULL;
 
        lock = malloc(sizeof(Lock));
                return NULL;
 
        lock = malloc(sizeof(Lock));

-       if(lock == NULL)
+       if (lock == NULL)

                return NULL;
 
        lock->screen = screen;
                return NULL;
 
        lock->screen = screen;


@@ -174,41 +217,47 @@ lockscreen(Display *dpy, int screen) {
        wa.override_redirect = 1;
        wa.background_pixel = BlackPixel(dpy, lock->screen);
        lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
        wa.override_redirect = 1;
        wa.background_pixel = BlackPixel(dpy, lock->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);
+                                 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);
        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);
        XDefineCursor(dpy, lock->win, invisible);
        XMapRaised(dpy, lock->win);

-       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)

                        break;
                usleep(1000);
        }
                        break;
                usleep(1000);
        }

-       if(running && (len > 0)) {
-               for(len = 1000; len; len--) {
-                       if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                               == GrabSuccess)
+       if (running && (len > 0)) {
+               for (len = 1000; len; len--) {
+                       if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)

                                break;
                        usleep(1000);
                }
                                break;
                        usleep(1000);
                }

-               running = (len > 0);

        }
 
        }
 

-       if(!running) {
+       running &= (len > 0);
+       if (!running) {

                unlockscreen(dpy, lock);
                lock = NULL;
        }
                unlockscreen(dpy, lock);
                lock = NULL;
        }

+       else {
+               XSelectInput(dpy, lock->root, SubstructureNotifyMask);
+       }

 
        return lock;
 }
 
 static void
 
        return lock;
 }
 
 static void

-usage(void) {
-       fprintf(stderr, "usage: slock [-v]");
-       exit(EXIT_FAILURE);
+usage(void)
+{
+       fprintf(stderr, "usage: slock [-v]\n");
+       exit(1);

 }
 
 int
 }
 
 int


@@ -219,29 +268,43 @@ main(int argc, char **argv) {
        Display *dpy;
        int screen;
 
        Display *dpy;
        int screen;
 

-       if((argc == 2) && !strcmp("-v", argv[1]))
-               die("slock-%s, © 2006-2012 Anselm R Garbe", VERSION);
-       else if(argc != 1)
+       if ((argc == 2) && !strcmp("-v", argv[1]))
+               die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
+       else if (argc != 1)

                usage();
 
                usage();
 

-       if(!getpwuid(getuid()))
-               die("slock: no passwd entry for you");
+#ifdef __linux__
+       dontkillme();
+#endif
+
+       if (!getpwuid(getuid()))
+               die("slock: no passwd entry for you\n");

 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
 #endif
 
 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
 #endif
 

-       if(!(dpy = XOpenDisplay(0)))
-               die("slock: cannot open display");
+       if (!(dpy = XOpenDisplay(0)))
+               die("slock: cannot open display\n");

        /* 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);

-       if(locks == NULL)
-               die("slock: malloc: %s", strerror(errno));
-       for(screen = 0; screen < nscreens; screen++)
-               locks[screen] = lockscreen(dpy, screen);
+       if (locks == NULL)
+               die("slock: malloc: %s\n", strerror(errno));
+       int nlocks = 0;
+       for (screen = 0; screen < nscreens; screen++) {
+               if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
+                       nlocks++;
+       }

        XSync(dpy, False);
 
        XSync(dpy, False);
 

+       /* Did we actually manage to lock something? */
+       if (nlocks == 0) { /* nothing to protect */
+               free(locks);
+               XCloseDisplay(dpy);
+               return 1;
+       }
+

        /* Everything is now blank. Now wait for the correct password. */
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);
        /* Everything is now blank. Now wait for the correct password. */
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);


@@ -250,7 +313,7 @@ main(int argc, char **argv) {
 #endif
 
        /* Password ok, unlock everything and quit. */
 #endif
 
        /* Password ok, unlock everything and quit. */

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

                unlockscreen(dpy, locks[screen]);
 
        free(locks);
                unlockscreen(dpy, locks[screen]);
 
        free(locks);