applied somwhat similiar patch like Alex Elide proposed

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 12c991f..164a464 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -63,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);
@@ -78,6 +75,14 @@ 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;
+       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);
 
@@ -91,17 +96,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
@@ -130,6 +124,7 @@ main(int argc, char **argv) {
                                break;
                        }
                }
+       XUngrabPointer(dpy, CurrentTime);
        XFreePixmap(dpy, pmap);
        XDestroyWindow(dpy, w);
        XCloseDisplay(dpy);