applied somwhat similiar patch like Alex Elide proposed

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 824baa29f360730a9c7d156cec8ebb738eef1c7c..164a464d2174a73b627dc87527a2db77ba9e879b 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,8 +1,15 @@
 /* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+
+#if HAVE_SHADOW_H
 #include <shadow.h>
+#else
+#include <pwd.h>
+#endif
+
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,34 +21,70 @@
 
 int
 main(int argc, char **argv) {
+       char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char buf[32], passwd[256];
-       int num, prev_nitem;
+       int num, screen;
+#if HAVE_SHADOW_H
        struct spwd *sp;
-       unsigned int i, len;
+#else
+       struct passwd *pw;
+#endif
+       unsigned int len;
        Bool running = True;
-       KeySym ksym;
+       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);
        }
-       if(!(sp = getspnam(getenv("USER")))) {
+       if(geteuid() != 0) {
                fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
                exit(EXIT_FAILURE);
        }
+#if HAVE_SHADOW_H
+       sp = getspnam(getenv("USER"));
        endspent();
+#else
+       pw = getpwuid(getuid());
+       endpwent();
+#endif
        if(!(dpy = XOpenDisplay(0))) {
                fputs("slock: cannot open display\n", stderr);
                exit(EXIT_FAILURE);
        }
+       screen = DefaultScreen(dpy);
 
        /* init */
        passwd[0] = 0;
-       while(XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
-                        GrabModeAsync, CurrentTime) != GrabSuccess)
+
+       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);
+       running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
+                       ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess;
+       len = 10;
+       for(len = 10; len && (XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
+               GrabModeAsync, CurrentTime) != GrabSuccess); len--)
                usleep(1000);
+       running = running && (len > 0);
+       XMapRaised(dpy, w);
+       XSync(dpy, False);
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
@@ -53,20 +96,14 @@ main(int argc, char **argv) {
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
                                continue;
-                       /* first check if a control mask is omitted */
-                       if(ev.xkey.state & ControlMask) {
-                               switch (ksym) {
-                               case XK_h:
-                               case XK_H: ksym = XK_BackSpace;
-                                       break;
-                               case XK_u:
-                               case XK_U: passwd[0] = 0;
-                                       continue;
-                               }
-                       }
                        switch(ksym) {
                        case XK_Return:
-                               running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd));
+#if HAVE_SHADOW_H
+                               if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
+#else
+                               if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd))))
+#endif
+                                       XBell(dpy, 100);
                                passwd[0] = 0;
                                break;
                        case XK_Escape:
@@ -87,6 +124,9 @@ main(int argc, char **argv) {
                                break;
                        }
                }
+       XUngrabPointer(dpy, CurrentTime);
+       XFreePixmap(dpy, pmap);
+       XDestroyWindow(dpy, w);
        XCloseDisplay(dpy);
        return 0;
 }