added pointer grab

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 866400d..72afd1e 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,7 +1,7 @@
 /* (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>
@@ -9,6 +9,7 @@
 #include <pwd.h>
 #endif
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -22,13 +23,13 @@ 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, screen;
+       int num, screen;
 #if HAVE_SHADOW_H
        struct spwd *sp;
 #else
        struct passwd *pw;
 #endif
-       unsigned int i, len;
+       unsigned int len;
        Bool running = True;
        Cursor invisible;
        Display *dpy;
@@ -62,9 +63,6 @@ main(int argc, char **argv) {
 
        /* 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);
@@ -77,6 +75,11 @@ main(int argc, char **argv) {
        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);
 
@@ -90,17 +93,6 @@ 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:
 #if HAVE_SHADOW_H
@@ -129,6 +121,7 @@ main(int argc, char **argv) {
                                break;
                        }
                }
+       XUngrabPointer(dpy, CurrentTime);
        XFreePixmap(dpy, pmap);
        XDestroyWindow(dpy, w);
        XCloseDisplay(dpy);