Added tag 0.7 for changeset c4635bb35a45

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index db3aae0..a7f79d9 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,108 +1,144 @@
-/* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-#define _XOPEN_SOURCE
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details. */
+#define _XOPEN_SOURCE 500
+#if HAVE_SHADOW_H

 #include <shadow.h>
 #include <shadow.h>

+#endif
+
+#include <ctype.h>
+#include <pwd.h>
+#include <stdarg.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>

-#include <X11/cursorfont.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>
 

+void
+eprint(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+const char *
+get_password() { /* only run as root */
+       const char *rval;
+       struct passwd *pw;
+
+       if(geteuid() != 0)
+               eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
+       pw = getpwuid(getuid());
+       endpwent();
+       rval =  pw->pw_passwd;
+
+#if HAVE_SHADOW_H
+       {
+               struct spwd *sp;
+               sp = getspnam(getenv("USER"));
+               endspent();
+               rval = sp->sp_pwdp;
+       }
+#endif
+       /* drop privileges */
+       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+               eprint("slock: cannot drop privileges\n");
+       return rval;
+}
+

 int
 main(int argc, char **argv) {
 int
 main(int argc, char **argv) {

+       char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};

        char buf[32], passwd[256];
        char buf[32], passwd[256];

-       int num, prev_nitem, screen;
-       struct spwd *sp;
-       unsigned int i, len;
+       int num, screen;
+       const char *pws;
+       unsigned int len;

        Bool running = True;
        Bool running = True;

-       KeySym ksym;
+       Cursor invisible;

        Display *dpy;
        Display *dpy;

-       Window w;
+       KeySym ksym;
+       Pixmap pmap;
+       Window root, w;
+       XColor black, dummy;

        XEvent ev;
        XSetWindowAttributes wa;
 
        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")))) {
-               fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       endspent();
-       if(!(dpy = XOpenDisplay(0))) {
-               fputs("slock: cannot open display\n", stderr);
-               exit(EXIT_FAILURE);
-       }
+       if((argc > 1) && !strncmp(argv[1], "-v", 3))
+               eprint("slock-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
+       pws = get_password();
+       if(!(dpy = XOpenDisplay(0)))
+               eprint("slock: cannot open display\n");

        screen = DefaultScreen(dpy);
        screen = DefaultScreen(dpy);

+       root = RootWindow(dpy, screen);

 
        /* init */
 
        /* init */

-       passwd[0] = 0;
-       while(XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
-                        GrabModeAsync, CurrentTime) != GrabSuccess)
-               usleep(1000);
-

        wa.override_redirect = 1;
        wa.background_pixel = BlackPixel(dpy, screen);
        wa.override_redirect = 1;
        wa.background_pixel = BlackPixel(dpy, screen);

-       w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
-                       DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
+       w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),

                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);

-
-       XDefineCursor(dpy, w, XCreateFontCursor(dpy, XC_coffee_mug));
+       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);

        XMapRaised(dpy, w);
        XMapRaised(dpy, w);

+       for(len = 1000; len; len--) {
+               if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+                       break;
+               usleep(1000);
+       }
+       if((running = running && (len > 0))) {
+               for(len = 1000; len; len--) {
+                       if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                               == GrabSuccess)
+                               break;
+                       usleep(1000);
+               }
+               running = (len > 0);
+       }
+       len = 0;

        XSync(dpy, False);
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
                if(ev.type == KeyPress) {
        XSync(dpy, False);
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
                if(ev.type == KeyPress) {

-                       len = strlen(passwd);

                        buf[0] = 0;
                        buf[0] = 0;

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

                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
                                continue;
                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || 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:
                        switch(ksym) {
                        case XK_Return:

-                               if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
+                               passwd[len] = 0;
+                               if((running = strcmp(crypt(passwd, pws), pws)) != 0)

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

-                               passwd[0] = 0;
+                               len = 0;

                                break;
                        case XK_Escape:
                                break;
                        case XK_Escape:

-                               passwd[0] = 0;
+                               len = 0;

                                break;
                        case XK_BackSpace:
                                if(len)
                                break;
                        case XK_BackSpace:
                                if(len)

-                                       passwd[--len] = 0;
+                                       --len;

                                break;
                        default:
                                break;
                        default:

-                               if(num && !iscntrl((int) buf[0])) {
-                                       buf[num] = 0;
-                                       if(len)
-                                               strncat(passwd, buf, sizeof(passwd));
-                                       else
-                                               strncpy(passwd, buf, sizeof(passwd));
+                               if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
+                                       memcpy(passwd + len, buf, num);
+                                       len += num;

                                }
                                break;
                        }
                }
                                }
                                break;
                        }
                }

+       XUngrabPointer(dpy, CurrentTime);
+       XFreePixmap(dpy, pmap);

        XDestroyWindow(dpy, w);
        XCloseDisplay(dpy);
        return 0;
        XDestroyWindow(dpy, w);
        XCloseDisplay(dpy);
        return 0;