added pointer grab

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index db3aae0..72afd1e 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,28 +1,42 @@
 /* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 /* (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>
 #include <shadow.h>

+#else
+#include <pwd.h>
+#endif
+
+#include <ctype.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>
 
 int
 main(int argc, char **argv) {
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 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;
+       int num, screen;
+#if HAVE_SHADOW_H

        struct spwd *sp;
        struct spwd *sp;

-       unsigned int i, len;
+#else
+       struct passwd *pw;
+#endif
+       unsigned int len;

        Bool running = True;
        Bool running = True;

-       KeySym ksym;
+       Cursor invisible;

        Display *dpy;
        Display *dpy;

+       KeySym ksym;
+       Pixmap pmap;

        Window w;
        Window w;

+       XColor black, dummy;

        XEvent ev;
        XSetWindowAttributes wa;
 
        XEvent ev;
        XSetWindowAttributes wa;
 


@@ -30,11 +44,17 @@ main(int argc, char **argv) {
                fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
                exit(EXIT_SUCCESS);
        }
                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);
        }
                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();
        endspent();

+#else
+       pw = getpwuid(getuid());
+       endpwent();
+#endif

        if(!(dpy = XOpenDisplay(0))) {
                fputs("slock: cannot open display\n", stderr);
                exit(EXIT_FAILURE);
        if(!(dpy = XOpenDisplay(0))) {
                fputs("slock: cannot open display\n", stderr);
                exit(EXIT_FAILURE);


@@ -43,9 +63,6 @@ main(int argc, char **argv) {
 
        /* init */
        passwd[0] = 0;
 
        /* 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);


@@ -54,7 +71,15 @@ main(int argc, char **argv) {
                        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);
+       running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
+                       ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess
+               && XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
+                        GrabModeAsync, CurrentTime) == GrabSuccess;

        XMapRaised(dpy, w);
        XSync(dpy, False);
 
        XMapRaised(dpy, w);
        XSync(dpy, False);
 


@@ -68,20 +93,13 @@ main(int argc, char **argv) {
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
                                continue;
                                        || 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 HAVE_SHADOW_H

                                if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
                                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;
                                        XBell(dpy, 100);
                                passwd[0] = 0;
                                break;


@@ -103,6 +121,8 @@ main(int argc, char **argv) {
                                break;
                        }
                }
                                break;
                        }
                }

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

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