fixed missing new lines
[slock.git] / slock.c
diff --git a/slock.c b/slock.c
index 65722ea..7f74f71 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,13 +1,13 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for license details. */
 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>
 #endif
 
 #include <ctype.h>
+#include <errno.h>
 #include <pwd.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-const char *
-get_password() { /* only run as root */
+#if HAVE_BSD_AUTH
+#include <login_cap.h>
+#include <bsd_auth.h>
+#endif
+
+typedef struct {
+       int screen;
+       Window root, win;
+       Pixmap pmap;
+} Lock;
+
+static Lock **locks;
+static int nscreens;
+static Bool running = True;
+
+static void
+die(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+#ifndef HAVE_BSD_AUTH
+static const char *
+getpw(void) { /* only run as root */
        const char *rval;
        struct passwd *pw;
 
-       if(geteuid() != 0) {
-               fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
-               exit(EXIT_FAILURE);
-       }
        pw = getpwuid(getuid());
+       if(!pw)
+               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
        endpwent();
        rval =  pw->pw_passwd;
 
@@ -34,76 +58,50 @@ get_password() { /* only run as root */
        {
                struct spwd *sp;
                sp = getspnam(getenv("USER"));
+               if(!sp)
+                       die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                endspent();
                rval = sp->sp_pwdp;
        }
 #endif
+
        /* drop privileges */
-       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
-               fputs("slock: cannot drop privileges\n",stdout);
-               exit(EXIT_FAILURE);
-       }
+       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+               die("slock: cannot drop privileges");
        return rval;
 }
+#endif
 
-int
-main(int argc, char **argv) {
-       char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+static void
+#ifdef HAVE_BSD_AUTH
+readpw(Display *dpy)
+#else
+readpw(Display *dpy, const char *pws)
+#endif
+{
        char buf[32], passwd[256];
        int num, screen;
-       const char *pws;
        unsigned int len;
-       Bool running = True;
-       Cursor invisible;
-       Display *dpy;
        KeySym ksym;
-       Pixmap pmap;
-       Window w;
-       XColor black, dummy;
        XEvent ev;
-       XSetWindowAttributes wa;
-
-       if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
-               fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-               exit(EXIT_SUCCESS);
-       }
-       pws = get_password();
-       if(!(dpy = XOpenDisplay(0))) {
-               fputs("slock: cannot open display\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       screen = DefaultScreen(dpy);
 
-       /* init */
-       wa.override_redirect = 1;
-       wa.background_pixel = BlackPixel(dpy, screen);
-       w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
-                       DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
-                       0, DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
-
-       XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
-       pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
-       invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
-       XDefineCursor(dpy, w, invisible);
-       for(len = 1000; len && (XGrabPointer(dpy, RootWindow(dpy, screen), False,
-                       ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) != GrabSuccess); len--)
-               usleep(1000);
-       running = running && (len > 0);
-       for(len = 1000; len && (XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
-               GrabModeAsync, CurrentTime) != GrabSuccess); len--)
-               usleep(1000);
-       running = running && (len > 0);
        len = 0;
-       XMapRaised(dpy, w);
-       XSync(dpy, False);
+       running = True;
 
-       /* main event loop */
-       while(running && !XNextEvent(dpy, &ev))
+       /* 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) {
                        buf[0] = 0;
                        num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+                       if(IsKeypadKey(ksym)) {
+                               if(ksym == XK_KP_Enter)
+                                       ksym = XK_Return;
+                               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+                                       ksym = (ksym - XK_KP_0) + XK_0;
+                       }
                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
@@ -111,7 +109,12 @@ main(int argc, char **argv) {
                        switch(ksym) {
                        case XK_Return:
                                passwd[len] = 0;
-                               if((running = strcmp(crypt(passwd, pws), pws)) != 0)
+#ifdef HAVE_BSD_AUTH
+                               running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+#else
+                               running = strcmp(crypt(passwd, pws), pws);
+#endif
+                               if(running != False)
                                        XBell(dpy, 100);
                                len = 0;
                                break;
@@ -130,9 +133,128 @@ main(int argc, char **argv) {
                                break;
                        }
                }
+               else for(screen = 0; screen < nscreens; screen++)
+                       XRaiseWindow(dpy, locks[screen]->win);
+       }
+}
+
+static void
+unlockscreen(Display *dpy, Lock *lock) {
+       if(dpy == NULL || lock == NULL)
+               return;
+
        XUngrabPointer(dpy, CurrentTime);
-       XFreePixmap(dpy, pmap);
-       XDestroyWindow(dpy, w);
+       XFreePixmap(dpy, lock->pmap);
+       XDestroyWindow(dpy, lock->win);
+
+       free(lock);
+}
+
+static Lock *
+lockscreen(Display *dpy, int screen) {
+       char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+       unsigned int len;
+       Lock *lock;
+       XColor black, dummy;
+       XSetWindowAttributes wa;
+       Cursor invisible;
+
+       if(dpy == NULL || screen < 0)
+               return NULL;
+
+       lock = malloc(sizeof(Lock));
+       if(lock == NULL)
+               return NULL;
+
+       lock->screen = screen;
+
+       lock->root = RootWindow(dpy, lock->screen);
+
+       /* init */
+       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);
+       lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
+       invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &black, &black, 0, 0);
+       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)
+                       break;
+               usleep(1000);
+       }
+       if(running && (len > 0)) {
+               for(len = 1000; len; len--) {
+                       if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                               == GrabSuccess)
+                               break;
+                       usleep(1000);
+               }
+               running = (len > 0);
+       }
+
+       if(!running) {
+               unlockscreen(dpy, lock);
+               lock = NULL;
+       }
+
+       return lock;
+}
+
+static void
+usage(void) {
+       fprintf(stderr, "usage: slock [-v]\n");
+       exit(EXIT_FAILURE);
+}
+
+int
+main(int argc, char **argv) {
+#ifndef HAVE_BSD_AUTH
+       const char *pws;
+#endif
+       Display *dpy;
+       int screen;
+
+       if((argc == 2) && !strcmp("-v", argv[1]))
+               die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
+       else if(argc != 1)
+               usage();
+
+       if(!getpwuid(getuid()))
+               die("slock: no passwd entry for you");
+
+#ifndef HAVE_BSD_AUTH
+       pws = getpw();
+#endif
+
+       if(!(dpy = XOpenDisplay(0)))
+               die("slock: cannot open display");
+       /* 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);
+       XSync(dpy, False);
+
+       /* Everything is now blank. Now wait for the correct password. */
+#ifdef HAVE_BSD_AUTH
+       readpw(dpy);
+#else
+       readpw(dpy, pws);
+#endif
+
+       /* Password ok, unlock everything and quit. */
+       for(screen = 0; screen < nscreens; screen++)
+               unlockscreen(dpy, locks[screen]);
+
+       free(locks);
        XCloseDisplay(dpy);
+
        return 0;
 }